From owner-svn-ports-all@freebsd.org Tue Nov 12 20:07:22 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 806661B95C9; Tue, 12 Nov 2019 20:07:22 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47CJgZ2lgKz42yt; Tue, 12 Nov 2019 20:07:22 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3D74A5008; Tue, 12 Nov 2019 20:07:22 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xACK7LIl058584; Tue, 12 Nov 2019 20:07:21 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xACK7Kog058578; Tue, 12 Nov 2019 20:07:20 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201911122007.xACK7Kog058578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Tue, 12 Nov 2019 20:07:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517347 - in head: . security security/clamav security/clamav-milter security/clamav/files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head: . security security/clamav security/clamav-milter security/clamav/files X-SVN-Commit-Revision: 517347 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2019 20:07:22 -0000 Author: pi Date: Tue Nov 12 20:07:20 2019 New Revision: 517347 URL: https://svnweb.freebsd.org/changeset/ports/517347 Log: security/clamav: upgrade 0.101.4 -> 0.102.0 - Enable MILTER option by default - Disable MSPACK option by default - Sort OPTIONS_DEFINE, OPTIONS_DEFAULT and *_DESC - Remove security/clamav-milter, slave port that enables MILTER option - Add entry for security/clamav-milter to MOVED PR: 241860 Submitted by: Yasuhiro Kimura (maintainer) Added: head/security/clamav/files/patch-configure.ac (contents, props changed) Deleted: head/security/clamav-milter/ Modified: head/MOVED head/security/Makefile head/security/clamav/Makefile head/security/clamav/distinfo head/security/clamav/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Tue Nov 12 18:42:13 2019 (r517346) +++ head/MOVED Tue Nov 12 20:07:20 2019 (r517347) @@ -13455,3 +13455,4 @@ www/tomcat6|www/tomcat7|2019-11-02|Has expired: End-of www/p5-WWW-Mechanize-PhantomJS||2019-11-02|Has expired: uses expired lang/phantomjs x11/xfwp||2019-11-06|Has expired: Deprecated upstream x11/xfindproxy||2019-11-06|Has expired: Deprecated upstream +security/clamav-milter|security/clamav|2019-11-12|Now that MILTER option is enabled by default, use security/clamav instead Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Tue Nov 12 18:42:13 2019 (r517346) +++ head/security/Makefile Tue Nov 12 20:07:20 2019 (r517347) @@ -86,7 +86,6 @@ SUBDIR += cl-md5-sbcl SUBDIR += clamassassin SUBDIR += clamav - SUBDIR += clamav-milter SUBDIR += clamav-unofficial-sigs SUBDIR += clamd-stream-client SUBDIR += clamfs Modified: head/security/clamav/Makefile ============================================================================== --- head/security/clamav/Makefile Tue Nov 12 18:42:13 2019 (r517346) +++ head/security/clamav/Makefile Tue Nov 12 20:07:20 2019 (r517347) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= clamav -PORTVERSION= 0.101.4 +PORTVERSION= 0.102.0 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://www.clamav.net/downloads/production/ @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libltdl.so:devel/libltdl \ libcurl.so:ftp/curl -USES= compiler cpe gmake gnome libtool ncurses pathfix pkgconfig ssl +USES= autoreconf compiler cpe gmake gnome libtool ncurses pathfix pkgconfig ssl USE_RC_SUBR= clamav-clamd clamav-freshclam USE_LDCONFIG= yes @@ -45,8 +45,6 @@ CPPFLAGS+= -I${LOCALBASE}/include # force to use -lthr until it's not fixed. LDFLAGS+= -lthr -L${LOCALBASE}/lib -CONFLICTS?= clamav-milter-[0-9]* - SUB_FILES= pkg-deinstall SUB_LIST+= DBDIR=${DBDIR} \ LOGDIR=${LOGDIR} \ @@ -62,23 +60,22 @@ SUB_LIST+= DBDIR=${DBDIR} \ PLIST_SUB+= CLAMAVUSER=${CLAMAVUSER} \ CLAMAVGROUP=${CLAMAVGROUP} -OPTIONS_DEFINE= ARC ARJ LHA UNZOO UNRAR TESTS MILTER MSPACK LDAP ICONV STDERR \ - EXPERIMENTAL DOCS IPV6 DMG_XAR JSON PCRE +OPTIONS_DEFINE= ARC ARJ DOCS DMG_XAR EXPERIMENTAL JSON LDAP ICONV IPV6 \ + LHA MILTER MSPACK PCRE STDERR TESTS UNZOO UNRAR -OPTIONS_DEFAULT= ARC ARJ UNZOO UNRAR DMG_XAR \ - JSON PCRE MSPACK +OPTIONS_DEFAULT= ARC ARJ DMG_XAR JSON MILTER PCRE UNZOO UNRAR OPTIONS_SUB= yes ARC_DESC= Enable arch archives support ARJ_DESC= Enable arj archives support +DMG_XAR_DESC= Enable DMG and XAR archives support +EXPERIMENTAL_DESC= Build experimental code LHA_DESC= Enable lha archives support -UNZOO_DESC= Enable zoo archives support -TESTS_DESC= Run compile-time tests (req. python) 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 -EXPERIMENTAL_DESC= Build experimental code -DMG_XAR_DESC= Enable DMG and XAR archives support +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 Modified: head/security/clamav/distinfo ============================================================================== --- head/security/clamav/distinfo Tue Nov 12 18:42:13 2019 (r517346) +++ head/security/clamav/distinfo Tue Nov 12 20:07:20 2019 (r517347) @@ -1,3 +1,3 @@ -TIMESTAMP = 1566501172 -SHA256 (clamav-0.101.4.tar.gz) = 0bf094f0919d158a578421d66bc2569c8c8181233ba162bb51722f98c802bccd -SIZE (clamav-0.101.4.tar.gz) = 21408145 +TIMESTAMP = 1573089073 +SHA256 (clamav-0.102.0.tar.gz) = 48fe188c46c793c2d0cb5c81c106e4690251aff6dc8aa6575dc688343291bee1 +SIZE (clamav-0.102.0.tar.gz) = 13211357 Added: head/security/clamav/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/clamav/files/patch-configure.ac Tue Nov 12 20:07:20 2019 (r517347) @@ -0,0 +1,18 @@ +--- configure.ac.orig 2019-11-07 02:02:07 UTC ++++ configure.ac +@@ -108,6 +108,7 @@ m4_include([m4/reorganization/libs/bzip.m4]) + m4_include([m4/reorganization/libs/unrar.m4]) + + m4_include([m4/reorganization/libs/systemd.m4]) ++m4_include([m4/reorganization/milter/enable.m4]) + m4_include([m4/reorganization/milter/check.m4]) + m4_include([m4/reorganization/clamdtop.m4]) + +@@ -147,7 +148,6 @@ m4_include([m4/reorganization/code_checks/ipv6.m4]) + m4_include([m4/reorganization/code_checks/dns.m4]) + m4_include([m4/reorganization/code_checks/fanotify.m4]) + m4_include([m4/reorganization/code_checks/setpgrp.m4]) +-m4_include([m4/reorganization/milter/enable.m4]) + m4_include([m4/reorganization/utility_checks/id.m4]) + m4_include([m4/reorganization/utility_checks/yp.m4]) + m4_include([m4/reorganization/usergroup.m4]) Modified: head/security/clamav/pkg-plist ============================================================================== --- head/security/clamav/pkg-plist Tue Nov 12 18:42:13 2019 (r517346) +++ head/security/clamav/pkg-plist Tue Nov 12 20:07:20 2019 (r517347) @@ -39,10 +39,10 @@ %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/libclamav.html %%UNRAR%%lib/libclamunrar.so %%UNRAR%%lib/libclamunrar.so.9 -%%UNRAR%%lib/libclamunrar.so.9.0.2 +%%UNRAR%%lib/libclamunrar.so.9.0.4 %%UNRAR%%lib/libclamunrar_iface.so %%UNRAR%%lib/libclamunrar_iface.so.9 -%%UNRAR%%lib/libclamunrar_iface.so.9.0.2 +%%UNRAR%%lib/libclamunrar_iface.so.9.0.4 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%% @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%% @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%% @@ -58,10 +58,15 @@ bin/freshclam bin/sigtool include/clamav-config.h include/clamav-types.h +include/clamav-version.h include/clamav.h +include/libfreshclam.h lib/libclamav.so lib/libclamav.so.9 -lib/libclamav.so.9.0.2 +lib/libclamav.so.9.0.4 +lib/libfreshclam.so +lib/libfreshclam.so.2 +lib/libfreshclam.so.2.0.0 libdata/pkgconfig/libclamav.pc man/man1/clambc.1.gz man/man1/clamconf.1.gz