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

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit a5e52ac88038f6ca6255af9808291cacb5c44066
Author: Stephen Gran <steve at lobefin.net>
Date:   Sun Nov 23 15:23:26 2008 +0000

    Make restart of the milter conditional on admin settings, instead of
    always doing it.  This makes it opt-in, which I think is preferrable.
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-milter.default b/debian/clamav-milter.default
index 1912174..b556bef 100644
--- a/debian/clamav-milter.default
+++ b/debian/clamav-milter.default
@@ -18,3 +18,7 @@ OPTIONS="--max-children=2 -ol"
 # If you have troubles because of locale, uncomment the following line
 #
 #unset LANG
+#
+# If you use --external, you might want to set this to make sure
+# clamav-milter is started after clamd
+#RESTART_AFTER_CLAMD=yes
diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index f5d0f1a..13e57c7 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -87,7 +87,7 @@ case "$1" in
       exit 1
     fi
   fi
-  if [ -e "$CLAMAVDAEMONUPGRADE" ] ; then
+  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

-- 
Debian repository for ClamAV