[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6606-ge4d894b

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit e3d46ff401a759b7c581cfdfb2375d37627779ad
Author: Michael Tautschnig <mt at debian.org>
Date:   Mon Oct 25 23:06:32 2010 +0200

    Change $BASENAME to $NAME to be consistent with other clamav init scripts
    
    - partly fixes #600908
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index 01ad186..3efe5e6 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -14,11 +14,11 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/clamav-milter
 DESC="Sendmail milter plugin for ClamAV"
-BASENAME=clamav-milter
+NAME=clamav-milter
 CLAMAVCONF=/etc/clamav/clamav-milter.conf
 SUPERVISOR=/usr/bin/daemon
 SUPERVISORPIDFILE="/var/run/clamav/daemon-clamav-milter.pid"
-SUPERVISORARGS="-F $SUPERVISORPIDFILE --name=$BASENAME --respawn"
+SUPERVISORARGS="-F $SUPERVISORPIDFILE --name=$NAME --respawn"
 CLAMAVDAEMONUPGRADE="/var/run/clamav-daemon-being-upgraded"
 
 [ -x "$DAEMON" ] || exit 0
@@ -152,11 +152,11 @@ case "$1" in
     exit 0
   fi
   if [ -z "$RUN_SUPERVISED" ] ; then
-    log_daemon_msg "Starting $DESC" "$BASENAME"
+    log_daemon_msg "Starting $DESC" "$NAME"
     start-stop-daemon --start -o -c $User --exec $DAEMON
     ret=$?
   else
-    log_daemon_msg "Starting $DESC" "$BASENAME (supervised)"
+    log_daemon_msg "Starting $DESC" "$NAME (supervised)"
     $SUPERVISOR $SUPERVISORARGS -X "$SUPERVISOR_EXEC"
     ret=$?
   fi
@@ -168,7 +168,7 @@ case "$1" in
   ;;
   stop)
   OPTIND=1
-  log_daemon_msg "Stopping $DESC" "$BASENAME"
+  log_daemon_msg "Stopping $DESC" "$NAME"
   if [ -n "$PID" ]; then
     PID=`echo $PID | sed 's/[^0-9]//g'`
     kill -15 -"$PID" 2>/dev/null || true

-- 
Debian repository for ClamAV