svn commit: r525452 - branches/2020Q1/security/clamav

[Kurt Jaeger]

Author: pi
Date: Thu Feb  6 21:05:07 2020
New Revision: 525452
URL: https://svnweb.freebsd.org/changeset/ports/525452

Log:
  MFH: r525450
  
  security/clamav: upgrade 0.102.1 -> 0.102.2
  
  - Remove MSPACK option and always use archivers/libmspack in
    accordance with policy about bundled library described in 6.2 of
    Porter's Handbook.
  - Remove obsolete and no-op options from CONFIGURE_ARGS.
  
  PR:		243914
  Submitted by:	Yasuhiro KIMURA <yasu at utahime.org> (maintainer)
  Relnotes:	https://blog.clamav.net/2020/02/clamav-01022-security-patch-released.html
  Security:	CVE-2020-3123
  Approved by:	portmgr (security blanket)

Modified:
  branches/2020Q1/security/clamav/Makefile
  branches/2020Q1/security/clamav/distinfo
  branches/2020Q1/security/clamav/pkg-plist
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/security/clamav/Makefile
==============================================================================
--- branches/2020Q1/security/clamav/Makefile	Thu Feb  6 21:02:18 2020	(r525451)
+++ branches/2020Q1/security/clamav/Makefile	Thu Feb  6 21:05:07 2020	(r525452)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	0.102.1
+PORTVERSION=	0.102.2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	https://www.clamav.net/downloads/production/
@@ -12,7 +12,8 @@ COMMENT=	Command line virus scanner written entirely i
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libltdl.so:devel/libltdl \
+LIB_DEPENDS=	libmspack.so:archivers/libmspack \
+		libltdl.so:devel/libltdl \
 		libcurl.so:ftp/curl
 
 USES=		compiler cpe gmake gnome libtool ncurses pathfix pkgconfig ssl
@@ -30,13 +31,10 @@ PLIST_SUB+=	DBDIR=${DBDIR} \
 
 CONFIGURE_ARGS=	--libdir=${LOCALBASE}/lib \
 		--with-dbdir=${DBDIR} \
-		--disable-clamuko \
-		--disable-clamav \
 		--enable-bigstack \
-		--enable-readdir_r \
-		--enable-gethostbyname_r \
 		--disable-dependency-tracking \
-		--enable-clamdtop
+		--enable-clamdtop \
+		--with-system-libmspack=${LOCALBASE}/lib/libmspack.so
 
 CFLAGS_i386=	-march=i486
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -61,7 +59,7 @@ PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
 		CLAMAVGROUP=${CLAMAVGROUP}
 
 OPTIONS_DEFINE=	ARC ARJ DOCS DMG_XAR EXPERIMENTAL JSON LDAP ICONV IPV6 \
-		LHA MILTER MSPACK PCRE STDERR TESTS UNZOO UNRAR
+		LHA MILTER PCRE STDERR TESTS UNZOO UNRAR
 
 OPTIONS_DEFAULT=	ARC ARJ DMG_XAR JSON MILTER PCRE UNZOO UNRAR
 OPTIONS_SUB=	yes
@@ -72,7 +70,6 @@ DMG_XAR_DESC=		Enable DMG and XAR archives support
 EXPERIMENTAL_DESC=	Build experimental code
 LHA_DESC=		Enable lha archives support
 MILTER_DESC=		Compile the milter interface
-MSPACK_DESC=		Get mspack support from ports (otherwise use bundled)
 STDERR_DESC=		Print logs to stderr instead of stdout
 TESTS_DESC=		Run compile-time tests (req. python)
 UNZOO_DESC=		Enable zoo archives support
@@ -96,8 +93,6 @@ MILTER_CONFIGURE_ENABLE=milter
 MILTER_LIB_DEPENDS+=	libmilter.so:mail/libmilter
 .endif
 MILTER_USE=		RC_SUBR=clamav-milter
-MSPACK_CONFIGURE_WITH=	system-libmspack=${LOCALBASE}/lib/libmspack.so
-MSPACK_LIB_DEPENDS=	libmspack.so:archivers/libmspack
 PCRE_CONFIGURE_WITH=	pcre
 PCRE_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 STDERR_EXTRA_PATCHES=	${FILESDIR}/extra-patch-shared_output.c

Modified: branches/2020Q1/security/clamav/distinfo
==============================================================================
--- branches/2020Q1/security/clamav/distinfo	Thu Feb  6 21:02:18 2020	(r525451)
+++ branches/2020Q1/security/clamav/distinfo	Thu Feb  6 21:05:07 2020	(r525452)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574671743
-SHA256 (clamav-0.102.1.tar.gz) = 0dbda8d0d990d068732966f13049d112a26dce62145d234383467c1d877dedd6
-SIZE (clamav-0.102.1.tar.gz) = 13215586
+TIMESTAMP = 1580934691
+SHA256 (clamav-0.102.2.tar.gz) = 89fcdcc0eba329ca84d270df09d2bb89ae55f5024b0c3bddb817512fb2c907d3
+SIZE (clamav-0.102.2.tar.gz) = 13227538

Modified: branches/2020Q1/security/clamav/pkg-plist
==============================================================================
--- branches/2020Q1/security/clamav/pkg-plist	Thu Feb  6 21:02:18 2020	(r525451)
+++ branches/2020Q1/security/clamav/pkg-plist	Thu Feb  6 21:05:07 2020	(r525452)
@@ -2,9 +2,6 @@
 %%JSON%%man/man1/clamsubmit.1.gz
 %%MILTER%%@sample etc/clamav-milter.conf.sample
 %%MILTER%%sbin/clamav-milter
-%%NO_MSPACK%%lib/libclammspack.so
-%%NO_MSPACK%%lib/libclammspack.so.0
-%%NO_MSPACK%%lib/libclammspack.so.0.1.0
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix/Steps-Debian-Ubuntu.html