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: 13-Jul-2003 00:07:31
Branch: HEAD Handle: 2003071223072802
Modified files:
openpkg-src/samba rc.samba samba.spec
openpkg-web news.txt
Log:
one more broken package which lacked subst of l_susr on rc.xxx
installation; additionally make stopping more robust
Summary:
Revision Changes Path
1.10 +12 -4 openpkg-src/samba/rc.samba
1.45 +4 -2 openpkg-src/samba/samba.spec
1.5545 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/rc.samba
============================================================================
$ cvs diff -u -r1.9 -r1.10 rc.samba
--- openpkg-src/samba/rc.samba 10 Jul 2003 07:51:03 -0000 1.9
+++ openpkg-src/samba/rc.samba 12 Jul 2003 22:07:30 -0000 1.10
@@ -13,13 +13,21 @@
%stop -p 200 -u @l_susr@
opServiceEnabled samba || exit 0
- kill -TERM `cat @l_prefix@/var/samba/run/smbd.pid`
- kill -TERM `cat @l_prefix@/var/samba/run/nmbd.pid`
+ if [ -f @l_prefix@/var/samba/run/smbd.pid ]; then
+ kill -TERM `cat @l_prefix@/var/samba/run/smbd.pid`
+ fi
+ if [ -f @l_prefix@/var/samba/run/nmbd.pid ]; then
+ kill -TERM `cat @l_prefix@/var/samba/run/nmbd.pid`
+ fi
%restart -u @l_susr@
opServiceEnabled samba || exit 0
- kill -TERM `cat @l_prefix@/var/samba/run/smbd.pid`
- kill -TERM `cat @l_prefix@/var/samba/run/nmbd.pid`
+ if [ -f @l_prefix@/var/samba/run/smbd.pid ]; then
+ kill -TERM `cat @l_prefix@/var/samba/run/smbd.pid`
+ fi
+ if [ -f @l_prefix@/var/samba/run/nmbd.pid ]; then
+ kill -TERM `cat @l_prefix@/var/samba/run/nmbd.pid`
+ fi
sleep 2
@l_prefix@/sbin/smbd -D
@l_prefix@/sbin/nmbd -D
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 samba.spec
--- openpkg-src/samba/samba.spec 10 Jul 2003 07:51:03 -0000 1.44
+++ openpkg-src/samba/samba.spec 12 Jul 2003 22:07:30 -0000 1.45
@@ -33,7 +33,7 @@
Group: Filesystem
License: GPL
Version: 2.2.8a
-Release: 20030710
+Release: 20030713
# package options
%option with_pam no
@@ -141,7 +141,9 @@
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
strip $RPM_BUILD_ROOT%{l_prefix}/libexec/samba/* >/dev/null 2>&1 || true
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
- %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
+ %{l_shtool} install -c -m 755 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_susr@;%{l_susr};g' \
%{SOURCE rc.samba} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5544 -r1.5545 news.txt
--- openpkg-web/news.txt 12 Jul 2003 07:24:22 -0000 1.5544
+++ openpkg-web/news.txt 12 Jul 2003 22:07:28 -0000 1.5545
@@ -1,3 +1,4 @@
+13-Jul-2003: Upgraded package: P<samba-2.2.8a-20030713>
12-Jul-2003: Upgraded package: P<scribus-1.0rc1-20030712>
12-Jul-2003: Upgraded package: P<rrdtool-1.0.44-20030712>
12-Jul-2003: Upgraded package: P<perl-www-20030712-20030712>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
