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:02:08 Branch: HEAD Handle: 2003072115020602 Modified files: openpkg-src/clamav clamav.spec rc.clamav openpkg-web news.txt Log: %status and pidfile handling Summary: Revision Changes Path 1.12 +1 -1 openpkg-src/clamav/clamav.spec 1.6 +20 -3 openpkg-src/clamav/rc.clamav 1.5691 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/clamav/clamav.spec ============================================================================ $ cvs diff -u -r1.11 -r1.12 clamav.spec --- openpkg-src/clamav/clamav.spec 19 Jul 2003 17:05:48 -0000 1.11 +++ openpkg-src/clamav/clamav.spec 21 Jul 2003 14:02:08 -0000 1.12 @@ -33,7 +33,7 @@ Group: Filesystem License: GPL Version: 0.60 -Release: 20030719 +Release: 20030721 # list of sources Source0: http://www.clamav.org/stable/clamav-%{version}.tar.gz @@ . patch -p0 <<'@@ .' Index: openpkg-src/clamav/rc.clamav ============================================================================ $ cvs diff -u -r1.5 -r1.6 rc.clamav --- openpkg-src/clamav/rc.clamav 19 Jul 2003 17:05:48 -0000 1.5 +++ openpkg-src/clamav/rc.clamav 21 Jul 2003 14:02:08 -0000 1.6 @@ -9,6 +9,18 @@ %common clamav_cfgfile="@l_prefix@/etc/clamav/clamav.conf" clamav_pidfile="@l_prefix@/var/clamav/clamd.pid" + clamav_signal () { + [ -f $clamav_pidfile ] && kill -$1 `cat $clamav_pidfile` + } + +%status -p 200 -u @l_susr@ -o + clamav_usable="unknown" + clamav_active="no" + rcService clamav enable yes && \ + clamav_signal 0 && clamav_active="yes" + echo "clamav_enable=\"$clamav_enable\"" + echo "clamav_usable=\"$clamav_usable\"" + echo "clamav_active=\"$clamav_active\"" %start -p 200 -u @l_rusr@ rcService clamav enable yes || exit 0 @@ -16,9 +28,14 @@ %stop -p 200 -u @l_rusr@ rcService clamav enable yes || exit 0 - if [ -f $clamav_pidfile ]; then - kill -TERM `cat $clamav_pidfile` - fi + clamav_signal TERM + rm -f $clamav_pidfile 2>/dev/null || true + +%restart -p 200 -u @l_rusr@ + rcService clamav enable yes || exit 0 + rc clamav stop + sleep 2 + rc clamav start %daily -p 200 -u @l_rusr@ rcService clamav enable yes || exit 0 @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.5690 -r1.5691 news.txt --- openpkg-web/news.txt 21 Jul 2003 13:48:50 -0000 1.5690 +++ openpkg-web/news.txt 21 Jul 2003 14:02:06 -0000 1.5691 @@ -1,3 +1,4 @@ +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> 21-Jul-2003: Upgraded package: P<amavisd-20030616p2-20030721> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]