[CVS] OpenPKG: openpkg-registry/ registry-ui.pl
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: 10-Jul-2006 11:24:23
Branch: HEAD Handle: 2006071010242200
Modified files:
openpkg-registryregistry-ui.pl
Log:
support merging of user defined overrides into default config
Summary:
RevisionChanges Path
1.67+54 -17 openpkg-registry/registry-ui.pl
patch -p0 '@@ .'
Index: openpkg-registry/registry-ui.pl
$ cvs diff -u -r1.66 -r1.67 registry-ui.pl
--- openpkg-registry/registry-ui.pl 6 Jul 2006 23:02:57 - 1.66
+++ openpkg-registry/registry-ui.pl 10 Jul 2006 09:24:22 - 1.67
@@ -37,6 +37,7 @@
use MIME::Base64;
use XML::Simple;
use String::Divert;
+use Clone qw(clone);
# configure optional debugging
$Data::Dumper::Purity = 1;
@@ -58,10 +59,9 @@
$response-{message} = new String::Divert;
$response-{message}-fold(message);
-# configuration preset defaults then read config
+# default configuration text
#
-
-my $cfg = qq{
+my $defcfgtxt = qq{
##
## registry-ui.cfg - OpenPKG Registry User Interface Configuration
##
@@ -113,31 +113,68 @@
showsid 0;
};
};
-$cfg =~ s/^[ ]{4}//mg;
-$cfg =~ s/^\n//s;
+$defcfgtxt =~ s/^[ ]{4}//mg;
+$defcfgtxt =~ s/^\n//s;
+
+# outside CGI environment just print default config (useful during
installation)
+if ($ENV{GATEWAY_INTERFACE} !~ m/^CGI/) {
+print $defcfgtxt;
+exit 0;
+}
+
+# merges two hashes. First argument is a hash working as accumulator and
the
+# second argument is the hash to be added to it. Either argument can be
+# empty. A typical application is the accumulator being prefilled with
+# defaults and the adder comes with overrides. The function recursively
+# processes nested hashes. Values with dissimilar keys will be merged,
+# missing data on either side will be accumulated and identical keys on
both
+# sides will be overwritten with the added data. Returns a new hash with
+# cloned data. The original accumulator and adder passed in remain
untouched.
+# If the first element in an array is a hash it is assumed a pseudo-hash as
+# described in perlref(1) encountered and hash merging is attempted.
+#
+sub mergehashes ($$) {
+my ($acc, $add) = @_;
+$acc = clone($acc);
+$add = clone($add);
+foreach my $k (sort keys %{$add}) {
+if ((ref($acc-{$k}) eq HASH || (ref($acc-{$k}) eq ARRAY
and ref($acc-{$k}[0]) eq HASH))
+and (ref($add-{$k}) eq HASH || (ref($add-{$k}) eq ARRAY
and ref($add-{$k}[0]) eq HASH))
+ ) {
+$acc-{$k} = mergehashes($acc-{$k}, $add-{$k});
+}
+else {
+$acc-{$k} = $add-{$k};
+}
+}
+return $acc;
+}
-sub readconfig ($)
+sub parsecfgtxt ($)
{
-my ($cfgfile) = @_;
+my ($text) = @_;
+my $parse = {};
my $osspcfg = new OSSP::cfg::simple;
+$osspcfg-parse($text) || die error parsing config file;
+$parse = $osspcfg-unpack(-index = '.*', -strip = '.*', -flatten = 1)
|| die error unpacking config file;
+return $parse;
+}
+
+sub readcfgtxt ($)
+{
+my ($cfgfile) = @_;
die no config file specified unless (defined $cfgfile);
my $io = new IO::File $cfgfile;
die cannot open \$cfgfile\ for reading ($!) if(not defined $io);
my $txt = ''; $txt .= $_ while ($io);
$io-close();
-$osspcfg-parse($txt) || die error parsing config file;
-$cfg = $osspcfg-unpack(-index = '.*', -strip = '.*', -flatten = 1)
|| die error unpacking config file;
-return($cfg);
+return $txt;
}
-$cfg = readconfig($PREFIX/etc/openpkg-registry/registry-ui.cfg);
-#FIXME die Dumper($cfg); # currently default config is ignored and replaced
by readconfig. They should merge.
-# outside CGI environment just print default config (useful during
installation)
-if ($ENV{GATEWAY_INTERFACE} !~ m/^CGI/) {
-print $cfg;
-exit 0;
-}
+my $defcfg = parsecfgtxt($defcfgtxt);
+my $usecfg =
parsecfgtxt(readcfgtxt($PREFIX/etc/openpkg-registry/registry-ui.cfg));
+my $cfg = mergehashes($defcfg, $usecfg);
my $ase;
$ase = undef;
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg-registry/ openpkg-registry.spec
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: 10-Jul-2006 12:09:38
Branch: HEAD Handle: 2006071011093700
Modified files:
openpkg-src/openpkg-registry
openpkg-registry.spec
Log:
upgrading package: openpkg-registry 0.5.0 - 0.5.1
Summary:
RevisionChanges Path
1.15+18 -6 openpkg-src/openpkg-registry/openpkg-registry.spec
patch -p0 '@@ .'
Index: openpkg-src/openpkg-registry/openpkg-registry.spec
$ cvs diff -u -r1.14 -r1.15 openpkg-registry.spec
--- openpkg-src/openpkg-registry/openpkg-registry.spec4 Jul 2006
14:26:17 - 1.14
+++ openpkg-src/openpkg-registry/openpkg-registry.spec10 Jul 2006
10:09:37 - 1.15
@@ -32,8 +32,8 @@
Class:EVAL
Group:Bootstrapping
License: BSD-style
-Version: 0.5.0
-Release: 20060704
+Version: 0.5.1
+Release: 20060710
# package options
%option with_client yes
@@ -54,6 +54,7 @@
PreReq: apache::with_mod_perl
PreReq: perl-www = perl-www-5.8.7-20051031
PreReq: perl-xml
+PreReq: cfg::with_perl
# PreReq: ase FIXME production
%endif
AutoReq: no
@@ -109,7 +110,15 @@
%{l_shtool} install -c -m 755 %{l_value -s -a} \
registry-db.pl \
$RPM_BUILD_ROOT%{l_prefix}/sbin/openpkg-registry-setup
-# FIXME development
+( echo ##
+ echo ## registry-ui.cfg - OpenPKG Registry User Interface
Configuration
+ echo ##
+ echo ## Run ( cd %{l_prefix}/cgi/openpkg-registry
./registry-ui-.pl )
+ echo ## to review defaults in OSSP cfg syntax. This file has exactly
the same syntax.
+ echo ## Only overrides need to be placed here, missing config
directives remain default.
+ echo ##
+) $RPM_BUILD_ROOT%{l_prefix}/etc/openpkg-registry/registry-ui.cfg
+# FIXME development, also causes ( cd ./ ...) construct few lines
above
%{l_shtool} install -c -m 755 %{l_value -s -a} \
ase.pm \
$RPM_BUILD_ROOT%{l_prefix}/cgi/openpkg-registry/
@@ -119,6 +128,8 @@
%if %{with_server} == yes
'%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' \
+'%attr(640,%{l_musr},%{l_ngrp}) %dir
%{l_prefix}/etc/openpkg-registry/registry-ui.cfg' \
+'%config %{l_prefix}/etc/openpkg-registry/registry-ui.cfg' \
%endif
'%ghost %{l_prefix}/etc/openpkg/register.util' \
'%ghost %{l_prefix}/etc/openpkg/register.tran' \
@@ -134,8 +145,9 @@
%post
if [ $1 -eq 1 ]; then
# display final hints on initial installation
-( echo 1. To complete this installation of OpenPKG Registry please
start PostgreSQL and
- echoinitialize the OpenPKG Registry database like this:
+( echo 1. To complete this installation of OpenPKG Registry please
configure it,
+ echostart PostgreSQL and initialize the OpenPKG Registry
database like this:
+ echo \$ vi
$RPM_INSTALL_PREFIX/etc/openpkg-registry/registry-ui.cfg
echo # $RPM_INSTALL_PREFIX/etc/rc postgresql start
echo \$ $RPM_INSTALL_PREFIX/sbin/openpkg-registry-setup
echo
@@ -148,7 +160,7 @@
fi
if [ $1 -eq 2 ]; then
# display final hints on update installation
-( echo Please perform a OpenPKG Registry database upgrade by
running
+( echo Please perform an OpenPKG Registry database upgrade by
running
echo \$ $RPM_INSTALL_PREFIX/sbin/openpkg-registry-setup
) | %{l_rpmtool} msg -b -t notice
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ VERSION register.sh registry-db.pl re...
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: 10-Jul-2006 12:23:04
Branch: HEAD Handle: 2006071011230201
Modified files:
openpkg-registryVERSION register.sh registry-db.pl registry-ui.pl
Log:
bump before release
Summary:
RevisionChanges Path
1.17+1 -1 openpkg-registry/VERSION
1.35+2 -2 openpkg-registry/register.sh
1.26+2 -2 openpkg-registry/registry-db.pl
1.68+2 -2 openpkg-registry/registry-ui.pl
patch -p0 '@@ .'
Index: openpkg-registry/VERSION
$ cvs diff -u -r1.16 -r1.17 VERSION
--- openpkg-registry/VERSION 4 Jul 2006 14:23:47 - 1.16
+++ openpkg-registry/VERSION 10 Jul 2006 10:23:02 - 1.17
@@ -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.5.0 (04-Jul-2006)
+ This is OpenPKG Registry, Version 0.5.1 (10-Jul-2006)
@@ .
patch -p0 '@@ .'
Index: openpkg-registry/register.sh
$ cvs diff -u -r1.34 -r1.35 register.sh
--- openpkg-registry/register.sh 4 Jul 2006 14:23:48 - 1.34
+++ openpkg-registry/register.sh 10 Jul 2006 10:23:02 - 1.35
@@ -29,8 +29,8 @@
# program name, version and date
progname=register
-progvers=0.5.0
-progdate=04-Jul-2006
+progvers=0.5.1
+progdate=10-Jul-2006
# determine path to OpenPKG instance
PREFIX=@l_prefix@
@@ .
patch -p0 '@@ .'
Index: openpkg-registry/registry-db.pl
$ cvs diff -u -r1.25 -r1.26 registry-db.pl
--- openpkg-registry/registry-db.pl 4 Jul 2006 14:18:06 - 1.25
+++ openpkg-registry/registry-db.pl 10 Jul 2006 10:23:03 - 1.26
@@ -37,8 +37,8 @@
# program name, version and date
my $progname=registry-db.pl;
-my $progvers=0.5.0;
-my $progdate=04-Jul-2006;
+my $progvers=0.5.1;
+my $progdate=10-Jul-2006;
# derive data version from program version
my $datavers={};
@@ .
patch -p0 '@@ .'
Index: openpkg-registry/registry-ui.pl
$ cvs diff -u -r1.67 -r1.68 registry-ui.pl
--- openpkg-registry/registry-ui.pl 10 Jul 2006 09:24:22 - 1.67
+++ openpkg-registry/registry-ui.pl 10 Jul 2006 10:23:03 - 1.68
@@ -46,8 +46,8 @@
# program name, version and date
my $progname=registry-ui.pl;
-my $progvers=0.5.0;
-my $progdate=04-Jul-2006;
+my $progvers=0.5.1;
+my $progdate=10-Jul-2006;
# determine path to OpenPKG instance
my $PREFIX='@l_prefix@';
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-registry/ register.sh
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: 10-Jul-2006 17:18:14
Branch: HEAD Handle: 2006071016181300
Modified files:
openpkg-registryregister.sh
Log:
openpkg man register
Summary:
RevisionChanges Path
1.36+331 -16openpkg-registry/register.sh
patch -p0 '@@ .'
Index: openpkg-registry/register.sh
$ cvs diff -u -r1.35 -r1.36 register.sh
--- openpkg-registry/register.sh 10 Jul 2006 10:23:02 - 1.35
+++ openpkg-registry/register.sh 10 Jul 2006 15:18:13 - 1.36
@@ -253,11 +253,6 @@
##
## Primary operation Preparation
##
-## Creates registry data for one request and dumpes it stdout
-## in XML format. That request can be filtered and piped into
-## the --Tran phase or it can be copied and pasted into the
-## XMLdump CGI facility manually.
-##
preparation()
{
if [ .$REGISTRY_MODE = .wipe ]; then
@@ -301,13 +296,6 @@
##
## Primary operation Transaction
##
-## Reads registry data with one request from stdin, executes
-## the transaction and writes registry data with one or more
-## responses to stdout in XML format. Depending on the mode of
-## operation, the transaction might be an actual transport to the
-## XMLdump CGI facility or a fake activity which complements the
-## manual preparation.
-##
transaction()
{
if [ .$REGISTRY_MODE = .wipe ]; then
@@ -353,10 +341,6 @@
##
## Primary operation Utilization
##
-## Reads registry data with one response from stdin and updates
-## the local registry information. Note that this step requires
-## write accesss to the $REGISTRY_UTIL file.
-##
utilization()
{
if [ .$REGISTRY_MODE = .wipe ]; then
@@ -572,4 +556,335 @@
## primary operation switch
##
eval $op \[EMAIL PROTECTED]
+exit $?
+
+##
+## MANUAL PAGE
+##
+
+=pod
+
+=head1 NAME
+
+Bopenpkg register - OpenPKG Registry Command-Line Client
+
+=head1 SYNOPSIS
+
+Bregister -m|--mode=fake|post|wipe [I-a|--args=args]
+ -u|--user=user [I-d|--desc=text]
+ [I--plat=text] [I--orel=text] [I--uuid=file]
+ [I--conf=file] [I--prep=file] [I--tran=file]
+ [I--util=file]
+ [I-P|--preparation] [I-T|--transaction]
+ [I-U|--utilization] [I-C|--convenience]
+ [I-I|--interaction]
+ [I-v|--verbose] [I-h|--help]
+
+Bregister -S|--printstatus
+
+Bregister -R|--rewriteurls [Iurl ...]
+
+=head1 DESCRIPTION
+
+Bopenpkg register is the Command-Line Client the OpenPKG Registry. It is
+used by administrators to register an instance with the OpenPKG Registry for
+later association.
+
+Automatic association is intentionally not possible and login to the web form
+on http://registry.openpkg.org/ is required.
+
+After association, Bopenpkg register can be used for repetitive
+reregistrations which update the heartbeat of the instance on the Registry
+server, avoiding premature depature from the database. It is assumed that
+every instance will be reregistered every quarter of the year. Dormant
+instances might be discarded from the Registry, revoking their access to
+additional resources.
+
+=head1 PRIMARY OPERATIONS
+
+The following primary operations are available:
+
+=over 4
+
+=item B-h, B--help
+
+Display brief usage message.
+
+=item B-P, B--preparation
+
+Execute the primary operation preparation.
+Creates registry data for one request and dumps it stdout
+in XML format. That request can be filtered and piped into
+the transaction phase or it can be copied and pasted into the
+XMLdump CGI facility manually.
+A copy of the output of the last run is also saved to the
C${REGISTRY_PREP} file.
+
+=item B-T, B--transaction
+
+Execute the primary operation transaction.
+Reads registry data with one request from stdin, executes
+the transaction and writes registry data with one or more
+responses to stdout in XML format.
+Depending on the mode of operation, the transaction might be an actual
+transport to the XMLdump CGI facility or a fake activity which complements
the
+manual preparation.
+A copy of the output of the last run is also saved to the
C${REGISTRY_TRAN} file.
+
+=item B-U, B--utilization
+
+Execute the primary operation utilization.
+Reads registry data with one response from stdin and updates the local
+registry information.
+Depending on
[CVS] OpenPKG: openpkg-registry/ VERSION register.sh registry-db.pl re...
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: 10-Jul-2006 17:18:32 Branch: HEAD Handle: 2006071016183001 Modified files: openpkg-registryVERSION register.sh registry-db.pl registry-ui.pl Log: bump before release Summary: RevisionChanges Path 1.18+1 -1 openpkg-registry/VERSION 1.37+1 -1 openpkg-registry/register.sh 1.27+1 -1 openpkg-registry/registry-db.pl 1.69+1 -1 openpkg-registry/registry-ui.pl patch -p0 '@@ .' Index: openpkg-registry/VERSION $ cvs diff -u -r1.17 -r1.18 VERSION --- openpkg-registry/VERSION 10 Jul 2006 10:23:02 - 1.17 +++ openpkg-registry/VERSION 10 Jul 2006 15:18:30 - 1.18 @@ -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.5.1 (10-Jul-2006) + This is OpenPKG Registry, Version 0.5.2 (10-Jul-2006) @@ . patch -p0 '@@ .' Index: openpkg-registry/register.sh $ cvs diff -u -r1.36 -r1.37 register.sh --- openpkg-registry/register.sh 10 Jul 2006 15:18:13 - 1.36 +++ openpkg-registry/register.sh 10 Jul 2006 15:18:30 - 1.37 @@ -29,7 +29,7 @@ # program name, version and date progname=register -progvers=0.5.1 +progvers=0.5.2 progdate=10-Jul-2006 # determine path to OpenPKG instance @@ . patch -p0 '@@ .' Index: openpkg-registry/registry-db.pl $ cvs diff -u -r1.26 -r1.27 registry-db.pl --- openpkg-registry/registry-db.pl 10 Jul 2006 10:23:03 - 1.26 +++ openpkg-registry/registry-db.pl 10 Jul 2006 15:18:31 - 1.27 @@ -37,7 +37,7 @@ # program name, version and date my $progname=registry-db.pl; -my $progvers=0.5.1; +my $progvers=0.5.2; my $progdate=10-Jul-2006; # derive data version from program version @@ . patch -p0 '@@ .' Index: openpkg-registry/registry-ui.pl $ cvs diff -u -r1.68 -r1.69 registry-ui.pl --- openpkg-registry/registry-ui.pl 10 Jul 2006 10:23:03 - 1.68 +++ openpkg-registry/registry-ui.pl 10 Jul 2006 15:18:31 - 1.69 @@ -46,7 +46,7 @@ # program name, version and date my $progname=registry-ui.pl; -my $progvers=0.5.1; +my $progvers=0.5.2; my $progdate=10-Jul-2006; # determine path to OpenPKG instance @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg-registry/ openpkg-registry.spec
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: 10-Jul-2006 17:50:39 Branch: HEAD Handle: 2006071016503800 Modified files: openpkg-src/openpkg-registry openpkg-registry.spec Log: upgrading package: openpkg-registry 0.5.1 - 0.5.2 Summary: RevisionChanges Path 1.16+1 -1 openpkg-src/openpkg-registry/openpkg-registry.spec patch -p0 '@@ .' Index: openpkg-src/openpkg-registry/openpkg-registry.spec $ cvs diff -u -r1.15 -r1.16 openpkg-registry.spec --- openpkg-src/openpkg-registry/openpkg-registry.spec10 Jul 2006 10:09:37 - 1.15 +++ openpkg-src/openpkg-registry/openpkg-registry.spec10 Jul 2006 15:50:38 - 1.16 @@ -32,7 +32,7 @@ Class:EVAL Group:Bootstrapping License: BSD-style -Version: 0.5.1 +Version: 0.5.2 Release: 20060710 # package options @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec
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: 10-Jul-2006 17:51:11 Branch: HEAD Handle: 2006071016511001 Modified files: openpkg-src/openpkg HISTORY openpkg.spec Log: upgrading package: openpkg-registry 0.5.1 - 0.5.2 Summary: RevisionChanges Path 1.344 +1 -0 openpkg-src/openpkg/HISTORY 1.496 +2 -2 openpkg-src/openpkg/openpkg.spec patch -p0 '@@ .' Index: openpkg-src/openpkg/HISTORY $ cvs diff -u -r1.343 -r1.344 HISTORY --- openpkg-src/openpkg/HISTORY 28 Jun 2006 11:23:11 - 1.343 +++ openpkg-src/openpkg/HISTORY 10 Jul 2006 15:51:10 - 1.344 @@ -2,6 +2,7 @@ 2006 +20060710 upgrade to openpkg-registry 0.5.2 which comes with manual page 20060628 allow openpkg build emulation script to gracefully handle platform changes 20060625 align configure call of GNU make with the make package 20060625 upgrade to cURL 7.15.4 by using the GREP=grep workaround. @@ . patch -p0 '@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.495 -r1.496 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 28 Jun 2006 11:23:12 - 1.495 +++ openpkg-src/openpkg/openpkg.spec 10 Jul 2006 15:51:11 - 1.496 @@ -38,7 +38,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20060628 +%define V_openpkg 20060710 # the used software versions %define V_rpm 4.2.1 @@ -53,7 +53,7 @@ %define V_bash 3.1 %define V_uuid 1.4.2 %define V_config 20060310 -%define V_registry 0.4.1 +%define V_registry 0.5.2 %define V_perl 5.8.8 %define V_openssl 0.9.8b @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/perl-wx/ perl-wx.spec
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: 10-Jul-2006 22:25:06
Branch: HEAD Handle: 2006071021250600
Modified files:
openpkg-src/perl-wx perl-wx.spec
Log:
modifying package: perl-wx-5.8.8 20060706 - 20060710
Summary:
RevisionChanges Path
1.37+2 -2 openpkg-src/perl-wx/perl-wx.spec
patch -p0 '@@ .'
Index: openpkg-src/perl-wx/perl-wx.spec
$ cvs diff -u -r1.36 -r1.37 perl-wx.spec
--- openpkg-src/perl-wx/perl-wx.spec 6 Jul 2006 05:42:01 - 1.36
+++ openpkg-src/perl-wx/perl-wx.spec 10 Jul 2006 20:25:06 - 1.37
@@ -24,7 +24,7 @@
# package versions
%define V_perl5.8.8
-%define V_wx 0.51
+%define V_wx 0.53
%define V_wx_perl_treechecker 1.13
# package information
@@ -38,7 +38,7 @@
Group:Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 20060706
+Release: 20060710
# list of sources
Source0: http://www.cpan.org/modules/by-module/Wx/Wx-%{V_wx}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/bogofilter/ bogofilter.spec
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: 10-Jul-2006 22:26:07
Branch: HEAD Handle: 2006071021260600
Modified files:
openpkg-src/bogofilter bogofilter.spec
Log:
upgrading package: bogofilter 1.0.2 - 1.0.3
Summary:
RevisionChanges Path
1.106 +2 -2 openpkg-src/bogofilter/bogofilter.spec
patch -p0 '@@ .'
Index: openpkg-src/bogofilter/bogofilter.spec
$ cvs diff -u -r1.105 -r1.106 bogofilter.spec
--- openpkg-src/bogofilter/bogofilter.spec24 May 2006 18:50:50 -
1.105
+++ openpkg-src/bogofilter/bogofilter.spec10 Jul 2006 20:26:06 -
1.106
@@ -32,8 +32,8 @@
Class:BASE
Group:Text
License: GPL
-Version: 1.0.2
-Release: 20060524
+Version: 1.0.3
+Release: 20060710
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/bogofilter/bogofilter-%{version}.tar.bz2
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/perl-xml/ perl-xml.spec
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: 10-Jul-2006 22:29:18
Branch: HEAD Handle: 2006071021291800
Modified files:
openpkg-src/perl-xmlperl-xml.spec
Log:
modifying package: perl-xml-5.8.8 20060703 - 20060710
Summary:
RevisionChanges Path
1.248 +2 -2 openpkg-src/perl-xml/perl-xml.spec
patch -p0 '@@ .'
Index: openpkg-src/perl-xml/perl-xml.spec
$ cvs diff -u -r1.247 -r1.248 perl-xml.spec
--- openpkg-src/perl-xml/perl-xml.spec3 Jul 2006 11:05:54 -
1.247
+++ openpkg-src/perl-xml/perl-xml.spec10 Jul 2006 20:29:18 -
1.248
@@ -24,7 +24,7 @@
# versions of individual parts
%define V_perl5.8.8
-%define V_html_parser 3.54
+%define V_html_parser 3.55
%define V_html_simpleparse0.12
%define V_html_table 2.04
%define V_html_tagreader 1.08
@@ -93,7 +93,7 @@
Group:Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 20060703
+Release: 20060710
# package options
%option with_libxmlno
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/cryptlib/ cryptlib.patch cryptlib.spec
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: 10-Jul-2006 23:34:19
Branch: HEAD Handle: 2006071022341900
Modified files:
openpkg-src/cryptlibcryptlib.patch cryptlib.spec
Log:
upgrading package: cryptlib 3.22 - 3.23
Summary:
RevisionChanges Path
1.3 +0 -16 openpkg-src/cryptlib/cryptlib.patch
1.6 +4 -3 openpkg-src/cryptlib/cryptlib.spec
patch -p0 '@@ .'
Index: openpkg-src/cryptlib/cryptlib.patch
$ cvs diff -u -r1.2 -r1.3 cryptlib.patch
--- openpkg-src/cryptlib/cryptlib.patch 16 May 2006 07:23:05 -
1.2
+++ openpkg-src/cryptlib/cryptlib.patch 10 Jul 2006 21:34:19 -
1.3
@@ -11,19 +11,3 @@
#include crypt.h
/* Unix and Unix-like systems share the same makefile, make sure that the
-Index: cert/ext_def.c
cert/ext_def.c.orig 2005-08-14 22:34:44 +0200
-+++ cert/ext_def.c 2006-05-16 09:20:41 +0200
-@@ -116,9 +116,9 @@
-highest warning level enabled, this produces a compiler warning, so we
-turn the warning off for this module */
-
--extern const ATTRIBUTE_INFO FAR_BSS generalNameInfo[];
--extern const ATTRIBUTE_INFO FAR_BSS holdInstructionInfo[];
--extern const ATTRIBUTE_INFO FAR_BSS contentTypeInfo[];
-+static const ATTRIBUTE_INFO FAR_BSS generalNameInfo[];
-+static const ATTRIBUTE_INFO FAR_BSS holdInstructionInfo[];
-+static const ATTRIBUTE_INFO FAR_BSS contentTypeInfo[];
-
- #if defined( _MSC_VER )
- #pragma warning( disable: 4211 )
@@ .
patch -p0 '@@ .'
Index: openpkg-src/cryptlib/cryptlib.spec
$ cvs diff -u -r1.5 -r1.6 cryptlib.spec
--- openpkg-src/cryptlib/cryptlib.spec16 May 2006 07:23:05 -
1.5
+++ openpkg-src/cryptlib/cryptlib.spec10 Jul 2006 21:34:19 -
1.6
@@ -23,8 +23,8 @@
##
# package version
-%define V_full 3.22
-%define V_comp 322
+%define V_full 3.23
+%define V_comp 323
# package information
Name: cryptlib
@@ -37,7 +37,7 @@
Group:Cryptography
License: MIT-style
Version: %{V_full}
-Release: 20060516
+Release: 20060710
# list of sources
Source0: ftp://ftp.franken.de/pub/crypt/cryptlib/cl%{V_comp}.zip
@@ -79,6 +79,7 @@
%setup -q -c -T
%{l_prefix}/bin/unzip -q -x %{SOURCE0}
%patch -p0
+%{l_shtool} subst -e 's;\r$;;' tools/*.pl tools/*.sh
%build
%{l_make} %{l_mflags} \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
