Bug#767306: unblock: clamav/0.98.5~rc1+dfsg-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: pkg-clamav-devel@lists.alioth.debian.org
Please unblock package clamav
The patch for bug #636881 included in 0.98.5~beta1+dfsg-3 introduced an
important regression in clamav-milter: it fails to add X-Virus-Scanned
and X-Virus-Status headers.
If you agree to unblock this, we'd make an upload to fix this issue.
Attached is the proposed debdiff for the upload.
unblock clamav/0.98.5~rc1+dfsg-3
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16-3-amd64 (SMP w/4 CPU cores)
diff -Nru clamav-0.98.5~rc1+dfsg/debian/changelog clamav-0.98.5~rc1+dfsg/debian/changelog
--- clamav-0.98.5~rc1+dfsg/debian/changelog 2014-10-18 17:57:20.000000000 +0200
+++ clamav-0.98.5~rc1+dfsg/debian/changelog 2014-10-29 23:06:00.000000000 +0100
@@ -1,3 +1,11 @@
+clamav (0.98.5~rc1+dfsg-3) UNRELEASED; urgency=medium
+
+ * Add "clamav-milter-add-additinal-SMFIF_-flags-before-invo" to make sure
+ clamav-milter is able to add/replace X-Virus-Status + X-Virus-Scanned
+ header flags. Broken since bb-10731 got included (0.98.5~beta1+dfsg-3).
+
+ -- Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Sun, 26 Oct 2014 12:19:09 +0100
+
clamav (0.98.5~rc1+dfsg-2) unstable; urgency=medium
* Add patch to fix test failure on powerpc again.
diff -Nru clamav-0.98.5~rc1+dfsg/debian/.git-dpm clamav-0.98.5~rc1+dfsg/debian/.git-dpm
--- clamav-0.98.5~rc1+dfsg/debian/.git-dpm 2014-10-18 17:57:20.000000000 +0200
+++ clamav-0.98.5~rc1+dfsg/debian/.git-dpm 2014-10-29 22:33:36.000000000 +0100
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-0471298187f9fafc9575e516f07cb11b5660b005
-0471298187f9fafc9575e516f07cb11b5660b005
+ef4a9a712e15ffb2bb983cd8f337a7a4954332c6
+ef4a9a712e15ffb2bb983cd8f337a7a4954332c6
5c9ec4fd44d2b9d80b2dd45443a363f61bbae628
5c9ec4fd44d2b9d80b2dd45443a363f61bbae628
clamav_0.98.5~rc1+dfsg.orig.tar.xz
diff -Nru clamav-0.98.5~rc1+dfsg/debian/patches/0018-clamav-milter-add-additinal-SMFIF_-flags-before-invo.patch clamav-0.98.5~rc1+dfsg/debian/patches/0018-clamav-milter-add-additinal-SMFIF_-flags-before-invo.patch
--- clamav-0.98.5~rc1+dfsg/debian/patches/0018-clamav-milter-add-additinal-SMFIF_-flags-before-invo.patch 1970-01-01 01:00:00.000000000 +0100
+++ clamav-0.98.5~rc1+dfsg/debian/patches/0018-clamav-milter-add-additinal-SMFIF_-flags-before-invo.patch 2014-10-29 22:33:37.000000000 +0100
@@ -0,0 +1,86 @@
+From ef4a9a712e15ffb2bb983cd8f337a7a4954332c6 Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+Date: Sun, 26 Oct 2014 12:11:09 +0100
+Subject: clamav-milter: add additinal SMFIF_* flags before invoking
+ smfi_register()
+
+unfortunately after the shifting of the code (so that the socket could
+be part of a group which is not part of the clamav user) I forgot (or
+did not see it) to have the header flags added before the
+smfi_register() was invoked. As a result the socket was working but it
+was unable to add the X-Virus-Scanned & X-Virus-Status flags. This
+patch fixes the issue.
+
+https://bugzilla.clamav.net/show_bug.cgi?id=10731
+
+Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
+---
+ clamav-milter/clamav-milter.c | 48 ++++++++++++++++++++++++-------------------
+ 1 file changed, 27 insertions(+), 21 deletions(-)
+
+diff --git a/clamav-milter/clamav-milter.c b/clamav-milter/clamav-milter.c
+index 99e7fe7..22db98a 100644
+--- a/clamav-milter/clamav-milter.c
++++ b/clamav-milter/clamav-milter.c
+@@ -116,6 +116,33 @@ int main(int argc, char **argv) {
+ }
+ }
+
++ pt = optget(opts, "AddHeader")->strarg;
++ if (strcasecmp(pt, "No")) {
++ char myname[255];
++
++ if (((opt = optget(opts, "ReportHostname"))->enabled &&
++ strncpy(myname, opt->strarg, sizeof(myname))) ||
++ !gethostname(myname, sizeof(myname))) {
++
++ myname[sizeof(myname)-1] = '\0';
++ snprintf(xvirushdr, sizeof(xvirushdr), "clamav-milter %s at %s",
++ get_version(), myname);
++ } else {
++ snprintf(xvirushdr, sizeof(xvirushdr), "clamav-milter %s",
++ get_version());
++ }
++ xvirushdr[sizeof(xvirushdr)-1] = '\0';
++
++ descr.xxfi_flags |= SMFIF_ADDHDRS;
++
++ if (strcasecmp(pt, "Add")) { /* Replace or Yes */
++ descr.xxfi_flags |= SMFIF_CHGHDRS;
++ addxvirus = 1;
++ } else { /* Add */
++ addxvirus = 2;
++ }
++ }
++
+ if(!(my_socket = optget(opts, "MilterSocket")->strarg)) {
+ logg("!Please configure the MilterSocket directive\n");
+ logg_close();
+@@ -323,27 +350,6 @@ int main(int argc, char **argv) {
+ return 1;
+ }
+
+- pt = optget(opts, "AddHeader")->strarg;
+- if(strcasecmp(pt, "No")) {
+- char myname[255];
+-
+- if(((opt = optget(opts, "ReportHostname"))->enabled && strncpy(myname, opt->strarg, sizeof(myname))) || !gethostname(myname, sizeof(myname))) {
+- myname[sizeof(myname)-1] = '\0';
+- snprintf(xvirushdr, sizeof(xvirushdr), "clamav-milter %s at %s", get_version(), myname);
+- } else
+- snprintf(xvirushdr, sizeof(xvirushdr), "clamav-milter %s", get_version());
+- xvirushdr[sizeof(xvirushdr)-1] = '\0';
+-
+- descr.xxfi_flags |= SMFIF_ADDHDRS;
+-
+- if(strcasecmp(pt, "Add")) { /* Replace or Yes */
+- descr.xxfi_flags |= SMFIF_CHGHDRS;
+- addxvirus = 1;
+- } else { /* Add */
+- addxvirus = 2;
+- }
+- }
+-
+ multircpt = optget(opts, "SupportMultipleRecipients")->enabled;
+
+ if(!optget(opts, "Foreground")->enabled) {
diff -Nru clamav-0.98.5~rc1+dfsg/debian/patches/series clamav-0.98.5~rc1+dfsg/debian/patches/series
--- clamav-0.98.5~rc1+dfsg/debian/patches/series 2014-10-18 17:57:20.000000000 +0200
+++ clamav-0.98.5~rc1+dfsg/debian/patches/series 2014-10-29 22:33:36.000000000 +0100
@@ -15,3 +15,4 @@
0015-LLVM-3.5-version-check-update.patch
0016-add-support-for-LLVM-3.5.patch
0017-fix-test-failure-on-powerpc-again.patch
+0018-clamav-milter-add-additinal-SMFIF_-flags-before-invo.patch
Reply to: