ports/103560: [maintainer update] security/amavisd-new
Gabor Kovesdan
gkovesdan at t-hosting.hu
Sun Sep 24 12:40:23 UTC 2006
>Number: 103560
>Category: ports
>Synopsis: [maintainer update] security/amavisd-new
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 24 12:40:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Gabor Kovesdan
>Release: FreeBSD 6.1-RELEASE-p3 amd64
>Organization:
n/a
>Environment:
System: FreeBSD server.t-hosting.hu 6.1-RELEASE-p3 FreeBSD 6.1-RELEASE-p3 #0: Sat Aug 19 11:08:15 CEST 2006 root at server.t-hosting.hu:/usr/src/sys/amd64/compile/FREEBSD amd64
>Description:
- Use the same naming scheme for p0fanalyzer rc.d script as used by milter script
(this was the plan originally)
- Fix pkg-message to reflect the p0fanalyzer rc.d script behavior
- Don't hardcode the interface into p0fanalyzer rc.d script
- Respect amavis_p0fanalyzer_flags
- Bump PORTREVISION
Reported/Requested by: Attila Nagy <bra at fsn dot hu>
Reto Burkhalter <reto dot burkhalter at basis06 dot com>
>How-To-Repeat:
>Fix:
--- amavisd-new.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/security/amavisd-new/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile 17 Sep 2006 16:10:41 -0000 1.42
+++ Makefile 24 Sep 2006 12:15:14 -0000
@@ -8,7 +8,7 @@
PORTNAME= amavisd-new
PORTVERSION= 2.4.2
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= http://www.ijs.si/software/amavisd/ \
Index: files/amavis-p0fanalyzer.sh.in
===================================================================
RCS file: /usr/cvs/ports/security/amavisd-new/files/amavis-p0fanalyzer.sh.in,v
retrieving revision 1.1
diff -u -r1.1 amavis-p0fanalyzer.sh.in
--- files/amavis-p0fanalyzer.sh.in 17 Sep 2006 16:10:42 -0000 1.1
+++ files/amavis-p0fanalyzer.sh.in 24 Sep 2006 12:20:19 -0000
@@ -1,32 +1,36 @@
#!/bin/sh
# $FreeBSD: ports/security/amavisd-new/files/amavis-p0fanalyzer.sh.in,v 1.1 2006/09/17 16:10:42 erwin Exp $
-# PROVIDE: p0fanalyzer
+# PROVIDE: amavis_p0fanalyzer
# REQUIRE: DAEMON
# BEFORE: amavisd
# KEYWORD: FreeBSD
-p0fanalyzer_enable="${p0fanalyzer_enable-NO}"
+amavis_p0fanalyzer_enable="${amavis_p0fanalyzer_enable-NO}"
+amavis_p0fanalyzer_p0f_filter="${amavis_p0fanalyzer_p0f_filter-"tcp dst port 25"}"
+amavis_p0fanalyzer_pidfile1="${amavis_p0fanalyzer_pidfile1-/var/run/p0fanalyzer1.pid}"
+amavis_p0fanalyzer_pidfile2="${amavis_p0fanalyzer_pidfile2-/var/run/p0fanalyzer2.pid}"
. /etc/rc.subr
-name="p0fanalyzer"
+name="amavis_p0fanalyzer"
rcvar=`set_rcvar`
start_cmd=p0fanalyzer_start
stop_cmd=p0fanalyzer_stop
p0fanalyzer_start() {
- checkyesno p0fanalyzer_enable && echo "Starting p0f-analyzer." && \
- /usr/sbin/daemon -p /var/run/p0fanalyzer1.pid \
- %%PREFIX%%/bin/p0f -i bge0 -l 'tcp dst port 25' 2>&1 | \
- /usr/sbin/daemon -p /var/run/p0fanalyzer2.pid \
- %%PREFIX%%/sbin/p0f-analyzer.pl 2345
+ echo "Starting p0f-analyzer." && \
+ /usr/sbin/daemon -p ${amavis_p0fanalyzer_pidfile1} \
+ %%PREFIX%%/bin/p0f -l "${amavis_p0fanalyzer_p0f_filter}" \
+ "${amavis_p0fanalyzer_flags}" 2>&1 | \
+ /usr/sbin/daemon -p ${amavis_p0fanalyzer_pidfile2} \
+ %%PREFIX%%/sbin/p0f-analyzer.pl 2345
}
p0fanalyzer_stop() {
- /bin/kill `cat /var/run/p0fanalyzer2.pid`
- /bin/kill `cat /var/run/p0fanalyzer1.pid`
+ /bin/kill `cat ${amavis_p0fanalyzer_pidfile2}` && rm ${amavis_p0fanalyzer_pidfile2}
+ /bin/kill `cat ${amavis_p0fanalyzer_pidfile1}` && rm ${amavis_p0fanalyzer_pidfile1}
}
load_rc_config $name
Index: files/pkg-message.in
===================================================================
RCS file: /usr/cvs/ports/security/amavisd-new/files/pkg-message.in,v
retrieving revision 1.2
diff -u -r1.2 pkg-message.in
--- files/pkg-message.in 10 Sep 2006 14:05:50 -0000 1.2
+++ files/pkg-message.in 24 Sep 2006 12:15:08 -0000
@@ -22,9 +22,11 @@
you need the following additional lines in /etc/rc.conf
(with modifications according to your needs):
- amavisd_p0fanalyzer_enable="YES"
- amavisd_p0fanalyzer_p0f_interface='bge0'
- amavisd_p0fanalyzer_p0f_filter='tcp dst port 25'
+ amavis_p0fanalyzer_enable="YES"
+ amavis_p0fanalyzer_p0f_filter="tcp dst port 25"
+
+ You can pass another command line options to p0fanalyzer by setting
+ amavis_p0fanalyzer_flags.
Configuration templates are available in %%PREFIX%%/etc
as amavisd.conf-dist, amavisd.conf-sample and amavisd.conf-default.
--- amavisd-new.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list