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: 30-Jul-2003 20:14:37
Branch: OPENPKG_1_3_SOLID Handle: 2003073019143700
Modified files: (Branch: OPENPKG_1_3_SOLID)
openpkg-src/openpkg HISTORY openpkg.spec
Log:
MFS: changes since last merge
Summary:
Revision Changes Path
1.19.2.4.2.1+1 -0 openpkg-src/openpkg/HISTORY
1.127.2.6.2.2+9 -7 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.19.2.4 -r1.19.2.4.2.1 HISTORY
--- openpkg-src/openpkg/HISTORY 29 Jul 2003 10:23:37 -0000 1.19.2.4
+++ openpkg-src/openpkg/HISTORY 30 Jul 2003 18:14:37 -0000 1.19.2.4.2.1
@@ -2,6 +2,7 @@
2003
====
+20030730 add entry to /etc/shells only if /etc/shells already exists at all
20030729 aux.wrap{src,bin}.sh: exit immediately if uudecode cannot be found
20030729 rc: fixed processing of $openpkg_rc_def (requires pre-inclusion of rc.conf)
20030729 fixed nasty filedescriptor leakage in RPM on script execution
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.127.2.6.2.1 -r1.127.2.6.2.2 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 29 Jul 2003 15:00:19 -0000 1.127.2.6.2.1
+++ openpkg-src/openpkg/openpkg.spec 30 Jul 2003 18:14:37 -0000 1.127.2.6.2.2
@@ -994,13 +994,15 @@
# add entry to /etc/shells
shell="${prefix}/lib/openpkg/bash"
- exists=`cat /etc/shells 2>/dev/null | grep "^$shell"`
- if [ ".$exists" = . ]; then
- if [ ".$cusr" != ".root" ]; then
- echo "openpkg:WARNING: skipping addition of $shell to /etc/shells" 1>&2
- echo "openpkg:WARNING: (would require root-privileges)" 1>&2
- else
- echo "${shell}" >>/etc/shells
+ if [ -f /etc/shells ]; then
+ exists=`cat /etc/shells 2>/dev/null | grep "^$shell"`
+ if [ ".$exists" = . ]; then
+ if [ ".$cusr" != ".root" ]; then
+ echo "openpkg:WARNING: skipping addition of $shell to /etc/shells"
1>&2
+ echo "openpkg:WARNING: (would require root-privileges)" 1>&2
+ else
+ echo "${shell}" >>/etc/shells
+ fi
fi
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
