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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 8a0d93e203b0754277311f4d0474fdb921e6440c
Author: Michael Tautschnig <mt at debian.org>
Date:   Sun Nov 23 06:34:06 2008 -0800

    Revert "Wait clamav-milter.init when upgrading clamd"
    
    This reverts commit 2b910586c91ae257c062c09a9e46c25b3fd9d318.
    
    As noted by sgran, patching things that way won't work. I'll start a different
    approach. Well, I start loving git ...
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 08649d7..6ba3886 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,6 @@ clamav (0.94.dfsg.1-2) unstable; urgency=low
   
   [ Michael Tautschnig ]
   * Removed --unzip from clampipe script (closes: #506055)
-  * Wait before starting clamav-milter when clamav-daemon is being upgraded
-    (closes: #309067)
   * Moved clamav-milter specific stuff from its specific README.Debian to
     clamav-global one.
 
diff --git a/debian/clamav-daemon.postinst.in b/debian/clamav-daemon.postinst.in
index 007b7f1..070180d 100644
--- a/debian/clamav-daemon.postinst.in
+++ b/debian/clamav-daemon.postinst.in
@@ -89,6 +89,4 @@ esac
 
 #DEBHELPER#
 
-rm -f /var/run/clamav-daemon-being-upgraded
-
 exit 0
diff --git a/debian/clamav-daemon.prerm b/debian/clamav-daemon.prerm
deleted file mode 100644
index a208921..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 file and wait for clamd for up to 30secs
-  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 5ba928a..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,19 +86,6 @@ case "$1" in
       exit 1
     fi
   fi
-  if [ -e "$CLAMAVDAEMONUPGRADE" ] ; then
-    cnt=0
-    while [ -e "$CLAMAVDAEMONUPGRADE" ] ; do
-      cnt=`expr "$cnt" + 1`
-      if [ "$cnt" -gt 15 ]; then
-        break
-      fi
-      sleep 2
-    done
-    if [ -e "$CLAMAVDAEMONUPGRADE" ]; then
-      log_warning_msg "clamd may be required to run $DAEMON, but is still being upgraded!"
-    fi
-  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