Upgrade to 2.1.0.

PR:		ports/70526
Submitted by:	maintainer

6 files changed, 51 insertions, 47 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 018fca2..a2673997 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -7,8 +7,8 @@
 # Based on amavisd ports makefile.
 
 PORTNAME=	amavisd-new
-PORTVERSION=	20040701
-PORTREVISION=	1
+PORTVERSION=	2.1.0
+PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 		http://mirrors.catpipe.net/amavisd-new/ \
@@ -98,7 +98,7 @@ pre-build:
 	for f in amavisd.sh amavis-milter.sh INSTALL DEINSTALL MESSAGE; do \
 		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${f}.tmpl > ${WRKDIR}/$${f}; \
 	done
-	for f in amavisd.conf amavisd.conf-sample amavisd; do \
+	for f in amavisd.conf amavisd.conf-sample amavisd amavisd-nanny; do \
 		${SED} ${SED_SCRIPT} < ${WRKSRC}/$${f} > ${WRKDIR}/$${f}; \
 	done
 
@@ -112,6 +112,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/amavis-milter.sh ${PREFIX}/etc/rc.d
 .endif
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKDIR}/amavisd-nanny ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist
 .if !exists(${PREFIX}/etc/amavisd.conf)
 	${INSTALL_SCRIPT} ${WRKDIR}/amavisd.conf ${PREFIX}/etc
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index d8f75a7..aff1cd0 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1,2 +1,2 @@
-MD5 (amavisd-new-20040701.tar.gz) = d5566eeaf1e47b6c856f4e676e93d584
-SIZE (amavisd-new-20040701.tar.gz) = 451622
+MD5 (amavisd-new-2.1.0.tar.gz) = 200b0568ac9d14819c80575989617db6
+SIZE (amavisd-new-2.1.0.tar.gz) = 464610
diff --git a/security/amavisd-new/files/patch-amavisd-nanny b/security/amavisd-new/files/patch-amavisd-nanny
new file mode 100644
index 0000000..8e2860b
--- /dev/null
+++ b/security/amavisd-new/files/patch-amavisd-nanny
@@ -0,0 +1,11 @@
+--- amavisd-nanny.orig	Wed Aug 11 02:39:16 2004
++++ amavisd-nanny	Mon Aug 16 11:41:56 2004
+@@ -61,7 +61,7 @@
+ # main program starts here
+   $SIG{INT} = sub { die "\n" };
+   my($env) = BerkeleyDB::Env->new(
+-    '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
++    '-Home'=>'%%AMAVISDIR%%/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
+   defined $env or die "BDB no env: $BerkeleyDB::Error $!";
+   my($db) = BerkeleyDB::Hash->new(
+     '-Filename'=>'nanny.db', '-Env'=>$env );
diff --git a/security/amavisd-new/files/patch-amavisd-sample.conf b/security/amavisd-new/files/patch-amavisd-sample.conf
index 0e4863a..394c973 100644
--- a/security/amavisd-new/files/patch-amavisd-sample.conf
+++ b/security/amavisd-new/files/patch-amavisd-sample.conf
@@ -1,6 +1,6 @@
---- amavisd.conf-sample.orig	Mon Nov 10 00:07:53 2003
-+++ amavisd.conf-sample	Tue Nov 11 22:48:05 2003
-@@ -51,7 +51,7 @@
+--- amavisd.conf-sample.orig	Mon Aug 16 03:03:09 2004
++++ amavisd.conf-sample	Mon Aug 16 10:47:54 2004
+@@ -58,7 +58,7 @@
  # $MYHOME serves as a quick default for some other configuration settings.
  # More refined control is available with each individual setting further down.
  # $MYHOME is not used directly by the program. No trailing slash!
@@ -9,18 +9,18 @@
  
  # $mydomain serves as a quick default for some other configuration settings.
  # More refined control is available with each individual setting further down.
-@@ -60,8 +60,8 @@
+@@ -69,8 +69,8 @@
  
  # Set the user and group to which the daemon will change if started as root
  # (otherwise just keeps the UID unchanged, and these settings have no effect):
--$daemon_user  = 'vscan';	# (no default;  customary: vscan or amavis)
--$daemon_group = 'sweep';	# (no default;  customary: vscan or amavis)
-+$daemon_user  = '%%AMAVISUSER%%';	# (no default;  customary: vscan or amavis)
-+$daemon_group = '%%AMAVISGROUP%%';	# (no default;  customary: vscan or amavis)
+-$daemon_user  = 'vscan';   # (no default;  customary: vscan or amavis)
+-$daemon_group = 'vscan';   # (no default;  customary: vscan or amavis or sweep)
++$daemon_user  = '%%AMAVISUSER%%';   # (no default;  customary: vscan or amavis)
++$daemon_group = '%%AMAVISGROUP%%';   # (no default;  customary: vscan or amavis or sweep)
  
  # Runtime working directory (cwd), and a place where
  # temporary directories for unpacking mail are created.
-@@ -274,7 +274,7 @@
+@@ -284,7 +284,7 @@
  # 3: server, client
  # 4: decompose parts
  # 5: more debug details
@@ -29,12 +29,12 @@
  
  # Customizable template for the most interesting log file entry (e.g. with
  # $log_level=0) (take care to properly quote Perl special characters like '\')
-@@ -510,7 +510,7 @@
+@@ -567,7 +567,7 @@
  #   or a directory (no trailing slash)
  #   (the default value is undef, meaning no quarantine)
  #
 -$QUARANTINEDIR = '/var/virusmails';
 +$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
  
- #$virus_quarantine_method = "local:virus-%i-%n";    # default
- #$spam_quarantine_method  = "local:spam-%b-%i-%n";  # default
+ #$virus_quarantine_method        = 'local:virus-%i-%n';    # default
+ #$spam_quarantine_method         = 'local:spam-%b-%i-%n';  # default
diff --git a/security/amavisd-new/files/patch-amavisd.conf b/security/amavisd-new/files/patch-amavisd.conf
index bf2ceca..4311e98 100644
--- a/security/amavisd-new/files/patch-amavisd.conf
+++ b/security/amavisd-new/files/patch-amavisd.conf
@@ -1,38 +1,29 @@
---- amavisd.conf.orig	Thu Jul  1 22:04:36 2004
-+++ amavisd.conf	Wed Aug 11 16:23:13 2004
-@@ -9,7 +9,7 @@
- # MUST BE SET (no useful default):
- 
- $mydomain = 'example.com';
--$MYHOME   = '/var/amavis';
-+$MYHOME   = '%%AMAVISDIR%%';
- $TEMPBASE = "$MYHOME/tmp";
- 
- 
-@@ -19,8 +19,8 @@
+--- amavisd.conf.orig	Mon Aug 16 03:03:16 2004
++++ amavisd.conf	Mon Aug 16 10:51:16 2004
+@@ -12,15 +12,15 @@
  # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
  
- $max_servers = 2;         # number of pre-forked children
--$daemon_user  = 'vscan';  # (no default;  customary: vscan or amavis)
--$daemon_group = 'vscan';  # (no default;  customary: vscan or amavis)
-+$daemon_user  = '%%AMAVISUSER%%';  # (no default;  customary: vscan or amavis)
-+$daemon_group = '%%AMAVISGROUP%%';  # (no default;  customary: vscan or amavis)
- @local_domains_maps = ( [".$mydomain"] );
+ $max_servers = 2;            # number of pre-forked children (2..15 is common)
+-$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis)
+-$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis)
++$daemon_user  = '%%AMAVISUSER%%';     # (no default;  customary: vscan or amavis)
++$daemon_group = '%%AMAVISGROUP%%';    # (no default;  customary: vscan or amavis)
  
- $log_level = 0;
-@@ -28,7 +28,7 @@
- $DO_SYSLOG = 1;
- $SYSLOG_LEVEL = 'mail.info';
- $ENV{TMPDIR} = $TEMPBASE;
+ $mydomain = 'example.com';   # a convenient default for other settings
+ 
+-$MYHOME   = '/var/amavis';   # a convenient default for other settings
++$MYHOME   = '%%AMAVISDIR%%'; # a convenient default for other settings
+ $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to be created manually
+ $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR
 -$QUARANTINEDIR = '/var/virusmails';
 +$QUARANTINEDIR = '%%AMAVISQUARANTINE%%';
- # $daemon_chroot_dir = $MYHOME;  # (default is undef, meaning: do not chroot)
  
- $inet_socket_port = 10024;   # accept SMTP on this local TCP port(s) (Postfix)
-@@ -50,10 +50,10 @@
- $mailfrom_notify_admin     = "virusalert\@$mydomain";
- $mailfrom_notify_recip     = "virusalert\@$mydomain";
- $mailfrom_notify_spamadmin = "spam.police\@$mydomain";
+ # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef
+ 
+@@ -65,10 +65,10 @@
+ $mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender
+ $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
+ 
 -@addr_extension_virus_maps      = ('virus');
 -@addr_extension_spam_maps       = ('spam');
 -@addr_extension_banned_maps     = ('banned');
@@ -43,4 +34,4 @@
 +#@addr_extension_bad_header_maps = ('badh');
  
  $path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
- $file   = 'file';   # file(1) utility; use 3.41 or later to avoid vulnerability
+ $file   = 'file';   # file(1) utility; use recent versions
diff --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist
index 19e9e86..827b397 100644
--- a/security/amavisd-new/pkg-plist
+++ b/security/amavisd-new/pkg-plist
@@ -32,3 +32,4 @@ etc/rc.d/amavisd.sh
 %%AMAVIS_NOMILTER%%sbin/amavis
 %%AMAVIS_NOMILTER%%sbin/amavis-milter
 sbin/amavisd
+sbin/amavisd-nanny