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: 04-Jun-2003 17:21:07
Branch: HEAD Handle: 2003060416210700
Modified files:
openpkg-src/openpkg HISTORY openpkg.boot
Log:
fix "{s,m,r,r}{u,g}id" handling on initial bootstrapping via .src.sh.
Summary:
Revision Changes Path
1.4 +1 -0 openpkg-src/openpkg/HISTORY
1.25 +13 -3 openpkg-src/openpkg/openpkg.boot
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.3 -r1.4 HISTORY
--- openpkg-src/openpkg/HISTORY 4 Jun 2003 09:30:28 -0000 1.3
+++ openpkg-src/openpkg/HISTORY 4 Jun 2003 15:21:07 -0000 1.4
@@ -2,6 +2,7 @@
2003
====
+20030604 fix "{s,m,r,r}{u,g}id" handling on initial bootstrapping via .src.sh.
20030604 better support SuSE
20030603 make sure 'shtool install -e ...' does not fail if file is not writeable
due to permissions
20030530 add HISTORY file to package
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.24 -r1.25 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 29 Apr 2003 13:58:11 -0000 1.24
+++ openpkg-src/openpkg/openpkg.boot 4 Jun 2003 15:21:07 -0000 1.25
@@ -345,8 +345,10 @@
sed -e '/^%/d' | \
sed -e 's;%{SOURCE \([^ ]*\.tar[^ ]*\)};${RPM_DIST_DIR}/\1;g' \
-e 's;%{SOURCE \([^ ]*\)};${RPM_SOURCE_DIR}/\1;g' | \
- sed -e 's;%{[?]\([^:]*\):\([^}]*\)};${\1+\2};g' \
- -e 's;%{![?]\([^:]*\):\([^}]*\)};${\1-\2};g' \
+ sed -e 's;%{[?]\([^:}]*\):\([^}]*\)};${\1+\2};g' \
+ -e 's;%{![?]\([^:}]*\):\([^}]*\)};${\1-\2};g' \
+ -e 's;%{[?]\([^:}]*\)};${\1+""};g' \
+ -e 's;%{![?]\([^:}]*\)};${\1-""};g' \
-e 's;%{\([^}]*\)};${\1};g' >>$script
echo "++ executing(%$step): sh $script"
sh $script
@@ -498,7 +500,15 @@
# create Binary-Bootstrap file
echo "++ creating bootstrap binary shell script"
-cat $spec | sed -e "/^%pre$/,/^%/ p" -e 'd' | sed -e '/^%/d' -e 's/^ //'
>$tmpdir/rpm.pre
+cat $spec |\
+ sed -e "/^%pre$/,/^%/ p" -e 'd' |\
+ sed -e '/^%/d' -e 's/^ //' |\
+ sed -e 's;%{[?]l_\([^:}]*\):\([^}]*\)};${\1+\2};g' \
+ -e 's;%{![?]l_\([^:}]*\):\([^}]*\)};${\1-\2};g' \
+ -e 's;%{[?]l_\([^:}]*\)};${\1+""};g' \
+ -e 's;%{![?]l_\([^:}]*\)};${\1-""};g' \
+ -e 's;%{l_\([^}]*\)};${\1};g' >>$script \
+ >$tmpdir/rpm.pre
sed <`SOURCE aux.wrapbin.sh` \
-e "s;@SUSR@;$susr;" -e "s;@SGRP@;$sgrp;" \
-e "s;@MUSR@;$musr;" -e "s;@MGRP@;$mgrp;" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
