Amavisd-new updated to latest version 2.5.4, some bugs has been fixed; I have enabled some addictional utilities. 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 28 Mar 2008 14:05:07 -0000 @@ -2,7 +2,7 @@ COMMENT= interface between mailer MTA and content checkers -DISTNAME= amavisd-new-2.5.3 +DISTNAME= amavisd-new-2.5.4 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,6 +37,7 @@ 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 \ ::mail/p5-MIME-tools \ @@ -45,6 +50,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 28 Mar 2008 14:05:07 -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.5.4.tar.gz) = nUgstVXh6MCDTba5CEO0pA== +RMD160 (amavisd-new-2.5.4.tar.gz) = w3jnDSVMADy52Tm6nckUDlXqoC8= +SHA1 (amavisd-new-2.5.4.tar.gz) = xjc1WU7LwFhQrfgbzTDhk+uHPjg= +SHA256 (amavisd-new-2.5.4.tar.gz) = G4QQ8CPJTczmGwUQ/HNxBvTDWoz/7oHBk2TNuGxIrys= +SIZE (amavisd-new-2.5.4.tar.gz) = 791835 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 28 Mar 2008 14:05:07 -0000 @@ -1,6 +1,6 @@ $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 +--- amavisd.orig Wed Mar 12 20:06:37 2008 ++++ amavisd Thu Mar 20 12:16:13 2008 @@ -153,7 +153,7 @@ sub fetch_modules($$@) { BEGIN { @@ -10,7 +10,7 @@ $OpenBSD: patch-amavisd,v 1.4 2007/11/27 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 { +@@ -18019,7 +18019,7 @@ sub initializeSpamAssassin { local_tests_only => $sa_local_tests_only, home_dir_for_helpers => $helpers_home, stop_at_threshold => 0, Index: patches/patch-amavisd-agent =================================================================== RCS file: patches/patch-amavisd-agent diff -N patches/patch-amavisd-agent --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-amavisd-agent 28 Mar 2008 14:05:07 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- amavisd-agent.orig Thu Mar 20 12:21:58 2008 ++++ amavisd-agent Thu Mar 20 12:22:16 2008 +@@ -146,7 +146,7 @@ sub fmt_ticks($) { + { die "Usage: $0 [ -w <wait-interval> ]\n" } + } + my($env) = BerkeleyDB::Env->new( +- '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL); ++ '-Home'=>'/var/amavisd/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL); + defined $env or die "BDB no env: $BerkeleyDB::Error $!"; + my($db) = BerkeleyDB::Hash->new( + '-Filename'=>'snmp.db', '-Flags'=>DB_RDONLY, '-Env'=>$env ); Index: patches/patch-amavisd-nanny =================================================================== RCS file: patches/patch-amavisd-nanny diff -N patches/patch-amavisd-nanny --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-amavisd-nanny 28 Mar 2008 14:05:07 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- amavisd-nanny.orig Thu Mar 20 12:20:51 2008 ++++ amavisd-nanny Thu Mar 20 12:21:06 2008 +@@ -56,7 +56,7 @@ my($idlettl) = 3*60*60; # idle children are sent a SIG + my($activettl) = 10*60; # stuck active children are sent a SIGTERM + # after this many seconds + +-my($db_home) = '/var/amavis/db'; # DB databases directory ++my($db_home) = '/var/amavisd/db'; # DB databases directory + my($dbfile) = 'nanny.db'; + my($wakeuptime) = 2; # sleep time in seconds, may be fractional + 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 28 Mar 2008 14:05:07 -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 28 Mar 2008 14:05:07 -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 Mar 12 20:06:30 2008 ++++ amavisd.conf Thu Mar 20 12:17:12 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,7 +13,7 @@ $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 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 28 Mar 2008 14:05:07 -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
