Update to latest release, lot of changes from 2.6 branch. Release notes available at http://www.amavis.org/release-notes.txt. Database schema has changed, you should read carefully README.sql if you use Mysql or Pgsql for storage or lookups. Use patch -E to apply the diff. Comments ? Ok ? Cheers Giovanni
Index: Makefile =================================================================== RCS file: /cvs/ports/mail/amavisd-new/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile 24 May 2011 16:04:16 -0000 1.22 +++ Makefile 12 Jul 2011 17:06:05 -0000 @@ -2,10 +2,10 @@ COMMENT= interface between mailer MTA and content checkers -DISTNAME= amavisd-new-2.6.6 +DISTNAME= amavisd-new-2.7.0 CATEGORIES= mail security -HOMEPAGE= http://www.ijs.si/software/amavisd/ +HOMEPAGE= http://www.amavis.org/ MAINTAINER= Giovanni Bechis <giova...@openbsd.org> # GPLv2 @@ -47,6 +47,11 @@ NO_REGRESS= Yes PKG_ARCH= * +pre-configure: + @perl -pi -e 's,/var/amavis,/var/amavisd,g' ${WRKSRC}/amavisd-* + @perl -pi -e "s,= 'vscan',= '_vscan',g" ${WRKSRC}/amavisd-signer \ + ${WRKSRC}/amavisd.conf ${WRKSRC}/amavisd.conf-default + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${PREFIX}/sbin/amavisd ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-agent \ @@ -55,8 +60,12 @@ do-install: ${PREFIX}/bin/amavisd-nanny ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-release \ ${PREFIX}/bin/amavisd-release + ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-signer \ + ${PREFIX}/bin/amavisd-signer ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-snmp-subagent \ ${PREFIX}/bin/amavisd-snmp-subagent + ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-submit \ + ${PREFIX}/bin/amavisd-submit ${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl \ ${PREFIX}/bin/p0f-analyzer.pl ${INSTALL_DATA} ${WRKSRC}/JpegTester.pm \ @@ -78,7 +87,5 @@ do-install: ${PREFIX}/share/examples/amavisd-new/amavisd.conf ${INSTALL_DATA} ${WRKSRC}/amavisd.conf-default \ ${PREFIX}/share/examples/amavisd-new/amavisd.conf-default - ${INSTALL_DATA} ${WRKSRC}/amavisd.conf-sample \ - ${PREFIX}/share/examples/amavisd-new/amavisd.conf-sample .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/mail/amavisd-new/distinfo,v retrieving revision 1.12 diff -u -p -r1.12 distinfo --- distinfo 24 May 2011 16:04:16 -0000 1.12 +++ distinfo 12 Jul 2011 17:06:05 -0000 @@ -1,5 +1,5 @@ -MD5 (amavisd-new-2.6.6.tar.gz) = a923JRFcJoIRC4LUFJTfcw== -RMD160 (amavisd-new-2.6.6.tar.gz) = 6MJ8XCNmZaNz/Cmy9I1H6cjqyJs= -SHA1 (amavisd-new-2.6.6.tar.gz) = w1AlO1H5Ev46qojNvacq0DEHghA= -SHA256 (amavisd-new-2.6.6.tar.gz) = TTzgBfY9zozkdOB77AAdrFRYceK/VkHB/+v/a5eeM9U= -SIZE (amavisd-new-2.6.6.tar.gz) = 952177 +MD5 (amavisd-new-2.7.0.tar.gz) = fYXc4R5UWYwLQBCu8yPu/A== +RMD160 (amavisd-new-2.7.0.tar.gz) = uGndQc/VaxhVpC7cKFJ2AW9mPFw= +SHA1 (amavisd-new-2.7.0.tar.gz) = tLoKTp0/u/xqeQ6Bg3qLfrlID0c= +SHA256 (amavisd-new-2.7.0.tar.gz) = U0s9kcMeDoenNgLITf60swtOpk3umfzOq9WbG8AIKws= +SIZE (amavisd-new-2.7.0.tar.gz) = 941811 Index: patches/patch-amavisd =================================================================== RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd,v retrieving revision 1.8 diff -u -p -r1.8 patch-amavisd --- patches/patch-amavisd 13 Oct 2009 13:29:18 -0000 1.8 +++ patches/patch-amavisd 12 Jul 2011 17:06:05 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-amavisd,v 1.8 2009/10/13 13:29:18 giovanni Exp $ ---- amavisd.orig Thu Jun 25 14:39:01 2009 -+++ amavisd Mon Jul 20 17:49:14 2009 -@@ -22083,6 +22083,7 @@ sub initializeSpamAssassin { +--- amavisd.orig Fri Jul 1 18:21:07 2011 ++++ amavisd Tue Jul 12 10:39:35 2011 +@@ -24679,6 +24679,7 @@ sub new_SpamAssassin_instance { rules_filename => $sa_configpath, site_rules_filename => $sa_siteconfigpath, # LOCAL_STATE_DIR => '/var/lib', Index: patches/patch-amavisd-agent =================================================================== RCS file: patches/patch-amavisd-agent diff -N patches/patch-amavisd-agent --- patches/patch-amavisd-agent 13 Oct 2009 13:29:18 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-amavisd-agent,v 1.1 2009/10/13 13:29:18 giovanni Exp $ ---- amavisd-agent.orig Mon Jul 20 17:50:55 2009 -+++ amavisd-agent Mon Jul 20 17:51:09 2009 -@@ -50,7 +50,7 @@ use BerkeleyDB; - - my($dbfile) = 'snmp.db'; - my($db_home) = # DB databases directory -- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; -+ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavisd/db'; - - my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional - my($repeatcount); # -c, repeat count (when defined) Index: patches/patch-amavisd-nanny =================================================================== RCS file: patches/patch-amavisd-nanny diff -N patches/patch-amavisd-nanny --- patches/patch-amavisd-nanny 13 Oct 2009 13:29:18 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-amavisd-nanny,v 1.1 2009/10/13 13:29:18 giovanni Exp $ ---- amavisd-nanny.orig Mon Jul 20 17:50:13 2009 -+++ amavisd-nanny Mon Jul 20 17:50:31 2009 -@@ -58,7 +58,7 @@ my($activettl) = 10*60; # stuck active children are se - - my($dbfile) = 'nanny.db'; - my($db_home) = # DB databases directory -- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; -+ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavisd/db'; - my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional - my($repeatcount); # -c, repeat count (when defined) - Index: patches/patch-amavisd-release =================================================================== RCS file: patches/patch-amavisd-release diff -N patches/patch-amavisd-release --- patches/patch-amavisd-release 23 Sep 2008 21:39:21 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-amavisd-release,v 1.1 2008/09/23 21:39:21 kili Exp $ ---- 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-snmp-subagent =================================================================== RCS file: patches/patch-amavisd-snmp-subagent diff -N patches/patch-amavisd-snmp-subagent --- patches/patch-amavisd-snmp-subagent 13 Oct 2009 13:29:18 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-amavisd-snmp-subagent,v 1.1 2009/10/13 13:29:18 giovanni Exp $ ---- amavisd-snmp-subagent.orig Mon Jul 20 17:51:16 2009 -+++ amavisd-snmp-subagent Mon Jul 20 17:51:40 2009 -@@ -64,7 +64,7 @@ $syslog_ident = $myproduct_name; - $syslog_facility = LOG_MAIL; - - my($db_home) = # DB databases directory -- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; -+ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavisd/db'; - - my($mta_queue_dir); - Index: patches/patch-amavisd_conf =================================================================== RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd_conf,v retrieving revision 1.5 diff -u -p -r1.5 patch-amavisd_conf --- patches/patch-amavisd_conf 16 Nov 2009 10:37:31 -0000 1.5 +++ patches/patch-amavisd_conf 12 Jul 2011 17:06:05 -0000 @@ -1,14 +1,14 @@ $OpenBSD: patch-amavisd_conf,v 1.5 2009/11/16 10:37:31 giovanni Exp $ ---- amavisd.conf.orig Thu Jun 25 14:38:47 2009 -+++ amavisd.conf Thu Nov 12 17:08:56 2009 -@@ -15,12 +15,12 @@ use strict; +--- amavisd.conf.orig Fri Jul 1 18:21:01 2011 ++++ amavisd.conf Tue Jul 12 14:59:33 2011 +@@ -14,12 +14,12 @@ use strict; # $bypass_decode_parts = 1; # controls running of decoders&dearchivers $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 -+$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 @@ -17,25 +17,16 @@ $OpenBSD: patch-amavisd_conf,v 1.5 2009/ $TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc. $QUARANTINEDIR = '/var/virusmails'; # -Q -@@ -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 - --$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 - $enable_dkim_verification = 1; # enable DKIM signatures verification -@@ -321,7 +321,7 @@ $banned_filename_re = new_RE( - ['uue', \&do_ascii], - ['hqx', \&do_ascii], - ['ync', \&do_ascii], +@@ -315,7 +315,7 @@ $banned_filename_re = new_RE( + # ['uue', \&do_ascii], + # ['hqx', \&do_ascii], + # ['ync', \&do_ascii], - ['F', \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ], +# ['F', \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ], ['Z', \&do_uncompress, ['uncompress','gzip -d','zcat'] ], ['gz', \&do_uncompress, 'gzip -d'], ['gz', \&do_gunzip], -@@ -334,8 +334,10 @@ $banned_filename_re = new_RE( +@@ -333,8 +333,10 @@ $banned_filename_re = new_RE( # ['a', \&do_ar, 'ar'], # unpacking .a seems an overkill ['zip', \&do_unzip], ['7z', \&do_7zip, ['7zr','7za','7z'] ], Index: patches/patch-amavisd_conf-default =================================================================== RCS file: patches/patch-amavisd_conf-default diff -N patches/patch-amavisd_conf-default --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-amavisd_conf-default 12 Jul 2011 17:06:05 -0000 @@ -0,0 +1,27 @@ +$OpenBSD$ +--- amavisd.conf-default.orig Fri Jul 1 18:20:56 2011 ++++ amavisd.conf-default Tue Jul 12 14:59:33 2011 +@@ -20,9 +20,9 @@ use strict; + # $mydomain = ... no useful default, should be set if used in expressions + # $snmp_contact = ''; + # $snmp_location = ''; +-# $daemon_user = undef; +-# $daemon_group = undef; +-# $MYHOME = '/var/amavis'; ++$daemon_user = _vscan; ++$daemon_group = _vscan; ++$MYHOME = '/var/amavisd'; + # $TEMPBASE = $MYHOME; # after-default + # $db_home = "$MYHOME/db"; # after-default + # $pid_file = "$MYHOME/amavisd.pid"; # after-default +@@ -355,8 +355,8 @@ use strict; + # ['zip', \&do_unzip], + # ['kmz', \&do_unzip], + # ['7z', \&do_7zip, ['7zr','7za','7z'] ], +-# ['rar', \&do_unrar, \$unrar], +-# ['arj', \&do_unarj, \$unarj], ++# ['rar', \&do_7zip, '7z'], ++# ['arj', \&do_7zip, '7z'], + # ['arc', \&do_arc, \$arc], + # ['zoo', \&do_zoo, \$zoo], + # ['lha', \&do_lha, \$lha], Index: patches/patch-amavisd_conf-sample =================================================================== RCS file: patches/patch-amavisd_conf-sample diff -N patches/patch-amavisd_conf-sample --- patches/patch-amavisd_conf-sample 16 Nov 2009 10:37:31 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,45 +0,0 @@ -$OpenBSD: patch-amavisd_conf-sample,v 1.4 2009/11/16 10:37:31 giovanni Exp $ ---- amavisd.conf-sample.orig Thu Jun 25 14:38:38 2009 -+++ amavisd.conf-sample Thu Nov 12 17:13:28 2009 -@@ -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), -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 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) - $enable_global_cache = 1; # enable use of libdb-based cache if $enable_db=1 - - $enable_dkim_verification = 1; # enable DKIM signatures verification -@@ -1711,7 +1711,7 @@ $dspam = 'dspam'; - ['uue', \&do_ascii], - ['hqx', \&do_ascii], - ['ync', \&do_ascii], -- ['F', \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ], -+# ['F', \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ], - ['Z', \&do_uncompress, ['uncompress','gzip -d','zcat'] ], - ['gz', \&do_uncompress, 'gzip -d'], - ['gz', \&do_gunzip], -@@ -1724,8 +1724,10 @@ $dspam = 'dspam'; - # ['a', \&do_ar, 'ar'], # unpacking .a seems an overkill - ['zip', \&do_unzip], - ['7z', \&do_7zip, ['7zr','7za','7z'] ], -- ['rar', \&do_unrar, ['rar','unrar'] ], -- ['arj', \&do_unarj, ['arj','unarj'] ], -+# ['rar', \&do_unrar, ['rar','unrar'] ], -+ ['rar', \&do_7zip, '7z'], -+# ['arj', \&do_unarj, ['arj','unarj'] ], -+ ['arj', \&do_7zip, '7z'], - ['arc', \&do_arc, ['nomarch','arc'] ], - ['zoo', \&do_zoo, ['zoo','unzoo'] ], - ['lha', \&do_lha, 'lha'], Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/amavisd-new/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 11 May 2011 12:57:47 -0000 1.12 +++ pkg/PLIST 12 Jul 2011 17:06:05 -0000 @@ -6,7 +6,9 @@ bin/amavisd-agent bin/amavisd-nanny bin/amavisd-release +bin/amavisd-signer bin/amavisd-snmp-subagent +bin/amavisd-submit bin/p0f-analyzer.pl libdata/perl5/site_perl/JpegTester.pm sbin/amavisd @@ -49,7 +51,6 @@ share/examples/amavisd-new/ share/examples/amavisd-new/amavisd.conf @sample ${SYSCONFDIR}/amavisd.conf share/examples/amavisd-new/amavisd.conf-default -share/examples/amavisd-new/amavisd.conf-sample @mode 0755 @owner _vscan @group _vscan
