From 572125493cee05233ae6b44504b254fd9c440235 Mon Sep 17 00:00:00 2001
From: erwin <erwin@FreeBSD.org>
Date: Mon, 27 Nov 2006 12:55:21 +0000
Subject: - 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]
PR:		105862
Submitted by:	gabor (maintainer)
---
 security/amavisd-new/Makefile                       | 12 +++++++++---
 security/amavisd-new/distinfo                       |  6 +++---
 security/amavisd-new/files/amavis-p0fanalyzer.sh.in |  6 +++---
 3 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'security/amavisd-new')

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 501670f03065..c35e726f7c9b 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -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_FILES=	pkg-install pkg-deinstall pkg-message
 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 @@ PLIST_SUB+=	AMAVIS_NOAMAVIS=${AMAVIS_NOAMAVIS} \
 
 .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))
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index efef45272781..2eb85d81ab26 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -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
diff --git a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
index 97a9f16ae6de..df48438d3387 100644
--- a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
+++ b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
@@ -22,10 +22,10 @@ stop_cmd=p0fanalyzer_stop
 
 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}
 }
 
-- 
cgit