svn commit: r459992 - in branches/2018Q1/security/clamav: . files

[Larry Rosenman]

Author: ler
Date: Fri Jan 26 14:14:09 2018
New Revision: 459992
URL: https://svnweb.freebsd.org/changeset/ports/459992

Log:
  MFH: r459048 r459972
  
  security/clamav: remove LHA from default options.
  
  r459039 made distribution of the lha binary not allowed.
  
  PR:		225180
  Submitted by:	antoine
  
  security/clamav: upgrade to 0.99.3.
  * Update to 0.99.3.
  * Fix following portlint warnings.
  ** Move position of USES in Makefile.
  ** Remove reference of undefined LLVM option.
  ** Regenerate files/patch-libclamav_regex_pcre.c by 'make makepatch
  ** add USES=ssl
  
  PR:		225461
  Submitted by:	yasu at utahime.org
  
  Approved by:	ports-secteam (swills)
  Security:	b464f61b-84c7-4e1c-8ad4-6cf9efffd025

Deleted:
  branches/2018Q1/security/clamav/files/patch-configure
Modified:
  branches/2018Q1/security/clamav/Makefile
  branches/2018Q1/security/clamav/distinfo
  branches/2018Q1/security/clamav/files/patch-libclamav_regex_pcre.c
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/security/clamav/Makefile
==============================================================================
--- branches/2018Q1/security/clamav/Makefile	Fri Jan 26 13:23:59 2018	(r459991)
+++ branches/2018Q1/security/clamav/Makefile	Fri Jan 26 14:14:09 2018	(r459992)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	0.99.2
-PORTREVISION=	8
+PORTVERSION=	0.99.3
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/downloads/production/
 
@@ -28,7 +27,7 @@ STDERR_DESC=		Print logs to stderr instead of stdout
 EXPERIMENTAL_DESC=	Build experimental code
 DMG_XAR_DESC=		Enable DMG and XAR archives support
 
-OPTIONS_DEFAULT=	ARC ARJ LHA UNZOO UNRAR DMG_XAR \
+OPTIONS_DEFAULT=	ARC ARJ UNZOO UNRAR DMG_XAR \
 			JSON PCRE
 
 ARC_RUN_DEPENDS=	arc:archivers/arc
@@ -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} ""; \

Modified: branches/2018Q1/security/clamav/distinfo
==============================================================================
--- branches/2018Q1/security/clamav/distinfo	Fri Jan 26 13:23:59 2018	(r459991)
+++ branches/2018Q1/security/clamav/distinfo	Fri Jan 26 14:14:09 2018	(r459992)
@@ -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

Modified: branches/2018Q1/security/clamav/files/patch-libclamav_regex_pcre.c
==============================================================================
--- branches/2018Q1/security/clamav/files/patch-libclamav_regex_pcre.c	Fri Jan 26 13:23:59 2018	(r459991)
+++ branches/2018Q1/security/clamav/files/patch-libclamav_regex_pcre.c	Fri Jan 26 14:14:09 2018	(r459992)
@@ -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)