Date: Sun, 26 Nov 2006 12:00:01 +0100 (CET) From: Gabor Kovesdan <gkovesdan@t-hosting.hu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Gabor Kovesdan <gkovesdan@t-hosting.hu> Subject: ports/105862: [maintainer update] security/amavisd-new Message-ID: <20061126110001.57A389A94E3@server.t-hosting.hu> Resent-Message-ID: <200611261100.kAQB0QFa033197@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105862 >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 Nov 26 11:00:25 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Gabor Kovesdan >Release: FreeBSD 6.1-RELEASE-p3 amd64 >Organization: n/a >Environment: >Description: - Update to 2.4.4 - Don't quote amavis_p0f_daemon_flags in the p0f rc.d script [1] - Don't use -p option of daemon on 4.X since it doesn't have such [1] Requested by: Michael Scheidell <scheidell@secnap.net> [1] >How-To-Repeat: >Fix: --- amavisd.diff begins here --- Index: Makefile =================================================================== RCS file: /usr/cvs/ports/security/amavisd-new/Makefile,v retrieving revision 1.45 diff -u -r1.45 Makefile --- Makefile 2 Oct 2006 09:26:16 -0000 1.45 +++ Makefile 26 Nov 2006 10:44:30 -0000 @@ -7,8 +7,7 @@ # Based on amavisd ports makefile. PORTNAME= amavisd-new -PORTVERSION= 2.4.3 -PORTREVISION= 1 +PORTVERSION= 2.4.4 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= http://www.ijs.si/software/amavisd/ \ @@ -76,7 +75,8 @@ SUB_LIST+= AMAVISUSER=${AMAVISUSER} \ AMAVISGROUP=${AMAVISGROUP} \ AMAVISDIR=${AMAVISDIR} \ - AMAVISQUARANTINE=${AMAVISQUARANTINE} + AMAVISQUARANTINE=${AMAVISQUARANTINE} \ + DAEMON="${DAEMON}" PLIST_SUB+= AMAVIS_NOAMAVIS=${AMAVIS_NOAMAVIS} \ AMAVIS_NOMILTER=${AMAVIS_NOMILTER} \ @@ -84,6 +84,12 @@ .include <bsd.port.pre.mk> +.if ${OSVERSION} < 500000 +DAEMON=/usr/sbin/daemon +.else +DAEMON=/usr/sbin/daemon -p +.endif + USE_RC_SUBR+= amavisd.sh .if !defined(WITH_MILTER) || (!exists(/usr/lib/libmilter.a) && !exists(${PREFIX}/lib/libmilter.a)) Index: distinfo =================================================================== RCS file: /usr/cvs/ports/security/amavisd-new/distinfo,v retrieving revision 1.28 diff -u -r1.28 distinfo --- distinfo 2 Oct 2006 09:26:16 -0000 1.28 +++ distinfo 24 Nov 2006 22:13:57 -0000 @@ -1,3 +1,3 @@ -MD5 (amavisd-new-2.4.3.tar.gz) = 7c5f23b1cd523df31d10cf38150e8cea -SHA256 (amavisd-new-2.4.3.tar.gz) = ff71af590a0dc62bda558a037daceaea3b776d1ef7d0689ab0bfb582d436cf15 -SIZE (amavisd-new-2.4.3.tar.gz) = 876615 +MD5 (amavisd-new-2.4.4.tar.gz) = 08b009ca24dc3676293fc6b80db250a3 +SHA256 (amavisd-new-2.4.4.tar.gz) = b3a11ff3813e8b6c7cdf48c852c7bc672b2c0c6115d1b1dba896cd6358b67889 +SIZE (amavisd-new-2.4.4.tar.gz) = 887625 Index: files/amavis-p0fanalyzer.sh.in =================================================================== RCS file: /usr/cvs/ports/security/amavisd-new/files/amavis-p0fanalyzer.sh.in,v retrieving revision 1.3 diff -u -r1.3 amavis-p0fanalyzer.sh.in --- files/amavis-p0fanalyzer.sh.in 1 Oct 2006 17:48:40 -0000 1.3 +++ files/amavis-p0fanalyzer.sh.in 26 Nov 2006 10:44:14 -0000 @@ -22,10 +22,10 @@ p0fanalyzer_start() { echo "Starting p0f-analyzer." && \ - /usr/sbin/daemon -p ${amavis_p0fanalyzer_pidfile1} \ - %%PREFIX%%/bin/p0f "${amavis_p0f_daemon_flags}" \ + %%DAEMON%% ${amavis_p0fanalyzer_pidfile1} \ + %%PREFIX%%/bin/p0f ${amavis_p0f_daemon_flags} \ -l "${amavis_p0fanalyzer_p0f_filter}" 2>&1 | \ - /usr/sbin/daemon -p ${amavis_p0fanalyzer_pidfile2} \ + %%DAEMON%% ${amavis_p0fanalyzer_pidfile2} \ %%PREFIX%%/sbin/p0f-analyzer.pl ${amavis_p0fanalyzer_flags} } Index: files/patch-amavisd =================================================================== RCS file: files/patch-amavisd diff -N files/patch-amavisd --- amavisd.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061126110001.57A389A94E3>