Received: by mail.netbsd.org (Postfix, from userid 605) id 1E17984DC8; Fri, 1 Nov 2019 15:22:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9AF9D84D3A for ; Fri, 1 Nov 2019 15:22:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id K-cGA3D5NAHX for ; Fri, 1 Nov 2019 15:22:32 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 1B67E84CD3 for ; Fri, 1 Nov 2019 15:22:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1538BFA92; Fri, 1 Nov 2019 15:22:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1572621752294480" MIME-Version: 1.0 Date: Fri, 1 Nov 2019 15:22:32 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/www/c-icap-modules To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20191101152232.1538BFA92@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1572621752294480 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Fri Nov 1 15:22:32 UTC 2019 Modified Files: pkgsrc/www/c-icap-modules: distinfo Added Files: pkgsrc/www/c-icap-modules/patches: patch-services_virus__scan_clamav__mod.c Log Message: c-icap-modules: Avoid symbol clash with newer clamav. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/c-icap-modules/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/c-icap-modules/patches/patch-services_virus__scan_clamav__mod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1572621752294480 Content-Disposition: inline Content-Length: 2590 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/c-icap-modules/distinfo diff -u pkgsrc/www/c-icap-modules/distinfo:1.8 pkgsrc/www/c-icap-modules/distinfo:1.9 --- pkgsrc/www/c-icap-modules/distinfo:1.8 Thu Oct 3 16:36:54 2019 +++ pkgsrc/www/c-icap-modules/distinfo Fri Nov 1 15:22:31 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2019/10/03 16:36:54 sborrill Exp $ +$NetBSD: distinfo,v 1.9 2019/11/01 15:22:31 jperkin Exp $ SHA1 (c_icap_modules-0.5.3.tar.gz) = df76f30b2cc29aeef700f477693e7017eaa847f4 RMD160 (c_icap_modules-0.5.3.tar.gz) = 350b5dec612dbb9efc1a57792c6ed2ea6a7c8c06 @@ -6,4 +6,5 @@ SHA512 (c_icap_modules-0.5.3.tar.gz) = 5 Size (c_icap_modules-0.5.3.tar.gz) = 452505 bytes SHA1 (patch-services_content__filtering_Makefile.in) = cf07c131df55622100106964ae06f4bd946044dc SHA1 (patch-services_url_check_Makefile.in) = 159f8ec62edc350086ba803cf9c51e9a8c063318 +SHA1 (patch-services_virus__scan_clamav__mod.c) = 2b54ed2972850545ffe258a3d17a87a459494a2d SHA1 (patch-services_virus_scan_Makefile.in) = 2bd465cfddd34e04ea8c47fc247ff5a0066f01c6 Added files: Index: pkgsrc/www/c-icap-modules/patches/patch-services_virus__scan_clamav__mod.c diff -u /dev/null pkgsrc/www/c-icap-modules/patches/patch-services_virus__scan_clamav__mod.c:1.1 --- /dev/null Fri Nov 1 15:22:32 2019 +++ pkgsrc/www/c-icap-modules/patches/patch-services_virus__scan_clamav__mod.c Fri Nov 1 15:22:31 2019 @@ -0,0 +1,32 @@ +$NetBSD: patch-services_virus__scan_clamav__mod.c,v 1.1 2019/11/01 15:22:31 jperkin Exp $ + +Avoid symbol clash with newer clamav. + +--- services/virus_scan/clamav_mod.c.orig 2019-01-17 10:49:34.000000000 +0000 ++++ services/virus_scan/clamav_mod.c +@@ -105,7 +105,7 @@ extern ci_off_t CLAMAV_MAXSCANSIZE; + extern char *CLAMAV_TMP; + + #define CLAMAV_VERSION_SIZE 64 +-static char CLAMAV_VERSION[CLAMAV_VERSION_SIZE]; ++static char CLAMAV_ENGINE_VERSION[CLAMAV_VERSION_SIZE]; + #define CLAMAV_SIGNATURE_SIZE SERVICE_ISTAG_SIZE + 1 + static char CLAMAV_SIGNATURE[CLAMAV_SIGNATURE_SIZE]; + +@@ -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(CLAMAV_ENGINE_VERSION, CLAMAV_VERSION_SIZE - 1, "%s/%d", str_version, version); ++ CLAMAV_ENGINE_VERSION[CLAMAV_VERSION_SIZE - 1] = '\0'; + } + + const char *clamav_version() + { +- return CLAMAV_VERSION; ++ return CLAMAV_ENGINE_VERSION; + } + + const char *clamav_signature() --_----------=_1572621752294480--