- Update to 2.5.1

- Dependency changes
- Require the fixed versions of zoo/unzoo, which are not vulnerable
- Add ramdisk support

PR:		ports/113396
Submitted by:	Michael Scheidell <scheidell@secnap.net>
Reviewed by:	Mark Martinec <Mark.Martinec@ijs.si> (author)

5 files changed, 30 insertions, 8 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 71767b65be90..66af41843d6e 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -7,7 +7,7 @@
 # Based on amavisd ports makefile.
 
 PORTNAME=	amavisd-new
-PORTVERSION=	2.5.0
+PORTVERSION=	2.5.1
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Unix/Syslog.pm:${PORTSDIR}/sysutils/p5-Un
 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
 		p5-Convert-UUlib>=1.08,1:${PORTSDIR}/converters/p5-Convert-UUlib \
-		p5-Compress-Zlib>=1.04:${PORTSDIR}/archivers/p5-Compress-Zlib \
+		p5-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
@@ -140,7 +140,8 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/altermime:${PORTSDIR}/mail/altermime
 .endif
 
 .if defined(WITH_FILE)
-RUN_DEPENDS+=	${LOCALBASE}/bin/file:${PORTSDIR}/sysutils/file
+# security fix, file > 4.21 needed
+RUN_DEPENDS+=	file>=4.21:${PORTSDIR}/sysutils/file
 .endif
 
 .if defined(WITH_RAR)
@@ -180,11 +181,12 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 .endif
 
 .if defined(WITH_ZOO)
-RUN_DEPENDS+=	${LOCALBASE}/bin/zoo:${PORTSDIR}/archivers/zoo
+# DOS condition in 2.10.1_2
+RUN_DEPENDS+=	zoo>=2.10.1_2:${PORTSDIR}/archivers/zoo
 .endif
 
 .if defined(WITH_UNZOO)
-RUN_DEPENDS+=	${LOCALBASE}/bin/unzoo:${PORTSDIR}/archivers/unzoo
+RUN_DEPENDS+=	unzoo>=4.4_1:${PORTSDIR}/archivers/unzoo
 .endif
 
 .if defined(WITH_LZOP)
@@ -268,6 +270,7 @@ do-install:
 .endif
 
 post-install:
+	${LN} -s ${PREFIX}/sbin/amavisd-release ${PREFIX}/sbin/amavisd-requeue
 	@${CAT} ${PKGMESSAGE}
 
 .if ${PERL_LEVEL} < 500802
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index e1915b3c1da5..7783eb699bb5 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1,3 +1,3 @@
-MD5 (amavisd-new-2.5.0.tar.gz) = 990a8c78911e208afca8c43a1f7c018d
-SHA256 (amavisd-new-2.5.0.tar.gz) = d5f5238a565868b5150c2591cd06780556d2aa093355475874e6b539e7eb1116
-SIZE (amavisd-new-2.5.0.tar.gz) = 780990
+MD5 (amavisd-new-2.5.1.tar.gz) = c0bed5db53dfce6e70047597989523e2
+SHA256 (amavisd-new-2.5.1.tar.gz) = 2ac5a933d62072b3ed9986252003fd3942179618c7ba76d3390570547fc981de
+SIZE (amavisd-new-2.5.1.tar.gz) = 786898
diff --git a/security/amavisd-new/files/amavisd.sh.in b/security/amavisd-new/files/amavisd.sh.in
index e27dfc84497a..3b920269966b 100644
--- a/security/amavisd-new/files/amavisd.sh.in
+++ b/security/amavisd-new/files/amavisd.sh.in
@@ -23,6 +23,20 @@ command=%%PREFIX%%/sbin/amavisd > /dev/null 2>&1
 pidfile=%%AMAVISDIR%%/amavisd.pid
 required_files=%%PREFIX%%/etc/amavisd.conf
 
+start_precmd=start_precmd
+
+# possible values include: amavisd_ram="512m"
+# adds ram disk for amavisd defanging/decoding, speeds up large systems 10%
+start_precmd()
+{
+rm -rf %%AMAVISDIR%%/tmp/* %%AMAVISDIR%%/tmp/.* 2>/dev/null || true
+if [ ${amavisd_ram} ];then
+  df %%AMAVISDIR%%/tmp |  grep '^/dev/md' > /dev/null
+  if [ $? -eq 1 ];then
+   mdmfs -M -s ${amavisd_ram} -w %%AMAVISUSER%%:%%AMAVISGROUP%% md %%AMAVISDIR%%/tmp || true
+  fi
+fi
+}
 stop_postcmd=stop_postcmd
 
 stop_postcmd()
diff --git a/security/amavisd-new/files/pkg-message.in b/security/amavisd-new/files/pkg-message.in
index ee7bd2d5fe94..cc1192b7f84a 100644
--- a/security/amavisd-new/files/pkg-message.in
+++ b/security/amavisd-new/files/pkg-message.in
@@ -13,6 +13,10 @@
 
     amavisd_enable="YES"
 
+ Optionally enable amavisd tmp ram disk with: (example 512k)
+
+    amavisd_ram="512m"
+
  If you have installed and want to use the amavis sendmail milter interface,
  you need the following additional line in /etc/rc.conf:
 
diff --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist
index d3b81ed231a1..cfe2539fdf92 100644
--- a/security/amavisd-new/pkg-plist
+++ b/security/amavisd-new/pkg-plist
@@ -79,3 +79,4 @@ sbin/amavisd
 sbin/amavisd-agent
 sbin/amavisd-nanny
 sbin/amavisd-release
+sbin/amavisd-requeue