Package: release.debian.org
User: release.debian....@packages.debian.org
Usertags: pu
Tags: stretch
Severity: normal
Please find attached the proposed update to dansguardian for Stretch as
part of the clamav transition, #924278.
Sebastian
diff -u dansguardian-2.10.1.1/debian/changelog
dansguardian-2.10.1.1/debian/changelog
--- dansguardian-2.10.1.1/debian/changelog
+++ dansguardian-2.10.1.1/debian/changelog
@@ -1,3 +1,10 @@
+dansguardian (2.10.1.1-5.1+deb9u2) stretch; urgency=medium
+
+ * Non-maintainer upload.
+ * Add support for clamav 0.101 (Closes: #923981).
+
+ -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc> Thu, 22 Aug 2019
19:19:58 +0200
+
dansguardian (2.10.1.1-5.1+deb9u1) stretch; urgency=medium
* Non-maintainer upload.
diff -u dansguardian-2.10.1.1/debian/control
dansguardian-2.10.1.1/debian/control
--- dansguardian-2.10.1.1/debian/control
+++ dansguardian-2.10.1.1/debian/control
@@ -6,7 +6,7 @@
debhelper (>= 9),
dh-autoreconf,
dpatch (>= 2.0.32~),
- libclamav-dev (>= 0.90),
+ libclamav-dev (>= 0.101.1),
libpcre3-dev,
zlib1g-dev
Standards-Version: 3.9.2
diff -u dansguardian-2.10.1.1/debian/patches/00list
dansguardian-2.10.1.1/debian/patches/00list
--- dansguardian-2.10.1.1/debian/patches/00list
+++ dansguardian-2.10.1.1/debian/patches/00list
@@ -9,0 +10 @@
+90_clamav111_support.dpatch
only in patch2:
unchanged:
--- dansguardian-2.10.1.1.orig/debian/patches/90_clamav111_support.dpatch
+++ dansguardian-2.10.1.1/debian/patches/90_clamav111_support.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_clamav111_support.dpatch by Sebastian A. Siewior
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds support for clamav 0.101.1
+
+@DPATCH@
+diff --git a/src/contentscanners/clamav.cpp b/src/contentscanners/clamav.cpp
+index cb5e5be1b3fc..7af3c9383e60 100644
+--- a/src/contentscanners/clamav.cpp
++++ b/src/contentscanners/clamav.cpp
+@@ -172,7 +172,13 @@ int clamavinstance::scanMemory(HTTPHeader *
requestheader, HTTPHeader * docheade
+ }
+
+ #ifdef CL_INIT_DEFAULT
+- rc = cl_scandesc(fd, &vn, NULL, engine, CL_SCAN_STDOPT);
++ struct cl_scan_options cl_options;
++
++ memset(&cl_options, 0, sizeof(struct cl_scan_options));
++ cl_options.general = CL_SCAN_GENERAL_ALLMATCHES;
++ cl_options.parse = ~0;
++
++ rc = cl_scandesc(fd, NULL, &vn, NULL, engine, &cl_options);
+ #else
+ rc = cl_scandesc(fd, &vn, NULL, engine, &limits, CL_SCAN_STDOPT);
+ #endif
+@@ -201,7 +207,13 @@ int clamavinstance::scanFile(HTTPHeader * requestheader,
HTTPHeader * docheader,
+ lastmessage = lastvirusname = "";
+ const char *vn = NULL;
+ #ifdef CL_INIT_DEFAULT
+- int rc = cl_scanfile(filename, &vn, NULL, engine, CL_SCAN_STDOPT );
++ struct cl_scan_options cl_options;
++
++ memset(&cl_options, 0, sizeof(struct cl_scan_options));
++ cl_options.general = CL_SCAN_GENERAL_ALLMATCHES;
++ cl_options.parse = ~0;
++
++ int rc = cl_scanfile(filename, &vn, NULL, engine, &cl_options);
+ #else
+ int rc = cl_scanfile(filename, &vn, NULL, engine, &limits,
CL_SCAN_STDOPT );
+ #endif
+--
+2.20.1
+
