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 18:14:53
Branch: HEAD Handle: 2003073017145101
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
openpkg-web news.txt
Log:
Add entry to /etc/shells only if /etc/shells already exists at all,
because if no /etc/shells exists all shells are usually allowed anyway.
But if we would create a fresh /etc/shells with just our single shell,
we render the system unusable.
Submitted by: Bernd Dammann <[EMAIL PROTECTED]>
Summary:
Revision Changes Path
1.26 +1 -0 openpkg-src/openpkg/HISTORY
1.186 +10 -8 openpkg-src/openpkg/openpkg.spec
1.5911 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.25 -r1.26 HISTORY
--- openpkg-src/openpkg/HISTORY 29 Jul 2003 10:19:37 -0000 1.25
+++ openpkg-src/openpkg/HISTORY 30 Jul 2003 16:14:52 -0000 1.26
@@ -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.185 -r1.186 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 29 Jul 2003 08:44:05 -0000 1.185
+++ openpkg-src/openpkg/openpkg.spec 30 Jul 2003 16:14:52 -0000 1.186
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030729
+%define V_openpkg 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.5910 -r1.5911 news.txt
--- openpkg-web/news.txt 30 Jul 2003 13:26:36 -0000 1.5910
+++ openpkg-web/news.txt 30 Jul 2003 16:14:51 -0000 1.5911
@@ -1,3 +1,4 @@
+30-Jul-2003: Upgraded package: P<openpkg-20030730-20030730>
30-Jul-2003: Upgraded package: P<ncurses-5.3.20030726-20030730>
30-Jul-2003: Upgraded package: P<flex-2.5.4a-20030730>
30-Jul-2003: Upgraded package: P<cdk-4.9.10.20030418-20030730>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]