[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6161-gd204a0c
Scott Kitterman
scott at kitterman.com
Fri Apr 9 15:28:06 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit d204a0c3fe4ec467cd112b48563fafd0723f25f7
Author: Scott Kitterman <scott at kitterman.com>
Date: Fri Apr 9 11:27:33 2010 -0400
* Update clamav-milter.logcheck.ignore.server (closes: #541008)
- Thanks to Martin Krafft for the patch
* Correct options in clamav-milter.init.in (closes: #576955)
- Thanks to Marco d'Itri for the patch
diff --git a/debian/changelog b/debian/changelog
index 0f5a396..cef286c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ clamav (0.96+dfsg-1) unstable; urgency=low
* Remove deprecated MailFollowURLs option from default clamd.conf in
clamav-base.postinst.in
* Additional debian/copyright updates for OpenBSD regex in llvm
+ * Update clamav-milter.logcheck.ignore.server (closes: #541008)
+ - Thanks to Martin Krafft for the patch
+ * Correct options in clamav-milter.init.in (closes: #576955)
+ - Thanks to Marco d'Itri for the patch
[ Alberto WU ]
* New upstream release (closes: #576908)
diff --git a/debian/clamav-milter.init.in b/debian/clamav-milter.init.in
index ef7437d..01ad186 100644
--- a/debian/clamav-milter.init.in
+++ b/debian/clamav-milter.init.in
@@ -107,7 +107,7 @@ if is_true "$Foreground"; then
exit 0
else
RUN_SUPERVISED=1
- SUPERVISOR_EXEC="$DAEMON $OPTIONS --pidfile $PIDFILE $SOCKET"
+ SUPERVISOR_EXEC="$DAEMON $OPTIONS"
fi
fi
diff --git a/debian/clamav-milter.logcheck.ignore.server b/debian/clamav-milter.logcheck.ignore.server
index 53220c9..58cba2e 100644
--- a/debian/clamav-milter.logcheck.ignore.server
+++ b/debian/clamav-milter.logcheck.ignore.server
@@ -1 +1,2 @@
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ clamav-milter\[[0-9]+\]: [_[:alnum:]-]+: [/.[:alnum:]-]+: [._[:alnum:]-]+ Intercepted virus from
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ clamav-milter\[[[:digit:]]{,5}\]: Can't resolve LocalNet hostname unknown$
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list