From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Sep 24 12:40:23 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 597E316A415 for ; Sun, 24 Sep 2006 12:40:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9650543D55 for ; Sun, 24 Sep 2006 12:40:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8OCeMfE058312 for ; Sun, 24 Sep 2006 12:40:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8OCeMAx058306; Sun, 24 Sep 2006 12:40:22 GMT (envelope-from gnats) Resent-Date: Sun, 24 Sep 2006 12:40:22 GMT Resent-Message-Id: <200609241240.k8OCeMAx058306@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gabor Kovesdan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D2EB16A403 for ; Sun, 24 Sep 2006 12:30:16 +0000 (UTC) (envelope-from root@server.t-hosting.hu) Received: from server.t-hosting.hu (server.t-hosting.hu [217.20.133.7]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5179543D66 for ; Sun, 24 Sep 2006 12:30:10 +0000 (GMT) (envelope-from root@server.t-hosting.hu) Received: from localhost (localhost [127.0.0.1]) by server.t-hosting.hu (Postfix) with ESMTP id BDFAF99D3F8; Sun, 24 Sep 2006 14:30:08 +0200 (CEST) Received: from server.t-hosting.hu ([127.0.0.1]) by localhost (server.t-hosting.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 46fwL+F+nUD6; Sun, 24 Sep 2006 14:30:08 +0200 (CEST) Received: by server.t-hosting.hu (Postfix, from userid 0) id 61F6999D3E2; Sun, 24 Sep 2006 14:30:08 +0200 (CEST) Message-Id: <20060924123008.61F6999D3E2@server.t-hosting.hu> Date: Sun, 24 Sep 2006 14:30:08 +0200 (CEST) From: Gabor Kovesdan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Gabor Kovesdan Subject: ports/103560: [maintainer update] security/amavisd-new X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Gabor Kovesdan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Sep 2006 12:40:23 -0000 >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@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 Reto Burkhalter >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: