From owner-svn-ports-head@FreeBSD.ORG Fri Nov 21 16:42:52 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6CBB965A; Fri, 21 Nov 2014 16:42:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 583D0A07; Fri, 21 Nov 2014 16:42:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALGgqDk015049; Fri, 21 Nov 2014 16:42:52 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALGgp1i015039; Fri, 21 Nov 2014 16:42:51 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201411211642.sALGgp1i015039@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Fri, 21 Nov 2014 16:42:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373003 - in head/security/clamav: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 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, 21 Nov 2014 16:42:52 -0000 Author: garga Date: Fri Nov 21 16:42:51 2014 New Revision: 373003 URL: https://svnweb.freebsd.org/changeset/ports/373003 QAT: https://qat.redports.org/buildarchive/r373003/ Log: - Fix error building clamav when old version is installed and openssl from base is also installed [1] - Fix library version decrease that happened when moved to 0.98.5 [2] - Bump PORTREVISION PR: 195182 Obtained from: https://bugzilla.clamav.net/show_bug.cgi?id=11194 [1] (based on) https://bugzilla.clamav.net/show_bug.cgi?id=11193 [2] Added: head/security/clamav/files/patch-fix-11194 (contents, props changed) Modified: head/security/clamav/Makefile head/security/clamav/pkg-plist Modified: head/security/clamav/Makefile ============================================================================== --- head/security/clamav/Makefile Fri Nov 21 16:35:45 2014 (r373002) +++ head/security/clamav/Makefile Fri Nov 21 16:42:51 2014 (r373003) @@ -3,6 +3,7 @@ PORTNAME= clamav PORTVERSION= 0.98.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF @@ -167,6 +168,7 @@ CFLAGS+= -march=i486 post-patch: @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ + -e 's|LC_REVISION=22|LC_REVISION=24|' \ ${WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's,^\(pkgconfigdir = \).*$$,\1$$\(prefix\)/libdata/pkgconfig,g' \ ${WRKSRC}/Makefile.in Added: head/security/clamav/files/patch-fix-11194 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/clamav/files/patch-fix-11194 Fri Nov 21 16:42:51 2014 (r373003) @@ -0,0 +1,84 @@ +diff -ruN ../clamav-0.98.5.orig/clamav-milter/Makefile.in ./clamav-milter/Makefile.in +--- ../clamav-0.98.5.orig/clamav-milter/Makefile.in 2014-11-21 14:24:08.000000000 -0200 ++++ ./clamav-milter/Makefile.in 2014-11-21 14:27:37.000000000 -0200 +@@ -504,7 +504,7 @@ + + @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_builddir)/docs/man/clamav-milter.8 + @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@AM_CFLAGS = @WERR_CFLAGS_MILTER@ +-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @JSON_CPPFLAGS@ ++AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ + CLEANFILES = *.gcda *.gcno + all: all-am + +diff -ruN ../clamav-0.98.5.orig/clamd/Makefile.in ./clamd/Makefile.in +--- ../clamav-0.98.5.orig/clamd/Makefile.in 2014-11-21 14:24:08.000000000 -0200 ++++ ./clamd/Makefile.in 2014-11-21 14:27:58.000000000 -0200 +@@ -479,7 +479,7 @@ + @BUILD_CLAMD_TRUE@ fan.h + + @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@ +-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav ++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ + + # it does support --help and --version but with the default config file + # it outputs an error message which tells us to edit the config files +diff -ruN ../clamav-0.98.5.orig/clamdscan/Makefile.in ./clamdscan/Makefile.in +--- ../clamav-0.98.5.orig/clamdscan/Makefile.in 2014-11-21 14:24:08.000000000 -0200 ++++ ./clamdscan/Makefile.in 2014-11-21 14:28:39.000000000 -0200 +@@ -468,7 +468,7 @@ + @BUILD_CLAMD_TRUE@ client.h + + @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@ +-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@ ++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@ + AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT) + CLEANFILES = *.gcda *.gcno + all: all-am +diff -ruN ../clamav-0.98.5.orig/clamscan/Makefile.in ./clamscan/Makefile.in +--- ../clamav-0.98.5.orig/clamscan/Makefile.in 2014-11-21 14:24:08.000000000 -0200 ++++ ./clamscan/Makefile.in 2014-11-21 14:30:29.000000000 -0200 +@@ -456,7 +456,7 @@ + manager.h + + AM_CFLAGS = @WERR_CFLAGS@ +-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@ ++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @CLAMSCAN_CPPFLAGS@ + CLEANFILES = *.gcda *.gcno + all: all-am + +diff -ruN ../clamav-0.98.5.orig/clamsubmit/Makefile.in ./clamsubmit/Makefile.in +--- ../clamav-0.98.5.orig/clamsubmit/Makefile.in 2014-11-21 14:24:08.000000000 -0200 ++++ ./clamsubmit/Makefile.in 2014-11-21 14:30:45.000000000 -0200 +@@ -449,7 +449,7 @@ + clamsubmit.c + + AM_CFLAGS = @WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@ +-AM_CPPFLAGS = @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav ++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @JSON_CPPFLAGS@ + AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamsubmit$(EXEEXT) + CLEANFILES = *.gcda *.gcno + all: all-am +diff -ruN ../clamav-0.98.5.orig/freshclam/Makefile.in ./freshclam/Makefile.in +--- ../clamav-0.98.5.orig/freshclam/Makefile.in 2014-11-21 14:24:08.000000000 -0200 ++++ ./freshclam/Makefile.in 2014-11-21 14:31:23.000000000 -0200 +@@ -472,7 +472,7 @@ + mirman.h + + AM_CFLAGS = @WERR_CFLAGS@ +-AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@ ++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@ @JSON_CPPFLAGS@ @SSL_CPPFLAGS@ + AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT) + CLEANFILES = *.gcda *.gcno + all: all-am +diff -ruN ../clamav-0.98.5.orig/sigtool/Makefile.in ./sigtool/Makefile.in +--- ../clamav-0.98.5.orig/sigtool/Makefile.in 2014-11-21 14:24:08.000000000 -0200 ++++ ./sigtool/Makefile.in 2014-11-21 14:32:01.000000000 -0200 +@@ -456,7 +456,7 @@ + sigtool.c + + AM_CFLAGS = @WERR_CFLAGS@ +-AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@ ++AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @SIGTOOL_CPPFLAGS@ + CLEANFILES = *.gcda *.gcno + all: all-am + Modified: head/security/clamav/pkg-plist ============================================================================== --- head/security/clamav/pkg-plist Fri Nov 21 16:35:45 2014 (r373002) +++ head/security/clamav/pkg-plist Fri Nov 21 16:42:51 2014 (r373003) @@ -13,13 +13,13 @@ include/clamav.h include/clamav-config.h lib/libclamav.so lib/libclamav.so.6 -lib/libclamav.so.6.1.22 +lib/libclamav.so.6.1.24 %%UNRAR%%lib/libclamunrar.so %%UNRAR%%lib/libclamunrar.so.6 -%%UNRAR%%lib/libclamunrar.so.6.1.22 +%%UNRAR%%lib/libclamunrar.so.6.1.24 %%UNRAR%%lib/libclamunrar_iface.so %%UNRAR%%lib/libclamunrar_iface.so.6 -%%UNRAR%%lib/libclamunrar_iface.so.6.1.22 +%%UNRAR%%lib/libclamunrar_iface.so.6.1.24 libdata/pkgconfig/libclamav.pc man/man1/clambc.1.gz man/man1/clamconf.1.gz