ports/172182: amavis-p0fanalyzer doesn't start because of error in startup script

[Rouslan Iskhakov]

>Number:         172182
>Category:       ports
>Synopsis:       amavis-p0fanalyzer doesn't start because of error in startup script
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 30 16:20:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Rouslan Iskhakov
>Release:        9.0-RELEASE-p3
>Organization:
>Environment:
FreeBSD mail.rshell.net 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 02:52:29 UTC 2012     root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
amavis-p0fanalyzer doesn't start because of error in startup script.
>How-To-Repeat:
/usr/local/etc/rc.d/amavis-p0fanalyzer start
>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/security/amavisd-new/Makefile /tmp/amavisd-new/Makefile
--- /usr/ports/security/amavisd-new/Makefile	2012-09-30 11:58:20.000000000 +0200
+++ /tmp/amavisd-new/Makefile	2012-09-30 18:02:52.000000000 +0200
@@ -8,6 +8,7 @@
 
 PORTNAME=	amavisd-new
 PORTVERSION=	2.8.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
diff -ruN /usr/ports/security/amavisd-new/files/amavis-p0fanalyzer.in /tmp/amavisd-new/files/amavis-p0fanalyzer.in
--- /usr/ports/security/amavisd-new/files/amavis-p0fanalyzer.in	2012-08-06 01:19:36.000000000 +0200
+++ /tmp/amavisd-new/files/amavis-p0fanalyzer.in	2012-09-30 17:52:47.000000000 +0200
@@ -9,7 +9,6 @@
 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}"
-amavis_p0f_daemon_flags="${amavis_p0f_daemon_flags--l}"
 amavis_p0fanalyzer_flags="${amavis_p0fanalyzer_flags-2345}"
 
 . /etc/rc.subr
@@ -23,8 +22,7 @@
 p0fanalyzer_start() {
 	echo "Starting p0f-analyzer." && \
 	  %%DAEMON%% ${amavis_p0fanalyzer_pidfile1} \
-	  %%PREFIX%%/bin/p0f ${amavis_p0f_daemon_flags} \
-	  "${amavis_p0fanalyzer_p0f_filter}" 2>&1 | \
+	  %%PREFIX%%/bin/p0f "${amavis_p0fanalyzer_p0f_filter}" 2>&1 | \
 	  %%DAEMON%% ${amavis_p0fanalyzer_pidfile2} \
 	  %%PREFIX%%/sbin/p0f-analyzer.pl ${amavis_p0fanalyzer_flags}
 }


>Release-Note:
>Audit-Trail:
>Unformatted: