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: 30-Jul-2003 20:13:33
Branch: OPENPKG_1_STABLE HEAD Handle: 2003073019133101
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_STABLE)
openpkg-src/openpkg HISTORY openpkg.spec
Log:
MFC: changes since last merge
Summary:
Revision Changes Path
1.19.2.5 +1 -0 openpkg-src/openpkg/HISTORY
1.127.2.7 +10 -8 openpkg-src/openpkg/openpkg.spec
1.5914 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.19.2.4 -r1.19.2.5 HISTORY
--- openpkg-src/openpkg/HISTORY 29 Jul 2003 10:23:37 -0000 1.19.2.4
+++ openpkg-src/openpkg/HISTORY 30 Jul 2003 18:13:32 -0000 1.19.2.5
@@ -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 -r1.127.2.7 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 29 Jul 2003 10:11:42 -0000 1.127.2.6
+++ openpkg-src/openpkg/openpkg.spec 30 Jul 2003 18:13:32 -0000 1.127.2.7
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 1.20030729
+%define V_openpkg 1.20030730
# the used software versions
%define V_rpm 4.0.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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5913 -r1.5914 news.txt
--- openpkg-web/news.txt 30 Jul 2003 18:05:00 -0000 1.5913
+++ openpkg-web/news.txt 30 Jul 2003 18:13:31 -0000 1.5914
@@ -1,3 +1,4 @@
+30-Jul-2003: Upgraded package: P<openpkg-1.20030730-1.20030730>
30-Jul-2003: Upgraded package: P<pgp-6.5.8-1.20030730>
30-Jul-2003: Upgraded package: P<uucp-1.07-1.20030730>
30-Jul-2003: Upgraded package: P<openpkg-20030730-20030730>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
