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 16:28:38
Branch: HEAD Handle: 2003072115283601
Modified files:
openpkg-src/cups cups.spec rc.cups
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.8 +1 -1 openpkg-src/cups/cups.spec
1.6 +23 -4 openpkg-src/cups/rc.cups
1.5692 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cups/cups.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 cups.spec
--- openpkg-src/cups/cups.spec 19 Jul 2003 17:05:48 -0000 1.7
+++ openpkg-src/cups/cups.spec 21 Jul 2003 14:28:37 -0000 1.8
@@ -33,7 +33,7 @@
Group: Print
License: GPL/LGPL with exceptions
Version: 1.1.19
-Release: 20030719
+Release: 20030721
# package options
%option with_openssl no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cups/rc.cups
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.cups
--- openpkg-src/cups/rc.cups 19 Jul 2003 17:05:48 -0000 1.5
+++ openpkg-src/cups/rc.cups 21 Jul 2003 14:28:37 -0000 1.6
@@ -6,14 +6,33 @@
%config
cups_enable="$openpkg_rc_def"
+%common
+ cups_pidfile="@l_prefix@/var/cups/cupsd.pid"
+ cups_signal () {
+ [ -f $cups_pidfile ] && kill -$1 `cat $cups_pidfile`
+ }
+
+%status -p 200 -u @l_susr@ -o
+ cups_usable="unknown"
+ cups_active="no"
+ rcService cups enable yes && \
+ cups_signal 0 && cups_active="yes"
+ echo "cups_enable=\"$cups_enable\""
+ echo "cups_usable=\"$cups_usable\""
+ echo "cups_active=\"$cups_active\""
+
%start -p 200 -u @l_susr@
rcService cups enable yes || exit 0
@l_prefix@/libexec/cups/cupsd
%stop -p 200 -u @l_susr@
rcService cups enable yes || exit 0
- if [ -f @l_prefix@/var/cups/cupsd.pid ]; then
- kill -TERM `cat @l_prefix@/var/cups/cupsd.pid`
- rm -f @l_prefix@/var/cups/cupsd.pid >/dev/null 2>&1 || true
- fi
+ cups_signal TERM
+ rm -f $cups_pidfile 2>/dev/null || true
+
+%restart -p 200 -u @l_susr@
+ rcService cups enable yes || exit 0
+ rc cups stop
+ sleep 2
+ rc cups start
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5691 -r1.5692 news.txt
--- openpkg-web/news.txt 21 Jul 2003 14:02:06 -0000 1.5691
+++ openpkg-web/news.txt 21 Jul 2003 14:28:36 -0000 1.5692
@@ -1,3 +1,4 @@
+21-Jul-2003: Upgraded package: P<cups-1.1.19-20030721>
21-Jul-2003: Upgraded package: P<clamav-0.60-20030721>
21-Jul-2003: Upgraded package: P<libevent-0.7a-20030721>
21-Jul-2003: Upgraded package: P<bash-2.05b-20030721>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
