www/c-icap-modules: update to 0.5.4
Remove patch patch-services_virus__scan_clamav__mod.c fixed by upstream (Bug 121: https://sourceforge.net/p/c-icap/bugs/121) Changelog: * Bug 121: Support for Clamav-0.102.1 * Various issues reported by clang analyzer * Fix memory leak when clamd TCP server is used instead of unix pipes. PR: 242795 Submitted by: Franco Fichtner <franco@opnsense.org>
This commit is contained in:
parent
375d5a1938
commit
6d093c1b8e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=520670
3 changed files with 4 additions and 35 deletions
|
@ -2,8 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= c-icap
|
||||
PORTVERSION= 0.5.3
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 0.5.4
|
||||
CATEGORIES= www security
|
||||
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.5.x/
|
||||
PKGNAMESUFFIX= -modules
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1547975297
|
||||
SHA256 (c_icap_modules-0.5.3.tar.gz) = 6e2f87a60379ffde26947c6e82ff0c7f614bc005588bf1efb40c74f69c82f925
|
||||
SIZE (c_icap_modules-0.5.3.tar.gz) = 452505
|
||||
TIMESTAMP = 1575242090
|
||||
SHA256 (c_icap_modules-0.5.4.tar.gz) = 87409920c66027204e9cca5f20e137b63cd12daf6dfcd85c1fa62ab2bd1c57cc
|
||||
SIZE (c_icap_modules-0.5.4.tar.gz) = 450411
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
--- services/virus_scan/clamav_mod.c.orig 2019-11-25 19:36:11 UTC
|
||||
+++ 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 _CLAMAV_VERSION_SIZE 64
|
||||
+static char _CLAMAV_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_VERSION, _CLAMAV_VERSION_SIZE - 1, "%s/%d", str_version, version);
|
||||
+ _CLAMAV_VERSION[_CLAMAV_VERSION_SIZE - 1] = '\0';
|
||||
}
|
||||
|
||||
const char *clamav_version()
|
||||
{
|
||||
- return CLAMAV_VERSION;
|
||||
+ return _CLAMAV_VERSION;
|
||||
}
|
||||
|
||||
const char *clamav_signature()
|
Loading…
Reference in a new issue