Amavisd-new updated to latest version, bug fixes and some new features
from current version.
http://www.ijs.si/software/amavisd/release-notes.txt
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 4 Jan 2008 02:53:52 -0000 1.6
+++ Makefile 1 Jul 2008 16:13:47 -0000
@@ -2,7 +2,7 @@
COMMENT= interface between mailer MTA and content checkers
-DISTNAME= amavisd-new-2.5.3
+DISTNAME= amavisd-new-2.6.1
CATEGORIES= mail security
HOMEPAGE= http://www.ijs.si/software/amavisd/
@@ -14,7 +14,11 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= ${HOMEPAGE} \
+ http://mirrors.catpipe.net/amavisd-new/ \
+ http://mirror.mainloop.se/amavisd/ \
+ http://mirror.cedratnet.com/amavisd-new/ \
+ http://mirror.omroep.nl/amavisd-new/
RUN_DEPENDS= ::archivers/arc \
::archivers/bzip2 \
@@ -33,8 +37,10 @@ RUN_DEPENDS= ::archivers/arc \
::converters/p5-Convert-TNEF \
::converters/rpm2cpio \
:p5-Convert-UUlib->=1.05:converters/p5-Convert-UUlib \
+ ::databases/p5-BerkeleyDB \
::devel/p5-Net-Server \
::mail/p5-Mail-SpamAssassin \
+ :p5-Mail-DKIM->=0.31:mail/p5-Mail-DKIM \
::mail/p5-MIME-tools \
::sysutils/p5-Unix-Syslog
@@ -45,6 +51,12 @@ PKG_ARCH= *
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${PREFIX}/sbin/amavisd
+ ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-agent \
+ ${PREFIX}/bin/amavisd-agent
+ ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-nanny \
+ ${PREFIX}/bin/amavisd-nanny
+ ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-release \
+ ${PREFIX}/bin/amavisd-release
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amavisd-new
${INSTALL_DATA} ${WRKSRC}/AAAREADME.first \
${PREFIX}/share/doc/amavisd-new
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 4 Jan 2008 02:53:52 -0000 1.6
+++ distinfo 1 Jul 2008 16:13:47 -0000
@@ -1,5 +1,5 @@
-MD5 (amavisd-new-2.5.3.tar.gz) = XPGnpIGFXGcSN4wEdQWCVQ==
-RMD160 (amavisd-new-2.5.3.tar.gz) = Sbl/83grQviqunvrc0QDmNg2ONk=
-SHA1 (amavisd-new-2.5.3.tar.gz) = LhRgrVBa1CUah27FBtAho5LHwMA=
-SHA256 (amavisd-new-2.5.3.tar.gz) =
9yRlThXqs/q84ihzpfKg/PLbk3TKhJec8Gaik2DuUz0=
-SIZE (amavisd-new-2.5.3.tar.gz) = 789275
+MD5 (amavisd-new-2.6.1.tar.gz) = JHTUwDT5aljluK+Rr1FGiQ==
+RMD160 (amavisd-new-2.6.1.tar.gz) = yeJIVAv6+cxquWd3a9mOFktjbbg=
+SHA1 (amavisd-new-2.6.1.tar.gz) = UePj2cKqoz9qQahAksgq25TiqAY=
+SHA256 (amavisd-new-2.6.1.tar.gz) =
TJh4bktpRFn2usQkE800t9AWV2O5CLMjTVQHEm+zsT0=
+SIZE (amavisd-new-2.6.1.tar.gz) = 911740
Index: patches/patch-amavisd
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd,v
retrieving revision 1.4
diff -u -p -r1.4 patch-amavisd
--- patches/patch-amavisd 27 Nov 2007 13:53:19 -0000 1.4
+++ patches/patch-amavisd 1 Jul 2008 16:13:47 -0000
@@ -1,20 +1,19 @@
$OpenBSD: patch-amavisd,v 1.4 2007/11/27 13:53:19 okan Exp $
---- 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 {
+--- amavisd.orig Wed Apr 23 20:50:05 2008
++++ amavisd Thu May 8 20:19:26 2008
+@@ -212,7 +212,7 @@ BEGIN {
+ File::Glob->import(':globally'); # use the same module as Perl 5.8 uses
+ }
fetch_modules('REQUIRED BASIC MODULES', 1, qw(
- Exporter POSIX Fcntl Socket Errno Carp Time::HiRes
+ 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
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,
+@@ -20166,6 +20166,7 @@ sub initializeSpamAssassin {
stop_at_threshold => 0,
--# LOCAL_STATE_DIR => '/var/lib',
+ need_tags => 'TIMING,LANGUAGES,RELAYCOUNTRY,ASN,ASNCIDR',
+ # LOCAL_STATE_DIR => '/var/lib',
+ LOCAL_STATE_DIR => '/var/db/spamassassin',
# PREFIX => '/usr/local',
# DEF_RULES_DIR => '/usr/local/share/spamassassin',
Index: patches/patch-amavisd-release
===================================================================
RCS file: patches/patch-amavisd-release
diff -N patches/patch-amavisd-release
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-amavisd-release 1 Jul 2008 16:13:47 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- amavisd-release.orig Fri Feb 22 16:11:37 2008
++++ amavisd-release Fri Feb 22 16:12:33 2008
+@@ -11,7 +11,7 @@
+ # To be placed in amavisd.conf:
+ # $interface_policy{'SOCK'} = 'AM.PDP';
+ # $policy_bank{'AM.PDP'} = {protocol=>'AM.PDP'};
+-# $unix_socketname='/var/amavis/amavisd.sock';
++# $unix_socketname='/var/amavisd/amavisd.sock';
+ #or:
+ # $interface_policy{'9998'} = 'AM.PDP';
+ # $policy_bank{'AM.PDP'} = {protocol=>'AM.PDP'};
+@@ -79,7 +79,7 @@ use vars qw($log_level $socketname);
+
+ $log_level = 1;
+ # $socketname = '127.0.0.1:9998';
+- $socketname = '/var/amavis/amavisd.sock';
++ $socketname = '/var/amavisd/amavisd.sock';
+
+ sub sanitize_str {
+ my($str, $keep_eol) = @_;
Index: patches/patch-amavisd_conf
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd_conf,v
retrieving revision 1.3
diff -u -p -r1.3 patch-amavisd_conf
--- patches/patch-amavisd_conf 27 Nov 2007 13:53:19 -0000 1.3
+++ patches/patch-amavisd_conf 1 Jul 2008 16:13:47 -0000
@@ -1,10 +1,10 @@
$OpenBSD: patch-amavisd_conf,v 1.3 2007/11/27 13:53:19 okan Exp $
---- amavisd.conf.orig Wed Jun 27 12:42:55 2007
-+++ amavisd.conf Sat Nov 24 11:18:48 2007
+--- amavisd.conf.orig Wed Apr 23 20:49:58 2008
++++ amavisd.conf Thu May 8 20:19:02 2008
@@ -15,12 +15,12 @@ use strict;
# $bypass_decode_parts = 1; # controls running of decoders&dearchivers
- $max_servers = 2; # num of pre-forked children (2..15 is common),
-m
+ $max_servers = 2; # num of pre-forked children (2..30 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
@@ -13,11 +13,11 @@ $OpenBSD: patch-amavisd_conf,v 1.3 2007/
$mydomain = 'example.com'; # a convenient default for other settings
-# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H
-+$MYHOME = '/var/amavisd'; # 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
+@@ -44,7 +44,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
@@ -25,4 +25,4 @@ $OpenBSD: patch-amavisd_conf,v 1.3 2007/
+$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
-
+ $enable_dkim_verification = 1; # enable DKIM signatures verification
Index: patches/patch-amavisd_conf-sample
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd_conf-sample,v
retrieving revision 1.2
diff -u -p -r1.2 patch-amavisd_conf-sample
--- patches/patch-amavisd_conf-sample 27 Nov 2007 13:53:19 -0000 1.2
+++ patches/patch-amavisd_conf-sample 1 Jul 2008 16:13:47 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-amavisd_conf-sample,v 1.2 2007/11/27 13:53:19 okan Exp $
---- amavisd.conf-sample.orig Wed Jun 27 12:42:49 2007
-+++ amavisd.conf-sample Sat Nov 24 10:18:52 2007
+--- amavisd.conf-sample.orig Wed Apr 23 20:49:52 2008
++++ amavisd.conf-sample Thu May 8 20:19:02 2008
@@ -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
@@ -20,4 +20,4 @@ $OpenBSD: patch-amavisd_conf-sample,v 1.
+$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
- # MTA SETTINGS, UNCOMMENT AS APPROPRIATE,
+ $enable_dkim_verification = 1; # enable DKIM signatures verification
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 27 Nov 2007 13:53:19 -0000 1.6
+++ pkg/PLIST 1 Jul 2008 16:13:47 -0000
@@ -1,6 +1,9 @@
@comment $OpenBSD: PLIST,v 1.6 2007/11/27 13:53:19 okan Exp $
@newgroup _vscan:530
@newuser _vscan:530:_vscan::Amavisd-new Daemon:/var/empty:/sbin/nologin
+bin/amavisd-agent
+bin/amavisd-nanny
+bin/amavisd-release
sbin/amavisd
share/doc/amavisd-new/
share/doc/amavisd-new/AAAREADME.first
@@ -45,4 +48,6 @@ share/examples/amavisd-new/amavisd.conf-
@group _vscan
@sample /var/amavisd/
@sample /var/amavisd/tmp/
[EMAIL PROTECTED] /var/amavisd/db/
[EMAIL PROTECTED] /var/amavisd/var/
@extraunexec rm -rf /var/amavisd/* 2>/dev/null || true
