[CVS] OpenPKG: openpkg-re/ releasenotes.txt

2007-02-20 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-re   Date:   21-Feb-2007 00:57:57
  Branch: HEAD Handle: 2007022023575600

  Modified files:
openpkg-re  releasenotes.txt

  Log:
New in OpenPKG-2-STABLE-20070221

  Summary:
RevisionChanges Path
1.28+54 -3  openpkg-re/releasenotes.txt
  

  patch -p0 <<'@@ .'
  Index: openpkg-re/releasenotes.txt
  
  $ cvs diff -u -r1.27 -r1.28 releasenotes.txt
  --- openpkg-re/releasenotes.txt   17 Oct 2006 13:29:10 -  1.27
  +++ openpkg-re/releasenotes.txt   20 Feb 2007 23:57:56 -  1.28
  @@ -2,7 +2,7 @@
 OpenPKG Release Notes
 =
   
  -  o $Revision: 1.27 $. The most recent update of this file can be
  +  o $Revision: 1.28 $. The most recent update of this file can be
   downloaded from http://cvs.openpkg.org/openpkg-re/releasenotes.txt
   The history of this document, specific versions and
   differences between versions can be retrieved from
  @@ -22,7 +22,7 @@
   
 o Genealogy
   1.0, 1.1, 1.2, 1.3, (1.9 available for upgrades from 1.x to 2.x)
  -2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.20060622, 2.20061018
  +2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.20060622, 2.20061018, 2.20070221
   2 (STABLE)
   CURRENT
   
  @@ -68,11 +68,62 @@
  package because the whole functionality is embedded in the bootstrap
  anyway.
   
  -  New in CURRENT past OpenPKG-2-STABLE-20061018
  +  New in CURRENT past OpenPKG-2-STABLE-20070221
 =
   
 o nothing documented, yet
   
  +  New in OpenPKG-2-STABLE-20070221
  +  
  +
  +  o openpkg curl
  +
  +This new tool is a wrapper around the curl application shipped with the
  +bootstrap.  It ensures the first option to curl is always "-q", ignoring
  +all ~/.curlrc files. It also checks whether a readable
  +%{l_prefix}/etc/openpkg/curlrc file exists and adds a "--config ..."
  +option automatically. The wrapper also goes through URL rewriting to obey
  +registered instances. Finally, the "openpkg" master program ensures use 
of
  +appropriate user ids.
  +
  +  o openpkg build
  +
  +This tool has been modified to use "openpkg curl" to fetch index files,
  +source and binary RPMs. The ftp and http capabilities internal to rpm are
  +no longer used by this tool. Downloaded files are removed after clean
  +usage unless the new "-k" option is used to keep the files
  +unconditionally.
  +
  +The result of is change is a uniform configuration of proxies through
  +%{l_prefix}/etc/openpkg/curlrc, support for custom user:pass@ URLs with
  +http (unsupported by rpm 4.2.1) and support for https (entirely
  +unsupported by rpm 4.2.1).
  +
  +  o openpkg register
  +
  +The tool has been adjusted to remember the --user and --link options of
  +the last successful registration for later reuse. Unless custom 
parameters
  +are supplied, it automatically downloads anonymous link credentials from
  +the openpkg.org website. Any instance is automatically registered online
  +at installation time and it re-registers daily. This behaviour happens
  +unconditionally and creates network traffic which might cause costs to 
the
  +user.  The (re)registration constantly updates the openpkg registry with
  +information about package names, versions, releases and options being 
used
  +in the field.
  +
  +  o %{l_prefix}/etc/rc.conf new configuration variables
  +
  +openpkg_reghour="3" -> specifies the local time hour 0-23 when
  +   (re)registration is triggered.
  +
  +openpkg_regrand="1" -> specifies the random range of hours 1-4 
  +   added to reghour to distribute workload.
  +   
  +  o openpkg.sh bootstrap new command line options
  +
  +--reg_user= -> preset "openpkg register --user="
  +--reg_link= -> preset "openpkg register --link="
  +
 New in OpenPKG-2-STABLE-20061018
 
   
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.boot openpkg.spec ...

2007-02-20 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:   21-Feb-2007 00:57:46
  Branch: HEAD Handle: 2007022023574400

  Modified files:
openpkg-src/openpkg HISTORY openpkg.boot openpkg.spec rc.openpkg

  Log:
upgrade to openpkg-tools 1.4.0 ("openpkg curl"), upgrade to
openpkg-registry 1.1.0 (autoregister)

  Summary:
RevisionChanges Path
1.426   +1  -0  openpkg-src/openpkg/HISTORY
1.62+6  -0  openpkg-src/openpkg/openpkg.boot
1.565   +16 -5  openpkg-src/openpkg/openpkg.spec
1.21+12 -0  openpkg-src/openpkg/rc.openpkg
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/HISTORY
  
  $ cvs diff -u -r1.425 -r1.426 HISTORY
  --- openpkg-src/openpkg/HISTORY   7 Feb 2007 07:53:53 -   1.425
  +++ openpkg-src/openpkg/HISTORY   20 Feb 2007 23:57:44 -  1.426
  @@ -2,6 +2,7 @@
   2007
   
   
  +20070221 upgrade to openpkg-tools 1.4.0 ("openpkg curl"), upgrade to 
openpkg-registry 1.1.0 (autoregister)
   20070207 upgrade to openpkg-tools 1.3.2
   20070206 upgrade to GNU gzip 1.3.11
   20070204 rpmtool cflags tool detection must handle relative pathes (no gcc) 
and absolute pathes (with gcc)
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.boot
  
  $ cvs diff -u -r1.61 -r1.62 openpkg.boot
  --- openpkg-src/openpkg/openpkg.boot  1 Jan 2007 17:40:19 -   1.61
  +++ openpkg-src/openpkg/openpkg.boot  20 Feb 2007 23:57:44 -  1.62
  @@ -57,6 +57,7 @@
   ruid=''; rgid=''
   nuid=''; ngid=''
   use_tar=''; use_make=''; use_cc=''; use_ar=''; use_ld=''; use_strip=''
  +reg_user=''; reg_link=''
   bs=0
   
   #   parse command line options
  @@ -95,6 +96,8 @@
   --use_ar=*   ) use_ar=$arg;;
   --use_ld=*   ) use_ld=$arg;;
   --use_strip=*) use_strip=$arg ;;
  +--reg_user=* ) reg_user=$arg ;;
  +--reg_link=* ) reg_link=$arg ;;
   -bs | -s ) bs=1;;
   *) help=1  ;;
   esac
  @@ -110,6 +113,7 @@
   echo "   [--{s,m,r,n}uid=] [--{s,m,r,n}gid=]" 2>&1
   echo "   [--use_tar=] [--use_make=] [--use_cc=]" 2>&1
   echo "   [--use_ar=] [--use_ld=] [--use_strip=]" 2>&1
  +echo "   [--reg_user=] [--reg_link=]" 2>&1
   echo "   [-t|--tar] [-h|--help] [-v|--version]" 2>&1
   exit 1
   fi
  @@ -286,6 +290,8 @@
 echo "use_ar=$use_ar"
 echo "use_ld=$use_ld"
 echo "use_strip=$use_strip"
  +  echo "reg_user=$reg_user"
  +  echo "reg_link=$reg_link"
 grep '%define' $spec | \
 sed \
   -e 's:^%define *\([^ ]*\) *\(.*\):\1="\2":'
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.spec
  
  $ cvs diff -u -r1.564 -r1.565 openpkg.spec
  --- openpkg-src/openpkg/openpkg.spec  7 Feb 2007 07:53:53 -   1.564
  +++ openpkg-src/openpkg/openpkg.spec  20 Feb 2007 23:57:44 -  1.565
  @@ -39,7 +39,7 @@
   #   o any cc(1)
   
   #   the package version/release
  -%define   V_openpkg  20070207
  +%define   V_openpkg  20070221
   
   #   the used software versions
   %define   V_rpm  4.2.1
  @@ -55,10 +55,10 @@
   %define   V_bash 3.2
   %define   V_uuid 1.5.1
   %define   V_config   20060923
  -%define   V_registry 1.0.1
  +%define   V_registry 1.1.0
   %define   V_perl 5.8.8
   %define   V_openssl  0.9.8d
  -%define   V_tools1.3.2
  +%define   V_tools1.4.0
   %define   V_exec 2.0.0-C
   
   #   package information
  @@ -1165,6 +1165,7 @@
   
   #   install OpenPKG Tool Chain command subset
   ( cd openpkg-tools-%{V_tools}
  +  cp cmd/curl.sh $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/curl.sh
 cp cmd/build.pl $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/build.pl
 chmod 644 $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/build.pl
 cp cmd/build.8 $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/build.8
  @@ -1291,6 +1292,7 @@
   chmod 644 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.func
   mkdir $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
   sed -e "s:@l_prefix@:%{l_prefix}:g" \
  +-e "s:@l_musr@:%{l_musr}:g" \
   <`SOURCE rc.openpkg` \
   >$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.openpkg
   chmod 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/rc.openpkg
  @@ -1318,11 +1320,16 @@
   

[CVS] OpenPKG: openpkg-tools/ VERSION

2007-02-20 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-toolsDate:   21-Feb-2007 00:00:28
  Branch: HEAD Handle: 2007022023002700

  Modified files:
openpkg-tools   VERSION

  Log:
bump before release

  Summary:
RevisionChanges Path
1.94+1  -1  openpkg-tools/VERSION
  

  patch -p0 <<'@@ .'
  Index: openpkg-tools/VERSION
  
  $ cvs diff -u -r1.93 -r1.94 VERSION
  --- openpkg-tools/VERSION 6 Feb 2007 18:50:31 -   1.93
  +++ openpkg-tools/VERSION 20 Feb 2007 23:00:27 -  1.94
  @@ -2,5 +2,5 @@
 VERSION -- Version Information for OpenPKG Tool Chain (syntax: Text)
 [automatically generated and maintained by GNU shtool]
   
  -  This is OpenPKG Tool Chain, Version 1.3.2 (06-Feb-2007)
  +  This is OpenPKG Tool Chain, Version 1.4.0 (20-Feb-2007)
   
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


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

2007-02-20 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:   20-Feb-2007 23:50:57
  Branch: HEAD Handle: 2007022022505700

  Modified files:
openpkg-src/freeradius  freeradius.spec

  Log:
found no evidence that make or gcc are required during runtime

  Summary:
RevisionChanges Path
1.26+4  -4  openpkg-src/freeradius/freeradius.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/freeradius/freeradius.spec
  
  $ cvs diff -u -r1.25 -r1.26 freeradius.spec
  --- openpkg-src/freeradius/freeradius.spec5 Jan 2007 07:48:33 -   
1.25
  +++ openpkg-src/freeradius/freeradius.spec20 Feb 2007 22:50:57 -  
1.26
  @@ -40,7 +40,7 @@
   Group:RADIUS
   License:  GPL
   Version:  %{V_here}
  -Release:  20070105
  +Release:  20070220
   
   #   list of sources
   Source0:  ftp://ftp.freeradius.org/pub/radius/freeradius-%{V_real}.tar.gz
  @@ -50,10 +50,10 @@
   #   build information
   Prefix:   %{l_prefix}
   BuildRoot:%{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20060823, libtool, gcc, make
  +BuildPreReq:  OpenPKG, openpkg >= 20060823, make, gcc, libtool
   PreReq:   OpenPKG, openpkg >= 20060823
  -BuildPreReq:  make, gcc, perl, openssl, openldap, gdbm
  -PreReq:   make, gcc, perl, openssl, openldap, gdbm
  +BuildPreReq:  perl, openssl, openldap, gdbm
  +PreReq:   perl, openssl, openldap, gdbm
   AutoReq:  no
   AutoReqProv:  no
   
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


[CVS] OpenPKG: openpkg-tools/cmd/ build.pl

2007-02-20 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-toolsDate:   20-Feb-2007 23:24:42
  Branch: HEAD Handle: 2007022022244200

  Modified files:
openpkg-tools/cmd   build.pl

  Log:
make "openpkg build" use "openpkg curl" for downloading indices,
sources and binaries; add -k option to keep downloaded packages after
use

  Summary:
RevisionChanges Path
1.41+48 -20 openpkg-tools/cmd/build.pl
  

  patch -p0 <<'@@ .'
  Index: openpkg-tools/cmd/build.pl
  
  $ cvs diff -u -r1.40 -r1.41 build.pl
  --- openpkg-tools/cmd/build.pl1 Jan 2007 17:45:10 -   1.40
  +++ openpkg-tools/cmd/build.pl20 Feb 2007 22:24:42 -  1.41
  @@ -34,7 +34,8 @@
  $opt_R, $opt_r, $opt_f, $opt_u, $opt_U, $opt_a, $opt_A,
  $opt_z, $opt_Z, $opt_P, $opt_N, $opt_E, $opt_H, $opt_i,
  $opt_D, $opt_p, $opt_q, $opt_s, $opt_S, $opt_X, $opt_M,
  -   $opt_L, $opt_W, $opt_K, $opt_e, $opt_b, $opt_B, $opt_g
  +   $opt_L, $opt_W, $opt_K, $opt_e, $opt_b, $opt_B, $opt_g,
  +   $opt_k
   );
   
   #   global context variables
  @@ -46,7 +47,7 @@
   ##
   
   #   parse command line options
  -my $getopts = 'hR:r:f:uUaAzZP:N:E:H:iD:p:qsSXMLWKebBg';
  +my $getopts = 'hR:r:f:uUaAzZP:N:E:H:iD:p:qsSXMLWKebBgk';
   getopts($getopts);
   
   #   parse configuration script options
  @@ -93,6 +94,7 @@
   " -Lgenerate list of packages in repository 
depending on target\n" .
   " -Winclude dependencies as if all build options are 
enabled\n" .
   " -Kkeep temporarily installed packages\n" .
  +" -kkeep temporarily downloaded packages\n" .
   " -erebuild exact version of a package from 
repository\n" .
   " -bbuild-time check existing binaries for 
dependencies only\n" .
   " -Bbuild-time check existing binaries for 
dependencies and target\n" .
  @@ -378,9 +380,10 @@
   $bzip2 =~ s/\/bin\/openpkg rpm$/\/lib\/openpkg\/bzip2/;
   my $curl = $rpm;
   $curl =~ s/\/bin\/openpkg rpm$/\/lib\/openpkg\/curl/;
  +$curl = "$l_prefix/bin/openpkg curl" if (system("$l_prefix/bin/openpkg 
curl file://$l_prefix/etc/openpkg/platform >/dev/null 2>&1") == 0);
   
   #   expand RPM macros holding information
  -my $c = run("$rpm --eval '%{_rpmdir} %{_rpmfilename} %{_target_os} 
%{_target_cpu}'");
  +my $c = run("$rpm --eval '%{_rpmdir} %{_rpmfilename} %{_target_os} 
%{_target_cpu} %{_srcrpmdir}'");
   
   #   parse and post-process information
   chomp($c);
  @@ -400,6 +403,7 @@
   bzip2=> $bzip2,
   curl => $curl,
   rpmdir   => $q[0],
  +srcrpmdir=> $q[4],
   template => $q[1],
   platform => '',
   prefix   => $l_prefix,
  @@ -2399,6 +2403,12 @@
   }
   }
   
  +#   compute path to source RPM from rpm config and target data
  +sub target2srcrpm ($$) {
  +my ($target, $c) = @_;
  +return 
$c->{srcrpmdir}.'/'.$target->{name}.'-'.$target->{version}.'-'.$target->{release}.'.src.rpm';
  +}
  +
   #   compute path to binary RPM from rpm config and target data
   sub target2rpm ($$) {
   my ($target, $c) = @_;
  @@ -2472,6 +2482,13 @@
   return (glob("$prefix/RPM/PKG/$bpkg"))[0];
   }
   
  +#   indent text to form a block
  +sub indent ($) {
  +my ($txt) = @_;
  +$txt =~ s/^//gm;
  +return $txt;
  +}
  +
   #   print commands from package build list
   #   c  -> configuration to derive paths from
   #   uncond -> always do the --rebuild
  @@ -2484,9 +2501,12 @@
   my ($pkg, $spkg, $bpkg, $ppkg);
   my ($opt);
   my ($cmd1, $cmd2, $mark);
  +my ($cmd3, $srcpkg);
   
   $mark = '';
   
  +my $err;
  +if ($ignore) { $err = "|| true" } else { $err = "|| exit \$?" };
   foreach (@$list) {
   $pkg = $_->{name};
   $spkg = $_->{href};
  @@ -2494,6 +2514,8 @@
   die "openpkg:build:FATAL: internal error, ",vsn($_)," without 
source URL\n";
   }
   $bpkg = target2rpm($_, $c);
  +$srcpkg = target2srcrpm($_, $c);
  +$cmd3 = '';
   
   #   rebuild binary package IF
   #   'unconditional' option
  @@ -2524,36 +2546,37 @@
   npriv($config->{"mkp"} . " $ppkg").
   " )";
   } elsif (defined $_->{prefix}) {
  -$cmd1 = npriv($config->{"curl"} . " -s -o $bpkg $spkg");
  +$cmd1 = '';
  +

[CVS] OpenPKG: openpkg-tools/cmd/ curl.sh

2007-02-20 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-toolsDate:   20-Feb-2007 23:23:12
  Branch: HEAD Handle: 2007022022231200

  Added files:
openpkg-tools/cmd   curl.sh

  Log:
new "openpkg curl" command

  Summary:
RevisionChanges Path
1.1 +70 -0  openpkg-tools/cmd/curl.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-tools/cmd/curl.sh
  
  $ cvs diff -u -r0 -r1.1 curl.sh
  --- /dev/null 2007-02-20 23:22:00 +0100
  +++ curl.sh   2007-02-20 23:23:12 +0100
  @@ -0,0 +1,70 @@
  +##
  +##  curl -- OpenPKG Tools "curl" command
  +##  Copyright (c) 2000-2005 OpenPKG Foundation e.V. 
  +##  Copyright (c) 2000-2005 Ralf S. Engelschall 
  +##
  +##  Permission to use, copy, modify, and distribute this software for
  +##  any purpose with or without fee is hereby granted, provided that
  +##  the above copyright notice and this permission notice appear in all
  +##  copies.
  +##
  +##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  +##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  +##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  +##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
  +##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  +##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  +##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  +##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  +##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  +##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  +##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  +##  SUCH DAMAGE.
  +##
  +
  +#   determine path to OpenPKG instance
  +PREFIX="@l_prefix@"
  +if [ ".${OPENPKG_PREFIX}" != . ]; then
  +PREFIX="${OPENPKG_PREFIX}"
  +fi
  +
  +#   determine curl and config
  +curl="$PREFIX/lib/openpkg/curl"
  +conf="$PREFIX/etc/openpkg/curlrc"
  +
  +#   determine whether URL rewriting is active
  +rewrite=0
  +$PREFIX/bin/openpkg register --printstatus >/dev/null 2>&1 && rewrite=1
  +
  +#   main
  +if [ $rewrite == 1 ]; then
  +#   URL rewriting
  +declare -a a
  +declare -i i=0
  +while [ ".$1" != . ]; do
  +arg="$1"
  +printf '%s\n' "$arg" | grep :// >/dev/null && 
arg=`$PREFIX/bin/openpkg register --rewriteurls "$arg"`
  +a[$i]="$arg"
  +i=i+1
  +shift
  +done
  +set -- "[EMAIL PROTECTED]"
  +unset arg i a
  +else
  +#   stealth mode
  +:
  +fi
  +
  +#   remove user supplied -q option (ignore ~/.curlrc)
  +[ ".$1" = .-q ] && shift
  +
  +#   force -q option (ignore ~/.curlrc)
  +set -- "-q" "$@"
  +
  +#   prepend --config  option if conf file is readable
  +declare -a a;
  +[ -r "$conf" -o true ] && set -- "--config" "$conf" "$@"
  +
  +#   execute underlying application
  +exec $curl "$@"
  +
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


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

2007-02-20 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:   20-Feb-2007 23:19:24
  Branch: HEAD Handle: 2007022022192400

  Modified files:
openpkg-registryregister.sh

  Log:
make --mode=post the default; make --mode and --user optional and
attempt to grab missing configuration from autoregister service; in
automatic mode, do not run interaction stuff unless STDIN is tied to a
terminal; log in UTC

  Summary:
RevisionChanges Path
1.61+77 -17 openpkg-registry/register.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.60 -r1.61 register.sh
  --- openpkg-registry/register.sh  20 Feb 2007 22:13:12 -  1.60
  +++ openpkg-registry/register.sh  20 Feb 2007 22:19:24 -  1.61
  @@ -29,8 +29,8 @@
   
   #   program name, version and date
   progname="register"
  -progvers="1.0.1"
  -progdate="22-Oct-2006"
  +progvers="1.1.0"
  +progdate="20-Feb-2007"
   
   #   determine path to OpenPKG instance
   PREFIX="@l_prefix@"
  @@ -102,7 +102,8 @@
   op="automatic"
   
   #   standard options
  -REGISTRY_MODE=""
  +REGISTRY_AUTO="http://openpkg.org/go/autoregister";
  +REGISTRY_MODE="post"
   REGISTRY_ARGS="http://registry.openpkg.org/register";
   REGISTRY_USER=""
   REGISTRY_LINK=""
  @@ -248,8 +249,8 @@
   if [ ".$help" != ".Usage" ]; then
   echo "$progname:ERROR: $help" 1>&2
   fi
  -echo "Usage: $progname -m|--mode=fake|post|wipe [-a|--args=]"
  -echo "   -u|--user= [-d|--desc=]"
  +echo "Usage: $progname [-u|--user=] [-l|--link=] 
[-d|--desc=]"
  +echo "   [-m|--mode=fake|post|wipe] [-a|--args=]"
   echo "   [--plat=] [--orel=] [--uuid=]"
   echo "   [--conf=] [--prep=] [--tran=] 
[--util=] [--data=[,...]]"
   echo "   [-P|--preparation] [-T|--transaction] [-U|--utilization]"
  @@ -429,6 +430,34 @@
   }
   
   ##
  +##  Automatic registration data retrieval
  +##
  +autoregdata()
  +{
  +if [ ".$REGISTRY_AUTO" != . ]; then
  +O=""
  +if [ $verbose = no ]; then O="$O --silent"; fi
  +response=`$curl \
  +$O -L \
  +--user-agent "$useragent" \
  +--connect-timeout 8 \
  +--max-time 16 \
  +$REGISTRY_AUTO \
  +| awk '
  +BEGIN { registry=0 }
  +// { registry=1 }
  +// { registry=0 }' \
  +| sed -e 's;^.*[^>]*.*$;;' \
  +  -e 's;\([^=]*\)="\([^"]*\)" *;\1="\2"\\
  +;g' \
  +| awk -F= '/=/ { print "REGISTRY_"toupper($1)"="$2"" }'`
  +if [ $verbose = yes ]; then echo "autoregdata from $REGISTRY_AUTO"; 
echo "$response"; fi
  +eval "$response"
  +fi
  +}
  +
  +##
   ##  Primary operation Convenience
   ##
   convenience()
  @@ -441,6 +470,24 @@
   fi
   
   preparation | transaction | utilization
  +
  +readutil || error "problem reading util"
  +if [ ".$REGISTRY_DONE" = .yes ]; then
  +echo "#`TZ= date '+%Y-%m-%d %H:%M:%S'` UTC" | tee "$REGISTRY_CONF" 
|| return
  +(
  +echo "REGISTRY_USER=\"$REGISTRY_USER\""
  +echo "REGISTRY_LINK=\"$REGISTRY_LINK\""
  +echo "REGISTRY_DESC=\"$REGISTRY_DESC\""
  +echo "REGISTRY_PLAT=\"$REGISTRY_PLAT\""
  +echo "REGISTRY_OREL=\"$REGISTRY_OREL\""
  +echo "REGISTRY_UUID=\"$REGISTRY_UUID\""
  +echo "REGISTRY_PREP=\"$REGISTRY_PREP\""
  +echo "REGISTRY_MODE=\"$REGISTRY_MODE\""
  +echo "REGISTRY_ARGS=\"$REGISTRY_ARGS\""
  +echo "REGISTRY_TRAN=\"$REGISTRY_TRAN\""
  +echo "REGISTRY_UTIL=\"$REGISTRY_UTIL\""
  +) | tee -a "$REGISTRY_CONF"
  +fi
   }
   
   ##
  @@ -473,7 +520,7 @@
   echo ""
   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 \
  +echo "#`TZ= date '+%Y-%m-%d %H:%M:%S'` UTC" | 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"
  @@ -584,16 +631,10 @@
   }
   
   ##
  -##  automatically pick interaction or convenience
  +##  check whether important configuration data is missing
   ##
  -automatic()
  +checkmissing()
   {
  -if [ ".$REGISTRY_MODE" = .wipe ]; then
  -

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

2007-02-20 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:   20-Feb-2007 23:13:12
  Branch: HEAD Handle: 2007022022131200

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

  Log:
add connection timeout and limit maximum transfer time

  Summary:
RevisionChanges Path
1.31+1  -1  openpkg-registry/VERSION
1.60+2  -0  openpkg-registry/register.sh
1.56+2  -2  openpkg-registry/registry-db.pl
1.105   +2  -2  openpkg-registry/registry-ui.pl
1.13+2  -2  openpkg-registry/registry.pm
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/VERSION
  
  $ cvs diff -u -r1.30 -r1.31 VERSION
  --- openpkg-registry/VERSION  22 Oct 2006 17:12:55 -  1.30
  +++ openpkg-registry/VERSION  20 Feb 2007 22:13:12 -  1.31
  @@ -2,5 +2,5 @@
 VERSION -- Version Information for OpenPKG Registry (syntax: Text)
 [automatically generated and maintained by GNU shtool]
   
  -  This is OpenPKG Registry, Version 1.0.1 (22-Oct-2006)
  +  This is OpenPKG Registry, Version 1.1.0 (20-Feb-2007)
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.59 -r1.60 register.sh
  --- openpkg-registry/register.sh  20 Feb 2007 22:09:54 -  1.59
  +++ openpkg-registry/register.sh  20 Feb 2007 22:13:12 -  1.60
  @@ -379,6 +379,8 @@
   $curl \
   $O \
   --user-agent "$useragent" \
  +--connect-timeout 15 \
  +--max-time 120 \
   --form 'page=dropxml' \
   --form 'data=<-' \
   --form 'submit=DROPXML' \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-registry/registry-db.pl
  
  $ cvs diff -u -r1.55 -r1.56 registry-db.pl
  --- openpkg-registry/registry-db.pl   22 Oct 2006 17:12:55 -  1.55
  +++ openpkg-registry/registry-db.pl   20 Feb 2007 22:13:12 -  1.56
  @@ -34,8 +34,8 @@
   
   #   program name, version and date
   my $progname="registry-db.pl";
  -my $progvers="1.0.1";
  -my $progdate="22-Oct-2006";
  +my $progvers="1.1.0";
  +my $progdate="20-Feb-2007";
   
   #   configure data dumper
   $Data::Dumper::Purity = 1;
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-registry/registry-ui.pl
  
  $ cvs diff -u -r1.104 -r1.105 registry-ui.pl
  --- openpkg-registry/registry-ui.pl   22 Oct 2006 17:12:55 -  1.104
  +++ openpkg-registry/registry-ui.pl   20 Feb 2007 22:13:12 -  1.105
  @@ -41,8 +41,8 @@
   
   #   program name, version and date
   my $progname="registry-ui.pl";
  -my $progvers="1.0.1";
  -my $progdate="22-Oct-2006";
  +my $progvers="1.1.0";
  +my $progdate="20-Feb-2007";
   
   #   configure data dumper
   $Data::Dumper::Purity = 1;
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-registry/registry.pm
  
  $ cvs diff -u -r1.12 -r1.13 registry.pm
  --- openpkg-registry/registry.pm  22 Oct 2006 17:12:55 -  1.12
  +++ openpkg-registry/registry.pm  20 Feb 2007 22:13:12 -  1.13
  @@ -30,8 +30,8 @@
   
   #   program name, version and date
   my $progname="registry.pm";
  -my $progvers="1.0.1";
  -my $progdate="22-Oct-2006";
  +my $progvers="1.1.0";
  +my $progdate="20-Feb-2007";
   
   #   get configuration file name
   #
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


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

2007-02-20 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:   20-Feb-2007 23:09:54
  Branch: HEAD Handle: 2007022022095400

  Modified files:
openpkg-registryregister.sh

  Log:
rename one usage of two independent meanings from the same variable
name

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

  patch -p0 <<'@@ .'
  Index: openpkg-registry/register.sh
  
  $ cvs diff -u -r1.58 -r1.59 register.sh
  --- openpkg-registry/register.sh  22 Oct 2006 17:12:55 -  1.58
  +++ openpkg-registry/register.sh  20 Feb 2007 22:09:54 -  1.59
  @@ -411,16 +411,16 @@
   sed -e 's;^.*; ;' -e 
's;.*$;;'`
   if [ ".$response" = . ]; then error "no response seen on stdin"; fi
   
  -REGISTRY_UUID=`echo $response | awk '/./ { print $1 }'`
  +REGISTRY_DBID=`echo $response | awk '/./ { print $1 }'`
   REGISTRY_DONE=`echo $response | awk '/./ { print $2 }'`
   REGISTRY_RESP=`echo $response | sed -e 's;^[^ ][^ ]* [^ ][^ ]* ;;'`
   
  -[ ".$REGISTRY_UUID" = . ] && error "missing information REGISTRY_UUID"
  +[ ".$REGISTRY_DBID" = . ] && error "missing information REGISTRY_DBID"
   [ ".$REGISTRY_DONE" = . ] && error "missing information REGISTRY_DONE"
   [ ".$REGISTRY_RESP" = . ] && error "missing information REGISTRY_RESP"
   
   (
  -echo "REGISTRY_UUID=\"$REGISTRY_UUID\""
  +echo "REGISTRY_DBID=\"$REGISTRY_DBID\""
   echo "REGISTRY_DONE=\"$REGISTRY_DONE\""
   echo "REGISTRY_RESP=\"$REGISTRY_RESP\""
   ) | tee $REGISTRY_UTIL
  @@ -943,7 +943,7 @@
   
   =item OPENPKG_UTIL=F<${PREFIX}/etc/openpkg/register.util>
   
  - REGISTRY_UUID="..."
  + REGISTRY_DBID="..."
REGISTRY_DONE="yes"
REGISTRY_RESP="openpkg://foo.example.com/my/openpkg/prefix"
   
  @@ -953,7 +953,7 @@
   
# su - openpkg-mop
$ openpkg register --printstatus
  - REGISTRY_UUID="..."
  + REGISTRY_DBID="..."
REGISTRY_DONE="yes"
REGISTRY_RESP="openpkg://foo.example.com/my/openpkg/prefix"
$ openpkg register --printstatus >/dev/null && echo "Yup"
  @@ -964,7 +964,7 @@
$ openpkg register --printstatus || echo "Nope"
Nope
$ openpkg register [EMAIL PROTECTED] --mode=post
  - REGISTRY_UUID=""
  + REGISTRY_DBID=""
REGISTRY_DONE="yes"
REGISTRY_RESP="openpkg://foo.example.com/my/openpkg/prefix"
$ openpkg register --printstatus >/dev/null && echo "Yup"
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


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

2007-02-20 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:   20-Feb-2007 23:02:23
  Branch: HEAD Handle: 2007022022022200

  Modified files:
openpkg-registryrpm.sh

  Log:
do not tamper with STDOUT

  Summary:
RevisionChanges Path
1.8 +3  -1  openpkg-registry/rpm.sh
  

  patch -p0 <<'@@ .'
  Index: openpkg-registry/rpm.sh
  
  $ cvs diff -u -r1.7 -r1.8 rpm.sh
  --- openpkg-registry/rpm.sh   12 May 2006 14:20:11 -  1.7
  +++ openpkg-registry/rpm.sh   20 Feb 2007 22:02:22 -  1.8
  @@ -44,7 +44,7 @@
   declare -i i=0
   while [ ".$1" != . ]; do
   arg="$1"
  -printf '%s\n' "$arg" | grep :// && arg=`$PREFIX/bin/openpkg register 
--rewriteurls "$arg"`
  +printf '%s\n' "$arg" | grep :// >/dev/null && 
arg=`$PREFIX/bin/openpkg register --rewriteurls "$arg"`
   a[$i]="$arg"
   i=i+1
   shift
  @@ -55,5 +55,7 @@
   #   stealth mode
   :
   fi
  +
  +#   execute underlying application
   exec $rpm "$@"
   
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


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

2007-02-20 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:   20-Feb-2007 21:06:35
  Branch: HEAD Handle: 2007022020063500

  Modified files:
openpkg-src/qt  qt.spec

  Log:
upgrading package: qt 3.3.7 -> 3.3.8

  Summary:
RevisionChanges Path
1.131   +4  -4  openpkg-src/qt/qt.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/qt/qt.spec
  
  $ cvs diff -u -r1.130 -r1.131 qt.spec
  --- openpkg-src/qt/qt.spec1 Jan 2007 17:41:20 -   1.130
  +++ openpkg-src/qt/qt.spec20 Feb 2007 20:06:35 -  1.131
  @@ -32,8 +32,8 @@
   Class:EVAL
   Group:XWindow
   License:  GPL
  -Version:  3.3.7
  -Release:  20061020
  +Version:  3.3.8
  +Release:  20070220
   
   #   package options
   %option   with_threads  yes
  @@ -42,7 +42,7 @@
   %option   with_toolsno
   
   #   list of sources
  -Source0:  
ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-%{version}.tar.bz2
  +Source0:  
ftp://ftp.trolltech.com/pub/qt/source/qt-x11-free-%{version}.tar.gz
   Patch0:   qt.patch
   
   #   build information
  @@ -78,7 +78,7 @@
   prog qt = {
   version   = %{version}
   url   = ftp://ftp.trolltech.com/pub/qt/source/
  -regex = qt-x11-free-(\d+\.\d+\.\d+)\.tar\.gz
  +regex = qt-x11-free-(\d+\.\d+\.\d+)\.tar\.(gz|bz2)
   }
   
   %prep
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


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

2007-02-20 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:   20-Feb-2007 20:48:27
  Branch: HEAD Handle: 2007022019482700

  Modified files:
openpkg-src/irssi   irssi.spec

  Log:
upgrading package: irssi 0.8.10a -> 0.8.11rc1

  Summary:
RevisionChanges Path
1.14+6  -4  openpkg-src/irssi/irssi.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/irssi/irssi.spec
  
  $ cvs diff -u -r1.13 -r1.14 irssi.spec
  --- openpkg-src/irssi/irssi.spec  1 Jan 2007 17:38:44 -   1.13
  +++ openpkg-src/irssi/irssi.spec  20 Feb 2007 19:48:27 -  1.14
  @@ -23,8 +23,9 @@
   ##
   
   #   package version
  -%define   V_dist   0.8.10a
  -%define   V_subdir 0.8.10
  +%define   V_opkg   0.8.11rc1
  +%define   V_dist   0.8.11-rc1
  +%define   V_subdir 0.8.11-rc1
   
   #   package information
   Name: irssi
  @@ -36,8 +37,8 @@
   Class:EVAL
   Group:InstantMessaging
   License:  GPL
  -Version:  %{V_dist}
  -Release:  20061013
  +Version:  %{V_opkg}
  +Release:  20070220
   
   #   package options
   %option   with_perl  yes
  @@ -80,6 +81,7 @@
   LDFLAGS="%{l_ldflags}" \
   ./configure \
   --prefix=%{l_prefix} \
  +--mandir=%{l_prefix}/man \
   --sysconfdir=%{l_prefix}/etc/irssi \
   --with-ncurses=%{l_prefix} \
   --with-glib-prefix=%{l_prefix} \
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


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

2007-02-20 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:   20-Feb-2007 20:47:36
  Branch: HEAD Handle: 2007022019473500

  Modified files:
openpkg-src/re2cre2c.spec

  Log:
upgrading package: re2c 0.11.0 -> 0.11.1

  Summary:
RevisionChanges Path
1.31+2  -2  openpkg-src/re2c/re2c.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/re2c/re2c.spec
  
  $ cvs diff -u -r1.30 -r1.31 re2c.spec
  --- openpkg-src/re2c/re2c.spec2 Jan 2007 14:02:03 -   1.30
  +++ openpkg-src/re2c/re2c.spec20 Feb 2007 19:47:35 -  1.31
  @@ -32,8 +32,8 @@
   Class:PLUS
   Group:CompilerCompiler
   License:  MIT/PD
  -Version:  0.11.0
  -Release:  20070102
  +Version:  0.11.1
  +Release:  20070220
   
   #   list of sources
   Source0:  
http://switch.dl.sourceforge.net/sourceforge/re2c/re2c-%{version}.tar.gz
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


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

2007-02-20 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:   20-Feb-2007 20:47:36
  Branch: HEAD Handle: 2007022019473500

  Modified files:
openpkg-src/iozone  iozone.spec

  Log:
upgrading package: iozone 3.281 -> 3.283

  Summary:
RevisionChanges Path
1.129   +3  -3  openpkg-src/iozone/iozone.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/iozone/iozone.spec
  
  $ cvs diff -u -r1.128 -r1.129 iozone.spec
  --- openpkg-src/iozone/iozone.spec19 Jan 2007 09:18:59 -  1.128
  +++ openpkg-src/iozone/iozone.spec20 Feb 2007 19:47:35 -  1.129
  @@ -23,8 +23,8 @@
   ##
   
   #   package version
  -%define   V_logic  3.281
  -%define   V_real   3_281
  +%define   V_logic  3.283
  +%define   V_real   3_283
   
   #   package information
   Name: iozone
  @@ -37,7 +37,7 @@
   Group:Benchmark
   License:  Open Source
   Version:  %{V_logic}
  -Release:  20070119
  +Release:  20070220
   
   #   list of sources
   Source0:  http://www.iozone.org/src/current/iozone%{V_real}.tar
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org


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

2007-02-20 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:   20-Feb-2007 15:26:09
  Branch: HEAD Handle: 2007022014260900

  Modified files:
openpkg-src/varnish varnish.spec

  Log:
upgrading package: varnish 1.0.2 -> 1.0.3

  Summary:
RevisionChanges Path
1.6 +2  -2  openpkg-src/varnish/varnish.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/varnish/varnish.spec
  
  $ cvs diff -u -r1.5 -r1.6 varnish.spec
  --- openpkg-src/varnish/varnish.spec  1 Jan 2007 17:42:41 -   1.5
  +++ openpkg-src/varnish/varnish.spec  20 Feb 2007 14:26:09 -  1.6
  @@ -32,8 +32,8 @@
   Class:EVAL
   Group:Web
   License:  BSD
  -Version:  1.0.2
  -Release:  20061107
  +Version:  1.0.3
  +Release:  20070220
   
   #   list of sources
   Source0:  
http://switch.dl.sourceforge.net/sourceforge/varnish/varnish-%{version}.tar.gz
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org