Amavisd-new updated to latest version (2.5.2),
many bug fixes and new feautures added.
Changelog available at http://www.ijs.si/software/amavisd/release-notes.txt
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 16 Sep 2007 00:17:04 -0000 1.4
+++ Makefile 24 Nov 2007 10:34:14 -0000
@@ -2,8 +2,7 @@
COMMENT= interface between mailer MTA and content checkers
-VERSION= 2.3.2
-PKGNAME= ${DISTNAME}p0
+VERSION= 2.5.2
DISTNAME= amavisd-new-${VERSION}
CATEGORIES= mail security
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 5 Apr 2007 16:20:01 -0000 1.4
+++ distinfo 24 Nov 2007 10:34:14 -0000
@@ -1,5 +1,5 @@
-MD5 (amavisd-new-2.3.2.tar.gz) = SvR/fgsqr3G9V4PcJqV2qA==
-RMD160 (amavisd-new-2.3.2.tar.gz) = Y5yKUtnQ/d8Wt0A7ubn9wAR7VCY=
-SHA1 (amavisd-new-2.3.2.tar.gz) = NMJ2MQuY7dBqTrTfVOJcQtK62AI=
-SHA256 (amavisd-new-2.3.2.tar.gz) =
nyjvEj3YigLPRsMDTE1jwtKF0+7bgf39JUaF4X3A3t0=
-SIZE (amavisd-new-2.3.2.tar.gz) = 786156
+MD5 (amavisd-new-2.5.2.tar.gz) = UtIn1EL6xkkWSIuD15gG1w==
+RMD160 (amavisd-new-2.5.2.tar.gz) = t7yZisNEKLYs904cEUspWp8yJlI=
+SHA1 (amavisd-new-2.5.2.tar.gz) = JGUTFEjOENrIURRQaV/2O8Vl5ts=
+SHA256 (amavisd-new-2.5.2.tar.gz) =
X1kIUMUFAXwmM/R87Ug6riPshX4qeC92PrFvn58/zu8=
+SIZE (amavisd-new-2.5.2.tar.gz) = 788546
Index: patches/patch-amavisd
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd,v
retrieving revision 1.3
diff -u -r1.3 patch-amavisd
--- patches/patch-amavisd 31 Oct 2006 20:41:40 -0000 1.3
+++ patches/patch-amavisd 24 Nov 2007 10:34:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-amavisd,v 1.3 2006/10/31 20:41:40 pvalchev Exp $
---- amavisd.orig Wed Jun 29 06:26:11 2005
-+++ amavisd Tue Oct 31 08:15:59 2006
-@@ -128,7 +128,7 @@ sub fetch_modules($$@) {
+--- amavisd.orig Wed Jun 27 12:43:00 2007
++++ amavisd Sat Nov 24 10:18:12 2007
+@@ -153,7 +153,7 @@ sub fetch_modules($$@) {
BEGIN {
fetch_modules('REQUIRED BASIC MODULES', 1, qw(
@@ -9,12 +9,13 @@
+ Exporter POSIX Fcntl Socket Errno Carp Carp::Heavy Time::HiRes
IO::Handle IO::File IO::Socket IO::Socket::UNIX IO::Socket::INET
IO::Wrap IO::Stringy Digest::MD5 Unix::Syslog File::Basename
- Mail::Field Mail::Address Mail::Header Mail::Internet Compress::Zlib
-@@ -12566,6 +12566,7 @@ sub init() {
+ Compress::Zlib MIME::Base64 MIME::QuotedPrint MIME::Words
+@@ -17909,7 +17909,7 @@ sub initializeSpamAssassin {
local_tests_only => $sa_local_tests_only,
home_dir_for_helpers => $helpers_home,
stop_at_threshold => 0,
+-# LOCAL_STATE_DIR => '/var/lib',
+ LOCAL_STATE_DIR => '/var/db/spamassassin',
+ # PREFIX => '/usr/local',
# DEF_RULES_DIR => '/usr/local/share/spamassassin',
- # LOCAL_RULES_DIR => '/etc/mail/spamassassin',
- #see man Mail::SpamAssassin for other options
+ # LOCAL_RULES_DIR => '/usr/local/etc/mail/spamassassin',
Index: patches/patch-amavisd_conf
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd_conf,v
retrieving revision 1.2
diff -u -r1.2 patch-amavisd_conf
--- patches/patch-amavisd_conf 7 Aug 2005 21:25:55 -0000 1.2
+++ patches/patch-amavisd_conf 24 Nov 2007 10:34:14 -0000
@@ -1,28 +1,28 @@
$OpenBSD: patch-amavisd_conf,v 1.2 2005/08/07 21:25:55 sturm Exp $
---- amavisd.conf.orig Wed Jun 29 12:26:05 2005
-+++ amavisd.conf Sun Aug 7 19:15:35 2005
-@@ -14,12 +14,12 @@ use strict;
- # @bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code
+--- amavisd.conf.orig Wed Jun 27 12:42:55 2007
++++ amavisd.conf Sat Nov 24 11:18:48 2007
+@@ -15,12 +15,12 @@ use strict;
+ # $bypass_decode_parts = 1; # controls running of decoders&dearchivers
- $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 = '_vscan'; # (no default; customary: vscan or amavis)
-+$daemon_group = '_vscan'; # (no default; customary: vscan or amavis)
+ $max_servers = 2; # num of pre-forked children (2..15 is common),
-m
+-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
+-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
++$daemon_user = '_vscan'; # (no default; customary: vscan or amavis), -u
++$daemon_group = '_vscan'; # (no default; customary: vscan or amavis), -g
$mydomain = 'example.com'; # a convenient default for other settings
--$MYHOME = '/var/amavis'; # a convenient default for other settings
-+$MYHOME = '/var/amavisd'; # 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';
-@@ -42,7 +42,7 @@ $log_recip_templ = undef; # disable b
- $DO_SYSLOG = 1; # log via syslogd (preferred)
- $SYSLOG_LEVEL = 'mail.debug';
+-# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H
++$MYHOME = '/var/amavisd'; # a convenient default for other settings, -H
+ $TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T
+ $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc.
+ $QUARANTINEDIR = '/var/virusmails'; # -Q
+@@ -42,7 +42,7 @@ $syslog_facility = 'mail'; # Syslog facility as a st
+ $syslog_priority = 'debug'; # Syslog base (minimal) priority as a string,
+ # choose from: emerg, alert, crit, err, warning, notice, info,
debug
-$enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny)
+$enable_db = 0; # enable use of BerkeleyDB/libdb (SNMP and nanny)
$enable_global_cache = 1; # enable use of libdb-based cache if $enable_db=1
+ $nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed
- $inet_socket_port = 10024; # listen on this local TCP port(s) (see
$protocol)
Index: patches/patch-amavisd_conf-sample
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd_conf-sample,v
retrieving revision 1.1
diff -u -r1.1 patch-amavisd_conf-sample
--- patches/patch-amavisd_conf-sample 7 Aug 2005 21:27:04 -0000 1.1
+++ patches/patch-amavisd_conf-sample 24 Nov 2007 10:34:14 -0000
@@ -1,20 +1,20 @@
$OpenBSD: patch-amavisd_conf-sample,v 1.1 2005/08/07 21:27:04 sturm Exp $
---- amavisd.conf-sample.orig Wed Jun 29 12:25:59 2005
-+++ amavisd.conf-sample Sun Aug 7 19:15:54 2005
-@@ -73,8 +73,8 @@ $mydomain = 'example.com'; # (no us
+--- amavisd.conf-sample.orig Wed Jun 27 12:42:49 2007
++++ amavisd.conf-sample Sat Nov 24 10:18:52 2007
+@@ -74,8 +74,8 @@ $mydomain = 'example.com'; # (no useful default)
# 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 = 'vscan'; # (no default; customary: vscan or amavis or
sweep)
-+$daemon_user = '_vscan'; # (no default; customary: vscan or amavis)
-+$daemon_group = '_vscan'; # (no default; customary: vscan or amavis or
sweep)
+-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
+-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
++$daemon_user = '_vscan'; # (no default; customary: vscan or amavis), -u
++$daemon_group = '_vscan'; # (no default; customary: vscan or amavis), -g
# Runtime working directory (cwd), and a place where
# temporary directories for unpacking mail are created.
-@@ -99,7 +99,7 @@ $TEMPBASE = $MYHOME; # (must be
- $ENV{TMPDIR} = $TEMPBASE; # wise to set TMPDIR, but not obligatory
- #...
+@@ -99,7 +99,7 @@ $TEMPBASE = $MYHOME; # (must be set if other c
+ # set environment variables if you want (no defaults):
+ $ENV{TMPDIR} = $TEMPBASE; # used for SA temporary files, by some decoders,
etc.
-$enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny)
+$enable_db = 0; # enable use of BerkeleyDB/libdb (SNMP and nanny)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 7 Aug 2005 21:25:55 -0000 1.5
+++ pkg/PLIST 24 Nov 2007 10:34:14 -0000
@@ -12,30 +12,36 @@
share/doc/amavisd-new/README.chroot
share/doc/amavisd-new/README.contributed
share/doc/amavisd-new/README.courier
+share/doc/amavisd-new/README.courier-old
share/doc/amavisd-new/README.customize
share/doc/amavisd-new/README.exim_v3
share/doc/amavisd-new/README.exim_v3_app
share/doc/amavisd-new/README.exim_v4
share/doc/amavisd-new/README.exim_v4_app
share/doc/amavisd-new/README.exim_v4_app2
+share/doc/amavisd-new/README.ldap
share/doc/amavisd-new/README.lookups
share/doc/amavisd-new/README.milter
share/doc/amavisd-new/README.old.scanners
share/doc/amavisd-new/README.performance
share/doc/amavisd-new/README.policy-on-notifications
share/doc/amavisd-new/README.postfix
+share/doc/amavisd-new/README.postfix.html
share/doc/amavisd-new/README.protocol
share/doc/amavisd-new/README.sendmail
share/doc/amavisd-new/README.sendmail-dual
+share/doc/amavisd-new/README.sendmail-dual.old
share/doc/amavisd-new/README.sql
+share/doc/amavisd-new/README.sql-mysql
+share/doc/amavisd-new/README.sql-pg
share/doc/amavisd-new/RELEASE_NOTES
share/examples/amavisd-new/
-share/examples/amavisd-new/amavisd.conf-sample
-share/examples/amavisd-new/amavisd.conf-default
share/examples/amavisd-new/amavisd.conf
@sample ${SYSCONFDIR}/amavisd.conf
+share/examples/amavisd-new/amavisd.conf-default
+share/examples/amavisd-new/amavisd.conf-sample
[EMAIL PROTECTED] 755
@owner _vscan
@group _vscan
[EMAIL PROTECTED] 755
@sample /var/amavisd/
@extraunexec rm -rf /var/amavisd/* 2>/dev/null || true