From owner-svn-ports-head@freebsd.org Fri Nov 30 10:53:41 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B9A3113FBD4; Fri, 30 Nov 2018 10:53:41 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D38FD7C18E; Fri, 30 Nov 2018 10:53:40 +0000 (UTC) (envelope-from ler@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 95062279B2; Fri, 30 Nov 2018 10:53:40 +0000 (UTC) (envelope-from ler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAUAreeh004665; Fri, 30 Nov 2018 10:53:40 GMT (envelope-from ler@FreeBSD.org) Received: (from ler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAUAreVk004664; Fri, 30 Nov 2018 10:53:40 GMT (envelope-from ler@FreeBSD.org) Message-Id: <201811301053.wAUAreVk004664@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ler set sender to ler@FreeBSD.org using -f From: Larry Rosenman Date: Fri, 30 Nov 2018 10:53:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486246 - head/security/clamav X-SVN-Group: ports-head X-SVN-Commit-Author: ler X-SVN-Commit-Paths: head/security/clamav X-SVN-Commit-Revision: 486246 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D38FD7C18E X-Spamd-Result: default: False [0.90 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.34)[0.335,0]; NEURAL_SPAM_SHORT(0.26)[0.257,0]; NEURAL_SPAM_MEDIUM(0.31)[0.312,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Nov 2018 10:53:41 -0000 Author: ler Date: Fri Nov 30 10:53:39 2018 New Revision: 486246 URL: https://svnweb.freebsd.org/changeset/ports/486246 Log: security/clamav: really do the right thing with the MSPACK option. previous patch added the configure argument to find archivers/libmspack installed, but neglected to set USES+= pkgconfig to actually have the binary use that version. With it now properly finding libmspack.so, revert to not trying to install libclammspack* if the MSPACK option is set. PR: 233658 Modified: head/security/clamav/Makefile head/security/clamav/pkg-plist Modified: head/security/clamav/Makefile ============================================================================== --- head/security/clamav/Makefile Fri Nov 30 10:39:42 2018 (r486245) +++ head/security/clamav/Makefile Fri Nov 30 10:53:39 2018 (r486246) @@ -2,7 +2,7 @@ PORTNAME= clamav PORTVERSION= 0.100.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://www.clamav.net/downloads/production/ @@ -16,7 +16,7 @@ BUILD_DEPENDS= pkg-config:devel/pkgconf LIB_DEPENDS= libltdl.so:devel/libltdl \ libcurl.so:ftp/curl -USES= cpe gmake gnome libtool ncurses pathfix ssl +USES= cpe gmake gnome libtool ncurses pathfix pkgconfig ssl USE_RC_SUBR= clamav-clamd clamav-freshclam USE_LDCONFIG= yes @@ -97,7 +97,7 @@ LHA_RUN_DEPENDS= lha:archivers/lha MILTER_CONFIGURE_WITH= sendmail=/usr/sbin/sendmail MILTER_CONFIGURE_ENABLE=milter MILTER_USE= RC_SUBR=clamav-milter -MSPACK_CONFIGURE_WITH= system-libmspack=${LOCALBASE}/lib/libmspack.so +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 Modified: head/security/clamav/pkg-plist ============================================================================== --- head/security/clamav/pkg-plist Fri Nov 30 10:39:42 2018 (r486245) +++ head/security/clamav/pkg-plist Fri Nov 30 10:53:39 2018 (r486246) @@ -2,6 +2,11 @@ %%JSON%%man/man1/clamsubmit.1.gz %%MILTER%%@sample etc/clamav-milter.conf.sample %%MILTER%%sbin/clamav-milter +%%NO_MSPACK%%lib/libclammspack.a +%%NO_MSPACK%%lib/libclammspack.so +%%NO_MSPACK%%lib/libclammspack.so.0 +%%NO_MSPACK%%lib/libclammspack.so.0.1.0 +%%NO_MSPACK%%libdata/pkgconfig/libclammspack.pc %%PORTDOCS%%%%DOCSDIR%%/html/clam.png %%PORTDOCS%%%%DOCSDIR%%/html/clamdoc.css %%PORTDOCS%%%%DOCSDIR%%/html/clamdoc.html @@ -107,12 +112,7 @@ include/clamav.h lib/libclamav.so lib/libclamav.so.7 lib/libclamav.so.7.1.1 -lib/libclammspack.a -lib/libclammspack.so -lib/libclammspack.so.0 -lib/libclammspack.so.0.1.0 libdata/pkgconfig/libclamav.pc -libdata/pkgconfig/libclammspack.pc man/man1/clambc.1.gz man/man1/clamconf.1.gz man/man1/clamdscan.1.gz