Bug#964411: stretch-pu: package c-icap-modules/1:0.4.4-1+deb9u2
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu
ClamAV was updated to 0.102, which needs a fix in c-icap-modules.
diff -Nru c-icap-modules-0.4.4/debian/changelog c-icap-modules-0.4.4/debian/changelog
--- c-icap-modules-0.4.4/debian/changelog 2019-03-10 23:00:14.000000000 +0200
+++ c-icap-modules-0.4.4/debian/changelog 2020-07-06 23:32:58.000000000 +0300
@@ -1,3 +1,10 @@
+c-icap-modules (1:0.4.4-1+deb9u2) stretch; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport support for ClamAV 0.102. (Closes: #952009)
+
+ -- Adrian Bunk <bunk@debian.org> Mon, 06 Jul 2020 23:32:58 +0300
+
c-icap-modules (1:0.4.4-1+deb9u1) stretch; urgency=medium
* Non-maintainer upload.
diff -Nru c-icap-modules-0.4.4/debian/patches/c-icap-modules-clamav-0.102.patch c-icap-modules-0.4.4/debian/patches/c-icap-modules-clamav-0.102.patch
--- c-icap-modules-0.4.4/debian/patches/c-icap-modules-clamav-0.102.patch 1970-01-01 02:00:00.000000000 +0200
+++ c-icap-modules-0.4.4/debian/patches/c-icap-modules-clamav-0.102.patch 2020-07-06 23:32:58.000000000 +0300
@@ -0,0 +1,43 @@
+Description: Backport support for ClamAV 0.102
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/952009
+
+--- c-icap-modules-0.4.4.orig/services/virus_scan/clamav_mod.c
++++ c-icap-modules-0.4.4/services/virus_scan/clamav_mod.c
+@@ -104,8 +104,8 @@ extern ci_off_t CLAMAV_MAXFILESIZE;
+ extern ci_off_t CLAMAV_MAXSCANSIZE;
+ extern char *CLAMAV_TMP;
+
+-#define CLAMAV_VERSION_SIZE 64
+-static char CLAMAV_VERSION[CLAMAV_VERSION_SIZE];
++#define CLAMAVLIB_VERSION_SIZE 64
++static char CLAMAVLIB_VERSION[CLAMAVLIB_VERSION_SIZE];
+ #define CLAMAV_SIGNATURE_SIZE SERVICE_ISTAG_SIZE + 1
+ static char CLAMAV_SIGNATURE[CLAMAV_SIGNATURE_SIZE];
+
+@@ -631,7 +631,7 @@ void clamav_set_versions()
+ {
+ char str_version[64];
+ int cfg_version = 0;
+- unsigned int version, level;
++ unsigned int version = 0, level = 0;
+
+ clamav_get_versions(&level, &version, str_version, sizeof(str_version));
+
+@@ -641,13 +641,13 @@ void clamav_set_versions()
+ CLAMAV_SIGNATURE[CLAMAV_SIGNATURE_SIZE - 1] = '\0';
+
+ /*set the clamav version*/
+- snprintf(CLAMAV_VERSION, CLAMAV_VERSION_SIZE - 1, "%s/%d", str_version, version);
+- CLAMAV_VERSION[CLAMAV_VERSION_SIZE - 1] = '\0';
++ snprintf(CLAMAVLIB_VERSION, CLAMAVLIB_VERSION_SIZE - 1, "%s/%d", str_version, version);
++ CLAMAVLIB_VERSION[CLAMAVLIB_VERSION_SIZE - 1] = '\0';
+ }
+
+ const char *clamav_version()
+ {
+- return CLAMAV_VERSION;
++ return CLAMAVLIB_VERSION;
+ }
+
+ const char *clamav_signature()
diff -Nru c-icap-modules-0.4.4/debian/patches/series c-icap-modules-0.4.4/debian/patches/series
--- c-icap-modules-0.4.4/debian/patches/series 2019-03-10 22:59:27.000000000 +0200
+++ c-icap-modules-0.4.4/debian/patches/series 2020-07-06 23:32:58.000000000 +0300
@@ -1 +1,2 @@
c-icap-modules-clamav-backport.patch
+c-icap-modules-clamav-0.102.patch
Reply to: