From owner-svn-ports-head@freebsd.org Tue Feb 2 11:56:00 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CE580A98AB0; Tue, 2 Feb 2016 11:56:00 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from vps.amdmi3.ru (vps.amdmi3.ru [109.234.38.216]) by mx1.freebsd.org (Postfix) with ESMTP id 64828D77; Tue, 2 Feb 2016 11:56:00 +0000 (UTC) (envelope-from amdmi3@amdmi3.ru) Received: from hive.panopticon (unknown [78.153.152.119]) by vps.amdmi3.ru (Postfix) with ESMTPS id 5C778B0616; Tue, 2 Feb 2016 14:55:57 +0300 (MSK) Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 5118EFAC; Tue, 2 Feb 2016 14:54:38 +0300 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id ACEE33E62; Tue, 2 Feb 2016 14:55:55 +0300 (MSK) Date: Tue, 2 Feb 2016 14:55:55 +0300 From: Dmitry Marakasov To: ports-secteam@freebsd.org Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, mm@FreeBSD.org Subject: Re: svn commit: r407812 - head/www/c-icap-modules Message-ID: <20160202115555.GE1365@hades.panopticon> References: <201602021141.u12BfIgB086258@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <201602021141.u12BfIgB086258@repo.freebsd.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 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: Tue, 02 Feb 2016 11:56:01 -0000 * Dmitry Marakasov (amdmi3@FreeBSD.org) wrote: > Author: amdmi3 > Date: Tue Feb 2 11:41:18 2016 > New Revision: 407812 > URL: https://svnweb.freebsd.org/changeset/ports/407812 > > Log: > - Fix incorrect config file handling (srv_url_check.conf was copied from srv_content_filtering.conf.default, not srv_url_check.conf.default) by switching to @sample > - Fix LICENSE > > Approved by: portmgr blanket > MFH: 2016Q1 (blanket) Sorry, I call the MFH request back, since the problem fixed is only present in HEAD and is the fact the result of the latest update. > Modified: > head/www/c-icap-modules/Makefile > head/www/c-icap-modules/pkg-plist > > Modified: head/www/c-icap-modules/Makefile > ============================================================================== > --- head/www/c-icap-modules/Makefile Tue Feb 2 11:18:08 2016 (r407811) > +++ head/www/c-icap-modules/Makefile Tue Feb 2 11:41:18 2016 (r407812) > @@ -3,6 +3,7 @@ > > PORTNAME= c-icap > PORTVERSION= 0.4.2 > +PORTREVISION= 1 > CATEGORIES= www security > MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/0.4.x/ > PKGNAMESUFFIX= -modules > @@ -11,7 +12,8 @@ DISTNAME= c_icap_modules-${PORTVERSION} > MAINTAINER= mm@FreeBSD.org > COMMENT= Modules for c-icap: virus_scan and srv_url_check > > -LICENSE= GPLv2 > +LICENSE= GPLv2+ > +LICENSE_FILE= ${WRKSRC}/COPYING > > LIB_DEPENDS+= libicapapi.so:${PORTSDIR}/www/c-icap \ > libclamav.so:${PORTSDIR}/security/clamav > > Modified: head/www/c-icap-modules/pkg-plist > ============================================================================== > --- head/www/c-icap-modules/pkg-plist Tue Feb 2 11:18:08 2016 (r407811) > +++ head/www/c-icap-modules/pkg-plist Tue Feb 2 11:41:18 2016 (r407812) > @@ -1,18 +1,8 @@ > -@unexec if cmp -s %D/etc/c-icap/clamav_mod.conf %D/etc/c-icap/clamav_mod.conf.default; then rm -f %D/etc/c-icap/clamav_mod.conf; fi > -etc/c-icap/clamav_mod.conf.default > -@exec [ -f %B/clamav_mod.conf ] || cp %B/%f %B/clamav_mod.conf > -@unexec if cmp -s %D/etc/c-icap/clamd_mod.conf %D/etc/c-icap/clamd_mod.conf.default; then rm -f %D/etc/c-icap/clamd_mod.conf; fi > -etc/c-icap/clamd_mod.conf.default > -@exec [ -f %B/clamd_mod.conf ] || cp %B/%f %B/clamd_mod.conf > -@unexec if cmp -s %D/etc/c-icap/srv_content_filtering.conf %D/etc/c-icap/srv_content_filtering.conf.default; then rm -f %D/etc/c-icap/srv_content_filtering.conf; fi > -etc/c-icap/srv_content_filtering.conf.default >> -@exec [ -f %B/srv_url_check.conf ] || cp %B/%f %B/srv_url_check.conf > -@unexec if cmp -s %D/etc/c-icap/srv_url_check.conf %D/etc/c-icap/srv_url_check.conf.default; then rm -f %D/etc/c-icap/srv_url_check.conf; fi > -etc/c-icap/srv_url_check.conf.default >> -@exec [ -f %B/srv_url_check.conf ] || cp %B/%f %B/srv_url_check.conf > -@unexec if cmp -s %D/etc/c-icap/virus_scan.conf %D/etc/c-icap/virus_scan.conf.default; then rm -f %D/etc/c-icap/virus_scan.conf; fi > -etc/c-icap/virus_scan.conf.default > -@exec [ -f %B/virus_scan.conf ] || cp %B/%f %B/virus_scan.conf > +@sample etc/c-icap/clamav_mod.conf.default etc/c-icap/clamav_mod.conf > +@sample etc/c-icap/clamd_mod.conf.default etc/c-icap/clamd_mod.conf > +@sample etc/c-icap/srv_content_filtering.conf.default etc/c-icap/srv_content_filtering.conf > +@sample etc/c-icap/srv_url_check.conf.default etc/c-icap/srv_url_check.conf > +@sample etc/c-icap/virus_scan.conf.default etc/c-icap/virus_scan.conf > lib/c_icap/clamav_mod.a > lib/c_icap/clamav_mod.so > lib/c_icap/clamd_mod.a -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://amdmi3.ru