[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. 99ae9353f6834da0cb73f59f4b32d1f0ae1263fa

[Stephen Gran]

The following commit has been merged in the debian/unstable branch:
commit 85a2c8e777fe849dd2a7eb7bcd885399bdbe57a2
Author: Stephen Gran <steve at lobefin.net>
Date:   Thu Sep 4 13:25:35 2008 +0100

    Revert "Correct logcheck ignore lines for clamav-daemon"
    
    This reverts commit ce86a07f2860e07f2ad17d55967e09860f4779f8.

diff --git a/debian/clamav-daemon.logcheck.ignore.paranoid b/debian/clamav-daemon.logcheck.ignore.paranoid
index 8288b29..83a276b 100644
--- a/debian/clamav-daemon.logcheck.ignore.paranoid
+++ b/debian/clamav-daemon.logcheck.ignore.paranoid
@@ -1,6 +1,6 @@
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ clamd\[[0-9]+\]: SelfCheck: Database status OK\.$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ clamd\[[0-9]+\]: Reading databases from .*$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ clamd\[[0-9]+\]: Database correctly reloaded \([0-9]+ signatures\)$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ clamd\[[0-9]+\]: Database correctly reloaded \([0-9]+ viruses\)$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ clamd\[[0-9]+\]: SIGHUP caught: re-opening log file\.$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ clamd\[[0-9]+\]: No stats for Database check - forcing reload$
 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ clamd\[[0-9]+\]: SelfCheck: Database modification detected\. Forcing reload\.$
diff --git a/debian/clamav-milter.default b/debian/clamav-milter.default
index 1912174..07d7b70 100644
--- a/debian/clamav-milter.default
+++ b/debian/clamav-milter.default
@@ -1,20 +1,10 @@
-# Default options: 2 children max and scan outgoing and local messages
 OPTIONS="--max-children=2 -ol"
-#
-# If you want to set an alternate pidfile (why?) please do it here:
-#
+#If you want to set an alternate pidfile (why?) please do it here:
 #PIDFILE=/var/run/clamav/clamav-milter.pid
-#
-# If you want to set an alternate socket, do so here (remember to change 
-#  sendmail.mc for sendmail and main.cf for postfix):
-#
+#If you want to set an alternate socket, do so here (remember to change 
+#  sendmail.mc):
 #SOCKET=local:/var/run/clamav/clamav-milter.ctl
 #
-# For postfix, you might want these settings:
-#
+#For postfix, you might want these settings:
 #USE_POSTFIX='yes'
 #SOCKET=local:/var/spool/postfix/clamav/clamav-milter.ctl
-#
-# If you have troubles because of locale, uncomment the following line
-#
-#unset LANG

-- 
Debian repository for ClamAV