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: 11-Dec-2004 23:20:30
Branch: OPENPKG_2_2_SOLID Handle: 2004121122202900
Modified files: (Branch: OPENPKG_2_2_SOLID)
openpkg-src/openpkg HISTORY openpkg.spec rc rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen rpmtool
Log:
MFC: all latest changes except for new software versions
Summary:
Revision Changes Path
1.214.2.3 +10 -0 openpkg-src/openpkg/HISTORY
1.361.2.5 +46 -3 openpkg-src/openpkg/openpkg.spec
1.57.4.1 +5 -4 openpkg-src/openpkg/rc
1.51.2.1 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.55.2.1 +1 -1 openpkg-src/openpkg/rpm.patch.feature
1.60.2.1 +7 -4 openpkg-src/openpkg/rpm.patch.porting
1.50.2.1 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.39.4.1 +2 -2 openpkg-src/openpkg/rpmtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.214.2.2 -r1.214.2.3 HISTORY
--- openpkg-src/openpkg/HISTORY 4 Nov 2004 16:13:19 -0000
1.214.2.2
+++ openpkg-src/openpkg/HISTORY 11 Dec 2004 22:20:29 -0000
1.214.2.3
@@ -2,6 +2,16 @@
2004
====
+20041002 **** RELEASE AS PART OF OPENPKG 2.2.2 ***
+20041211 fix system start/stop transfer script for FreeBSD 5 (II)
+20041210 fix system start/stop transfer script for FreeBSD 5
+20041125 port RPM to NetBSD 2.0 (pre-release)
+20041119 upgrade to BeeCrypt 4.1.1 (excluded in 2.2.2)
+20041118 upgrade to BeeCrypt 4.1.0 (excluded in 2.2.2)
+20041118 upgrade to OSSP uuid 1.1.1 (excluded in 2.2.2)
+20041118 fix rc(1) command processing for "%cmd -u foo" situations under
umask 027 and similar
+20041008 port to MacOS X 10.3.6 by disabling assembly code in gzip
+
20041004 **** RELEASE AS PART OF OPENPKG 2.2.1 ***
20041104 apply GNU bash patch for brain-dead Linux platforms with broken
WCONTINUE
20041103 upgrade to OSSP uuid 1.1.0 (excluded in 2.2.1)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.361.2.4 -r1.361.2.5 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 4 Nov 2004 16:13:20 -0000
1.361.2.4
+++ openpkg-src/openpkg/openpkg.spec 11 Dec 2004 22:20:29 -0000
1.361.2.5
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 2.2.1
+%define V_openpkg 2.2.2
# the used software versions
%define V_rpm 4.2.1
@@ -419,6 +419,9 @@
${l_tar} xf `SOURCE gzip-%{V_gzip}.tar` 2>/dev/null || true
( cd gzip-%{V_gzip}
echo "ac_cv_prog_cc_g=no" >config.cache
+ case $plid in
+ Darwin/* ) echo "gzip_cv_assembler=no" >>config.cache ;;
+ esac
CC="${l_cc}" \
./configure \
--cache-file=./config.cache
@@ -1510,7 +1513,7 @@
echo "openpkg:WARNING: (would require root-privileges)" 1>&2
else
case "$plid" in
- FreeBSD/* )
+ FreeBSD/4.* )
if [ ! -f /etc/rc.d/${name}.sh ]; then
# make sure /etc/rc.d exists
if [ ! -d /etc/rc.d ]; then
@@ -1550,6 +1553,43 @@
chmod 755 /etc/rc.d/${name}.sh
fi
;;
+ FreeBSD/* )
+ if [ -f /etc/rc.d/${name}.sh ]; then
+ # remove old transfer script (for upgrading from
FreeBSD 4 only)
+ rm -f /etc/rc.d/${name}.sh >/dev/null 2>&1
+ fi
+ if [ ! -f /etc/rc.d/openpkg-${name} ]; then
+ # install transfer script
+ rm -f /etc/rc.d/openpkg-${name} >/dev/null 2>&1
+ ( echo "#!/bin/sh"
+ echo "##"
+ echo "## openpkg-${name} -- startup/shutdown transfer
script for OpenPKG ${prefix} hierarchy"
+ echo "##"
+ echo ""
+ echo "# PROVIDE: openpkg-${name}"
+ echo "# REQUIRE: LOGIN"
+ echo "# KEYWORD: shutdown"
+ echo ""
+ echo ". /etc/rc.subr"
+ echo ""
+ echo "name=\"openpkg_${name}\""
+ echo "start_cmd=\"openpkg_rc_all start\""
+ echo "stop_cmd=\"openpkg_rc_all stop\""
+ echo "restart_cmd=\"openpkg_rc_all stop start\""
+ echo ""
+ echo "openpkg_rc_all () {"
+ echo " if [ -f ${prefix}/etc/rc ]; then"
+ echo " ${prefix}/etc/rc all \"[EMAIL
PROTECTED]""
+ echo " fi"
+ echo "}"
+ echo ""
+ echo "load_rc_config \$name"
+ echo "run_rc_command \"\$1\""
+ echo ""
+ ) >/etc/rc.d/openpkg-${name}
+ chmod 755 /etc/rc.d/openpkg-${name}
+ fi
+ ;;
NetBSD/* )
if [ ! -f /etc/rc.d/${name} ]; then
( echo "#!/bin/sh"
@@ -2091,9 +2131,12 @@
echo "openpkg:WARNING: (would require root-privileges)" 1>&2
else
case "$plid" in
- FreeBSD/* )
+ FreeBSD/4.* )
rm -f /etc/rc.d/${name}.sh >/dev/null 2>&1
;;
+ FreeBSD/* )
+ rm -f /etc/rc.d/openpkg-${name} >/dev/null 2>&1
+ ;;
NetBSD/* )
rm -f /etc/rc.d/${name} >/dev/null 2>&1
;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rc
============================================================================
$ cvs diff -u -r1.57 -r1.57.4.1 rc
--- openpkg-src/openpkg/rc 4 Jun 2004 15:25:17 -0000 1.57
+++ openpkg-src/openpkg/rc 11 Dec 2004 22:20:29 -0000 1.57.4.1
@@ -424,7 +424,7 @@
fi
# iterate over all packages (in priority order!) where the command
- # was found n order to execute, print, or evaluate their scripts
+ # was found in order to execute, print, or evaluate their scripts
verbose_pos=0
for entry in `echo $list | tr ',' '\012' | sort -n`; do
[ ".$entry" = . ] && continue
@@ -480,7 +480,7 @@
# prepare temporary files
rm -f $tmpfile $outfile $errfile
- touch $tmpfile $outfile $errfile
+ (umask 077; touch $tmpfile $outfile $errfile)
# generate: optionally enable shell debugging
if [ ".$debug" = .1 ]; then
@@ -516,8 +516,9 @@
# execute as different user
if [ ".$verbose" = .1 ]; then
echo "openpkg:rc:NOTICE: $prefix:$s_name:%$cmd:
executing as user $s_user"
- fi
+ fi
if [ ".$user" = "[EMAIL PROTECTED]@" -a "[EMAIL PROTECTED]@"
= ".root" ]; then
+ chown $s_user $tmpfile
if [ ".$debug" = .1 ]; then
su - $s_user -c "PATH=\"$PATH\"; $bash $tmpfile"
>$outfile
rc=$?
@@ -540,7 +541,7 @@
# execute as current user
if [ ".$verbose" = .1 ]; then
echo "openpkg:rc:NOTICE: $prefix:$s_name:%$cmd:
executing as user $user"
- fi
+ fi
if [ ".$debug" = .1 ]; then
$bash $tmpfile >$outfile
rc=$?
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.51 -r1.51.2.1 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 21 Jul 2004 14:30:30 -0000
1.51
+++ openpkg-src/openpkg/rpm.patch.bugfix 11 Dec 2004 22:20:29 -0000
1.51.2.1
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Jul-2004
+## Created on: 25-Nov-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.55 -r1.55.2.1 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 21 Jul 2004 14:30:31 -0000
1.55
+++ openpkg-src/openpkg/rpm.patch.feature 11 Dec 2004 22:20:29 -0000
1.55.2.1
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Jul-2004
+## Created on: 25-Nov-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.60 -r1.60.2.1 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 21 Jul 2004 14:30:31 -0000
1.60
+++ openpkg-src/openpkg/rpm.patch.porting 11 Dec 2004 22:20:29 -0000
1.60.2.1
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Jul-2004
+## Created on: 25-Nov-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -251,12 +251,15 @@
+---------------------------------------------------------------------------
Index: lib/fs.c
--- lib/fs.c 4 Jun 2003 18:09:43 -0000 1.1.1.13
-+++ lib/fs.c 22 Jan 2004 21:42:23 -0000 1.2
-@@ -164,6 +164,12 @@
++++ lib/fs.c 25 Nov 2004 09:32:16 -0000 1.3
+@@ -164,6 +164,15 @@
int nextMount = 0;
getmntinfo_r(&mounts, flags, &mntCount, &bufSize);
+# elif HAVE_GETMNTINFO
++# if defined(__NetBSD__) && (__NetBSD_Version__ > 200030000)
++# define statfs statvfs
++# endif
+ struct statfs * mounts = NULL;
+ int mntCount, flags = MNT_NOWAIT;
+ int nextMount = 0;
@@ -265,7 +268,7 @@
# endif
filesystems = xcalloc((numAlloced + 1), sizeof(*filesystems)); /* XXX
memory leak */
-@@ -193,6 +199,9 @@
+@@ -193,6 +202,9 @@
# elif HAVE_GETMNTINFO_R
if (nextMount == mntCount) break;
mntdir = mounts[nextMount++].f_mntonname;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.50 -r1.50.2.1 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 21 Jul 2004 14:30:31 -0000
1.50
+++ openpkg-src/openpkg/rpm.patch.regen 11 Dec 2004 22:20:29 -0000
1.50.2.1
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 21-Jul-2004
+## Created on: 25-Nov-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.39 -r1.39.4.1 rpmtool
--- openpkg-src/openpkg/rpmtool 7 Jun 2004 16:30:28 -0000 1.39
+++ openpkg-src/openpkg/rpmtool 11 Dec 2004 22:20:29 -0000 1.39.4.1
@@ -1191,7 +1191,7 @@
break
fi
- # send signal to program
+ # send signal to program
if [ ".$opt_p" != . ]; then
pids="$opt_p"
elif [ ".$opt_m" != . ]; then
@@ -1211,7 +1211,7 @@
fi
done
- # optionally send signal to childs of program
+ # optionally send signal to childs of program
if [ ".$opt_c" = .yes ]; then
for pid in $pids; do
cpids=`$cmd3 | sed -e "s;^[ ${TAB}]*;;" | egrep "[0-9]*
$pid" |\
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
