Update to 0.103.0.

PR:		249318
Submitted by:	maintainer

3 files changed, 70 insertions, 73 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 4baa0e81a2b5..741cd9233cee 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	0.102.4
+PORTVERSION=	0.103.0
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	https://www.clamav.net/downloads/production/
@@ -12,9 +12,9 @@ COMMENT=	Command line virus scanner written entirely in C
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libmspack.so:archivers/libmspack \
+LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libltdl.so:devel/libltdl \
-		libcurl.so:ftp/curl
+		libmspack.so:archivers/libmspack
 
 USES=		compiler cpe gmake gnome libtool ncurses pathfix pkgconfig ssl
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
@@ -23,11 +23,11 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-PLIST_SUB+=	DBDIR=${DBDIR} \
-		LOGDIR=${LOGDIR} \
-		RUNDIR=${RUNDIR} \
+PLIST_SUB+=	CLAMAVGROUP=${CLAMAVGROUP} \
 		CLAMAVUSER=${CLAMAVUSER} \
-		CLAMAVGROUP=${CLAMAVGROUP}
+		DBDIR=${DBDIR} \
+		LOGDIR=${LOGDIR} \
+		RUNDIR=${RUNDIR}
 
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--enable-bigstack \
@@ -45,25 +45,25 @@ CFLAGS_i386=	-march=i486
 LDFLAGS+=	-lthr
 
 SUB_FILES=	pkg-deinstall
-SUB_LIST+=	DBDIR=${DBDIR} \
-		LOGDIR=${LOGDIR} \
-		RUNDIR=${RUNDIR} \
-		CHMOD=${CHMOD} \
+SUB_LIST+=	CHMOD=${CHMOD} \
 		CHOWN=${CHOWN} \
-		CLAMAVUSER=${CLAMAVUSER} \
-		CLAMAVGROUP=${CLAMAVGROUP} \
-		CLAMAV_CLAMD_SOCKET=${CLAMAV_CLAMD_SOCKET} \
 		CLAMAV_CLAMD_PIDFILE=${CLAMAV_CLAMD_PIDFILE} \
-		CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET}
+		CLAMAV_CLAMD_SOCKET=${CLAMAV_CLAMD_SOCKET} \
+		CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET} \
+		CLAMAVGROUP=${CLAMAVGROUP} \
+		CLAMAVUSER=${CLAMAVUSER} \
+		DBDIR=${DBDIR} \
+		LOGDIR=${LOGDIR} \
+		RUNDIR=${RUNDIR}
 
-PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
-		CLAMAVGROUP=${CLAMAVGROUP}
+PLIST_SUB+=	CLAMAVGROUP=${CLAMAVGROUP} \
+		CLAMAVUSER=${CLAMAVUSER}
 
-OPTIONS_DEFINE=	ARC ARJ DOCS DMG_XAR EXPERIMENTAL JSON LDAP ICONV IPV6 \
-		LHA MILTER PCRE STDERR TESTS UNZOO UNRAR
+OPTIONS_DEFINE=	ARC ARJ DMG_XAR DOCS EXPERIMENTAL ICONV IPV6 JSON LDAP LHA \
+		MILTER PCRE STDERR TESTS UNRAR UNZOO
 
-OPTIONS_DEFAULT=	ARC ARJ DMG_XAR JSON MILTER PCRE UNZOO UNRAR
-OPTIONS_SUB=	yes
+OPTIONS_DEFAULT=	ARC ARJ DMG_XAR JSON MILTER PCRE UNRAR UNZOO
+OPTIONS_SUB=		yes
 
 ARC_DESC=		Enable arch archives support
 ARJ_DESC=		Enable arj archives support
@@ -75,35 +75,35 @@ STDERR_DESC=		Print logs to stderr instead of stdout
 TESTS_DESC=		Run compile-time tests (req. python)
 UNZOO_DESC=		Enable zoo archives support
 
-ARC_RUN_DEPENDS=	arc:archivers/arc
-ARJ_RUN_DEPENDS=	arj:archivers/arj
-DMG_XAR_CONFIGURE_WITH=	xml=${LOCALBASE}
-DMG_XAR_USE=		GNOME=libxml2
+ARC_RUN_DEPENDS=		arc:archivers/arc
+ARJ_RUN_DEPENDS=		arj:archivers/arj
+DMG_XAR_CONFIGURE_WITH=		xml=${LOCALBASE}
+DMG_XAR_USE=			GNOME=libxml2
 EXPERIMENTAL_CONFIGURE_ENABLE=	experimental
-ICONV_CONFIGURE_WITH=	iconv
-ICONV_USES=		iconv
-IPV6_CONFIGURE_ENABLE=	ipv6
-JSON_CONFIGURE_WITH=	libjson=${LOCALBASE}
-JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
-LDAP_LDFLAGS=		-lldap -L${LOCALBASE}/lib
-LDAP_USE=		OPENLDAP=yes
-LHA_RUN_DEPENDS=	lha:archivers/lha
-MILTER_CONFIGURE_WITH=	sendmail=/usr/sbin/sendmail
-MILTER_CONFIGURE_ENABLE=milter
+ICONV_CONFIGURE_WITH=		iconv
+ICONV_USES=			iconv
+IPV6_CONFIGURE_ENABLE=		ipv6
+JSON_CONFIGURE_WITH=		libjson=${LOCALBASE}
+JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
+LDAP_LDFLAGS=			-lldap -L${LOCALBASE}/lib
+LDAP_USE=			OPENLDAP=yes
+LHA_RUN_DEPENDS=		lha:archivers/lha
+MILTER_CONFIGURE_WITH=		sendmail=/usr/sbin/sendmail
+MILTER_CONFIGURE_ENABLE=	milter
 .if !exists(/usr/lib/libmilter.so)
-MILTER_CFLAGS=		-I${LOCALBASE}/include
-MILTER_LDFLAGS=		-L${LOCALBASE}/lib
-MILTER_LIB_DEPENDS+=	libmilter.so:mail/libmilter
+MILTER_CFLAGS=			-I${LOCALBASE}/include
+MILTER_LDFLAGS=			-L${LOCALBASE}/lib
+MILTER_LIB_DEPENDS+=		libmilter.so:mail/libmilter
 .endif
-MILTER_USE=		RC_SUBR=clamav-milter
-PCRE_CONFIGURE_WITH=	pcre
-PCRE_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
-STDERR_EXTRA_PATCHES=	${FILESDIR}/extra-patch-shared_output.c
-TESTS_CONFIGURE_ENABLE=	check
-TESTS_BUILD_DEPENDS=	${LOCALBASE}/include/check.h:devel/check
-TESTS_USES=		python:build
-UNRAR_CONFIGURE_ENABLE=	unrar
-UNZOO_RUN_DEPENDS=	unzoo:archivers/unzoo
+MILTER_USE=			RC_SUBR=clamav-milter
+PCRE_CONFIGURE_WITH=		pcre
+PCRE_LIB_DEPENDS=		libpcre2-8.so:devel/pcre2
+STDERR_EXTRA_PATCHES=		${FILESDIR}/extra-patch-shared_output.c
+TESTS_CONFIGURE_ENABLE=		check
+TESTS_BUILD_DEPENDS=		${LOCALBASE}/include/check.h:devel/check
+TESTS_USES=			python:build
+UNRAR_CONFIGURE_ENABLE=		unrar
+UNZOO_RUN_DEPENDS=		unzoo:archivers/unzoo
 
 CLAMAVUSER?=	clamav
 CLAMAVGROUP?=	clamav
@@ -113,11 +113,11 @@ CLAMAV_CLAMD_PIDFILE?=	${RUNDIR}/clamd.pid
 CLAMAV_MILTER_SOCKET?=	${RUNDIR}/clmilter.sock
 
 .if ${CLAMAVUSER} == "clamav"
-USERS=	clamav
+USERS=		clamav
 .endif
 
 .if ${CLAMAVGROUP} == "clamav"
-GROUPS=	clamav mail
+GROUPS=		clamav mail
 .endif
 
 DBDIR=		/var/db/clamav
@@ -125,26 +125,23 @@ LOGDIR=		/var/log/clamav
 RUNDIR=		/var/run/clamav
 PY_NO_THREAD=	${WRKDIR}/.python-has-no-threads
 
-SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
-		-e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \
-		-e 's|^\#?(PidFile) .*/([a-z\-]+\.pid)$$|\1 ${RUNDIR}/\2|' \
-		-e 's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' \
-		-e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \
-		-e 's|^\#?(AllowSupplementaryGroups).*$$|\1 yes|' \
-		-e 's|^\#?(ScanMail).*$$|\1 yes|' \
-		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' \
-		-e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \
-		-e 's|^\#?(FixStaleSocket).*$$|\1 yes|' \
-		-e 's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' \
-		-e 's|^\#?(MilterSocket) */tmp.*$$|\1 ${CLAMAV_MILTER_SOCKET}|' \
-		-e 's|^\#?(ClamdSocket).*$$|\1 unix:${CLAMAV_CLAMD_SOCKET}|'
+SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' -e \
+		's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \
+		-e 's|^\#?(PidFile) .*/([a-z\-]+\.pid)$$|\1 ${RUNDIR}/\2|' -e \
+		's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' -e \
+		's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' -e \
+		's|^\#?(AllowSupplementaryGroups).*$$|\1 yes|' -e \
+		's|^\#?(ScanMail).*$$|\1 yes|' -e \
+		's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' -e \
+		's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' -e \
+		's|^\#?(FixStaleSocket).*$$|\1 yes|' -e \
+		's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' -e \
+		's|^\#?(MilterSocket) */tmp.*$$|\1 ${CLAMAV_MILTER_SOCKET}|' -e \
+		's|^\#?(ClamdSocket).*$$|\1 unix:${CLAMAV_CLAMD_SOCKET}|'
 
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lthr|g' \
-			  -e 's|LC_REVISION=22|LC_REVISION=24|' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} ${SED_CONF} \
 		${WRKSRC}/etc/clamd.conf.sample \
 		${WRKSRC}/etc/freshclam.conf.sample \
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 7521c8e15543..e0134b92b115 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594929106
-SHA256 (clamav-0.102.4.tar.gz) = eebd426a68020ecad0d2084b8c763e6898ccfd5febcae833d719640bb3ff391b
-SIZE (clamav-0.102.4.tar.gz) = 13234444
+TIMESTAMP = 1600093216
+SHA256 (clamav-0.103.0.tar.gz) = 32a9745277bfdda80e77ac9ca2f5990897418e9416880f3c31553ca673e80546
+SIZE (clamav-0.103.0.tar.gz) = 13357078
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index 12bd2707f35d..db14d904b9ac 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -12,6 +12,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/OnAccess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/AuthenticodeRules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/AllowLists.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/BodySignatureFormat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/BytecodeSignatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/ContainerMetadata.html
@@ -25,7 +26,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/HashSignatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/LogicalSignatures.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/PhishSigs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/Whitelists.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/YaraRules.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Usage.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Usage/Configuration.html
@@ -36,10 +36,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/libclamav.html
 %%UNRAR%%lib/libclamunrar.so
 %%UNRAR%%lib/libclamunrar.so.9
-%%UNRAR%%lib/libclamunrar.so.9.0.4
+%%UNRAR%%lib/libclamunrar.so.9.0.5
 %%UNRAR%%lib/libclamunrar_iface.so
 %%UNRAR%%lib/libclamunrar_iface.so.9
-%%UNRAR%%lib/libclamunrar_iface.so.9.0.4
+%%UNRAR%%lib/libclamunrar_iface.so.9.0.5
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%
@@ -60,10 +60,10 @@ include/clamav.h
 include/libfreshclam.h
 lib/libclamav.so
 lib/libclamav.so.9
-lib/libclamav.so.9.0.4
+lib/libclamav.so.9.0.5
 lib/libfreshclam.so
 lib/libfreshclam.so.2
-lib/libfreshclam.so.2.0.0
+lib/libfreshclam.so.2.0.1
 libdata/pkgconfig/libclamav.pc
 man/man1/clambc.1.gz
 man/man1/clamconf.1.gz