- Do not hardcode pidfile in the rc.d script [1]

- Depend on p5-Mail-DKIM >= 0.33 [2]
- Patch clamscan timeout bug [2]
- REQUIRE: mysql postgresql in rc.d script [2]
- Bump PORTREVISION
- pkg-message nits

PR:		ports/132575 [1], ports/133073 [2]
Submitted by:	Helmut Schneider <jumper99@gmx.de> [1],
		Michael Scheidell <scheidell@secnap.net> [2]

4 files changed, 15 insertions, 5 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 5f5805f1c8df..af62fc0de9be 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	amavisd-new
 PORTVERSION=	2.6.2
 PORTEPOCH=	1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 		http://mirrors.catpipe.net/amavisd-new/ \
@@ -29,7 +29,7 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Un
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 		${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6 \
 		p5-Net-Server>=0.93:${PORTSDIR}/net/p5-Net-Server \
-		p5-Mail-DKIM>=0.31:${PORTSDIR}/mail/p5-Mail-DKIM
+		p5-Mail-DKIM>=0.33:${PORTSDIR}/mail/p5-Mail-DKIM
 
 USE_PERL5_RUN=	5.8.2+
 GNU_CONFIGURE=	yes
diff --git a/security/amavisd-new/files/amavisd.sh.in b/security/amavisd-new/files/amavisd.sh.in
index e5ad30f5ad18..d9eb02bc5bf2 100644
--- a/security/amavisd-new/files/amavisd.sh.in
+++ b/security/amavisd-new/files/amavisd.sh.in
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: amavisd
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN mysql postgresql
 # BEFORE: mail
 # KEYWORD: shutdown
 
@@ -20,7 +20,6 @@ name=amavisd
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/amavisd > /dev/null 2>&1
-pidfile=%%AMAVISDIR%%/amavisd.pid
 required_files=%%PREFIX%%/etc/amavisd.conf
 extra_commands="reload"
 
@@ -59,6 +58,7 @@ amavisd_reload()
 # set defaults
 
 amavisd_enable=${amavisd_enable:-"NO"}
+amavisd_pidfile=${amavisd_pidfile:-"%%AMAVISDIR%%/amavisd.pid"}
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd
index 380920f8b9f4..d57ed337cee3 100644
--- a/security/amavisd-new/files/patch-amavisd
+++ b/security/amavisd-new/files/patch-amavisd
@@ -83,6 +83,12 @@
        my($subj) = $msginfo->get_header_field_body('subject');
        my($from) = $msginfo->get_header_field_body('from');  # raw full field
        my($rfc2822_from)   = $msginfo->rfc2822_from;  # undef, scalar or listref
+@@ -19993,4 +19993,5 @@
+       1;
+     } or do { $eval_stat = $@ ne '' ? $@ : "errno=$!" };
++    prolong_timer('ask_daemon_internal', $deadline-time);
+     last  if $eval_stat eq '';  # mission accomplished
+     # error handling (most interesting error codes are EPIPE and ENOTCONN)
 @@ -21931,7 +21936,8 @@
                                       $part->base_name, $err_nm[$sts], $sts);
          my($newpart) = $newpart_obj->full_name;
diff --git a/security/amavisd-new/files/pkg-message.in b/security/amavisd-new/files/pkg-message.in
index 332bfa3aaa09..4340dec4f1d6 100644
--- a/security/amavisd-new/files/pkg-message.in
+++ b/security/amavisd-new/files/pkg-message.in
@@ -13,7 +13,11 @@
 
     amavisd_enable="YES"
 
- Optionally enable amavisd tmp ram disk with: (example 512m)
+ You can set the pidfile, if you do not use the default path:
+
+    amavisd_pidfile="/var/amavis/amavisd.pid"
+
+ Optionally enable amavisd tmp ram disk with: (DISCOURAGED!)
 
     amavisd_ram="512m"