Update to version 2.3.1. From PR#31015 by Julian Dunn.

Here's an excerpt from the rather long RELEASE_NOTES included in the
distribution:

QUICK OVERVIEW:

Provides more flexible configuration of decoders. Allows recipients to have
individual banning rules. Assigns a long-term unique id to each message,
reducing clashes and facilitating retrieval of information. The daemon can
store information to a SQL database for logging, reporting and quarantine
retrieval, optionally storing entire message to a SQL database. File-based
quarantine can disperse files to 62 subdirectories. Provides a quarantine
release mechanism. Reconnects to SQL if connection is broken. Can skip
quarantining high-score spam. Compatibility with IPv6-enabled Postfix
is improved.

SECURITY:

- require minimal version 1.05 of Convert::UUlib to avoid a known security
  problem in the underlying uulib (likely to be exploitable);

4 files changed, 20 insertions, 19 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 069f9815036..3489fb2ac25 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/08/06 06:19:29 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/22 09:47:30 cube Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 		http://ftp.cfu.net/pub/amavisd-new/ \
 		ftp://ftp.cfu.net/pub/amavisd-new/
 
-VERSION=	2.2.1
+VERSION=	2.3.1
 PATCHLEVEL=	# empty
 
 MAINTAINER=	jdunn@aquezada.com
@@ -16,12 +16,12 @@ HOMEPAGE=	http://www.ijs.si/software/amavisd/
 COMMENT=	daemonized interface between MTA and content checkers
 
 DEPENDS+=	p5-Archive-Tar-[0-9]*:../../archivers/p5-Archive-Tar
-DEPENDS+=	p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
+DEPENDS+=	p5-Archive-Zip>=1.14:../../archivers/p5-Archive-Zip
 DEPENDS+=	p5-BerkeleyDB-[0-9]*:../../databases/p5-BerkeleyDB
 DEPENDS+=	p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib
 DEPENDS+=	p5-Convert-TNEF-[0-9]*:../../converters/p5-Convert-TNEF
-DEPENDS+=	p5-Convert-UUlib-[0-9]*:../../converters/p5-Convert-UUlib
-DEPENDS+=	p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
+DEPENDS+=	p5-Convert-UUlib>=1.05:../../converters/p5-Convert-UUlib
+DEPENDS+=	p5-Digest-MD5>=2.22:../../security/p5-Digest-MD5
 DEPENDS+=	p5-MIME-tools>=5.415:../../mail/p5-MIME-tools
 DEPENDS+=	p5-MailTools>=1.58:../../mail/p5-MailTools
 DEPENDS+=	p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
diff --git a/security/amavisd-new/PLIST b/security/amavisd-new/PLIST
index e9a00267c57..ba80d98c838 100644
--- a/security/amavisd-new/PLIST
+++ b/security/amavisd-new/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/05 14:53:05 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/08/22 09:47:30 cube Exp $
 ${MILTER}sbin/amavis
 ${MILTER}sbin/amavis-milter
 sbin/amavisd
@@ -27,6 +27,7 @@ share/doc/amavisd-new/README.postfix
 share/doc/amavisd-new/README.protocol
 share/doc/amavisd-new/README.sendmail
 share/doc/amavisd-new/README.sendmail-dual
+share/doc/amavisd-new/README.sql
 share/doc/amavisd-new/RELEASE_NOTES
 share/doc/amavisd-new/amavisd-new-docs.html
 share/examples/amavisd-new/amavisd.conf-default
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index 6f38b3a361a..15de33173f4 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:10:05 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/08/22 09:47:30 cube Exp $
 
-SHA1 (amavisd-new-2.2.1.tar.gz) = e7624364c52c450d9d92784c1c7395c524be253a
-RMD160 (amavisd-new-2.2.1.tar.gz) = 7b8540575aac552752a37a3b8ad6b5b817717811
-Size (amavisd-new-2.2.1.tar.gz) = 741461 bytes
-SHA1 (patch-aa) = 30a62b2e8954bcb5b106a9715f1e64837065fbe0
+SHA1 (amavisd-new-2.3.1.tar.gz) = 7cdb1294252e147e829a473f97ada2a8fefe1203
+RMD160 (amavisd-new-2.3.1.tar.gz) = fc0a97a21a01fa5b84a3cc50d4159ca632fc3c3d
+Size (amavisd-new-2.3.1.tar.gz) = 780829 bytes
+SHA1 (patch-aa) = c669fda0df16424c9234ad4ba7dcb080e8b66354
diff --git a/security/amavisd-new/patches/patch-aa b/security/amavisd-new/patches/patch-aa
index 3e91d1180c2..7ab78d6054b 100644
--- a/security/amavisd-new/patches/patch-aa
+++ b/security/amavisd-new/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/11/28 23:31:49 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2005/08/22 09:47:30 cube Exp $
 
---- amavisd.conf.orig	2004-11-02 22:22:48.000000000 +0100
+--- amavisd.conf.orig	2005-05-09 20:22:36.000000000 +0200
 +++ amavisd.conf
-@@ -12,15 +12,15 @@ use strict;
+@@ -14,15 +14,15 @@ use strict;
  # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
  
  $max_servers = 2;            # number of pre-forked children (2..15 is common)
@@ -19,15 +19,15 @@ $NetBSD: patch-aa,v 1.2 2004/11/28 23:31:49 wiz Exp $
  $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR
 -$QUARANTINEDIR = '/var/virusmails';
 +$QUARANTINEDIR = '@AMAVIS_QUARANTINE@';
+ # $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
  
  # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef
- 
-@@ -72,7 +72,7 @@ $mailfrom_to_quarantine = ''; # null ret
+@@ -79,7 +79,7 @@ $mailfrom_to_quarantine = ''; # null ret
  # $recipient_delimiter = '+';  # undef disables address extensions altogether
  # when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+
  
 -$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
 +$path = '@PREFIX@/sbin:@PREFIX@/bin:@LOCALBASE@/sbin:@LOCALBASE@/bin:/usr/sbin:/sbin:/usr/bin:/bin';
- $file   = 'file';   # file(1) utility; use recent versions
- $gzip   = 'gzip';
- $bzip2  = 'bzip2';
+ # $dspam = 'dspam';
+ 
+ $MAXLEVELS = 14;