OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Jan-2004 14:04:37
Branch: HEAD Handle: 2004012813043500
Modified files:
openpkg-src/openpkg HISTORY README aux.prereq.sh aux.usrgrp.sh
dot.bash_login local.README lsync lsync.pod
mkproxyrpm.pl openpkg.boot rc rc.func root.README
rpmdb rpmmacros rpmpopt rpmtool rpmtool.pod
rpmx.pl uuid.sh
Log:
fix typos and remove trailing whitespaces from source files
Summary:
Revision Changes Path
1.116 +3 -2 openpkg-src/openpkg/HISTORY
1.22 +7 -7 openpkg-src/openpkg/README
1.15 +3 -3 openpkg-src/openpkg/aux.prereq.sh
1.12 +3 -3 openpkg-src/openpkg/aux.usrgrp.sh
1.4 +1 -1 openpkg-src/openpkg/dot.bash_login
1.3 +3 -3 openpkg-src/openpkg/local.README
1.7 +5 -5 openpkg-src/openpkg/lsync
1.6 +1 -1 openpkg-src/openpkg/lsync.pod
1.10 +5 -5 openpkg-src/openpkg/mkproxyrpm.pl
1.44 +6 -6 openpkg-src/openpkg/openpkg.boot
1.50 +8 -8 openpkg-src/openpkg/rc
1.12 +2 -2 openpkg-src/openpkg/rc.func
1.3 +3 -3 openpkg-src/openpkg/root.README
1.3 +3 -3 openpkg-src/openpkg/rpmdb
1.51 +3 -3 openpkg-src/openpkg/rpmmacros
1.12 +2 -2 openpkg-src/openpkg/rpmpopt
1.33 +54 -54 openpkg-src/openpkg/rpmtool
1.11 +1 -1 openpkg-src/openpkg/rpmtool.pod
1.17 +9 -9 openpkg-src/openpkg/rpmx.pl
1.3 +1 -1 openpkg-src/openpkg/uuid.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.115 -r1.116 HISTORY
--- openpkg-src/openpkg/HISTORY 24 Jan 2004 11:57:03 -0000 1.115
+++ openpkg-src/openpkg/HISTORY 28 Jan 2004 13:04:35 -0000 1.116
@@ -2,6 +2,7 @@
2004
====
+20040127 fix typos and remove trailing whitespaces from source files
20040124 add parallel build support in %{l_mflags} for HP/UX
20040123 adjust copyright year in all messages to cover new year 2004
20040123 upgrade to cURL 7.11.0
@@ -46,7 +47,7 @@
20031027 port RPM to OpenDarwin 6.6.2
20031027 try to cleanup glob(3) replacement hacks in RPM
20031021 fix RPM GCC building on Unixware by using Linux i386 assembly specific
stuff on Linux only.
-20031020 include "trigger argument passing patch" from RPM BugDB
+20031020 include "trigger argument passing patch" from RPM BugDB
20031020 make "rpm --setperms" and "rpm --setugids" more portable by using Bash
20031020 finish porting to SCO UnixWare 7.1.3
20031019 port mostly to SCO UnixWare 7.1.3 (only some libtool issues remaining)
@@ -60,7 +61,7 @@
20031010 working off the aux.prereq.sh script for adjusted platform checks and
additional disk space checks
20031008 make sure RPM does not pick up headers of a vendor BeeCrypt package under
RedHat Linux
20031008 fix --makeproxy command after recent OpenPKG branding in "rpm --version"
output
-20031006 add 'Provides: openpkg = 1.3.1-1.3.1' for easier mixing with OpenPKG 1.3
release packages
+20031006 add 'Provides: openpkg = 1.3.1-1.3.1' for easier mixing with OpenPKG 1.3
release packages
20031006 add OpenPKG branding to "rpm --version" output
20031005 check availability of unpacking tools in .src.sh script
20030929 upgrade to latest OSSP platform script to recognize even more platforms
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/README
============================================================================
$ cvs diff -u -r1.21 -r1.22 README
--- openpkg-src/openpkg/README 20 Jan 2004 16:56:12 -0000 1.21
+++ openpkg-src/openpkg/README 28 Jan 2004 13:04:35 -0000 1.22
@@ -29,10 +29,10 @@
make.patch .............. patch for GNU make
bash.patch .............. patch for GNU bash
beecrypt.patch .......... patch for BeeCrypt
- rpm.patch.bugfix ........ patch for RPM (bugfixing parts)
- rpm.patch.feature ....... patch for RPM (new features parts)
- rpm.patch.porting ....... patch for RPM (portability enhancement parts)
- rpm.patch.regen ......... patch for RPM (re-generated files parts)
+ rpm.patch.bugfix ........ patch for RPM (bugfixing parts)
+ rpm.patch.feature ....... patch for RPM (new features parts)
+ rpm.patch.porting ....... patch for RPM (portability enhancement parts)
+ rpm.patch.regen ......... patch for RPM (re-generated files parts)
rpmpopt ................. replacements/extensions for RPM's POPT configuration
rpmmacros ............... replacements/extensions for RPM's macros
@@ -43,7 +43,7 @@
dot.bashrc .............. the source for installed <prefix>/.bashrc
dot.bash_login .......... the source for installed <prefix>/.bash_login
dot.lsyncrc ............. the source for installed <prefix>/local/.lsyncrc
-
+
rc ...................... the OpenPKG run-command handling script
rc.func ................. the OpenPKG run-command function definitions
rc.conf ................. the OpenPKG run-command configuration template
@@ -60,7 +60,7 @@
aux.usrgrp.sh ........... user/group name/id determination script
aux.prereq.sh ........... prerequisite checking script
aux.wrapsrc.sh .......... wrapper script for generating openpkg-V-R.src.sh
- aux.wrapbin.sh .......... wrapper script for generating openpkg-V-R.P-L.sh
+ aux.wrapbin.sh .......... wrapper script for generating openpkg-V-R.P-L.sh
shtool .................. the portable shell tool (GNU shtool)
platform ................ the platform identification script (OSSP platform)
@@ -134,7 +134,7 @@
uncompression tools, and finally wrapped into a self-extracting
shell script by appending aux.wrapbin.sh (padded to 64KB for easier
unpacking of the attached tarball) to its front.
-
+
The result is the binary bootstrap script openpkg-V-R.P-L.sh which
can be used to install the target hierarchy from scratch without any
pre-installed RPM. Nevetheless the installed target hierarchy looks
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.prereq.sh
============================================================================
$ cvs diff -u -r1.14 -r1.15 aux.prereq.sh
--- openpkg-src/openpkg/aux.prereq.sh 23 Jan 2004 12:46:08 -0000 1.14
+++ openpkg-src/openpkg/aux.prereq.sh 28 Jan 2004 13:04:35 -0000 1.15
@@ -65,7 +65,7 @@
echo "++ platform technology: $platform_tech"
echo "++ platform support: [$support]"
case "$support" in
- no )
+ no )
echo "ERROR: platform not supported" 1>&2
exit 1
;;
@@ -108,12 +108,12 @@
#
# ...FIXME...
-#
+#
# CHECK: available tools in $PATH
#
# ...FIXME...
-#
+#
# CHECK: available devices /dev/random, etc.
#
# ...FIXME...
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.usrgrp.sh
============================================================================
$ cvs diff -u -r1.11 -r1.12 aux.usrgrp.sh
--- openpkg-src/openpkg/aux.usrgrp.sh 23 Jan 2004 12:46:08 -0000 1.11
+++ openpkg-src/openpkg/aux.usrgrp.sh 28 Jan 2004 13:04:35 -0000 1.12
@@ -108,7 +108,7 @@
fi
# determine OpenPKG musr/mgrp
-if [ ".$musr" = . ]; then
+if [ ".$musr" = . ]; then
musr="$usr"
fi
if [ ".$musr" = . ]; then
@@ -134,7 +134,7 @@
fi
# determine OpenPKG rusr/rgrp
-if [ ".$rusr" = . ]; then
+if [ ".$rusr" = . ]; then
rusr="${usr}-r"
fi
if [ ".$rusr" = ".-r" ]; then
@@ -160,7 +160,7 @@
fi
# determine OpenPKG nusr/ngrp
-if [ ".$nusr" = . ]; then
+if [ ".$nusr" = . ]; then
nusr="${usr}-n"
fi
if [ ".$nusr" = ".-n" ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/dot.bash_login
============================================================================
$ cvs diff -u -r1.3 -r1.4 dot.bash_login
--- openpkg-src/openpkg/dot.bash_login 14 Oct 2003 13:09:41 -0000 1.3
+++ openpkg-src/openpkg/dot.bash_login 28 Jan 2004 13:04:35 -0000 1.4
@@ -18,7 +18,7 @@
export TMPDIR=/tmp
export BLOCKSIZE=1024
-# suck in the whole Bourne-Shell
+# suck in the whole Bourne-Shell
# environment of OpenPKG hierarchy
eval [EMAIL PROTECTED]@/etc/rc --eval all env`
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/local.README
============================================================================
$ cvs diff -u -r1.2 -r1.3 local.README
--- openpkg-src/openpkg/local.README 2 Nov 2001 13:20:52 -0000 1.2
+++ openpkg-src/openpkg/local.README 28 Jan 2004 13:04:35 -0000 1.3
@@ -1,4 +1,4 @@
-
+
This is @l_prefix@/local/, the manually-managed software package hierarchy
inside the OpenPKG software hierarchy @[EMAIL PROTECTED] This filesystem area
contains software which was manually installed under @l_prefix@/local/PKG/
@@ -8,9 +8,9 @@
Use "eval [EMAIL PROTECTED]@/etc/rc --eval all env`" from within a user's
Bourne (Again) Shell startup script (.profile or .bashrc) in
- order to activate this hierarchy and all of its packages.
+ order to activate this hierarchy and all of its packages.
- In case of any questions or problems post to the OpenPKG project
+ In case of any questions or problems post to the OpenPKG project
user support mailing list <[EMAIL PROTECTED]>. For more
details about OpenPKG visit http://www.openpkg.org/.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/lsync
============================================================================
$ cvs diff -u -r1.6 -r1.7 lsync
--- openpkg-src/openpkg/lsync 23 Jan 2004 12:46:08 -0000 1.6
+++ openpkg-src/openpkg/lsync 28 Jan 2004 13:04:35 -0000 1.7
@@ -34,7 +34,7 @@
progdate="04-Aug-2001"
# root directory
-# (if empty, .lsyncrc files provide default)
+# (if empty, .lsyncrc files provide default)
root=""
# subdirectory where packages are physically installed
@@ -49,7 +49,7 @@
##
# default run-time modes
-nop=0
+nop=0
quiet=0
trace=0
help=''
@@ -139,7 +139,7 @@
# make sure a root directory was found or specified
if [ ".$root" = . ]; then
echo "$progname:ERROR: no root directory specified!" 1>&2
- echo "$progname:HINT: use --root=DIR option explicitly on command line" 1>&2
+ echo "$progname:HINT: use --root=DIR option explicitly on command line" 1>&2
echo "$progname:HINT: or implicitly inside an .lsyncrc file in your home" 1>&2
echo "$progname:HINT: directory or in any parent directory." 1>&2
exit 3
@@ -239,10 +239,10 @@
continue
fi
- #
+ #
# PASS 1: remove dangling symbolic links in access layer
#
-
+
# iterate over all symlinks in the access layer subdir
for link in . `ls "$root/$subdir/" | sed -e "s;^$root/$subdir/*;;g"`; do
test ".$link" = ".." && continue
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/lsync.pod
============================================================================
$ cvs diff -u -r1.5 -r1.6 lsync.pod
--- openpkg-src/openpkg/lsync.pod 23 Jan 2004 12:46:08 -0000 1.5
+++ openpkg-src/openpkg/lsync.pod 28 Jan 2004 13:04:35 -0000 1.6
@@ -51,7 +51,7 @@
I<root>/I<pkgdir>/) by managing symbolic links in an access layer
(located under I<root>/) corresponding to package installation
files (found in I<root>/I<pkgdir>/pkgname/subdir/) which need to be
-collected in global directories (located under I<root>/subdir/).
+collected in global directories (located under I<root>/subdir/).
The purpose of this is that individual packages can be installed and
deinstalled seperately without interfering with other packages while
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/mkproxyrpm.pl
============================================================================
$ cvs diff -u -r1.9 -r1.10 mkproxyrpm.pl
--- openpkg-src/openpkg/mkproxyrpm.pl 23 Jan 2004 12:46:08 -0000 1.9
+++ openpkg-src/openpkg/mkproxyrpm.pl 28 Jan 2004 13:04:35 -0000 1.10
@@ -57,7 +57,7 @@
}
}
-# exception handling support
+# exception handling support
$SIG{__DIE__} = sub {
my ($err) = @_;
$err =~ s|\s+at\s+.*||s if (not $verbose);
@@ -93,7 +93,7 @@
return $fullprog;
}
-# convert a subdirectory (a/b/c/)
+# convert a subdirectory (a/b/c/)
# into a corresponding reverse path (../../../)
sub sub2rev {
my ($sub) = @_;
@@ -164,13 +164,13 @@
|| die "cannot create temporary directory '$tmpdir'";
&cleanup_remember("rmdir $tmpdir");
}
-&verbose("-- $tmpdir");
+&verbose("-- $tmpdir");
# determine RPM program
if (not -x $rpm) {
$rpm = &fullpath($rpm);
}
-my $rpmvers = `$rpm --version 2>/dev/null`;
+my $rpmvers = `$rpm --version 2>/dev/null`;
$rpmvers =~ s|^OpenPKG\s+RPM\s+([0-9.]+)\s*$|$1|s || die "program '$rpm' seems to
be not RPM";
&verbose("++ determining RPM program");
&verbose("-- $rpm ($rpmvers)");
@@ -211,7 +211,7 @@
my $q = '';
foreach my $t (qw(
NAME SUMMARY URL VENDOR PACKAGER DISTRIBUTION GROUP LICENSE VERSION RELEASE
- DESCRIPTION
+ DESCRIPTION
)) {
$q .= "S-$t:<%{$t}>\n";
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.43 -r1.44 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 23 Jan 2004 12:46:08 -0000 1.43
+++ openpkg-src/openpkg/openpkg.boot 28 Jan 2004 13:04:35 -0000 1.44
@@ -189,7 +189,7 @@
[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
l_release="CURRENT"
;;
- * )
+ * )
l_release=`echo "${l_version}" |\
sed -e 's;^;#;' \
-e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
@@ -309,10 +309,10 @@
prolog="$tmpdir/openpkg.boot.prolog.sh"
cp /dev/null $prolog
(
- echo "_specdir=`pwd`"
- echo "_sourcedir=$distdir"
- echo "_tmppath=$tmpdir"
- echo "_builddir=$tmpdir"
+ echo "_specdir=`pwd`"
+ echo "_sourcedir=$distdir"
+ echo "_tmppath=$tmpdir"
+ echo "_builddir=$tmpdir"
echo "l_prefix=$prefix"
echo "l_tag_fmt=\"$tag\""
echo "l_buildroot=$tmpdir/$name-$version-root"
@@ -563,7 +563,7 @@
[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
l_release="CURRENT"
;;
- * )
+ * )
l_release=`echo "${l_version}" |\
sed -e 's;^;#;' \
-e 's;^#\([0-9][0-9]*\.[0-9][0-9]*\)\.0$;\1-RELEASE;' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.49 -r1.50 rc
--- openpkg-src/openpkg/rc 23 Jan 2004 12:46:08 -0000 1.49
+++ openpkg-src/openpkg/rc 28 Jan 2004 13:04:35 -0000 1.50
@@ -167,7 +167,7 @@
for var in $*; do
eval "echo \${$var}"
done
-
+
# stop processing immediately
exit 0
fi
@@ -386,7 +386,7 @@
fi
fi
done
-
+
# if operating on all scripts, complain if a non-standard command
# was used and it was not found in any(!) script at all. The
# standard commands are accepted to perform no operation if no
@@ -395,7 +395,7 @@
case "$cmd" in
start|stop|monthly|weekly|daily|hourly|quarterly )
;;
- * )
+ * )
echo "openpkg:rc:ERROR: command \"$cmd\" not found in any script"
1>&2
rv=1
break
@@ -447,7 +447,7 @@
verbose_pos=0
for entry in `echo $list | tr ',' '\012' | sort -n`; do
[ ".$entry" = . ] && continue
-
+
# re-determine the script name, script and whether to print output
eval `echo $entry | sed -e 's%^[0-9]*:\(.*\):\(.*\):\(.*\)$%s_name="\1";
s_user="\2"; s_output="\3";%'`
@@ -500,7 +500,7 @@
# prepare temporary files
rm -f $tmpfile $outfile $errfile
touch $tmpfile $outfile $errfile
-
+
# generate: optionally enable shell debugging
if [ ".$debug" = .1 ]; then
echo "set -x" >>$tmpfile
@@ -529,7 +529,7 @@
# generate: %common section and particular command section
sed <$rcdir/rc.$s_name >>$tmpfile -e "1,/^%common/d" -e '/^%.*/,$d'
sed <$rcdir/rc.$s_name >>$tmpfile -e "1,/^%$cmd/d" -e '/^%.*/,$d'
-
+
# execute the generated script with GNU Bash
if [ ".$user" != ".$s_user" ]; then
# execute as different user
@@ -555,7 +555,7 @@
fi
) 1>&2
- # enforce global return value
+ # enforce global return value
rv=1
else
if [ ".$s_output" = .yes ]; then
@@ -610,7 +610,7 @@
# for --eval we cannot just print the resulting script because
# not all Bourne-Shell implementations like to "eval" large
# multi-line outputs. Hence we output a little one-liner which
- # "sources" the script instead and cleans up.
+ # "sources" the script instead and cleans up.
case $SHELL in
csh|*/csh|tcsh|*/tcsh )
echo "source $tmpfile; rm -rf $tmpdir 2>/dev/null || true"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc.func
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.func
--- openpkg-src/openpkg/rc.func 23 Jan 2004 12:46:08 -0000 1.11
+++ openpkg-src/openpkg/rc.func 28 Jan 2004 13:04:35 -0000 1.12
@@ -53,7 +53,7 @@
# rcPath (manipulate colon-separated PATH-style variable)
#
# Usage: rcPath [-a] [-r] [-p] [-e] <var> <dir> [<dir> ...]
-# Example: rcPathAdd -a -e PATH /bin /sbin /usr/bin /usr/sbin /usr/ccs/bin
+# Example: rcPath -a -e PATH /bin /sbin /usr/bin /usr/sbin /usr/ccs/bin
# Description: removes (-r) or adds (-a) by appending or prepending
# (-p) one or more directories <dir> (optionally have
# to be existing if -e is given) to a colon-separated
@@ -115,7 +115,7 @@
#
# Usage: rcTmp [-i] [-f [-n <name>]] [-k]
# Example: rcTmp -i; tmpfile=`rcTmp -f -n tmp`; ...; rcTmp -k
-# Description:
+# Description: ???
#
rcTmp () {
local mode=""
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/root.README
============================================================================
$ cvs diff -u -r1.2 -r1.3 root.README
--- openpkg-src/openpkg/root.README 2 Nov 2001 13:20:52 -0000 1.2
+++ openpkg-src/openpkg/root.README 28 Jan 2004 13:04:35 -0000 1.3
@@ -1,4 +1,4 @@
-
+
This is @l_prefix@, an RPM-based OpenPKG software package hierarchy.
This filesystem area contains software which was automatically
installed through OpenPKG RPM packages from http://www.openpkg.org/.
@@ -16,9 +16,9 @@
Use "eval [EMAIL PROTECTED]@/etc/rc --eval all env`" from within a user's
Bourne (Again) Shell startup script (.profile or .bashrc) in
- order to activate this hierarchy and all of its packages.
+ order to activate this hierarchy and all of its packages.
- In case of any questions or problems post to the OpenPKG project
+ In case of any questions or problems post to the OpenPKG project
user support mailing list <[EMAIL PROTECTED]>. For more
details about OpenPKG visit http://www.openpkg.org/.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmdb
============================================================================
$ cvs diff -u -r1.2 -r1.3 rpmdb
--- openpkg-src/openpkg/rpmdb 23 Jan 2004 12:46:08 -0000 1.2
+++ openpkg-src/openpkg/rpmdb 28 Jan 2004 13:04:35 -0000 1.3
@@ -266,7 +266,7 @@
db_extend () {
# make sure all RPM database DB files are present
verbose 2 "making sure RPM database contains all possible DB files"
- for dbfile in $dbfiles; do
+ for dbfile in $dbfiles; do
eval `echo $dbfile | sed -e 's/^\(.*\):\(.*\)$/dbtype="\1"; dbfile="\2";/'`
if [ ! -f $dbpath/$dbfile ]; then
verbose 3 "creating DB file: $dbpath/$dbfile ($dbtype)"
@@ -328,7 +328,7 @@
# fix ownership and permissions of (especially newly created)
# RPM database files to make sure they are consistent
verbose 2 "making sure RPM database files have consistent attributes"
- for dbfile in $dbfiles; do
+ for dbfile in $dbfiles; do
eval `echo $dbfile | sed -e 's/^\(.*\):\(.*\)$/dbtype="\1"; dbfile="\2";/'`
verbose 3 "fixating DB file: $dbpath/$dbfile ($dbtype)"
chown $musr:$mgrp $dbpath/$dbfile 2>/dev/null || true
@@ -338,7 +338,7 @@
db_list () {
# list all database files
- for dbfile in $dbfiles; do
+ for dbfile in $dbfiles; do
eval `echo $dbfile | sed -e 's/^\(.*\):\(.*\)$/dbtype="\1"; dbfile="\2";/'`
if [ $verbose -eq 0 ]; then
echo "$dbfile"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.50 -r1.51 rpmmacros
--- openpkg-src/openpkg/rpmmacros 23 Jan 2004 12:46:08 -0000 1.50
+++ openpkg-src/openpkg/rpmmacros 28 Jan 2004 13:04:35 -0000 1.51
@@ -68,9 +68,9 @@
# standard RPM target platform identification
# (defaults via %{_host*} macros; used internally for %ifarch/%ifnarch)
-%_target_cpu %{_host_cpu}
+%_target_cpu %{_host_cpu}
%_target_vendor %{_host_vendor}
-%_target_os %{_host_os}
+%_target_os %{_host_os}
%_target_alias %{_host_alias}
%_target %{_host}
@@ -293,7 +293,7 @@
%_repackage_name_fmt
%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}-%%{OS}-%{l_tag}.rpm
%_solve_name_fmt
%{_solve_pkgsdir}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}-%%{OS}-%{l_tag}.rpm
-# override the payload compression for the CPIO parts of an RPM
+# override the payload compression for the CPIO parts of an RPM
# (we use the equivalent of "bzip2 -9")
%_source_payload w9.bzdio
%_binary_payload w9.bzdio
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmpopt
============================================================================
$ cvs diff -u -r1.11 -r1.12 rpmpopt
--- openpkg-src/openpkg/rpmpopt 23 Jan 2004 12:46:08 -0000 1.11
+++ openpkg-src/openpkg/rpmpopt 28 Jan 2004 13:04:35 -0000 1.12
@@ -44,7 +44,7 @@
rpm alias --norestriction --define "restriction no" \
--POPTdesc=$"include %NoSource files in .src.rpm"
-# RPM extension: "rpm --with[out] <name>"
+# RPM extension: "rpm --with[out] <name>"
rpm alias --with --define "with_!#:+ yes" \
--POPTdesc=$"set '%option <name> yes'" \
--POPTargs=$"<name>"
@@ -74,7 +74,7 @@
# RPM extension: "rpm --db-private ..."
rpm alias --db-private --define "_rpmdb_private yes" \
- --POPTdesc=$"operate RPM database in in Berkeley-DB DB_PRIVATE mode"
+ --POPTdesc=$"operate RPM database in Berkeley-DB DB_PRIVATE mode"
# RPM adjustment: "rpm --setperms ..."
rpm alias --setperms -q --qf \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.32 -r1.33 rpmtool
--- openpkg-src/openpkg/rpmtool 24 Jan 2004 11:57:03 -0000 1.32
+++ openpkg-src/openpkg/rpmtool 28 Jan 2004 13:04:35 -0000 1.33
@@ -38,7 +38,7 @@
echo "This is $prog_name, version $prog_vers ($prog_date)"
echo "Copyright (c) 2000-2004 Ralf S. Engelschall <[EMAIL PROTECTED]>"
echo ''
- echo "Usage: $prog_name [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]"
+ echo "Usage: $prog_name [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]"
echo ''
echo 'Available global <options>:'
echo ' -d, --debug enable internal debugging'
@@ -46,7 +46,7 @@
echo ' -h, --help display usage help page (this one)'
echo ''
echo 'Available <cmd-name> [<cmd-options>] [<cmd-args>]:'
- echo ' platform'
+ echo ' platform'
echo ' mflags [-O] <tool>'
echo ' cflags [-O] <tool>'
echo ' cppflags [-p <prefix>] [<subdir> ...]'
@@ -320,7 +320,7 @@
platform_machine=`(uname -m) 2>/dev/null` ||\
platform_machine=`(uname -p) 2>/dev/null` ||\
platform_machine='unknown'
-if [ ".$platform_machine" = ".Power Macintosh" ]; then
+if [ ".$platform_machine" = ".Power Macintosh" ]; then
platform_machine=`(uname -p) 2>/dev/null`
fi
platform_release=`(uname -r) 2>/dev/null` ||\
@@ -507,7 +507,7 @@
fi
echo "x$ldflags" | sed -e 's;^x;;' -e 's;^ *;;'
;;
-
+
files )
# if a Perl interpreter is available, we perform the operation
# with it because Perl is a magnitude (factor 10!) faster than
@@ -548,7 +548,7 @@
# read input file list
my @L = ();
- if ($#ARGV == -1 or ($#ARGV == 0 and $ARGV[0] eq "-")) {
+ if ($#ARGV == -1 or ($#ARGV == 0 and $ARGV[0] eq "-")) {
# read file list from stdin
while (<STDIN>) {
s/\n$//s;
@@ -576,7 +576,7 @@
# move tags to end of entry for easier parsing
1 while ($l =~ s|^(%\S+) (.+)|$2 $1|);
- # use `:' as a dummy path for tag-only entries (like `%defattr')
+ # use `:' as a dummy path for tag-only entries (like `%defattr')
# to avoid special cases in the later processing
if ($l =~ m|^%.+|) {
$l = ": $l";
@@ -690,7 +690,7 @@
print STDOUT join("\n", @L)."\n";
}
else {
- open(FP, ">$opt_o");
+ open(FP, ">$opt_o");
print FP join("\n", @L)."\n";
close(FP);
}
@@ -717,10 +717,10 @@
# remember the build root in a reasonable short variable ;)
br="$opt_r"
-
+
# make sure filename expansion is disabled per default
set -f
-
+
# read input file list
L=''
if [ $# -eq 0 ] || [ $# -eq 1 -a ".$1" = ".-" ]; then
@@ -733,7 +733,7 @@
L="$L$NL$arg"
done
fi
-
+
# PASS 1: PREPARATION AND SYNTACTICAL EXPANSION
if [ ".$opt_v" = .yes ]; then
echo "rpmtool:files: pass 1 (preparation and syntactical
expansions)" 1>&2
@@ -742,33 +742,33 @@
OIFS="$IFS"; IFS="$NL"
for l in $L; do
[ ".$l" = . ] && continue
-
+
# replace tabs with spaces, reduce multiple spaces to single
# spaces, and remove leading and trailing spaces
l=`echo "$l" | sed -e "s;${TAB}; ;g" -e 's; *; ;g' -e 's;^ *;;' -e
's; *$;;'`
-
+
# move tags to end of entry for easier parsing
while [ ".`echo \"$l\" | grep '^%[^ ]* .*'`" != . ]; do
l=`echo "$l" | sed -e 's;^\(%[^ ]*\) \(.*\);\2 \1;'`
done
-
- # use `:' as a dummy path for tag-only entries (like `%defattr')
+
+ # use `:' as a dummy path for tag-only entries (like `%defattr')
# to avoid special cases in the later processing
if [ ".`echo \"$l\" | grep '^%.*'`" != . ]; then
l=": $l"
fi
-
+
# split entry into path and optional tags
eval `echo ".$l" | sed -e 's;^\.\([^ ]*\)\(.*\)$;p="\1" t="\2";'`
-
+
# expand `{foo,bar,quux}' constructs in path (silent
# assumtion to make life easier is that the constructs
# occurs only once in a path!)
if [ ".`echo \".$p\" | grep '^\..*{[^}]*}.*$'`" != . ]; then
-
+
# split path into prolog, the set construct, and the epilog
eval `echo ".$p" | sed -e
's;^\.\(.*\){\([^}]*\)}\(.*\)$;pro="\1" set="\2" epi="\3";'`
-
+
# repeat prolog and epilog for all elements in set
OIFS2="$IFS"; IFS=","
for x in $set; do
@@ -782,7 +782,7 @@
done
L="$T"
IFS="$OIFS"
-
+
# PASS 2: FILESYSTEM-BASED EXPANSIONS
if [ ".$opt_v" = .yes ]; then
echo "rpmtool:files: pass 2 (filesystem-based expansions)" 1>&2
@@ -791,10 +791,10 @@
OIFS="$IFS"; IFS="$NL"
for l in $L; do
[ ".$l" = . ] && continue
-
+
# split entry into path and optional tags
eval `echo ".$l" | sed -e 's;^\.\([^ ]*\)\(.*\)$;p="\1" t="\2";'`
-
+
# expand...
if [ -d "$br$p" -a ".`expr \".$t\" : '\..*%dir.*'`" = .0 ]; then
# expand path because it is not tagged with %dir
@@ -815,7 +815,7 @@
done
IFS="$OIFS"
L="$T"
-
+
# PASS 3: DUPLICATION REMOVAL AND CLEANUP
if [ ".$opt_v" = .yes ]; then
echo "rpmtool:files: pass 3 (duplication removal and cleanup)" 1>&2
@@ -824,10 +824,10 @@
OIFS="$IFS"; IFS="$NL"
for l in $L; do
[ ".$l" = . ] && continue
-
+
# split entry into path and optional tags
eval `echo ".$l" | sed -e 's;^\.\([^ ]*\)\(.*\)$;p="\1" t="\2";'`
-
+
# add %dir tag if entry is a directory, but still not
# tagged as such (else RPM would again expand it recursively)
if [ -d "$br$p" ]; then
@@ -835,13 +835,13 @@
t="$t %dir"
fi
fi
-
+
# remove duplicate entries in already processed part
# (but make sure we keep the entries with the dummy tags)
if [ ".$p" != ".:" ]; then
T=`echo "$T" | grep -v "^$p " | grep -v "^$p\$"`
fi
-
+
# keep entry only if no %not tag is present
# (else all entries are removed)
if [ ".`expr \".$t\" : '\..*%not.*'`" = .0 ]; then
@@ -850,7 +850,7 @@
done
IFS="$OIFS"
L="$T"
-
+
# write out new file list
if [ ".$opt_o" = . -o ".$opt_o" = ".-" ]; then
outcmd="cat"
@@ -865,7 +865,7 @@
-e 's; *:$;;' | eval $outcmd
fi
;;
-
+
user )
# calling convention
if [ ".$opt_a" = .no -a ".$opt_r" = .no ]; then
@@ -975,7 +975,7 @@
echo "${user}:*:${uid}:${user}" >>/etc/group
;;
esac
-
+
# remove user
elif [ ".$opt_r" = .yes ]; then
case "$platform" in
@@ -990,7 +990,7 @@
echo "$msgprefix:Error: user $user does not exist" 1>&2
exit 1
fi
-
+
# remove entry from passwd database
case "$platform" in
*:FreeBSD:[456].*:* | *:NetBSD:1.*:* )
@@ -1040,7 +1040,7 @@
esac
fi
;;
-
+
group )
if [ ".$opt_a" = .no -a ".$opt_r" = .no ]; then
echo "$msgprefix:Error: either -a or -r has to be given" 1>&2
@@ -1134,34 +1134,34 @@
fi
case "$platform" in
*:FreeBSD:*:* | *:NetBSD:*:* )
- cmd0="ps -ax -o pid"
- cmd1="ps -ax -o command"
- cmd2="ps -ax -o pid,command"
- cmd3="ps -ax -o pid,ppid"
+ cmd0="ps -ax -o pid"
+ cmd1="ps -ax -o command"
+ cmd2="ps -ax -o pid,command"
+ cmd3="ps -ax -o pid,ppid"
;;
*:Linux:*:* | *:OSF1:5.*:* )
- cmd0="ps axo pid"
- cmd1="ps axo cmd"
- cmd2="ps axo pid,cmd"
- cmd3="ps axo pid,ppid"
+ cmd0="ps axo pid"
+ cmd1="ps axo cmd"
+ cmd2="ps axo pid,cmd"
+ cmd3="ps axo pid,ppid"
;;
*:SunOS:5.*:* )
- cmd0="ps -ef -o pid"
- cmd1="ps -ef -o args"
- cmd2="ps -ef -o pid,args"
- cmd3="ps -ef -o pid,ppid"
+ cmd0="ps -ef -o pid"
+ cmd1="ps -ef -o args"
+ cmd2="ps -ef -o pid,args"
+ cmd3="ps -ef -o pid,ppid"
;;
*:HP-UX:*:* )
- cmd0="ps -ef" # FIXME
+ cmd0="ps -ef" # FIXME
cmd1="ps -ef" # FIXME
cmd2="ps -ef" # FIXME
cmd3="ps -ef" # FIXME
;;
*:IRIX64:6.*:* )
- cmd0="ps -ef -o pid"
- cmd1="ps -ef -o args"
- cmd2="ps -ef -o pid,args"
- cmd3="ps -ef -o pid,ppid"
+ cmd0="ps -ef -o pid"
+ cmd1="ps -ef -o args"
+ cmd2="ps -ef -o pid,args"
+ cmd3="ps -ef -o pid,ppid"
;;
*:Darwin:*:* )
cmd0="ps -ax -opid"
@@ -1169,7 +1169,7 @@
cmd2="ps -ax -opid,command"
cmd3="ps -ax -opid,ppid"
esac
- # try all signals in order
+ # try all signals in order
i=$#
for sig in "$@"; do
# check whether program is still running/active
@@ -1222,7 +1222,7 @@
done
done
fi
-
+
# perform optional delay
i=`expr $i - 1`
if [ $i -gt 0 ]; then
@@ -1333,7 +1333,7 @@
error ) title="Error--" ;;
* ) echo "$msgprefix:Error: invalid message type \`$opt_t'" 1>&2;
exit 1 ;;
esac
-
+
# display message
if [ ".$opt_r" != .yes ]; then
echo . | awk '{ printf("\r"); }'
@@ -1355,7 +1355,7 @@
echo "Nevertheless, use it with great care in production
environments."
echo "It might be unstable and break your environment."
echo "Only CORE and BASE class packages are production grade."
- ) | sh $prog_path msg -r -t notice | sed -e 's;^;echo ";' -e
's;$;";'
+ ) | sh $prog_path msg -r -t notice | sed -e 's;^;echo ";' -e
's;$;";'
echo "set -x"
;;
EVAL )
@@ -1365,7 +1365,7 @@
echo "Hence, do not use it in production environments."
echo "It might be unstable or incompletely packaged."
echo "Only CORE and BASE class packages are production grade."
- ) | sh $prog_path msg -r -t warn | sed -e 's;^;echo ";' -e 's;$;";'
+ ) | sh $prog_path msg -r -t warn | sed -e 's;^;echo ";' -e 's;$;";'
echo "set -x"
;;
JUNK )
@@ -1374,7 +1374,7 @@
echo "It is in development state and still not even ready for
evaluation."
echo "Do not use it at all, as it is definitely unstable and
incomplete."
echo "Only CORE and BASE class packages are production grade."
- ) | sh $prog_path msg -r -t warn | sed -e 's;^;echo ";' -e 's;$;";'
+ ) | sh $prog_path msg -r -t warn | sed -e 's;^;echo ";' -e 's;$;";'
echo "set -x"
;;
esac
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool.pod
============================================================================
$ cvs diff -u -r1.10 -r1.11 rpmtool.pod
--- openpkg-src/openpkg/rpmtool.pod 23 Jan 2004 12:46:08 -0000 1.10
+++ openpkg-src/openpkg/rpmtool.pod 28 Jan 2004 13:04:35 -0000 1.11
@@ -43,7 +43,7 @@
=over 4
-=item B<platform>
+=item B<platform>
This command outputs a unique platform id in the format
"<architecture>-<system><release>". For instance, the output on a
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmx.pl
============================================================================
$ cvs diff -u -r1.16 -r1.17 rpmx.pl
--- openpkg-src/openpkg/rpmx.pl 23 Jan 2004 12:46:08 -0000 1.16
+++ openpkg-src/openpkg/rpmx.pl 28 Jan 2004 13:04:35 -0000 1.17
@@ -51,10 +51,10 @@
_dbpath _rpmdir _srcrpmdir _tmppath
_target
l_prefix
- l_fetch_mirror_0 l_fetch_mirror_1 l_fetch_mirror_2 l_fetch_mirror_3
l_fetch_mirror_4
- l_fetch_mirror_5 l_fetch_mirror_6 l_fetch_mirror_7 l_fetch_mirror_8
l_fetch_mirror_9
- l_fetch_backup_0 l_fetch_backup_1 l_fetch_backup_2 l_fetch_backup_3
l_fetch_backup_4
- l_fetch_backup_5 l_fetch_backup_6 l_fetch_backup_7 l_fetch_backup_8
l_fetch_backup_9
+ l_fetch_mirror_0 l_fetch_mirror_1 l_fetch_mirror_2 l_fetch_mirror_3
l_fetch_mirror_4
+ l_fetch_mirror_5 l_fetch_mirror_6 l_fetch_mirror_7 l_fetch_mirror_8
l_fetch_mirror_9
+ l_fetch_backup_0 l_fetch_backup_1 l_fetch_backup_2 l_fetch_backup_3
l_fetch_backup_4
+ l_fetch_backup_5 l_fetch_backup_6 l_fetch_backup_7 l_fetch_backup_8
l_fetch_backup_9
_httpproxy _httpport
_ftpproxy _ftpport
)) {
@@ -110,7 +110,7 @@
}
else {
$CFG->{OPT_ARG}->{$optname} = $arg;
- }
+ }
}
else {
push(@{$CFG->{ARG}}, $arg);
@@ -146,7 +146,7 @@
# make sure file URLs have a fully-qualified scheme.
if ($src =~ m|^/.+|) {
- $src = "file://$src"
+ $src = "file://$src"
}
# make sure only schemes curl(1) supports are used.
@@ -202,7 +202,7 @@
}
}
}
-
+
# cleanup
unlink("$dst.hdr");
@@ -238,7 +238,7 @@
print "$file\n";
}
}
- return 0;
+ return 0;
}
## ______________________________________________________________________
@@ -249,7 +249,7 @@
sub op_fetch {
my ($CFG) = @_;
-
+
if ($#{$CFG->{ARG}} ne 0) {
print STDERR "rpm: option --fetch requires an argument\n";
return 1;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/uuid.sh
============================================================================
$ cvs diff -u -r1.2 -r1.3 uuid.sh
--- openpkg-src/openpkg/uuid.sh 22 Jan 2004 21:26:43 -0000 1.2
+++ openpkg-src/openpkg/uuid.sh 28 Jan 2004 13:04:35 -0000 1.3
@@ -46,7 +46,7 @@
# special "Nil UUID"
UUID_NIL="00000000-0000-0000-0000-000000000000"
-
+
# Query Dynamic Information
do_query () {
# query RPM information
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
