[CVS] OpenPKG: openpkg-src/uucp/ rc.uucp uucp.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 21-Jul-2003 12:07:55
Branch: HEAD Handle: 2003072111075302
Modified files:
openpkg-src/uucprc.uucp uucp.spec
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
RevisionChanges Path
1.9 +16 -8 openpkg-src/uucp/rc.uucp
1.33+1 -1 openpkg-src/uucp/uucp.spec
1.5682 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/rc.uucp
$ cvs diff -u -r1.8 -r1.9 rc.uucp
--- openpkg-src/uucp/rc.uucp 19 Jul 2003 17:06:40 - 1.8
+++ openpkg-src/uucp/rc.uucp 21 Jul 2003 10:07:55 - 1.9
@@ -8,18 +8,24 @@
%common
uucp_pidfile="@l_prefix@/var/uucp/run/uucpd.pid"
+uucp_signal () {
+[ -f $uucp_pidfile ] && kill -$1 `cat $uucp_pidfile`
+}
uucp_start () {
( @l_prefix@/sbin/uucpd uucp @l_prefix@/sbin/uucico -l \
/dev/null 2>&1 &
echo "$!" >$uucp_pidfile
) /dev/null 2>&1
}
-uucp_stop () {
-if [ -f $uucp_pidfile ]; then
-kill -TERM `cat $uucp_pidfile`
-sleep 1
-fi
-}
+
+%status -p 200 -u @l_susr@ -o
+uucp_usable="unknown"
+uucp_active="no"
+rcService uucp enable yes && \
+uucp_signal 0 && uucp_active="yes"
+echo "uucp_enable=\"$uucp_enable\""
+echo "uucp_usable=\"$uucp_usable\""
+echo "uucp_active=\"$uucp_active\""
%start -p 200 -u @l_susr@
rcService uucp enable yes || exit 0
@@ -27,10 +33,12 @@
%stop -p 200 -u @l_susr@
rcService uucp enable yes || exit 0
-uucp_stop
+uucp_signal TERM
+rm -f $uucp_pidfile 2>/dev/null || true
%restart -u @l_susr@
rcService uucp enable yes || exit 0
-uucp_stop
+uucp_signal TERM
+sleep 2
uucp_start
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/uucp.spec
$ cvs diff -u -r1.32 -r1.33 uucp.spec
--- openpkg-src/uucp/uucp.spec19 Jul 2003 17:06:40 - 1.32
+++ openpkg-src/uucp/uucp.spec21 Jul 2003 10:07:55 - 1.33
@@ -33,7 +33,7 @@
Group:Communication
License: GPL
Version: 1.07
-Release: 20030719
+Release: 20030721
# list of sources
Source0: ftp://ftp.gnu.org/gnu/uucp/uucp-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5681 -r1.5682 news.txt
--- openpkg-web/news.txt 21 Jul 2003 09:56:52 - 1.5681
+++ openpkg-web/news.txt 21 Jul 2003 10:07:53 - 1.5682
@@ -1,3 +1,4 @@
+21-Jul-2003: Upgraded package: P
21-Jul-2003: Upgraded package: P
21-Jul-2003: Upgraded package: P
21-Jul-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/uucp/ rc.uucp uucp.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Mar-2003 15:56:07
Branch: HEAD Handle: 2003032814560502
Modified files:
openpkg-src/uucprc.uucp uucp.spec
openpkg-web news.txt
Log:
rc script clean up
Summary:
RevisionChanges Path
1.4 +3 -3 openpkg-src/uucp/rc.uucp
1.26+2 -1 openpkg-src/uucp/uucp.spec
1.3872 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/rc.uucp
$ cvs diff -u -r1.3 -r1.4 rc.uucp
--- openpkg-src/uucp/rc.uucp 19 Apr 2002 09:18:10 - 1.3
+++ openpkg-src/uucp/rc.uucp 28 Mar 2003 14:56:07 - 1.4
@@ -21,15 +21,15 @@
fi
}
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
opServiceEnabled uucp || exit 0
uucp_start
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
opServiceEnabled uucp || exit 0
uucp_stop
-%restart -u root
+%restart -u @l_susr@
opServiceEnabled uucp || exit 0
uucp_stop
uucp_start
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/uucp/uucp.spec
$ cvs diff -u -r1.25 -r1.26 uucp.spec
--- openpkg-src/uucp/uucp.spec3 Jan 2003 10:55:31 - 1.25
+++ openpkg-src/uucp/uucp.spec28 Mar 2003 14:56:07 - 1.26
@@ -33,7 +33,7 @@
Group:Communication
License: GPL
Version: 1.06.1
-Release: 2002
+Release: 20030328
# list of sources
Source0: ftp://ftp.gnu.org/gnu/uucp/uucp-%{version}.tar.gz
@@ -107,6 +107,7 @@
etc/* $RPM_BUILD_ROOT%{l_prefix}/etc/uucp/
%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
+-e 's;@l_susr@;%{l_susr};g' \
%{SOURCE rc.uucp} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%{l_shtool} install -c -m 644 /dev/null \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3871 -r1.3872 news.txt
--- openpkg-web/news.txt 28 Mar 2003 14:54:17 - 1.3871
+++ openpkg-web/news.txt 28 Mar 2003 14:56:05 - 1.3872
@@ -1,3 +1,4 @@
+28-Mar-2003: Upgraded package: P
28-Mar-2003: Upgraded package: P
28-Mar-2003: Upgraded package: P
28-Mar-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
