From owner-svn-ports-all@FreeBSD.ORG Tue May 6 13:04:06 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 773E360D; Tue, 6 May 2014 13:04:06 +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 63C78A5F; Tue, 6 May 2014 13:04:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s46D465X002883; Tue, 6 May 2014 13:04:06 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s46D45ve002875; Tue, 6 May 2014 13:04:05 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201405061304.s46D45ve002875@svn.freebsd.org> From: Mark Felder Date: Tue, 6 May 2014 13:04:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353090 - in head/security: clamav clamav-devel clamav-devel/files 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-all@freebsd.org X-Mailman-Version: 2.1.18 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, 06 May 2014 13:04:06 -0000 Author: feld Date: Tue May 6 13:04:05 2014 New Revision: 353090 URL: http://svnweb.freebsd.org/changeset/ports/353090 QAT: https://qat.redports.org/buildarchive/r353090/ Log: milter rc script was broken after last updates. conf_file was used before it was declared. While we're at it let's make conf_file configurable as clamav_milter_conf Approved by: garga Sponsored by: SupraNet Communications, Inc Modified: head/security/clamav-devel/Makefile head/security/clamav-devel/files/clamav-milter.in head/security/clamav/Makefile head/security/clamav/files/clamav-milter.in Modified: head/security/clamav-devel/Makefile ============================================================================== --- head/security/clamav-devel/Makefile Tue May 6 13:03:45 2014 (r353089) +++ head/security/clamav-devel/Makefile Tue May 6 13:04:05 2014 (r353090) @@ -3,7 +3,7 @@ PORTNAME= clamav PORTVERSION= 20140107 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.clamav.net/snapshot/ \ LOCAL/garga/clamav-devel Modified: head/security/clamav-devel/files/clamav-milter.in ============================================================================== --- head/security/clamav-devel/files/clamav-milter.in Tue May 6 13:03:45 2014 (r353089) +++ head/security/clamav-devel/files/clamav-milter.in Tue May 6 13:04:05 2014 (r353090) @@ -25,7 +25,8 @@ load_rc_config $name : ${clamav_milter_enable:=NO} : ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"} -: ${clamav_milter_flags="-c ${conf_file}"} +: ${clamav_milter_conf="%%PREFIX%%/etc/clamav-milter.conf"} +: ${clamav_milter_flags="-c ${clamav_milter_conf}"} : ${clamav_milter_socktimeout=60} : ${clamav_milter_socket_mode=777} : ${clamav_milter_socket_user=%%CLAMAVUSER%%} @@ -33,10 +34,9 @@ load_rc_config $name : ${clamav_clamd_enable:=NO} : ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"} -conf_file=%%PREFIX%%/etc/clamav-milter.conf command=%%PREFIX%%/sbin/clamav-milter required_dirs=%%DBDIR%% -required_files=${conf_file} +required_files=${clamav_milter_conf} start_precmd=start_precmd start_postcmd=start_postcmd Modified: head/security/clamav/Makefile ============================================================================== --- head/security/clamav/Makefile Tue May 6 13:03:45 2014 (r353089) +++ head/security/clamav/Makefile Tue May 6 13:04:05 2014 (r353090) @@ -3,7 +3,7 @@ PORTNAME= clamav PORTVERSION= 0.98.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF Modified: head/security/clamav/files/clamav-milter.in ============================================================================== --- head/security/clamav/files/clamav-milter.in Tue May 6 13:03:45 2014 (r353089) +++ head/security/clamav/files/clamav-milter.in Tue May 6 13:04:05 2014 (r353090) @@ -25,7 +25,8 @@ load_rc_config $name : ${clamav_milter_enable:=NO} : ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"} -: ${clamav_milter_flags="-c ${conf_file}"} +: ${clamav_milter_conf="%%PREFIX%%/etc/clamav-milter.conf"} +: ${clamav_milter_flags="-c ${clamav_milter_conf}"} : ${clamav_milter_socktimeout=60} : ${clamav_milter_socket_mode=777} : ${clamav_milter_socket_user=%%CLAMAVUSER%%} @@ -33,10 +34,9 @@ load_rc_config $name : ${clamav_clamd_enable:=NO} : ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"} -conf_file=%%PREFIX%%/etc/clamav-milter.conf command=%%PREFIX%%/sbin/clamav-milter required_dirs=%%DBDIR%% -required_files=${conf_file} +required_files=${clamav_milter_conf} start_precmd=start_precmd start_postcmd=start_postcmd