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

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 3d9e6d54b735c9efb5455dcdd55410810962f1b6
Author: Stephen Gran <steve at lobefin.net>
Date:   Sun Apr 12 13:15:32 2009 +0100

    Readd special case postfix handling
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index eb8b2f6..b3ffd3d 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -16,6 +16,7 @@ DAEMON=/usr/sbin/clamav-milter
 NAME=clamav-milter
 DESC="Sendmail milter plugin for ClamAV"
 CLAMAVMILTERCONF=/etc/clamav/clamav-milter.conf
+DEFAULT=/etc/default/clamav-milter
 SUPERVISOR=/usr/bin/daemon
 SUPERVISORNAME=daemon
 SUPERVISORPIDFILE="/var/run/clamav/daemon-clamav-milter.pid"
@@ -36,6 +37,10 @@ fi
 
 slurp_config "$CLAMAVMILTERCONF"
 
+[ ! -r $DEFAULT ] || . $DEFAULT
+[ -n "$PidFile" ] || PidFile=/var/run/clamav/clamav-milter.pid
+[ -n "$MilterSocket" ] || MilterSocket=local:/var/run/clamav/clamav-milter.ctl
+
 if [ -n "$Example" ]; then
   log_failure_msg "$DESC is not configured."
   log_failure_msg "Please edit $CLAMAVMILTERCONF and run '/etc/init.d/clamav-milter start'"
@@ -48,28 +53,38 @@ if is_true "$Foreground"; then
      exit 0
   else
      RUN_SUPERVISED=1
+     make_dir $(dirname "$SUPERVISORPIDFILE")
+     chown $User $(dirname "$SUPERVISORPIDFILE")
   fi
 fi
 
-[ -n "$User" ] || User=clamav
+case "$MilterSocket" in
+  /*)
+  SOCKET_PATH="$MilterSocket"
+  ;;
+  *)
+  # If the socket is type inet: we don't care - we can't rm -f that later :)
+  SOCKET_PATH=`echo $MilterSocket | sed -e s/(unix|local)\://`
+  ;;
+esac
 
-make_dir $(dirname "$SUPERVISORPIDFILE")
+[ -n "$User" ] || User=clamav
 
-THEPIDFILE="`grep ^PidFile $CLAMAVMILTERCONF | awk '{print $2}'`"
+THEPIDFILE=$PidFile
 [ -n "$THEPIDFILE" ] || THEPIDFILE='/var/run/clamav/clamav-milter.pid'
 make_dir $(dirname "$THEPIDFILE")
 chown $User $(dirname "$THEPIDFILE")
 
 if [ -f "$THEPIDFILE" ]; then
-  CLAMDPID=`pidofproc -p $THEPIDFILE $DAEMON`
+  CLAMMILTERPID=`pidofproc -p $THEPIDFILE $DAEMON`
   RUNNING=$?
 else
-  CLAMDPID=`pidofproc $DAEMON`
+  CLAMMILTERPID=`pidofproc $DAEMON`
   RUNNING=$?
 fi
 
 if [ -z "$RUN_SUPERVISED" ]; then
-  PID="$CLAMDPID"
+  PID="$CLAMMILTERPID"
 else
   [ -e "$SUPERVISORPIDFILE" ] && PID=`cat $SUPERVISORPIDFILE`
 fi
@@ -88,6 +103,22 @@ case "$1" in
     $SUPERVISOR $SUPERVISORARGS
     ret=$?
   fi
+  if [ $ret = 0 ] && [ "$USE_POSTFIX" = 'yes' ] && [ "${SOCKET_PATH#inet}" = "${SOCKET_PATH}" ]; then
+    cnt=0
+    until [ -e "$SOCKET_PATH" ] ; do
+      cnt=`expr "$cnt" + 1`
+      if [ "$cnt" -gt 15 ]; then
+        break
+      fi
+      sleep 2
+    done
+    if [ -e "$SOCKET_PATH" ]; then
+      chmod g+w $SOCKET_PATH
+      chgrp postfix $SOCKET_PATH
+    else
+      log_warning_msg "Socket not created.  Investigate"
+    fi
+  fi
   log_end_msg $ret
   ;;
   stop)

-- 
Debian repository for ClamAV