Hi, amavis-new updated to latest version, adds ip address reputation support (via Redis server) and fixes some bugs related to rar5 format support and to perl-5.20. A couple of new tools useful to check amavisd status are also installed, those new tools needs some more dependencies. Comments ? Ok ? Cheers Giovanni
Index: Makefile =================================================================== RCS file: /cvs/ports/mail/amavisd-new/Makefile,v retrieving revision 1.33 diff -u -p -r1.33 Makefile --- Makefile 5 Dec 2013 10:21:49 -0000 1.33 +++ Makefile 11 Jul 2014 07:11:31 -0000 @@ -2,14 +2,13 @@ COMMENT= interface between mailer MTA and content checkers -DISTNAME= amavisd-new-2.8.1 -REVISION= 0 +DISTNAME= amavisd-new-2.9.1 CATEGORIES= mail security HOMEPAGE= http://www.amavis.org/ MAINTAINER= Giovanni Bechis <giova...@openbsd.org> -# GPLv2 +# BSD / GPLv2 PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${HOMEPAGE} \ @@ -27,16 +26,17 @@ RUN_DEPENDS= archivers/arc \ archivers/ripole \ archivers/unzip \ archivers/zoo \ - converters/p5-Convert-TNEF \ rpm2cpio-*|rpm-*:converters/rpm2cpio \ - converters/p5-Convert-UUlib>=1.05 \ databases/p5-BerkeleyDB \ devel/p5-Net-Server \ devel/p5-IO-Multiplex \ + devel/p5-ZMQ \ + devel/p5-ZMQ-LibZMQ3 \ mail/p5-Mail-SpamAssassin \ mail/p5-Mail-DKIM>=0.31 \ mail/p5-MIME-tools \ net/net-snmp,-perl \ + net/p5-IO-Socket-INET6 \ net/p5-IO-Socket-IP \ security/clamav \ sysutils/p5-Unix-Syslog @@ -52,10 +52,12 @@ pre-configure: ${WRKSRC}/amavisd.conf ${WRKSRC}/amavisd.conf-default do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${PREFIX}/sbin/amavisd + cd ${WRKSRC}; ${INSTALL_SCRIPT} amavisd amavis-mc amavis-services \ + ${PREFIX}/sbin/ cd ${WRKSRC}; ${INSTALL_SCRIPT} amavisd-agent amavisd-nanny \ amavisd-release amavisd-signer amavisd-snmp-subagent \ - amavisd-submit p0f-analyzer.pl ${PREFIX}/bin/ + amavisd-submit amavisd-status amavisd-snmp-subagent-zmq \ + p0f-analyzer.pl ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/JpegTester.pm \ ${PREFIX}/libdata/perl5/site_perl/JpegTester.pm ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amavisd-new Index: distinfo =================================================================== RCS file: /cvs/ports/mail/amavisd-new/distinfo,v retrieving revision 1.17 diff -u -p -r1.17 distinfo --- distinfo 2 Jul 2013 09:35:58 -0000 1.17 +++ distinfo 10 Jul 2014 08:21:39 -0000 @@ -1,2 +1,2 @@ -SHA256 (amavisd-new-2.8.1.tar.gz) = 9DkdE5W9tcoF+zQXjz8IRZ7JXJFECfD4PZh6zTegui0= -SIZE (amavisd-new-2.8.1.tar.gz) = 1032704 +SHA256 (amavisd-new-2.9.1.tar.gz) = 3LWZ/viSST8q3X/VB0PFGFDtRiA3Ul7dWuov4qUvnrc= +SIZE (amavisd-new-2.9.1.tar.gz) = 1064155 Index: patches/patch-amavis-mc =================================================================== RCS file: patches/patch-amavis-mc diff -N patches/patch-amavis-mc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-amavis-mc 11 Jul 2014 06:43:02 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ +--- amavis-mc.orig Fri Jul 11 08:41:37 2014 ++++ amavis-mc Fri Jul 11 08:42:00 2014 +@@ -70,10 +70,10 @@ use vars qw(@path @services $daemon_user $daemon_group + + ### USER CONFIGURABLE: + +-$daemon_user = 'vscan'; +-$daemon_group = 'vscan'; ++$daemon_user = '_vscan'; ++$daemon_group = '_vscan'; + +-$pid_file = '/var/amavis/amavis-mc.pid'; ++$pid_file = '/var/amavisd/amavis-mc.pid'; + + $log_level = 0; + $syslog_ident = 'amavis-mc'; Index: patches/patch-amavis-services =================================================================== RCS file: patches/patch-amavis-services diff -N patches/patch-amavis-services --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-amavis-services 11 Jul 2014 06:43:02 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- amavis-services.orig Fri Jul 11 08:42:24 2014 ++++ amavis-services Fri Jul 11 08:42:55 2014 +@@ -71,7 +71,7 @@ $log_level = 0; # 0..5 + $syslog_facility = LOG_MAIL; + $syslog_ident = $myproduct_name; + +-$MYHOME = '/var/amavis'; ++$MYHOME = '/var/amavisd'; + + # A socket to which amavisd child processes report their data. + # should match one of the sockets in @zmq_sockets in amavisd.conf Index: patches/patch-amavisd =================================================================== RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd,v retrieving revision 1.10 diff -u -p -r1.10 patch-amavisd --- patches/patch-amavisd 7 Jul 2012 19:09:36 -0000 1.10 +++ patches/patch-amavisd 11 Jul 2014 06:43:02 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-amavisd,v 1.10 2012/07/07 19:09:36 giovanni Exp $ ---- amavisd.orig Sat Jun 30 15:43:31 2012 -+++ amavisd Tue Jul 3 18:09:39 2012 -@@ -26609,7 +26609,7 @@ sub new_SpamAssassin_instance { +--- amavisd.orig Fri Jun 27 19:46:02 2014 ++++ amavisd Fri Jul 11 08:00:37 2014 +@@ -28696,7 +28696,7 @@ sub new_SpamAssassin_instance { # PREFIX => '/usr/local', # DEF_RULES_DIR => '/usr/local/share/spamassassin', # LOCAL_RULES_DIR => '/etc/mail/spamassassin', Index: patches/patch-amavisd-snmp-subagent-zmq =================================================================== RCS file: patches/patch-amavisd-snmp-subagent-zmq diff -N patches/patch-amavisd-snmp-subagent-zmq --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-amavisd-snmp-subagent-zmq 11 Jul 2014 08:10:42 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- amavisd-snmp-subagent-zmq.orig Fri Jul 11 10:03:13 2014 ++++ amavisd-snmp-subagent-zmq Fri Jul 11 10:10:01 2014 +@@ -1123,7 +1123,7 @@ my $keep_running = 1; + if (!defined $mta_queue_dir) { # test for access to Postfix queue directory + local($ENV{PATH}) = '/usr/sbin:/usr/local/sbin:/opt/postfix/sbin'; + $! = 0; +- $mta_queue_dir = qx(postconf -h queue_directory); ++ $mta_queue_dir = qx(postconf -h queue_directory 2>&1); + if (!defined $mta_queue_dir) { + if ($! != 0) { + do_log(1, "no postfix (unable to run postconf command): $!"); Index: patches/patch-amavisd_conf =================================================================== RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd_conf,v retrieving revision 1.7 diff -u -p -r1.7 patch-amavisd_conf --- patches/patch-amavisd_conf 7 Jul 2012 19:09:36 -0000 1.7 +++ patches/patch-amavisd_conf 11 Jul 2014 07:26:22 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-amavisd_conf,v 1.7 2012/07/07 19:09:36 giovanni Exp $ ---- amavisd.conf.orig Sat Jun 30 23:33:32 2012 -+++ amavisd.conf Tue Jul 3 18:12:15 2012 +--- amavisd.conf.orig Fri Jun 27 19:46:22 2014 ++++ amavisd.conf Fri Jul 11 09:25:33 2014 @@ -14,12 +14,12 @@ use strict; # $bypass_decode_parts = 1; # controls running of decoders&dearchivers @@ -17,7 +17,16 @@ $OpenBSD: patch-amavisd_conf,v 1.7 2012/ $TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc. $QUARANTINEDIR = '/var/virusmails'; # -Q -@@ -313,7 +313,7 @@ $banned_filename_re = new_RE( +@@ -42,7 +42,7 @@ $syslog_facility = 'mail'; # Syslog facility as a st + # e.g.: mail, daemon, user, local0, ... local7 + + $enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny) +-# $enable_zmq = 1; # enable use of ZeroMQ (SNMP and nanny) ++$enable_zmq = 1; # enable use of ZeroMQ (SNMP and nanny) + $nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed + $enable_dkim_verification = 1; # enable DKIM signatures verification + $enable_dkim_signing = 1; # load DKIM signing code, keys defined by dkim_key +@@ -316,7 +316,7 @@ $banned_filename_re = new_RE( @decoders = ( ['mail', \&do_mime_decode], # [[qw(asc uue hqx ync)], \&do_ascii], # not safe @@ -26,7 +35,7 @@ $OpenBSD: patch-amavisd_conf,v 1.7 2012/ ['Z', \&do_uncompress, ['uncompress', 'gzip -d', 'zcat'] ], ['gz', \&do_uncompress, 'gzip -d'], ['gz', \&do_gunzip], -@@ -331,8 +331,8 @@ $banned_filename_re = new_RE( +@@ -334,8 +334,8 @@ $banned_filename_re = new_RE( # ['/usr/local/heirloom/usr/5bin/pax', 'pax', 'gcpio', 'cpio'] ['deb', \&do_ar, 'ar'], # ['a', \&do_ar, 'ar'], # unpacking .a seems an overkill Index: patches/patch-amavisd_conf-default =================================================================== RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd_conf-default,v retrieving revision 1.2 diff -u -p -r1.2 patch-amavisd_conf-default --- patches/patch-amavisd_conf-default 7 Jul 2012 19:09:36 -0000 1.2 +++ patches/patch-amavisd_conf-default 11 Jul 2014 06:43:07 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-amavisd_conf-default,v 1.2 2012/07/07 19:09:36 giovanni Exp $ ---- amavisd.conf-default.orig Sun Jul 1 00:15:39 2012 -+++ amavisd.conf-default Tue Jul 3 18:13:00 2012 +--- amavisd.conf-default.orig Tue May 6 17:15:10 2014 ++++ amavisd.conf-default Fri Jul 11 08:30:28 2014 @@ -20,9 +20,9 @@ use strict; # $mydomain = ... no useful default, should be set if used in expressions # $snmp_contact = ''; @@ -14,7 +14,7 @@ $OpenBSD: patch-amavisd_conf-default,v 1 # $TEMPBASE = $MYHOME; # after-default # $db_home = "$MYHOME/db"; # after-default # $pid_file = "$MYHOME/amavisd.pid"; # after-default -@@ -356,8 +356,8 @@ use strict; +@@ -371,8 +371,8 @@ use strict; ### ['tar', \&do_tar], # no longer supported # ['deb', \&do_ar, \$ar], ### ['a', \&do_ar, \$ar], # unpacking .a seems an overkill Index: patches/patch-amavisd_conf.orig =================================================================== RCS file: patches/patch-amavisd_conf.orig diff -N patches/patch-amavisd_conf.orig --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-amavisd_conf.orig 11 Jul 2014 06:43:02 -0000 @@ -0,0 +1,39 @@ +$OpenBSD: patch-amavisd_conf,v 1.7 2012/07/07 19:09:36 giovanni Exp $ +--- amavisd.conf.orig Fri Jun 27 19:46:22 2014 ++++ amavisd.conf Fri Jul 11 08:30:28 2014 +@@ -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 + + $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 + $TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T + $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc. + $QUARANTINEDIR = '/var/virusmails'; # -Q +@@ -316,7 +316,7 @@ $banned_filename_re = new_RE( + @decoders = ( + ['mail', \&do_mime_decode], + # [[qw(asc uue hqx ync)], \&do_ascii], # not safe +- ['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,8 @@ $banned_filename_re = new_RE( + # ['/usr/local/heirloom/usr/5bin/pax', 'pax', 'gcpio', 'cpio'] + ['deb', \&do_ar, 'ar'], + # ['a', \&do_ar, 'ar'], # unpacking .a seems an overkill +- ['rar', \&do_unrar, ['unrar', 'rar'] ], +- ['arj', \&do_unarj, ['unarj', 'arj'] ], ++ ['rar', \&do_7zip, ['7z'] ], ++ ['arj', \&do_7zip, ['7z'] ], + ['arc', \&do_arc, ['nomarch', 'arc'] ], + ['zoo', \&do_zoo, ['zoo', 'unzoo'] ], + ['doc', \&do_ole, 'ripole'], Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/amavisd-new/pkg/PLIST,v retrieving revision 1.16 diff -u -p -r1.16 PLIST --- pkg/PLIST 5 Dec 2013 10:21:49 -0000 1.16 +++ pkg/PLIST 11 Jul 2014 07:13:14 -0000 @@ -8,9 +8,13 @@ bin/amavisd-nanny bin/amavisd-release bin/amavisd-signer bin/amavisd-snmp-subagent +bin/amavisd-snmp-subagent-zmq +bin/amavisd-status bin/amavisd-submit bin/p0f-analyzer.pl libdata/perl5/site_perl/JpegTester.pm +sbin/amavis-mc +sbin/amavis-services sbin/amavisd share/doc/amavisd-new/ share/doc/amavisd-new/AAAREADME.first @@ -65,4 +69,5 @@ share/snmp/mibs/AMAVIS-MIB.txt @sample /var/amavisd/db/ @sample /var/amavisd/var/ @sample /var/virusmails/ +@rcscript ${RCDIR}/amavis_mc @rcscript ${RCDIR}/amavisd Index: pkg/amavis_mc.rc =================================================================== RCS file: pkg/amavis_mc.rc diff -N pkg/amavis_mc.rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/amavis_mc.rc 11 Jul 2014 07:25:07 -0000 @@ -0,0 +1,13 @@ +#!/bin/sh +# +# $OpenBSD$ + +daemon="${TRUEPREFIX}/sbin/amavis-mc" + +. /etc/rc.d/rc.subr + +rc_reload=NO + +pexp="/usr/bin/perl -T ${daemon}" + +rc_cmd $1
p5-ZMQ-1.05.tgz
Description: application/tar-gz
Description: application/tar-gz
Description: application/tar-gz
