diff options
| author | wiz <wiz@pkgsrc.org> | 2007-06-15 22:31:39 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2007-06-15 22:31:39 +0000 |
| commit | 174334c6be017115313586a9c83cebdb9876200e (patch) | |
| tree | cff77ccdb99e0af230ed02317c7ba4b22d00705d | |
| parent | e57a27b67ccdd01010c772dffae7e7a8b46504df (diff) | |
| download | pkgsrc-174334c6be017115313586a9c83cebdb9876200e.tar.gz | |
Improvements for freshclamd script from Sergey Svishchev:
For some reason, the script creates the pid file itself, instead
of using '-p' option to freshclamd. sig_stop=KILL seems unnecessary,
too.
Bump PKGREVISION.
| -rw-r--r-- | mail/clamav/Makefile | 4 | ||||
| -rw-r--r-- | mail/clamav/files/freshclamd.sh | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index 2594878b798..3987db14d41 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.73 2007/05/31 05:26:46 martti Exp $ +# $NetBSD: Makefile,v 1.74 2007/06/15 22:31:39 wiz Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} -#PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/} diff --git a/mail/clamav/files/freshclamd.sh b/mail/clamav/files/freshclamd.sh index 25bab124e2a..80b35c7679c 100644 --- a/mail/clamav/files/freshclamd.sh +++ b/mail/clamav/files/freshclamd.sh @@ -1,26 +1,20 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: freshclamd.sh,v 1.3 2006/06/20 20:24:45 jnemeth Exp $ +# $NetBSD: freshclamd.sh,v 1.4 2007/06/15 22:31:39 wiz Exp $ # # PROVIDE: freshclamd # REQUIRE: DAEMON LOGIN clamd - name="freshclamd" rcvar=$name command="@PREFIX@/bin/freshclam" required_files="@PKG_SYSCONFDIR@/freshclam.conf" -pidfile="@VARBASE@/run/${name}.pid" -sig_stop="KILL" +pidfile="@VIRUSDBDIR@/${name}.pid" freshclamd_user="@CLAMAV_USER@" freshclamd_flags=${freshclamd_flags:=-c 2} -command_args="-d" +command_args="-d -p $pidfile" . /etc/rc.subr load_rc_config $name run_rc_command "$1" - -if [ "$1" != "stop" ]; then - echo $(check_process $command) > $pidfile -fi |