security/clamav: sync with upstream

Taken from: HardenedBSD
opnsense · Jan 26, 2018 · 46134d2 · 46134d2
1 parent 35dfedb
commit 46134d2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 31 deletions.
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	0.99.2
-PORTREVISION=	9
+PORTVERSION=	0.99.3
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/downloads/production/
 
@@ -51,9 +50,9 @@ IPV6_CONFIGURE_ENABLE=	ipv6
 DMG_XAR_CONFIGURE_ENABLE=	xml
 DMG_XAR_USE=		GNOME=libxml2
 
+USES=		cpe gmake libtool ncurses pathfix ssl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		cpe gmake libtool ncurses pathfix
 INSTALL_TARGET=	install-strip
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
 
@@ -177,7 +176,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
 		${WRKSRC}/libclamunrar/unrar.c
 
-.if ${PORT_OPTIONS:MLLVM} && ${PORT_OPTIONS:MTESTS}
+.if ${PORT_OPTIONS:MTESTS}
 pre-configure:
 	@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
 		${ECHO_MSG} ""; \

diff --git a/security/clamav/distinfo b/security/clamav/distinfo
@@ -1,2 +1,3 @@
-SHA256 (clamav-0.99.2.tar.gz) = 167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a
-SIZE (clamav-0.99.2.tar.gz) = 16067497
+TIMESTAMP = 1516919350
+SHA256 (clamav-0.99.3.tar.gz) = 00fa5292a6e00a3a4035b826267748965d5d2c4943d8ff417d740238263e8e84
+SIZE (clamav-0.99.3.tar.gz) = 16082645
diff --git a/security/clamav/files/patch-configure b/security/clamav/files/patch-configure
diff --git a/security/clamav/files/patch-libclamav_regex_pcre.c b/security/clamav/files/patch-libclamav_regex_pcre.c
@@ -1,5 +1,5 @@
---- libclamav/regex_pcre.c~	2017-11-28 14:40:56.484208243 +0100
-+++ libclamav/regex_pcre.c	2017-11-28 14:41:07.301207800 +0100
+--- libclamav/regex_pcre.c.orig	2018-01-23 21:04:06 UTC
++++ libclamav/regex_pcre.c
 @@ -112,7 +112,8 @@ int cli_pcre_addoptions(struct cli_pcre_
  #if USING_PCRE2
  int cli_pcre_compile(struct cli_pcre_data *pd, long long unsigned match_limit, long long unsigned match_limit_recursion, unsigned int options, int opt_override)