[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.94.dfsg.2-1-466-ga4903a4

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 5000316911227950539d3471138fa03a8b506c7f
Author: Michael Tautschnig <mt at debian.org>
Date:   Wed Mar 25 12:18:46 2009 +0100

    Don't do the clamav-daemon restarts milter game anymore
    
    - I'd hope that milter's new readtimeout kicks in and takes care of that anyway
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/clamav-daemon.postinst.in b/debian/clamav-daemon.postinst.in
index 26c98f9..070180d 100644
--- a/debian/clamav-daemon.postinst.in
+++ b/debian/clamav-daemon.postinst.in
@@ -89,14 +89,4 @@ esac
 
 #DEBHELPER#
 
-rm -f /var/run/clamav-daemon-being-upgraded
-if [ -e "/var/run/clamav-daemon-being-upgraded.milter-restart" ] ; then
-  if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-    invoke-rc.d clamav-milter start
-  else
-    /etc/init.d/clamav-milter start
-  fi
-  rm /var/run/clamav-daemon-being-upgraded.milter-restart
-fi
-
 exit 0
diff --git a/debian/clamav-daemon.prerm b/debian/clamav-daemon.prerm
deleted file mode 100644
index cd9a6d2..0000000
--- a/debian/clamav-daemon.prerm
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh
-set -e
-
-case "$1" in
-  upgrade)
-# information for clamav-milter that clamd is in the process of being upgraded,
-# which may cause problems when using --external in clamav-milter (see #309067);
-# clamav-milter will check for this and request a restart by clamav-daemon
-  touch /var/run/clamav-daemon-being-upgraded
-  ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index 13e57c7..cbfbcd2 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -23,7 +23,6 @@ OPTIONS="-dq"
 SUPERVISOR=/usr/bin/daemon
 SUPERVISORPIDFILE="/var/run/clamav/daemon-clamav-milter.pid"
 SUPERVISORARGS="-F $SUPERVISORPIDFILE --name=$BASENAME --respawn"
-CLAMAVDAEMONUPGRADE="/var/run/clamav-daemon-being-upgraded"
 
 [ -x "$DAEMON" ] || exit 0
 [ -r "$CLAMAVCONF" ] || exit 0
@@ -87,11 +86,6 @@ case "$1" in
       exit 1
     fi
   fi
-  if [ -e "$CLAMAVDAEMONUPGRADE" ] && [ "$RESTART_AFTER_CLAMD" = 'yes' ]; then
-    touch $CLAMAVDAEMONUPGRADE.milter-restart
-    log_warning_msg "clamd may be required to run $DAEMON, clamav-milter will be restarted by clamav-daemon"
-    exit 0
-  fi
   if [ -z "$RUN_SUPERVISED" ] ; then
     log_daemon_msg "Starting $DESC" "$BASENAME"
     su "$User" -p -s /bin/sh -c ". /lib/lsb/init-functions && start_daemon $DAEMON $OPTIONS --pidfile $PIDFILE $SOCKET" > /dev/null

-- 
Debian repository for ClamAV