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 openpkg-web Date: 03-Jun-2003 10:31:13
Branch: HEAD Handle: 2003060309311002
Modified files:
openpkg-src/openpkg HISTORY aux.usrgrp.sh openpkg.spec shtool
openpkg-web news.txt
Log:
make sure 'shtool install -e ...' does not fail if file is not
writeable due to permissions
Summary:
Revision Changes Path
1.2 +1 -0 openpkg-src/openpkg/HISTORY
1.8 +12 -0 openpkg-src/openpkg/aux.usrgrp.sh
1.163 +9 -1 openpkg-src/openpkg/openpkg.spec
1.13 +4 -3 openpkg-src/openpkg/shtool
1.4693 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.1 -r1.2 HISTORY
--- openpkg-src/openpkg/HISTORY 30 May 2003 18:36:57 -0000 1.1
+++ openpkg-src/openpkg/HISTORY 3 Jun 2003 08:31:11 -0000 1.2
@@ -2,6 +2,7 @@
2003
====
+20030603 make sure 'shtool install -e ...' does not fail if file is not writeable
due to permissions
20030530 add HISTORY file to package
20030519 upgrade to cURL 7.10.5
20030516 make sure 'shtool subst' does not fail if file is not writeable due to
permissions
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.usrgrp.sh
============================================================================
$ cvs diff -u -r1.7 -r1.8 aux.usrgrp.sh
--- openpkg-src/openpkg/aux.usrgrp.sh 16 Apr 2003 18:09:00 -0000 1.7
+++ openpkg-src/openpkg/aux.usrgrp.sh 3 Jun 2003 08:31:11 -0000 1.8
@@ -181,6 +181,18 @@
fi
fi
+# determine OpenPKG suid/sgid
+# FIXME?! (currently not necessary)
+
+# determine OpenPKG muid/mgid
+# FIXME?! (currently not necessary)
+
+# determine OpenPKG ruid/rgid
+# FIXME?! (currently not necessary)
+
+# determine OpenPKG nuid/ngid
+# FIXME?! (currently not necessary)
+
# print results
output=""
for var in \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.162 -r1.163 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 30 May 2003 18:36:57 -0000 1.162
+++ openpkg-src/openpkg/openpkg.spec 3 Jun 2003 08:31:11 -0000 1.163
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030530
+%define V_openpkg 20030603
# the used software versions
%define V_rpm 4.0.2
@@ -899,6 +899,14 @@
[ ".$rgrp" = . ] && rgrp="%{?l_rgrp}%{!?l_rgrp:%{l_fsgrp}-r}"
[ ".$nusr" = . ] && nusr="%{?l_nusr}%{!?l_nusr:%{l_fsusr}-n}"
[ ".$ngrp" = . ] && ngrp="%{?l_ngrp}%{!?l_ngrp:%{l_fsgrp}-n}"
+ [ ".$suid" = . ] && suid="%{?l_suid}"
+ [ ".$sgid" = . ] && sgid="%{?l_sgid}"
+ [ ".$muid" = . ] && muid="%{?l_muid}"
+ [ ".$mgid" = . ] && mgid="%{?l_mgid}"
+ [ ".$ruid" = . ] && ruid="%{?l_ruid}"
+ [ ".$rgid" = . ] && rgid="%{?l_rgid}"
+ [ ".$nuid" = . ] && nuid="%{?l_nuid}"
+ [ ".$ngid" = . ] && ngid="%{?l_ngid}"
# if any of these optional params are not used we won't have a
# corresponding macro either, so make use of one conditionally
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/shtool
============================================================================
$ cvs diff -u -r1.12 -r1.13 shtool
--- openpkg-src/openpkg/shtool 16 May 2003 08:55:03 -0000 1.12
+++ openpkg-src/openpkg/shtool 3 Jun 2003 08:31:12 -0000 1.13
@@ -6,7 +6,7 @@
## See http://www.gnu.org/software/shtool/ for more information.
## See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
##
-## Version: 2.0b0 (09-May-2003)
+## Version: 2.0b0 (03-Jun-2003)
## Contents: all available modules
##
@@ -65,7 +65,7 @@
exit 1
fi
if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
- echo "This is GNU shtool, version 2.0b0 (09-May-2003)"
+ echo "This is GNU shtool, version 2.0b0 (03-Jun-2003)"
echo "Copyright (c) 1994-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>"
echo "Report bugs to <[EMAIL PROTECTED]>"
echo ''
@@ -128,7 +128,7 @@
exit 0
fi
if [ ".$1" = ".-v" -o ".$1" = ."--version" ]; then
- echo "GNU shtool 2.0b0 (09-May-2003)"
+ echo "GNU shtool 2.0b0 (03-Jun-2003)"
exit 0
fi
if [ ".$1" = ".-r" -o ".$1" = ."--recreate" ]; then
@@ -1312,6 +1312,7 @@
sed="$sed -e '$e'"
done
cp $dsttmp $dsttmp.old
+ chmod u+w $dsttmp
eval "$sed <$dsttmp.old >$dsttmp" || shtool_exit $?
rm -f $dsttmp.old
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4692 -r1.4693 news.txt
--- openpkg-web/news.txt 3 Jun 2003 08:30:42 -0000 1.4692
+++ openpkg-web/news.txt 3 Jun 2003 08:31:10 -0000 1.4693
@@ -1,3 +1,4 @@
+03-Jun-2003: Upgraded package: P<openpkg-20030603-20030603>
03-Jun-2003: Upgraded package: P<nagios-1.1-20030603>
03-Jun-2003: Upgraded package: P<gcc33-3.3.1s20030602-20030603>
02-Jun-2003: Upgraded package: P<fsl-1.1.0-1.2.3>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
