[CVS] OpenPKG: openpkg-src/pango/ pango.spec

2005-11-29 Thread Steffen Weinreich 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Steffen Weinreich
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 23:19:08
  Branch: HEAD Handle: 2005112922190800

  Modified files:
openpkg-src/pango   pango.spec

  Log:
upgrading package: pango 1.10.1 -> 1.10.2

  Summary:
RevisionChanges Path
1.49+2  -2  openpkg-src/pango/pango.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/pango/pango.spec
  
  $ cvs diff -u -r1.48 -r1.49 pango.spec
  --- openpkg-src/pango/pango.spec  4 Oct 2005 20:33:32 -   1.48
  +++ openpkg-src/pango/pango.spec  29 Nov 2005 22:19:08 -  1.49
  @@ -23,7 +23,7 @@
   ##
   
   #   package version
  -%define   V_pango   1.10.1
  +%define   V_pango   1.10.2
   %define   V_glib_major  2.8
   %define   V_gtk_major   2.8
   
  @@ -38,7 +38,7 @@
   Group:XWindow
   License:  GPL
   Version:  %{V_pango}
  -Release:  20051004
  +Release:  20051129
   
   #   list of sources
   Source0:  
ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/pango-%{V_pango}.tar.bz2
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/snmp/ snmp.patch snmp.spec

2005-11-29 Thread Steffen Weinreich 
def solaris2
   +#undef _FILE_OFFSET_BITS /* solaris procfs doesn't support 64bit off_t */
  @@ -105,9 +105,9 @@

#ifdef solaris2
   Index: agent/mibgroup/util_funcs.c
   agent/mibgroup/util_funcs.c.orig 2004-06-18 14:58:24 +0200
  -+++ agent/mibgroup/util_funcs.c  2004-08-07 20:15:20 +0200
  -@@ -391,6 +391,9 @@
  +--- agent/mibgroup/util_funcs.c.orig 2005-03-02 19:43:12 +0100
   agent/mibgroup/util_funcs.c  2005-11-29 23:02:46 +0100
  +@@ -408,6 +408,9 @@
int fd[2][2], i, cnt;
charctmp[STRMAX], *cptr1, *cptr2, argvs[STRMAX], **argv,
**aptr;
  @@ -118,8 +118,8 @@
 * Setup our pipes 
 */
   Index: include/net-snmp/library/system.h
   include/net-snmp/library/system.h.orig   2003-11-30 23:31:42 +0100
  -+++ include/net-snmp/library/system.h2004-08-07 20:15:20 +0200
  +--- include/net-snmp/library/system.h.orig   2004-10-21 01:52:35 +0200
   include/net-snmp/library/system.h2005-11-29 23:02:46 +0100
   @@ -114,7 +114,8 @@
char   *strdup(const char *);
#endif
  @@ -131,9 +131,9 @@

int calculate_time_diff(struct timeval *,
   Index: snmplib/system.c
   snmplib/system.c.orig2004-12-25 05:51:17.0 +0100
  -+++ snmplib/system.c 2005-10-03 17:46:26.922736673 +0200
  -@@ -866,7 +866,7 @@
  +--- snmplib/system.c.orig2005-08-30 02:29:24 +0200
   snmplib/system.c 2005-11-29 23:02:46 +0100
  +@@ -871,7 +871,7 @@

#ifndef HAVE_SETENV
int
  @@ -142,19 +142,3 @@
{
char   *cp;
int ret;
  -@@ -1063,12 +1063,14 @@
  -  * If the release is ordered higher, return 1.
  -  * Be aware that "ordered higher" is not a guarantee of correctness.
  -  */
  -+#if HAVE_SYS_UTSNAME_H
  -+#include 
  -+#endif
  - int
  - netsnmp_os_prematch(const char *ospmname,
  - const char *ospmrelprefix)
  - {
  - #if HAVE_SYS_UTSNAME_H
  --#include 
  - static int printOSonce = 1;
  -   struct utsname utsbuf;
  -   if ( 0 != uname(&utsbuf))
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/snmp/snmp.spec
  
  $ cvs diff -u -r1.78 -r1.79 snmp.spec
  --- openpkg-src/snmp/snmp.spec3 Oct 2005 15:53:36 -   1.78
  +++ openpkg-src/snmp/snmp.spec29 Nov 2005 22:09:02 -  1.79
  @@ -35,8 +35,8 @@
   Class:BASE
   Group:Network
   License:  BSD
  -Version:  5.2.1
  -Release:  20051003
  +Version:  5.2.2
  +Release:  20051129
   
   #   package options
   %option   with_fslyes
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/openpkg-registry/ openpkg-registry.spec

2005-11-29 Thread Thomas Lotterer 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 21:19:20
  Branch: HEAD Handle: 2005112920192000

  Modified files:
openpkg-src/openpkg-registry
openpkg-registry.spec

  Log:
upgrading package: openpkg-registry 0.2.1 -> 0.2.5

  Summary:
RevisionChanges Path
1.7 +1  -1  openpkg-src/openpkg-registry/openpkg-registry.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-registry/openpkg-registry.spec
  
  $ cvs diff -u -r1.6 -r1.7 openpkg-registry.spec
  --- openpkg-src/openpkg-registry/openpkg-registry.spec29 Nov 2005 
19:07:43 -  1.6
  +++ openpkg-src/openpkg-registry/openpkg-registry.spec29 Nov 2005 
20:19:20 -  1.7
  @@ -32,7 +32,7 @@
   Class:EVAL
   Group:Bootstrapping
   License:  BSD-style
  -Version:  0.2.1
  +Version:  0.2.5
   Release:  20051129
   
   #   package options
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ VERSION register.sh registry-db.pl re...

2005-11-29 Thread Thomas Lotterer 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 21:17:19
  Branch: HEAD Handle: 2005112920171800

  Modified files:
openpkg-registryVERSION register.sh registry-db.pl registry-ui.pl

  Log:
bump before release

  Summary:
RevisionChanges Path
1.10+1  -1  openpkg-registry/VERSION
1.26+1  -1  openpkg-registry/register.sh
1.15+1  -1  openpkg-registry/registry-db.pl
1.50+1  -1  openpkg-registry/registry-ui.pl
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/VERSION
  
  $ cvs diff -u -r1.9 -r1.10 VERSION
  --- openpkg-registry/VERSION  29 Nov 2005 19:52:32 -  1.9
  +++ openpkg-registry/VERSION  29 Nov 2005 20:17:18 -  1.10
  @@ -2,5 +2,5 @@
 VERSION -- Version Information for OpenPKG Registry (syntax: Text)
 [automatically generated and maintained by GNU shtool]
   
  -  This is OpenPKG Registry, Version 0.2.4 (29-Nov-2005)
  +  This is OpenPKG Registry, Version 0.2.5 (29-Nov-2005)
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.25 -r1.26 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 20:12:36 -  1.25
  +++ openpkg-registry/register.sh  29 Nov 2005 20:17:18 -  1.26
  @@ -29,7 +29,7 @@
   
   #   program name, version and date
   progname="register"
  -progvers="0.2.4"
  +progvers="0.2.5"
   progdate="29-Nov-2005"
   
   #   determine path to OpenPKG instance
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-registry/registry-db.pl
  
  $ cvs diff -u -r1.14 -r1.15 registry-db.pl
  --- openpkg-registry/registry-db.pl   29 Nov 2005 19:52:32 -  1.14
  +++ openpkg-registry/registry-db.pl   29 Nov 2005 20:17:18 -  1.15
  @@ -37,7 +37,7 @@
   
   #   program name, version and date
   my $progname="registry-db.pl";
  -my $progvers="0.2.4";
  +my $progvers="0.2.5";
   my $progdate="29-Nov-2005";
   
   #   derive data version from program version
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-registry/registry-ui.pl
  
  $ cvs diff -u -r1.49 -r1.50 registry-ui.pl
  --- openpkg-registry/registry-ui.pl   29 Nov 2005 19:52:32 -  1.49
  +++ openpkg-registry/registry-ui.pl   29 Nov 2005 20:17:18 -  1.50
  @@ -43,7 +43,7 @@
   
   #   program name, version and date
   my $progname="registry-ui.pl";
  -my $progvers="0.2.4";
  +my $progvers="0.2.5";
   my $progdate="29-Nov-2005";
   
   #   determine path to OpenPKG instance
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 21:12:36
  Branch: HEAD Handle: 2005112920123600

  Modified files:
openpkg-registryregister.sh

  Log:
simplify sanity check for portability reasons

  Summary:
RevisionChanges Path
1.25+1  -1  openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.24 -r1.25 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 19:52:32 -  1.24
  +++ openpkg-registry/register.sh  29 Nov 2005 20:12:36 -  1.25
  @@ -63,7 +63,7 @@
   if [ ".$1" != . -a -r "$1" ]; then
   cat <"$1" | awk '
   BEGIN { rc=0 }
  -!/^([A-Z][A-Z0-9_]+[A-Z0-9]="[ !#$%&(-_a-~]+")? *(#.*)?$/ { rc=1 
}
  +!/^([A-Z][A-Z0-9_]+[A-Z0-9]="[^"]*")? *(#.*)?$/ { rc=1 }
   END { exit rc }' && return 0
   fi
   return 1
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ VERSION register.sh registry-db.pl re...

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 20:52:32
  Branch: HEAD Handle: 2005112919523200

  Modified files:
openpkg-registryVERSION register.sh registry-db.pl registry-ui.pl

  Log:
add a question mark to questions and bump version for forthcoming
release

  Summary:
RevisionChanges Path
1.9 +1  -1  openpkg-registry/VERSION
1.24+12 -12 openpkg-registry/register.sh
1.14+2  -2  openpkg-registry/registry-db.pl
1.49+2  -2  openpkg-registry/registry-ui.pl
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/VERSION
  
  $ cvs diff -u -r1.8 -r1.9 VERSION
  --- openpkg-registry/VERSION  28 Nov 2005 17:13:02 -  1.8
  +++ openpkg-registry/VERSION  29 Nov 2005 19:52:32 -  1.9
  @@ -2,5 +2,5 @@
 VERSION -- Version Information for OpenPKG Registry (syntax: Text)
 [automatically generated and maintained by GNU shtool]
   
  -  This is OpenPKG Registry, Version 0.2.1 (28-Nov-2005)
  +  This is OpenPKG Registry, Version 0.2.4 (29-Nov-2005)
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.23 -r1.24 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 19:32:36 -  1.23
  +++ openpkg-registry/register.sh  29 Nov 2005 19:52:32 -  1.24
  @@ -29,8 +29,8 @@
   
   #   program name, version and date
   progname="register"
  -progvers="0.2.1"
  -progdate="28-Nov-2005"
  +progvers="0.2.4"
  +progdate="29-Nov-2005"
   
   #   determine path to OpenPKG instance
   PREFIX="@l_prefix@"
  @@ -425,12 +425,12 @@
   echo "#`TZ= date '+%Y-%m-%d %H:%M:%S'`" | tee -a "$REGISTRY_CONF" 
2>/dev/null \
   || error "Configuration file not writable. Get more permissions and 
try again"
   
  -read -p "[REGISTRY_USER=\"$REGISTRY_USER\"] username ";  [ 
".$REPLY" != . ] && REGISTRY_USER="$REPLY"
  -read -p "[REGISTRY_DESC=\"$REGISTRY_DESC\"] description (*) ";   [ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
  -read -p "[REGISTRY_PLAT=\"$REGISTRY_PLAT\"] platform (*) ";  [ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
  -read -p "[REGISTRY_OREL=\"$REGISTRY_OREL\"] release (*) ";   [ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
  -read -p "[REGISTRY_UUID=\"$REGISTRY_UUID\"] uuid file to read "; [ 
".$REPLY" != . ] && REGISTRY_UUID="$REPLY"
  -read -p "[REGISTRY_PREP=\"$REGISTRY_PREP\"] prep dump file ";[ 
".$REPLY" != . ] && REGISTRY_PREP="$REPLY"
  +read -p "[REGISTRY_USER=\"$REGISTRY_USER\"] username? ";  [ 
".$REPLY" != . ] && REGISTRY_USER="$REPLY"
  +read -p "[REGISTRY_DESC=\"$REGISTRY_DESC\"] description (*)? ";   [ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
  +read -p "[REGISTRY_PLAT=\"$REGISTRY_PLAT\"] platform (*)? ";  [ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
  +read -p "[REGISTRY_OREL=\"$REGISTRY_OREL\"] release (*)? ";   [ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
  +read -p "[REGISTRY_UUID=\"$REGISTRY_UUID\"] uuid file to read? "; [ 
".$REPLY" != . ] && REGISTRY_UUID="$REPLY"
  +read -p "[REGISTRY_PREP=\"$REGISTRY_PREP\"] prep dump file? ";[ 
".$REPLY" != . ] && REGISTRY_PREP="$REPLY"
   
   [ ".$REGISTRY_USER" = . ] && error "missing information REGISTRY_USER"
   [ ".$REGISTRY_DESC" = . ] && error "missing information REGISTRY_DESC"
  @@ -460,9 +460,9 @@
   
   echo ""
   echo " Step 2/3: Transaction "
  -read -p "[REGISTRY_MODE=\"$REGISTRY_MODE\"] mode (post or fake) "; [ 
".$REPLY" != . ] && REGISTRY_MODE="$REPLY"
  -read -p "[REGISTRY_ARGS=\"$REGISTRY_ARGS\"] args ";[ 
".$REPLY" != . ] && REGISTRY_ARGS="$REPLY"
  -read -p "[REGISTRY_TRAN=\"$REGISTRY_TRAN\"] tran dump file ";  [ 
".$REPLY" != . ] && REGISTRY_TRAN="$REPLY"
  +read -p "[REGISTRY_MODE=\"$REGISTRY_MODE\"] mode (post or fake)? "; [ 
".$REPLY" != . ] && REGISTRY_MODE="$REPLY"
  +read -p "[REGISTRY_ARGS=\"$REGISTRY_ARGS\"] args? ";[ 
".$REPLY" != . ] && REGISTRY_ARGS="$REPLY"
  +read -p "[REGISTRY_TRAN=\"$REGISTRY_TRAN\"] tran dump file? ";  [ 
".$REPLY" != . ] && REGISTRY_TRAN="$REPLY"
   
   [ ".$REGISTRY_MODE" = . ] && error "missing information REGISTRY_MODE"
   [ ".$REGISTRY_ARGS" = . ] && error "missing information REGISTRY_ARGS"
  @@ -479,7 +479,7 @@
   
   echo ""
   echo " Step 3/3: Utilization "
  -read -p "[REGISTRY_UTIL=

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 20:32:36
  Branch: HEAD Handle: 2005112919323600

  Modified files:
openpkg-registryregister.sh

  Log:
no need to prompt the user too often

  Summary:
RevisionChanges Path
1.23+3  -3  openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.22 -r1.23 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 19:29:11 -  1.22
  +++ openpkg-registry/register.sh  29 Nov 2005 19:32:36 -  1.23
  @@ -420,7 +420,7 @@
   echo "Just press RETURN to continue and/or keep a default setting."
   
   echo ""
  -read -p " Step 1/3: Preparation  [press RETURN to continue]"
  +echo " Step 1/3: Preparation "
   echo "Attempting to write to the configuration file \"$REGISTRY_CONF\""
   echo "#`TZ= date '+%Y-%m-%d %H:%M:%S'`" | tee -a "$REGISTRY_CONF" 
2>/dev/null \
   || error "Configuration file not writable. Get more permissions and 
try again"
  @@ -459,7 +459,7 @@
   preparation
   
   echo ""
  -read -p " Step 2/3: Transaction  [press RETURN to continue]"
  +echo " Step 2/3: Transaction "
   read -p "[REGISTRY_MODE=\"$REGISTRY_MODE\"] mode (post or fake) "; [ 
".$REPLY" != . ] && REGISTRY_MODE="$REPLY"
   read -p "[REGISTRY_ARGS=\"$REGISTRY_ARGS\"] args ";[ 
".$REPLY" != . ] && REGISTRY_ARGS="$REPLY"
   read -p "[REGISTRY_TRAN=\"$REGISTRY_TRAN\"] tran dump file ";  [ 
".$REPLY" != . ] && REGISTRY_TRAN="$REPLY"
  @@ -478,7 +478,7 @@
   transaction <$REGISTRY_PREP
   
   echo ""
  -read -p " Step 3/3: Utilization  [press RETURN to continue]"
  +echo " Step 3/3: Utilization "
   read -p "[REGISTRY_UTIL=\"$REGISTRY_UTIL\"] util dump file ";  [ 
".$REPLY" != . ] && REGISTRY_UTIL="$REPLY"
   
   [ ".$REGISTRY_UTIL" = . ] && error "missing information REGISTRY_UTIL"
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 20:29:11
  Branch: HEAD Handle: 2005112919291100

  Modified files:
openpkg-registryregister.sh

  Log:
tell the user which step it performs

  Summary:
RevisionChanges Path
1.22+3  -3  openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.21 -r1.22 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 19:28:16 -  1.21
  +++ openpkg-registry/register.sh  29 Nov 2005 19:29:11 -  1.22
  @@ -420,7 +420,7 @@
   echo "Just press RETURN to continue and/or keep a default setting."
   
   echo ""
  -read -p " Preparation  [press RETURN to continue]"
  +read -p " Step 1/3: Preparation  [press RETURN to continue]"
   echo "Attempting to write to the configuration file \"$REGISTRY_CONF\""
   echo "#`TZ= date '+%Y-%m-%d %H:%M:%S'`" | tee -a "$REGISTRY_CONF" 
2>/dev/null \
   || error "Configuration file not writable. Get more permissions and 
try again"
  @@ -459,7 +459,7 @@
   preparation
   
   echo ""
  -read -p " Transaction  [press RETURN to continue]"
  +read -p " Step 2/3: Transaction  [press RETURN to continue]"
   read -p "[REGISTRY_MODE=\"$REGISTRY_MODE\"] mode (post or fake) "; [ 
".$REPLY" != . ] && REGISTRY_MODE="$REPLY"
   read -p "[REGISTRY_ARGS=\"$REGISTRY_ARGS\"] args ";[ 
".$REPLY" != . ] && REGISTRY_ARGS="$REPLY"
   read -p "[REGISTRY_TRAN=\"$REGISTRY_TRAN\"] tran dump file ";  [ 
".$REPLY" != . ] && REGISTRY_TRAN="$REPLY"
  @@ -478,7 +478,7 @@
   transaction <$REGISTRY_PREP
   
   echo ""
  -read -p " Utilization  [press RETURN to continue]"
  +read -p " Step 3/3: Utilization  [press RETURN to continue]"
   read -p "[REGISTRY_UTIL=\"$REGISTRY_UTIL\"] util dump file ";  [ 
".$REPLY" != . ] && REGISTRY_UTIL="$REPLY"
   
   [ ".$REGISTRY_UTIL" = . ] && error "missing information REGISTRY_UTIL"
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 20:28:17
  Branch: HEAD Handle: 2005112919281600

  Modified files:
openpkg-registryregister.sh

  Log:
output cosmetics

  Summary:
RevisionChanges Path
1.21+15 -15 openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.20 -r1.21 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 19:19:17 -  1.20
  +++ openpkg-registry/register.sh  29 Nov 2005 19:28:16 -  1.21
  @@ -333,7 +333,7 @@
   if [ ".$REGISTRY_MODE" = .post ]; then
   $curl \
   --silent \
  ---user-agent $useragent \
  +--user-agent "$useragent" \
   --form 'page=dropxml' \
   --form 'data=<-' \
   --form 'submit=DROPXML' \
  @@ -406,29 +406,28 @@
   return
   fi
   
  -echo "***"
  -echo "** Interactive step by step registration **"
  -echo "***"
  -echo "You may abort at any time pressing CTRL-C"
  +echo "OpenPKG Registry Client ($useragent)"
   echo ""
  -echo "Registration is a three step process:"
  -echo "-"
  -echo "1.) Preparation = create a configuration file and locally prepare 
a registration request"
  -echo "2.) Transaction = run a transaction to submit the request to the 
registry"
  -echo "3.) Utilization = memorize the response to activate URL rewriting"
  +echo "Interactive step-by-step registration procedure."
  +echo "You can abort at any time by just pressing CTRL-C."
   echo ""
  -echo "- a (*) marks an optional field where the empty string \"\" is 
allowed"
  -echo "- just press return to continue and/or keep the default setting"
  +echo "Registration is a three step process:"
  +echo "1. Preparation = create a configuration file and locally prepare a 
registration request"
  +echo "2. Transaction = run a transaction to submit the request to the 
registry"
  +echo "3. Utilization = memorize the response to activate local URL 
rewriting"
   echo ""
  +echo "A (*) marks an optional field where the empty string \"\" is 
allowed."
  +echo "Just press RETURN to continue and/or keep a default setting."
   
  +echo ""
   read -p " Preparation  [press RETURN to continue]"
   echo "Attempting to write to the configuration file \"$REGISTRY_CONF\""
   echo "#`TZ= date '+%Y-%m-%d %H:%M:%S'`" | tee -a "$REGISTRY_CONF" 
2>/dev/null \
   || error "Configuration file not writable. Get more permissions and 
try again"
   
   read -p "[REGISTRY_USER=\"$REGISTRY_USER\"] username ";  [ 
".$REPLY" != . ] && REGISTRY_USER="$REPLY"
  -read -p "[REGISTRY_DESC=\"$REGISTRY_DESC\"] description (*)";[ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
  -read -p "[REGISTRY_PLAT=\"$REGISTRY_PLAT\"] platform (*)";   [ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
  +read -p "[REGISTRY_DESC=\"$REGISTRY_DESC\"] description (*) ";   [ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
  +read -p "[REGISTRY_PLAT=\"$REGISTRY_PLAT\"] platform (*) ";  [ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
   read -p "[REGISTRY_OREL=\"$REGISTRY_OREL\"] release (*) ";   [ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
   read -p "[REGISTRY_UUID=\"$REGISTRY_UUID\"] uuid file to read "; [ 
".$REPLY" != . ] && REGISTRY_UUID="$REPLY"
   read -p "[REGISTRY_PREP=\"$REGISTRY_PREP\"] prep dump file ";[ 
".$REPLY" != . ] && REGISTRY_PREP="$REPLY"
  @@ -459,6 +458,7 @@
   
   preparation
   
  +echo ""
   read -p " Transaction  [press RETURN to continue]"
   read -p "[REGISTRY_MODE=\"$REGISTRY_MODE\"] mode (post or fake) "; [ 
".$REPLY" != . ] && REGISTRY_MODE="$REPLY"
   read -p "[REGISTRY_ARGS=\"$REGISTRY_ARGS\"] args ";[ 
".$REPLY" != . ] && REGISTRY_ARGS="$REPLY"
  @@ -477,8 +477,8 @@
   
   transaction <$REGISTRY_PREP
   
  +echo ""
   read -p " Utilization  [press RETURN to continue]"
  -echo "Press return to keep default"
   read -p "[REGISTRY_UTIL=\"$REGISTRY_UTIL\"] util dump file ";  [ 
".$REPLY" != . ] && REGISTRY_UTIL="$REPLY"
   
   [ ".$REGISTRY_UTIL" = . ] && error "missing information REGISTRY_UTIL"
  @@ .
__
The

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 20:19:18
  Branch: HEAD Handle: 2005112919191700

  Modified files:
openpkg-registryregister.sh

  Log:
there is just 'automatic' and 'automatically' in English AFAIK

  Summary:
RevisionChanges Path
1.20+3  -3  openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.19 -r1.20 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 19:18:02 -  1.19
  +++ openpkg-registry/register.sh  29 Nov 2005 19:19:17 -  1.20
  @@ -100,7 +100,7 @@
   #   default parameters
   
   #   primary operations
  -op="automatical"
  +op="automatic"
   
   #   standard options
   REGISTRY_MODE=""
  @@ -530,9 +530,9 @@
   }
   
   ##
  -##  automatical pick interaction or convenience
  +##  automatically pick interaction or convenience
   ##
  -automatical()
  +automatic()
   {
   if [ ".$REGISTRY_MODE" = .wipe ]; then
   convenience
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 20:18:02
  Branch: HEAD Handle: 2005112919180200

  Modified files:
openpkg-registryregister.sh

  Log:
add the usual blank on those error messages

  Summary:
RevisionChanges Path
1.19+1  -1  openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.18 -r1.19 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 19:16:47 -  1.18
  +++ openpkg-registry/register.sh  29 Nov 2005 19:18:02 -  1.19
  @@ -49,7 +49,7 @@
   
   error()
   {
  -echo "$progname:ERROR:$@"
  +echo "$progname:ERROR: $@"
   exit 1
   }
   
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 20:16:48
  Branch: HEAD Handle: 2005112919164700

  Modified files:
openpkg-registryregister.sh

  Log:
coding style cleanup (mainly consistent indentations)

  Summary:
RevisionChanges Path
1.18+88 -96 openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.17 -r1.18 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 17:59:37 -  1.17
  +++ openpkg-registry/register.sh  29 Nov 2005 19:16:47 -  1.18
  @@ -73,7 +73,7 @@
   {
   [ ".$REGISTRY_CONF" = . ] && return
   if [ -r "$REGISTRY_CONF" ]; then
  -  sanitycheck "$REGISTRY_CONF" && . "$REGISTRY_CONF"
  +sanitycheck "$REGISTRY_CONF" && . "$REGISTRY_CONF"
   fi
   }
   
  @@ -81,7 +81,7 @@
   {
   [ ".$REGISTRY_UUID" = . ] && return
   if [ -r "$REGISTRY_UUID" ]; then
  -  sanitycheck "$REGISTRY_UUID" && . "$REGISTRY_UUID"
  +sanitycheck "$REGISTRY_UUID" && . "$REGISTRY_UUID"
   fi
   }
   
  @@ -89,7 +89,7 @@
   {
   [ ".$REGISTRY_UTIL" = . ] && return
   if [ -r "$REGISTRY_UTIL" ]; then
  -  sanitycheck "$REGISTRY_UTIL" && . "$REGISTRY_UTIL"
  +sanitycheck "$REGISTRY_UTIL" && . "$REGISTRY_UTIL"
   fi
   }
   
  @@ -99,16 +99,16 @@
   
   #   default parameters
   
  -# Primary operations
  +#   primary operations
   op="automatical"
   
  -# Standard options
  +#   standard options
   REGISTRY_MODE=""
   REGISTRY_ARGS="http://registry.openpkg.org/register";
   REGISTRY_USER=""
   REGISTRY_DESC="openpkg://${HOSTNAME}${PREFIX}"
   
  -# Advanced options
  +#   advanced options
   REGISTRY_PLAT="`$oldbinnewsh --eval '%{l_platform -p}'`"
   REGISTRY_OREL="`$oldbinnewsh --eval '%{l_openpkg_release}'`"
   REGISTRY_UUID="$PREFIX/etc/openpkg/uuid"
  @@ -117,10 +117,10 @@
   REGISTRY_TRAN="$PREFIX/etc/openpkg/register.tran"
   REGISTRY_UTIL="$PREFIX/etc/openpkg/register.util"
   
  -# Read baseline config early and allow options to override contents
  +#   read baseline config early and allow options to override contents
   readconf
   
  -# Debug options
  +#   debug options
   verbose="no"
   help="no"
   
  @@ -136,84 +136,85 @@
  *) arg='' ;;
   esac
   case $opt in
  -# Primary operations
  +#   primary operations
   -P|--preparation ) op="preparation" ;;
   -T|--transaction ) op="transaction" ;;
   -U|--utilization ) op="utilization" ;;
   -C|--convenience ) op="convenience" ;;
   -I|--interaction ) op="interaction" ;;
   
  -# Additional features
  +#   additional features
   -S|--printstatus ) op="printstatus" ;;
   -R|--rewriteurls ) op="rewriteurls" ;;
   
  -# Standard options
  +#   standard options
   -m|--mode )
  -  if [ ".$arg" = . ]; then shift; arg="$1"; fi
  -  if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  -  REGISTRY_MODE="$arg"
  -  ;;
  +if [ ".$arg" = . ]; then shift; arg="$1"; fi
  +if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  +REGISTRY_MODE="$arg"
  +;;
   -a|--args )
  -  if [ ".$arg" = . ]; then shift; arg="$1"; fi
  -  if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  -  REGISTRY_ARGS="$arg"
  -  ;;
  +if [ ".$arg" = . ]; then shift; arg="$1"; fi
  +if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  +REGISTRY_ARGS="$arg"
  +;;
   -u|--user )
  -  if [ ".$arg" = . ]; then shift; arg="$1"; fi
  -  if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  -  REGISTRY_USER="$arg"
  -  ;;
  +if [ ".$arg" = . ]; then shift; arg="$1"; fi
  +if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  +REGISTRY_USER="$arg"
  +;;
   -d|--desc )
  -  if [ ".$arg" = . ]; then shift; arg="$1"; fi
  -  if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  -  REGISTRY_DESC="$arg"
  -  ;;
  +if [ ".$arg" = . ]; then shift; arg="$1"; fi
  +if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  +REGISTRY_DESC="$ar

[CVS] OpenPKG: openpkg-src/openpkg-registry/ openpkg-registry.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 20:07:44
  Branch: HEAD Handle: 2005112919074300

  Modified files:
openpkg-src/openpkg-registry
openpkg-registry.spec

  Log:
fix packaging

  Summary:
RevisionChanges Path
1.6 +5  -5  openpkg-src/openpkg-registry/openpkg-registry.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-registry/openpkg-registry.spec
  
  $ cvs diff -u -r1.5 -r1.6 openpkg-registry.spec
  --- openpkg-src/openpkg-registry/openpkg-registry.spec28 Nov 2005 
17:13:59 -  1.5
  +++ openpkg-src/openpkg-registry/openpkg-registry.spec29 Nov 2005 
19:07:43 -  1.6
  @@ -33,7 +33,7 @@
   Group:Bootstrapping
   License:  BSD-style
   Version:  0.2.1
  -Release:  20051128
  +Release:  20051129
   
   #   package options
   %option   with_client  yes
  @@ -120,10 +120,10 @@
   '%attr(700,%{l_rusr},%{l_rgrp}) %dir 
%{l_prefix}/var/openpkg-registry/db' \
   '%attr(775,%{l_musr},%{l_ngrp}) %dir 
%{l_prefix}/var/openpkg-registry/ui' \
   %endif
  -%ghost %{l_prefix}/etc/openpkg/register.util \
  -%ghost %{l_prefix}/etc/openpkg/register.tran \
  -%ghost %{l_prefix}/etc/openpkg/register.prep \
  -%config %{l_prefix}/etc/openpkg/register.conf
  +'%ghost %{l_prefix}/etc/openpkg/register.util' \
  +'%ghost %{l_prefix}/etc/openpkg/register.tran' \
  +'%ghost %{l_prefix}/etc/openpkg/register.prep' \
  +'%config %{l_prefix}/etc/openpkg/register.conf'
   
   %files -f files
   
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-re/ pmod-psod.txt

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-re   Date:   29-Nov-2005 19:58:40
  Branch: HEAD Handle: 2005112918584000

  Modified files:
openpkg-re  pmod-psod.txt

  Log:
PMOD switches

  Summary:
RevisionChanges Path
1.67+0  -1  openpkg-re/pmod-psod.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-re/pmod-psod.txt
  
  $ cvs diff -u -r1.66 -r1.67 pmod-psod.txt
  --- openpkg-re/pmod-psod.txt  21 Nov 2005 07:15:58 -  1.66
  +++ openpkg-re/pmod-psod.txt  29 Nov 2005 18:58:40 -  1.67
  @@ -12,7 +12,6 @@
   
 Week  Start Date  PMOD 
 - --- -
  -  CW-47 2005-11-21  thl
 CW-48 2005-11-28  steve
 CW-49 2005-12-05  mk
 CW-50 2005-12-12  rse
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Thomas Lotterer 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 18:59:37
  Branch: HEAD Handle: 2005112917593700

  Modified files:
openpkg-registryregister.sh

  Log:
prevent rpm.sh/register.sh loop bypassing the openpkg wrapper

  Summary:
RevisionChanges Path
1.17+7  -2  openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.16 -r1.17 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 17:04:49 -  1.16
  +++ openpkg-registry/register.sh  29 Nov 2005 17:59:37 -  1.17
  @@ -38,6 +38,11 @@
   PREFIX="${OPENPKG_PREFIX}"
   fi
   
  +#   determine old binary-only vs. shell+binary situation
  +oldbinnewsh="$PREFIX/libexec/openpkg/rpm" # old binary rpm, new embedded 
shell rpm
  +oldnanewbin="$PREFIX/lib/openpkg/rpm" # old n/a, new binary rpm
  +if [ -x $oldbinnewsh -a -x $oldnanewbin ]; then exec $oldnanewbin "$@"; fi
  +
   #   http post
   curl="$PREFIX/lib/openpkg/curl"
   useragent="openpkg-$progname/$progvers"
  @@ -104,8 +109,8 @@
   REGISTRY_DESC="openpkg://${HOSTNAME}${PREFIX}"
   
   # Advanced options
  -REGISTRY_PLAT="`$PREFIX/bin/openpkg rpm --eval '%{l_platform -p}'`"
  -REGISTRY_OREL="`$PREFIX/bin/openpkg rpm --eval '%{l_openpkg_release}'`"
  +REGISTRY_PLAT="`$oldbinnewsh --eval '%{l_platform -p}'`"
  +REGISTRY_OREL="`$oldbinnewsh --eval '%{l_openpkg_release}'`"
   REGISTRY_UUID="$PREFIX/etc/openpkg/uuid"
   REGISTRY_CONF="$PREFIX/etc/openpkg/register.conf"
   REGISTRY_PREP="$PREFIX/etc/openpkg/register.prep"
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/crossroads/ crossroads.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 18:50:11
  Branch: HEAD Handle: 2005112917501100

  Modified files:
openpkg-src/crossroads  crossroads.spec

  Log:
upgrading package: crossroads 0.17 -> 0.18

  Summary:
RevisionChanges Path
1.7 +2  -2  openpkg-src/crossroads/crossroads.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/crossroads/crossroads.spec
  
  $ cvs diff -u -r1.6 -r1.7 crossroads.spec
  --- openpkg-src/crossroads/crossroads.spec25 Nov 2005 08:46:34 -  
1.6
  +++ openpkg-src/crossroads/crossroads.spec29 Nov 2005 17:50:11 -  
1.7
  @@ -32,8 +32,8 @@
   Class:EVAL
   Group:Network
   License:  Open Source
  -Version:  0.17
  -Release:  20051125
  +Version:  0.18
  +Release:  20051129
   
   #   package options
   %option   with_fsl  yes
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/p7zip/ p7zip.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 18:49:31
  Branch: HEAD Handle: 2005112917493100

  Modified files:
openpkg-src/p7zip   p7zip.spec

  Log:
upgrading package: p7zip 4.27 -> 4.30

  Summary:
RevisionChanges Path
1.12+3  -3  openpkg-src/p7zip/p7zip.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/p7zip/p7zip.spec
  
  $ cvs diff -u -r1.11 -r1.12 p7zip.spec
  --- openpkg-src/p7zip/p7zip.spec  23 Sep 2005 06:55:56 -  1.11
  +++ openpkg-src/p7zip/p7zip.spec  29 Nov 2005 17:49:31 -  1.12
  @@ -32,11 +32,11 @@
   Class:EVAL
   Group:Archiver
   License:  LGPL
  -Version:  4.27
  -Release:  20050923
  +Version:  4.30
  +Release:  20051129
   
   #   list of sources
  -Source0:  
http://osdn.dl.sourceforge.net/p7zip/p7zip_%{version}_src.tar.bz2
  +Source0:  
http://osdn.dl.sourceforge.net/p7zip/p7zip_%{version}_src_all.tar.bz2
   Patch0:   p7zip.patch
   
   #   build information
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Thomas Lotterer 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 18:04:50
  Branch: HEAD Handle: 2005112917044900

  Modified files:
openpkg-registryregister.sh

  Log:
reorder options and update usage

  Summary:
RevisionChanges Path
1.16+24 -24 openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.15 -r1.16 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 17:01:46 -  1.15
  +++ openpkg-registry/register.sh  29 Nov 2005 17:04:49 -  1.16
  @@ -143,11 +143,6 @@
   -R|--rewriteurls ) op="rewriteurls" ;;
   
   # Standard options
  --c|--conf )
  -  if [ ".$arg" = . ]; then shift; arg="$1"; fi
  -  if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  -  REGISTRY_CONF="$arg"; readconf
  -  ;;
   -m|--mode )
 if [ ".$arg" = . ]; then shift; arg="$1"; fi
 if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  @@ -170,11 +165,26 @@
 ;;
   
   # Advanced options
  +--plat )
  +  if [ ".$arg" = . ]; then shift; arg="$1"; fi
  +  if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  +  REGISTRY_PLAT="$arg"
  +  ;;
  +--orel )
  +  if [ ".$arg" = . ]; then shift; arg="$1"; fi
  +  if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  +  REGISTRY_VERS="$arg"
  +  ;;
   --uuid )
 if [ ".$arg" = . ]; then shift; arg="$1"; fi
 if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
 REGISTRY_UUID="$arg"
 ;;
  +--conf )
  +  if [ ".$arg" = . ]; then shift; arg="$1"; fi
  +  if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  +  REGISTRY_CONF="$arg"; readconf
  +  ;;
   --prep )
 if [ ".$arg" = . ]; then shift; arg="$1"; fi
 if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  @@ -190,16 +200,6 @@
 if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
 REGISTRY_UTIL="$arg"
 ;;
  ---plat )
  -  if [ ".$arg" = . ]; then shift; arg="$1"; fi
  -  if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  -  REGISTRY_PLAT="$arg"
  -  ;;
  ---orel )
  -  if [ ".$arg" = . ]; then shift; arg="$1"; fi
  -  if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  -  REGISTRY_VERS="$arg"
  -  ;;
   
   # Debug options
   -v|--verbose ) verbose="yes" ;;
  @@ -220,19 +220,19 @@
   if [ ".$help" != ".Usage" ]; then
   echo "$progname:ERROR: $help" 1>&2
   fi
  -echo "Usage: $progname :
  -  [-v|--verbose] [-h|--help]
  -  [-P|--preparation] [-T|--transaction] [-U|--utilization] 
[-C|--convenience] [-I|--interaction]
  -  [-c|--conf=]
  +echo "Usage: $progname:
 -m|--mode=fake|post|wipe [-a|--args=] -u|--user= 
[-d|--desc=]
  -  [--uuid=] [--prep=] [--tran=] [--util=]
  +  [-v|--verbose] [-h|--help]
 [--plat=] [--orel=]
  -  Usage: $progname :
  +  [--uuid=]
  +  [--conf=] [--prep=] [--tran=] [--util=]
  +  [-P|--preparation] [-T|--transaction] [-U|--utilization] 
[-C|--convenience] [-I|--interaction]
  +
  +  Usage: $progname:
 -S|--printstatus
  -  Usage: $progname :
  -  -R|--rewriteurls [[url]...]]
  -  " 1>&2
   
  +  Usage: $progname:
  +  -R|--rewriteurls [[url]...]]" 1>&2
   if [ ".$help" != ".Usage" ]; then
   exit 1
   else
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Thomas Lotterer 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 18:01:46
  Branch: HEAD Handle: 2005112917014600

  Modified files:
openpkg-registryregister.sh

  Log:
handle --conf as much like the other advanced options as possible

  Summary:
RevisionChanges Path
1.15+16 -15 openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.14 -r1.15 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 16:37:55 -  1.14
  +++ openpkg-registry/register.sh  29 Nov 2005 17:01:46 -  1.15
  @@ -66,9 +66,9 @@
   
   readconf()
   {
  -[ ".$conf" = . ] && return
  -if [ -r "$conf" ]; then
  -  sanitycheck "$conf" && . "$conf"
  +[ ".$REGISTRY_CONF" = . ] && return
  +if [ -r "$REGISTRY_CONF" ]; then
  +  sanitycheck "$REGISTRY_CONF" && . "$REGISTRY_CONF"
   fi
   }
   
  @@ -107,12 +107,13 @@
   REGISTRY_PLAT="`$PREFIX/bin/openpkg rpm --eval '%{l_platform -p}'`"
   REGISTRY_OREL="`$PREFIX/bin/openpkg rpm --eval '%{l_openpkg_release}'`"
   REGISTRY_UUID="$PREFIX/etc/openpkg/uuid"
  +REGISTRY_CONF="$PREFIX/etc/openpkg/register.conf"
   REGISTRY_PREP="$PREFIX/etc/openpkg/register.prep"
   REGISTRY_TRAN="$PREFIX/etc/openpkg/register.tran"
   REGISTRY_UTIL="$PREFIX/etc/openpkg/register.util"
   
  -# Configuration file default and read attempt
  -conf="$PREFIX/etc/openpkg/register.conf"; readconf
  +# Read baseline config early and allow options to override contents
  +readconf
   
   # Debug options
   verbose="no"
  @@ -145,7 +146,7 @@
   -c|--conf )
 if [ ".$arg" = . ]; then shift; arg="$1"; fi
 if [ ".$arg" = . ]; then help="Missing argument to \"$opt\""; 
break; fi
  -  conf="$arg"; readconf
  +  REGISTRY_CONF="$arg"; readconf
 ;;
   -m|--mode )
 if [ ".$arg" = . ]; then shift; arg="$1"; fi
  @@ -404,7 +405,7 @@
   interaction()
   {
   if [ ".$REGISTRY_MODE" = .wipe ]; then
  -[ ".$conf" != . -a -w $conf ] && cat $conf
  +[ ".$REGISTRY_CONF" != . -a -w $REGISTRY_CONF ] && cat $REGISTRY_CONF
   return
   fi
   
  @@ -424,8 +425,8 @@
   echo ""
   
   read -p " Preparation  [press RETURN to continue]"
  -echo "Attempting to write to the configuration file \"$conf\""
  -echo "#`TZ= date '+%Y-%m-%d %H:%M:%S'`" | tee -a "$conf" 2>/dev/null \
  +echo "Attempting to write to the configuration file \"$REGISTRY_CONF\""
  +echo "#`TZ= date '+%Y-%m-%d %H:%M:%S'`" | tee -a "$REGISTRY_CONF" 
2>/dev/null \
   || error "Configuration file not writable. Get more permissions and try 
again"
   
   read -p "[REGISTRY_USER=\"$REGISTRY_USER\"] username ";  [ 
".$REPLY" != . ] && REGISTRY_USER="$REPLY"
  @@ -449,7 +450,7 @@
   [ ".$UUID_INSTANCE" = . ] && error "missing information UUID_INSTANCE"
   [ ".$UUID_PLATFORM" = . ] && error "missing information UUID_PLATFORM"
   
  -echo "Appending to configuration file \"$conf\""
  +echo "Appending to configuration file \"$REGISTRY_CONF\""
   (
   echo "REGISTRY_USER=\"$REGISTRY_USER\""
   echo "REGISTRY_DESC=\"$REGISTRY_DESC\""
  @@ -457,7 +458,7 @@
   echo "REGISTRY_OREL=\"$REGISTRY_OREL\""
   echo "REGISTRY_UUID=\"$REGISTRY_UUID\""
   echo "REGISTRY_PREP=\"$REGISTRY_PREP\""
  -) | tee -a "$conf"
  +) | tee -a "$REGISTRY_CONF"
   
   preparation
   
  @@ -470,12 +471,12 @@
   [ ".$REGISTRY_ARGS" = . ] && error "missing information REGISTRY_ARGS"
   [ ".$REGISTRY_TRAN" = . ] && error "missing information REGISTRY_TRAN"
   
  -echo "Appending to configuration file \"$conf\""
  +echo "Appending to configuration file \"$REGISTRY_CONF\""
   (
   echo "REGISTRY_MODE=\"$REGISTRY_MODE\""
   echo "REGISTRY_ARGS=\"$REGISTRY_ARGS\""
   echo "REGISTRY_TRAN=\"$REGISTRY_TRAN\""
  -) | tee -a "$conf"
  +) | tee -a "$REGISTRY_CONF"
   
   transaction <$REGISTRY_PREP
   
  @@ -485,10 +486,10 @@
   
   [ ".$REGISTRY_UTIL" = . ] && error "missing information REGISTRY_UTIL"
   
  -echo "Appending to configuration file \"$conf\""
  +echo "Appending to configuration file \"$REGISTRY_CONF\""
   (
   echo "REGISTRY_UTIL=\"$REGISTRY_UTIL\""
  -) | tee -a "$conf"
  +) | tee -a "$REGISTRY_CONF"
   
   utilization <$REGISTRY_TRAN
   }
  @@ .

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Thomas Lotterer 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 17:37:55
  Branch: HEAD Handle: 2005112916375500

  Modified files:
openpkg-registryregister.sh

  Log:
slightly improve interactive dialog

  Summary:
RevisionChanges Path
1.14+21 -12 openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.13 -r1.14 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 16:35:18 -  1.13
  +++ openpkg-registry/register.sh  29 Nov 2005 16:37:55 -  1.14
  @@ -408,16 +408,26 @@
   return
   fi
   
  -echo "Interactive step by step registration. You may abort at any time 
pressing CTRL-C sequence."
  -echo "(*) marks an optional field where the empty string \"\" is allowed"
  +echo "***"
  +echo "** Interactive step by step registration **"
  +echo "***"
  +echo "You may abort at any time pressing CTRL-C"
  +echo ""
  +echo "Registration is a three step process:"
  +echo "-"
  +echo "1.) Preparation = create a configuration file and locally prepare 
a registration request"
  +echo "2.) Transaction = run a transaction to submit the request to the 
registry"
  +echo "3.) Utilization = memorize the response to activate URL rewriting"
  +echo ""
  +echo "- a (*) marks an optional field where the empty string \"\" is 
allowed"
  +echo "- just press return to continue and/or keep the default setting"
  +echo ""
  +
  +read -p " Preparation  [press RETURN to continue]"
  +echo "Attempting to write to the configuration file \"$conf\""
  +echo "#`TZ= date '+%Y-%m-%d %H:%M:%S'`" | tee -a "$conf" 2>/dev/null \
  +|| error "Configuration file not writable. Get more permissions and try 
again"
   
  -touch "$conf" || error "Configuration file \"$conf\" not writable. Get 
more permissions and try again"
  -
  -read -p "Appending activity timestamp to configuration file \"$conf\" 
[press RETURN to continue]"
  -echo "#`TZ= date '+%Y-%m-%d %H:%M:%S'`" | tee -a "$conf"
  -
  -echo " Preparation "
  -echo "Press return to keep default"
   read -p "[REGISTRY_USER=\"$REGISTRY_USER\"] username ";  [ 
".$REPLY" != . ] && REGISTRY_USER="$REPLY"
   read -p "[REGISTRY_DESC=\"$REGISTRY_DESC\"] description (*)";[ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
   read -p "[REGISTRY_PLAT=\"$REGISTRY_PLAT\"] platform (*)";   [ 
".$REPLY" != . ] && REGISTRY_DESC="$REPLY"
  @@ -451,8 +461,7 @@
   
   preparation
   
  -echo " Transaction "
  -echo "Press return to keep default"
  +read -p " Transaction  [press RETURN to continue]"
   read -p "[REGISTRY_MODE=\"$REGISTRY_MODE\"] mode (post or fake) "; [ 
".$REPLY" != . ] && REGISTRY_MODE="$REPLY"
   read -p "[REGISTRY_ARGS=\"$REGISTRY_ARGS\"] args ";[ 
".$REPLY" != . ] && REGISTRY_ARGS="$REPLY"
   read -p "[REGISTRY_TRAN=\"$REGISTRY_TRAN\"] tran dump file ";  [ 
".$REPLY" != . ] && REGISTRY_TRAN="$REPLY"
  @@ -470,7 +479,7 @@
   
   transaction <$REGISTRY_PREP
   
  -echo " Utilization "
  +read -p " Utilization  [press RETURN to continue]"
   echo "Press return to keep default"
   read -p "[REGISTRY_UTIL=\"$REGISTRY_UTIL\"] util dump file ";  [ 
".$REPLY" != . ] && REGISTRY_UTIL="$REPLY"
   
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ register.sh rpm.sh

2005-11-29 Thread Thomas Lotterer 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 17:35:18
  Branch: HEAD Handle: 2005112916351800

  Modified files:
openpkg-registryregister.sh rpm.sh

  Log:
move registration detection and URL rewrite logic from rpm.sh into
rewrite.sh, making it available to other scripts

  Summary:
RevisionChanges Path
1.13+72 -3  openpkg-registry/register.sh
1.5 +5  -46 openpkg-registry/rpm.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.12 -r1.13 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 16:19:27 -  1.12
  +++ openpkg-registry/register.sh  29 Nov 2005 16:35:18 -  1.13
  @@ -66,12 +66,28 @@
   
   readconf()
   {
  -[ ".$conf" = . ] && error "missing information conf"
  +[ ".$conf" = . ] && return
   if [ -r "$conf" ]; then
 sanitycheck "$conf" && . "$conf"
   fi
   }
   
  +readuuid()
  +{
  +[ ".$REGISTRY_UUID" = . ] && return
  +if [ -r "$REGISTRY_UUID" ]; then
  +  sanitycheck "$REGISTRY_UUID" && . "$REGISTRY_UUID"
  +fi
  +}
  +
  +readutil()
  +{
  +[ ".$REGISTRY_UTIL" = . ] && return
  +if [ -r "$REGISTRY_UTIL" ]; then
  +  sanitycheck "$REGISTRY_UTIL" && . "$REGISTRY_UTIL"
  +fi
  +}
  +
   ##
   ##  command line option parsing
   ##
  @@ -103,6 +119,8 @@
   help="no"
   
   #   iterate over argument line
  +declare -a a
  +declare -i i=0
   while [ $# -gt 0 ]; do
   opt=$1
   case $opt in
  @@ -119,6 +137,10 @@
   -C|--convenience ) op="convenience" ;;
   -I|--interaction ) op="interaction" ;;
   
  +# Additional features
  +-S|--printstatus ) op="printstatus" ;;
  +-R|--rewriteurls ) op="rewriteurls" ;;
  +
   # Standard options
   -c|--conf )
 if [ ".$arg" = . ]; then shift; arg="$1"; fi
  @@ -183,9 +205,14 @@
   -h|--help) help="Usage"  ;;
   -*   ) help="Invalid option \`$opt'"; break ;;
   
  +# Optional arguments
  +* ) a[$i]="$opt"
  +i=i+1
   esac
   shift
   done
  +set -- "[EMAIL PROTECTED]"
  +unset i a
   
   #   display error or usage message
   if [ ".$help" != .no ]; then
  @@ -196,9 +223,13 @@
 [-v|--verbose] [-h|--help]
 [-P|--preparation] [-T|--transaction] [-U|--utilization] 
[-C|--convenience] [-I|--interaction]
 [-c|--conf=]
  -  -m|--mode= [-a|--args=] -u|--user= 
[-d|--desc=]
  +  -m|--mode=fake|post|wipe [-a|--args=] -u|--user= 
[-d|--desc=]
 [--uuid=] [--prep=] [--tran=] [--util=]
 [--plat=] [--orel=]
  +  Usage: $progname :
  +  -S|--printstatus
  +  Usage: $progname :
  +  -R|--rewriteurls [[url]...]]
 " 1>&2
   
   if [ ".$help" != ".Usage" ]; then
  @@ -454,6 +485,44 @@
   }
   
   ##
  +##  Additional feature printstatus
  +##
  +printstatus()
  +{
  +rc=0
  +readconf || error "problem reading conf"
  +readuuid || error "problem reading uuid"
  +readutil || error "problem reading util"
  +if [ ".$REGISTRY_DONE" = .yes ]; then
  +cat "$REGISTRY_UTIL"
  +return 0
  +fi
  +return 1
  +}
  +
  +##
  +##  Additional feature rewriteurls
  +##
  +rewriteurls()
  +{
  +readconf && readuuid && readutil || return $?
  +if [ ".$REGISTRY_DONE" = .yes ]; then
  +#   URL rewriting
  +while [ ".$1" != . ]; do
  +printf '%s\n' "$1" | sed \
  +-e "s;^\(ftp\)://\(ftp.openpkg.com\)/;\1://$UUID_REGISTRY:[EMAIL 
PROTECTED]/;" \
  +-e "s;^\(ftp\)://\(ftp.openpkg.org\)/;\1://$UUID_REGISTRY:[EMAIL 
PROTECTED]/;" \
  +-e "s;^\(ftp\)://\(ftp.openpkg.net\)/;\1://$UUID_REGISTRY:[EMAIL 
PROTECTED]/;"
  +shift
  +done
  +return 0
  +else
  +#   stealth mode
  +return 1
  +fi
  +}
  +
  +##
   ##  automatical pick interaction or convenience
   ##
   automatical()
  @@ -487,5 +556,5 @@
   ##
   ##  primary operation switch
   ##
  -eval $op
  +eval $op "\"[EMAIL PROTECTED]""
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-registry/rpm.sh
  
  $ cvs diff -u -r1.4 -r1.5 rpm.sh
  --- openpkg-registry/rpm.sh   28 Nov 2005 07:12:08 -  1.4
  +++ openpkg-registry/rpm.sh   29 Nov 2005 16:35:18 -  1.5
  @@ -34,59 +34,18 @@
   oldnanewbin="$PREFIX/lib/op

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Thomas Lotterer 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 17:19:27
  Branch: HEAD Handle: 2005112916192700

  Modified files:
openpkg-registryregister.sh

  Log:
remove optional positional args in favor of option enforcement, it was
reported they confuse the user; this makes --user and --mode
mandatory; --args belongs to --mode

  Summary:
RevisionChanges Path
1.12+2  -16 openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.11 -r1.12 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 16:15:36 -  1.11
  +++ openpkg-registry/register.sh  29 Nov 2005 16:19:27 -  1.12
  @@ -102,10 +102,6 @@
   verbose="no"
   help="no"
   
  -# Optional positional  and  arguments
  -user=""
  -desc=""
  -
   #   iterate over argument line
   while [ $# -gt 0 ]; do
   opt=$1
  @@ -187,19 +183,9 @@
   -h|--help) help="Usage"  ;;
   -*   ) help="Invalid option \`$opt'"; break ;;
   
  -# Optional positional  and  arguments
  -*)
  -  if [ ".$user" = . ]; then
  -user="$1"
  -  elif [ ".$desc" = . ]; then
  -desc="$1"
  -  fi
  -  ;;
   esac
   shift
   done
  -[ ".$user" != . ] && REGISTRY_USER="$user"
  -[ ".$desc" != . ] && REGISTRY_DESC="$desc"
   
   #   display error or usage message
   if [ ".$help" != .no ]; then
  @@ -210,10 +196,10 @@
 [-v|--verbose] [-h|--help]
 [-P|--preparation] [-T|--transaction] [-U|--utilization] 
[-C|--convenience] [-I|--interaction]
 [-c|--conf=]
  -  [-m|--mode=] [-u|--user=] [-d|--desc=] 
[-a|--args=]
  +  -m|--mode= [-a|--args=] -u|--user= 
[-d|--desc=]
 [--uuid=] [--prep=] [--tran=] [--util=]
 [--plat=] [--orel=]
  -  [ []]" 1>&2
  +  " 1>&2
   
   if [ ".$help" != ".Usage" ]; then
   exit 1
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Thomas Lotterer 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 17:15:37
  Branch: HEAD Handle: 2005112916153600

  Modified files:
openpkg-registryregister.sh

  Log:
remove convenience options, it was reported they confuse the user

  Summary:
RevisionChanges Path
1.11+1  -6  openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.10 -r1.11 register.sh
  --- openpkg-registry/register.sh  29 Nov 2005 11:12:28 -  1.10
  +++ openpkg-registry/register.sh  29 Nov 2005 16:15:36 -  1.11
  @@ -123,11 +123,6 @@
   -C|--convenience ) op="convenience" ;;
   -I|--interaction ) op="interaction" ;;
   
  -# Convenience options
  --p|--post ) REGISTRY_MODE="post" ;;
  --f|--fake ) REGISTRY_MODE="fake" ;;
  --w|--wipe ) REGISTRY_MODE="wipe" ;;
  -
   # Standard options
   -c|--conf )
 if [ ".$arg" = . ]; then shift; arg="$1"; fi
  @@ -214,7 +209,7 @@
   echo "Usage: $progname :
 [-v|--verbose] [-h|--help]
 [-P|--preparation] [-T|--transaction] [-U|--utilization] 
[-C|--convenience] [-I|--interaction]
  -  [-p|--post] [-f|--fake] [-w|--wipe] [-c|--conf=]
  +  [-c|--conf=]
 [-m|--mode=] [-u|--user=] [-d|--desc=] 
[-a|--args=]
 [--uuid=] [--prep=] [--tran=] [--util=]
 [--plat=] [--orel=]
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/fetchmail/ fetchmail.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 16:39:28
  Branch: HEAD Handle: 2005112915392800

  Modified files:
openpkg-src/fetchmail   fetchmail.spec

  Log:
upgrading package: fetchmail 6.2.9rc9 -> 6.2.9rc10

  Summary:
RevisionChanges Path
1.67+3  -3  openpkg-src/fetchmail/fetchmail.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/fetchmail/fetchmail.spec
  
  $ cvs diff -u -r1.66 -r1.67 fetchmail.spec
  --- openpkg-src/fetchmail/fetchmail.spec  18 Nov 2005 07:51:59 -  
1.66
  +++ openpkg-src/fetchmail/fetchmail.spec  29 Nov 2005 15:39:28 -  
1.67
  @@ -23,8 +23,8 @@
   ##
   
   #   package version
  -%define   V_dist 6.2.9-rc9
  -%define   V_opkg 6.2.9rc9
  +%define   V_dist 6.2.9-rc10
  +%define   V_opkg 6.2.9rc10
   
   #   package information
   Name: fetchmail
  @@ -37,7 +37,7 @@
   Group:Mail
   License:  GPL
   Version:  %{V_opkg}
  -Release:  20051118
  +Release:  20051129
   
   #   package options
   %option   with_conf  no
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/lame/ lame.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 16:44:31
  Branch: HEAD Handle: 2005112915443000

  Modified files:
openpkg-src/lamelame.spec

  Log:
upgrading package: lame 3.97b -> 3.97b2

  Summary:
RevisionChanges Path
1.46+2  -4  openpkg-src/lame/lame.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/lame/lame.spec
  
  $ cvs diff -u -r1.45 -r1.46 lame.spec
  --- openpkg-src/lame/lame.spec16 Oct 2005 08:09:41 -  1.45
  +++ openpkg-src/lame/lame.spec29 Nov 2005 15:44:30 -  1.46
  @@ -24,7 +24,7 @@
   
   #   package versions
   %define   V_logic  3.97
  -%define   V_real   3.97b
  +%define   V_real   3.97b2
   
   #   package information
   Name: lame
  @@ -37,7 +37,7 @@
   Group:Audio
   License:  GPL
   Version:  %{V_real}
  -Release:  20051016
  +Release:  20051129
   
   #   list of sources
   Source0:  
http://osdn.dl.sourceforge.net/sourceforge/lame/lame-%{V_real}.tar.gz
  @@ -72,8 +72,6 @@
   %prep
   %setup -q -n lame-%{V_logic}
   %patch -p0
  -mv acm ACM
  -ln -s ACM acm
   
   %build
   CC="%{l_cc}" \
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/vorbis-libs/ vorbis-libs.patch vorbis-libs....

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 16:43:40
  Branch: HEAD Handle: 2005112915434000

  Added files:
openpkg-src/vorbis-libs vorbis-libs.patch
  Modified files:
openpkg-src/vorbis-libs vorbis-libs.spec

  Log:
modifying package: vorbis-libs-1.1.1 20050627 -> 20051129

  Summary:
RevisionChanges Path
1.3 +16 -0  openpkg-src/vorbis-libs/vorbis-libs.patch
1.22+5  -3  openpkg-src/vorbis-libs/vorbis-libs.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/vorbis-libs/vorbis-libs.patch
  
  $ cvs diff -u -r0 -r1.3 vorbis-libs.patch
  --- /dev/null 2005-11-29 16:43:40 +0100
  +++ vorbis-libs.patch 2005-11-29 16:43:40 +0100
  @@ -0,0 +1,16 @@
  +Index: libao-0.8.6/configure
  +--- libao-0.8.6/configure.orig   2005-01-11 23:08:26.0 +0100
   libao-0.8.6/configure2005-10-14 17:54:02.406924830 +0200
  +@@ -19116,9 +19116,9 @@
  + PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT 
-fsigned-char";;
  + sparc-sun-*)
  + PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
  +-DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -mv8"
  +-CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char 
-mv8"
  +-PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char 
-mv8" ;;
  ++DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
  ++CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char"
  ++PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char" ;;
  + *-darwin*)
  + PLUGIN_LDFLAGS="-module -avoid-version"
  + DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char 
-Ddlsym=dlsym_auto_underscore"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/vorbis-libs/vorbis-libs.spec
  
  $ cvs diff -u -r1.21 -r1.22 vorbis-libs.spec
  --- openpkg-src/vorbis-libs/vorbis-libs.spec  27 Jun 2005 18:16:27 -  
1.21
  +++ openpkg-src/vorbis-libs/vorbis-libs.spec  29 Nov 2005 15:43:40 -  
1.22
  @@ -25,8 +25,8 @@
   #   package version
   %define   V_whole 1.1.1
   %define   V_libao 0.8.6
  -%define   V_libogg1.1.2
  -%define   V_libvorbis 1.1.1
  +%define   V_libogg1.1.3
  +%define   V_libvorbis 1.1.2
   
   #   package information
   Name: vorbis-libs
  @@ -39,12 +39,13 @@
   Group:Audio
   License:  LGPL
   Version:  %{V_whole}
  -Release:  20050627
  +Release:  20051129
   
   #   list of sources
   Source0:  http://downloads.xiph.org/releases/ao/libao-%{V_libao}.tar.gz
   Source1:  
http://downloads.xiph.org/releases/ogg/libogg-%{V_libogg}.tar.gz
   Source2:  
http://downloads.xiph.org/releases/vorbis/libvorbis-%{V_libvorbis}.tar.gz
  +Patch0:   vorbis-libs.patch
   
   #   build information
   Prefix:   %{l_prefix}
  @@ -78,6 +79,7 @@
   %setup -q -c
   %setup -q -T -D -a 1
   %setup -q -T -D -a 2
  +%patch -p0
   
   %build
   #   build libao
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/netpbm/ netpbm.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 16:43:39
  Branch: HEAD Handle: 2005112915433800

  Modified files:
openpkg-src/netpbm  netpbm.spec

  Log:
upgrading package: netpbm 10.26.19 -> 10.26.20

  Summary:
RevisionChanges Path
1.70+2  -2  openpkg-src/netpbm/netpbm.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/netpbm/netpbm.spec
  
  $ cvs diff -u -r1.69 -r1.70 netpbm.spec
  --- openpkg-src/netpbm/netpbm.spec18 Nov 2005 07:04:28 -  1.69
  +++ openpkg-src/netpbm/netpbm.spec29 Nov 2005 15:43:38 -  1.70
  @@ -32,8 +32,8 @@
   Class:BASE
   Group:Graphics
   License:  MIT-style
  -Version:  10.26.19
  -Release:  20051118
  +Version:  10.26.20
  +Release:  20051129
   
   #   list of sources
   Source0:  
http://osdn.dl.sourceforge.net/sourceforge/netpbm/netpbm-%{version}.tgz
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/dspam/ dspam.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 16:43:24
  Branch: HEAD Handle: 2005112915432400

  Modified files:
openpkg-src/dspam   dspam.spec

  Log:
upgrading package: dspam 3.6.1 -> 3.6.2

  Summary:
RevisionChanges Path
1.38+2  -2  openpkg-src/dspam/dspam.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/dspam/dspam.spec
  
  $ cvs diff -u -r1.37 -r1.38 dspam.spec
  --- openpkg-src/dspam/dspam.spec  8 Nov 2005 07:02:16 -   1.37
  +++ openpkg-src/dspam/dspam.spec  29 Nov 2005 15:43:24 -  1.38
  @@ -32,8 +32,8 @@
   Class:PLUS
   Group:Mail
   License:  GPL
  -Version:  3.6.1
  -Release:  20051108
  +Version:  3.6.2
  +Release:  20051129
   
   #   list of sources
   Source0:  
http://www.nuclearelephant.com/projects/dspam/sources/dspam-%{version}.tar.gz
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/php5/ php5.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 16:42:17
  Branch: HEAD Handle: 2005112915421600

  Modified files:
openpkg-src/php5php5.spec

  Log:
upgrading package: php5 5.1.0 -> 5.1.1

  Summary:
RevisionChanges Path
1.41+3  -3  openpkg-src/php5/php5.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/php5/php5.spec
  
  $ cvs diff -u -r1.40 -r1.41 php5.spec
  --- openpkg-src/php5/php5.spec26 Nov 2005 08:54:08 -  1.40
  +++ openpkg-src/php5/php5.spec29 Nov 2005 15:42:16 -  1.41
  @@ -23,8 +23,8 @@
   ##
   
   #   package versions
  -%define   V_php  5.1.0
  -%define   V_php_hardened 5.1.0-0.4.6
  +%define   V_php  5.1.1
  +%define   V_php_hardened 5.1.1-0.4.8
   
   #   package information
   Name: php5
  @@ -37,7 +37,7 @@
   Group:Language
   License:  PHP
   Version:  %{V_php}
  -Release:  20051126
  +Release:  20051129
   
   #   package options
   %option   with_calendar  no
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/openmpi/ openmpi.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 16:42:06
  Branch: HEAD Handle: 2005112915420500

  Modified files:
openpkg-src/openmpi openmpi.spec

  Log:
track releases only

  Summary:
RevisionChanges Path
1.2 +2  -2  openpkg-src/openmpi/openmpi.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openmpi/openmpi.spec
  
  $ cvs diff -u -r1.1 -r1.2 openmpi.spec
  --- openpkg-src/openmpi/openmpi.spec  20 Nov 2005 09:12:04 -  1.1
  +++ openpkg-src/openmpi/openmpi.spec  29 Nov 2005 15:42:05 -  1.2
  @@ -33,7 +33,7 @@
   Group:System
   License:  BSD-style
   Version:  1.0
  -Release:  20051120
  +Release:  20051129
   
   #   package options
   %option   with_cxx yes
  @@ -62,7 +62,7 @@
   prog openmpi = {
   version   = %{version}
   url   = http://www.open-mpi.org/software/
  -regex = openmpi-(__VER__)\.tar\.bz2
  +regex = openmpi-(\d+\.\d+(\.\d+)*)\.tar\.bz2
   }
   
   %prep
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/apache/ apache.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 16:41:25
  Branch: HEAD Handle: 2005112915412500

  Modified files:
openpkg-src/apache  apache.spec

  Log:
modifying package: apache-1.3.34 20051127 -> 20051129

  Summary:
RevisionChanges Path
1.316   +2  -2  openpkg-src/apache/apache.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.spec
  
  $ cvs diff -u -r1.315 -r1.316 apache.spec
  --- openpkg-src/apache/apache.spec27 Nov 2005 08:55:03 -  1.315
  +++ openpkg-src/apache/apache.spec29 Nov 2005 15:41:25 -  1.316
  @@ -36,7 +36,7 @@
   %define   V_mod_ssl2.8.25-1.3.34
   %define   V_mod_perl   1.29
   %define   V_mod_php4.4.1
  -%define   V_mod_php_hardened   4.4.1-0.4.6
  +%define   V_mod_php_hardened   4.4.1-0.4.8
   %define   V_mod_dav1.0.3-1.3.6
   %define   V_mod_layout 3.2.1
   %define   V_mod_macro  1.1.2
  @@ -65,7 +65,7 @@
   Group:Web
   License:  ASF
   Version:  %{V_apache}
  -Release:  20051127
  +Release:  20051129
   
   #   package options (suexec related)
   %option   with_suexec   yes
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/whois/ whois.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 16:40:03
  Branch: HEAD Handle: 2005112915400300

  Modified files:
openpkg-src/whois   whois.spec

  Log:
upgrading package: whois 4.7.8 -> 4.7.9

  Summary:
RevisionChanges Path
1.71+3  -3  openpkg-src/whois/whois.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/whois/whois.spec
  
  $ cvs diff -u -r1.70 -r1.71 whois.spec
  --- openpkg-src/whois/whois.spec  16 Sep 2005 18:57:02 -  1.70
  +++ openpkg-src/whois/whois.spec  29 Nov 2005 15:40:03 -  1.71
  @@ -32,8 +32,8 @@
   Class:BASE
   Group:DNS
   License:  GPL
  -Version:  4.7.8
  -Release:  20050916
  +Version:  4.7.9
  +Release:  20051129
   
   #   list of sources
   Source0:  
http://ftp.debian.org/debian/pool/main/w/whois/whois_%{version}.tar.gz
  @@ -57,7 +57,7 @@
   }
   
   %prep
  -%setup -q -n whois-4.7.7
  +%setup -q
   %{l_shtool} subst \
   -e 's;^OPTS[ ]*:*=.*$;OPTS=;' \
   Makefile
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/php/ php.spec

2005-11-29 Thread Ralf S. Engelschall 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 16:38:50
  Branch: HEAD Handle: 2005112915385000

  Modified files:
openpkg-src/php php.spec

  Log:
modifying package: php-4.4.1 20051126 -> 20051129

  Summary:
RevisionChanges Path
1.116   +2  -2  openpkg-src/php/php.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/php/php.spec
  
  $ cvs diff -u -r1.115 -r1.116 php.spec
  --- openpkg-src/php/php.spec  26 Nov 2005 08:09:20 -  1.115
  +++ openpkg-src/php/php.spec  29 Nov 2005 15:38:50 -  1.116
  @@ -24,7 +24,7 @@
   
   #   package component versions
   %define   V_php 4.4.1
  -%define   V_php_hardened4.4.1-0.4.6
  +%define   V_php_hardened4.4.1-0.4.8
   
   #   package information
   Name: php
  @@ -37,7 +37,7 @@
   Group:Language
   License:  PHP
   Version:  %{V_php}
  -Release:  20051126
  +Release:  20051129
   
   #   package options
   %option   with_bc   no
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/exim/ exim.spec

2005-11-29 Thread Christoph Schug 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Christoph Schug
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 14:49:44
  Branch: HEAD Handle: 2005112913494400

  Modified files:
openpkg-src/eximexim.spec

  Log:
upgrading package: exim 4.54 -> 4.60

  Summary:
RevisionChanges Path
1.93+2  -2  openpkg-src/exim/exim.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/exim/exim.spec
  
  $ cvs diff -u -r1.92 -r1.93 exim.spec
  --- openpkg-src/exim/exim.spec4 Oct 2005 13:55:04 -   1.92
  +++ openpkg-src/exim/exim.spec29 Nov 2005 13:49:44 -  1.93
  @@ -32,8 +32,8 @@
   Class:PLUS
   Group:Mail
   License:  GPL
  -Version:  4.54
  -Release:  20051004
  +Version:  4.60
  +Release:  20051129
   
   #   package options
   %option   with_auth_cram_md5  no
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/lighttpd/ lighttpd.spec rc.lighttpd

2005-11-29 Thread Christoph Schug 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Christoph Schug
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   29-Nov-2005 13:05:03
  Branch: HEAD Handle: 2005112912050300

  Modified files:
openpkg-src/lighttpdlighttpd.spec rc.lighttpd

  Log:
provide config check in rc script

  Summary:
RevisionChanges Path
1.17+1  -1  openpkg-src/lighttpd/lighttpd.spec
1.3 +3  -1  openpkg-src/lighttpd/rc.lighttpd
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/lighttpd/lighttpd.spec
  
  $ cvs diff -u -r1.16 -r1.17 lighttpd.spec
  --- openpkg-src/lighttpd/lighttpd.spec24 Nov 2005 09:20:42 -  
1.16
  +++ openpkg-src/lighttpd/lighttpd.spec29 Nov 2005 12:05:03 -  
1.17
  @@ -33,7 +33,7 @@
   Group:Web
   License:  MIT-style
   Version:  1.4.8
  -Release:  20051124
  +Release:  20051129
   
   #   package options
   %option   with_fslyes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/lighttpd/rc.lighttpd
  
  $ cvs diff -u -r1.2 -r1.3 rc.lighttpd
  --- openpkg-src/lighttpd/rc.lighttpd  23 Mar 2005 14:14:17 -  1.2
  +++ openpkg-src/lighttpd/rc.lighttpd  29 Nov 2005 12:05:03 -  1.3
  @@ -26,8 +26,10 @@
   }
   
   %status -u @l_susr@ -o
  -lighttpd_usable="unknown"
  +lighttpd_usable="no"
   lighttpd_active="no"
  +@l_prefix@/sbin/lighttpd -f $lighttpd_conffile -t >/dev/null 2>&1 && \
  +lighttpd_usable="yes"
   rcService lighttpd enable yes && \
   lighttpd_signal 0 && lighttpd_active="yes"
   echo "lighttpd_enable=\"$lighttpd_enable\""
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-registry/ register.sh

2005-11-29 Thread Thomas Lotterer 
  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Thomas Lotterer
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-registry Date:   29-Nov-2005 12:12:29
  Branch: HEAD Handle: 2005112911122800

  Modified files:
openpkg-registryregister.sh

  Log:
long options should be lowercase only

  Summary:
RevisionChanges Path
1.10+6  -6  openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.9 -r1.10 register.sh
  --- openpkg-registry/register.sh  28 Nov 2005 17:13:02 -  1.9
  +++ openpkg-registry/register.sh  29 Nov 2005 11:12:28 -  1.10
  @@ -117,11 +117,11 @@
   esac
   case $opt in
   # Primary operations
  --P|--Preparation ) op="preparation" ;;
  --T|--Transaction ) op="transaction" ;;
  --U|--Utilization ) op="utilization" ;;
  --C|--Convenience ) op="convenience" ;;
  --I|--Interaction ) op="interaction" ;;
  +-P|--preparation ) op="preparation" ;;
  +-T|--transaction ) op="transaction" ;;
  +-U|--utilization ) op="utilization" ;;
  +-C|--convenience ) op="convenience" ;;
  +-I|--interaction ) op="interaction" ;;
   
   # Convenience options
   -p|--post ) REGISTRY_MODE="post" ;;
  @@ -213,7 +213,7 @@
   fi
   echo "Usage: $progname :
 [-v|--verbose] [-h|--help]
  -  [-P|--Preparation] [-T|--Transaction] [-U|--Utilization] 
[-C|--Convenience] [-I|--Interaction]
  +  [-P|--preparation] [-T|--transaction] [-U|--utilization] 
[-C|--convenience] [-I|--interaction]
 [-p|--post] [-f|--fake] [-w|--wipe] [-c|--conf=]
 [-m|--mode=] [-u|--user=] [-d|--desc=] 
[-a|--args=]
 [--uuid=] [--prep=] [--tran=] [--util=]
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org