svn commit: r518789 - in head/www/c-icap-modules: . files

[Rodrigo Osorio]

Author: rodrigo
Date: Sun Dec  1 17:40:06 2019
New Revision: 518789
URL: https://svnweb.freebsd.org/changeset/ports/518789

Log:
  Unbreak www/c-icap-modules
  
  After clamav upgrade, there is a CLAMAV_VERSION variable on
  clamav-version.h that conflicts with c-icap-modules.
  
  Rename local variable adding a _ prefix to prevent the collision
  and fix the build.
  
  PR:		242231
  Submitted by:	garga
  Obtained from:	pfSense
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Added:
  head/www/c-icap-modules/files/patch-services_virus__scan_clamav__mod.c   (contents, props changed)
Modified:
  head/www/c-icap-modules/Makefile

Modified: head/www/c-icap-modules/Makefile
==============================================================================
--- head/www/c-icap-modules/Makefile	Sun Dec  1 17:33:54 2019	(r518788)
+++ head/www/c-icap-modules/Makefile	Sun Dec  1 17:40:06 2019	(r518789)
@@ -15,8 +15,6 @@ COMMENT=	Modules for c-icap: virus_scan and srv_url_ch
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		fails to build
-
 LIB_DEPENDS=	libicapapi.so:www/c-icap \
 		libclamav.so:security/clamav
 

Added: head/www/c-icap-modules/files/patch-services_virus__scan_clamav__mod.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/c-icap-modules/files/patch-services_virus__scan_clamav__mod.c	Sun Dec  1 17:40:06 2019	(r518789)
@@ -0,0 +1,30 @@
+--- 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()