From 810a8be6428fa639dd294b6ac10e2798f2dee4e6 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Tue, 6 May 2014 13:04:05 +0000 Subject: 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 --- security/clamav-devel/Makefile | 2 +- security/clamav-devel/files/clamav-milter.in | 6 +++--- security/clamav/Makefile | 2 +- security/clamav/files/clamav-milter.in | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile index 3be3d38e5cad..02146d6fc1a2 100644 --- a/security/clamav-devel/Makefile +++ b/security/clamav-devel/Makefile @@ -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 diff --git a/security/clamav-devel/files/clamav-milter.in b/security/clamav-devel/files/clamav-milter.in index 391fb672bfab..1c3d87815989 100644 --- a/security/clamav-devel/files/clamav-milter.in +++ b/security/clamav-devel/files/clamav-milter.in @@ -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 diff --git a/security/clamav/Makefile b/security/clamav/Makefile index aface5f6ef60..7396319a81a3 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -3,7 +3,7 @@ PORTNAME= clamav PORTVERSION= 0.98.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF diff --git a/security/clamav/files/clamav-milter.in b/security/clamav/files/clamav-milter.in index 391fb672bfab..1c3d87815989 100644 --- a/security/clamav/files/clamav-milter.in +++ b/security/clamav/files/clamav-milter.in @@ -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 -- cgit v1.2.3