Package: release.debian.org Severity: normal Tags: buster User: [email protected] Usertags: pu
ClamAV was updated to 0.102, which needs a fix in c-icap-modules.
diff -Nru c-icap-modules-0.5.3/debian/changelog c-icap-modules-0.5.3/debian/changelog --- c-icap-modules-0.5.3/debian/changelog 2019-01-21 15:11:27.000000000 +0200 +++ c-icap-modules-0.5.3/debian/changelog 2020-07-06 23:40:47.000000000 +0300 @@ -1,3 +1,10 @@ +c-icap-modules (1:0.5.3-1+deb10u1) buster; urgency=medium + + * Non-maintainer upload. + * Backport support for ClamAV 0.102. (Closes: #952009) + + -- Adrian Bunk <[email protected]> Mon, 06 Jul 2020 23:40:47 +0300 + c-icap-modules (1:0.5.3-1) unstable; urgency=medium [ Ondřej Nový ] diff -Nru c-icap-modules-0.5.3/debian/patches/c-icap-modules-clamav-0.102.patch c-icap-modules-0.5.3/debian/patches/c-icap-modules-clamav-0.102.patch --- c-icap-modules-0.5.3/debian/patches/c-icap-modules-clamav-0.102.patch 1970-01-01 02:00:00.000000000 +0200 +++ c-icap-modules-0.5.3/debian/patches/c-icap-modules-clamav-0.102.patch 2020-07-06 23:34:55.000000000 +0300 @@ -0,0 +1,43 @@ +Description: Backport support for ClamAV 0.102 +Author: Adrian Bunk <[email protected]> +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.5.3/debian/patches/series c-icap-modules-0.5.3/debian/patches/series --- c-icap-modules-0.5.3/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ c-icap-modules-0.5.3/debian/patches/series 2020-07-06 23:40:47.000000000 +0300 @@ -0,0 +1 @@ +c-icap-modules-clamav-0.102.patch
