svn commit: r353090 - in head/security: clamav clamav-devel clamav-devel/files clamav/files
Mark Felder
feld at FreeBSD.org
Tue May 6 13:04:06 UTC 2014
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
More information about the svn-ports-head
mailing list