Hi,
update to latest version, now with rspamd support as well.
Comments ? Ok ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile 12 Jul 2019 20:47:24 -0000 1.49
+++ Makefile 2 Aug 2019 16:42:45 -0000
@@ -3,9 +3,9 @@
COMMENT-main= interface between mailer MTA and content checkers
COMMENT-utils= utilities to monitor amavisd-new server
-V= 2.11.1
-DISTNAME= amavisd-new-${V}
-PKGNAME-main= ${DISTNAME}
+V= 2.12.0
+DISTNAME= amavis-v${V}
+PKGNAME-main= amavisd-new-${V}
PKGNAME-utils= amavisd-new-utils-${V}
CATEGORIES= mail security
@@ -15,11 +15,7 @@ MAINTAINER= Giovanni Bechis <giovanni@o
# BSD / GPLv2
PERMIT_PACKAGE= Yes
-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/
+MASTER_SITES= https://gitlab.com/amavis/amavis/-/archive/v${V}/
EXTRACT_SUFX= .tar.bz2
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo 16 Oct 2018 20:28:09 -0000 1.21
+++ distinfo 2 Aug 2019 16:42:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (amavisd-new-2.11.1.tar.bz2) = keXb5VNUq8yhTO2ybL+iIYZtL4l7CnGAttq+oLuUitg=
-SIZE (amavisd-new-2.11.1.tar.bz2) = 875204
+SHA256 (amavis-v2.12.0.tar.bz2) = DqXTrOg4jAuS2GfwlvS0AVzI9sw0xcFbe+Cx7NZbUpI=
+SIZE (amavis-v2.12.0.tar.bz2) = 873702
Index: patches/patch-amavisd
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd,v
retrieving revision 1.16
diff -u -p -r1.16 patch-amavisd
--- patches/patch-amavisd 16 Oct 2018 20:28:09 -0000 1.16
+++ patches/patch-amavisd 2 Aug 2019 16:42:45 -0000
@@ -6,7 +6,7 @@ Hunks 2, 5: fix DKIM signing
Index: amavisd
--- amavisd.orig
+++ amavisd
-@@ -12934,7 +12934,7 @@ sub after_chroot_init() {
+@@ -12939,7 +12939,7 @@ sub after_chroot_init() {
grep(/\.pm\z/, keys %INC)) {
next if !grep($_ eq $m, qw(Amavis::Conf
Archive::Tar Archive::Zip Compress::Zlib Compress::Raw::Zlib
@@ -15,15 +15,7 @@ Index: amavisd
MIME::Entity MIME::Parser MIME::Tools Mail::Header Mail::Internet
Digest::MD5 Digest::SHA Digest::SHA1 Crypt::OpenSSL::RSA
Authen::SASL Authen::SASL::XS Authen::SASL::Cyrus Authen::SASL::Perl
-@@ -22814,6 +22814,7 @@ sub process_smtp_request($$$$) {
- }
- # load policy banks from the 'client_ipaddr_policy' lookup
- Amavis::load_policy_bank($_,$msginfo) for @bank_names_cl;
-+ $msginfo->originating(c('originating'));
-
- $msginfo->client_addr($cl_ip); # ADDR
- $msginfo->client_port($cl_port); # PORT
-@@ -30592,7 +30593,7 @@ sub new_SpamAssassin_instance {
+@@ -30859,7 +30859,7 @@ sub new_SpamAssassin_instance {
# PREFIX => '/usr/local',
# DEF_RULES_DIR => '/usr/local/share/spamassassin',
# LOCAL_RULES_DIR => '/etc/mail/spamassassin',
@@ -32,7 +24,7 @@ Index: amavisd
#see Mail::SpamAssassin man page for other options
};
if ($sa_version_num < 3.001005 && !defined $sa_args->{LOCAL_STATE_DIR})
-@@ -31367,17 +31368,8 @@ BEGIN {
+@@ -31634,17 +31634,8 @@ BEGIN {
import Amavis::Unpackers::NewFilename qw(consumed_bytes);
}
@@ -50,11 +42,3 @@ Index: amavisd
use subs @EXPORT_OK;
-@@ -34357,6 +34349,7 @@ sub collect_some_dkim_info($) {
- $sig_ind++;
- }
- Amavis::load_policy_bank($_,$msginfo) for @bank_names;
-+ $msginfo->originating(c('originating'));
- $msginfo->dkim_signatures_valid(\@signatures_valid) if @signatures_valid;
- # if (ll(5) && $sig_ind > 0) {
- # # show which header fields are covered by which signature
Index: patches/patch-amavisd_conf
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd_conf,v
retrieving revision 1.9
diff -u -p -r1.9 patch-amavisd_conf
--- patches/patch-amavisd_conf 2 Feb 2016 21:58:32 -0000 1.9
+++ patches/patch-amavisd_conf 2 Aug 2019 16:42:45 -0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-amavisd_conf,v 1.9 2016/02/02 21:58:32 sthen Exp $
---- amavisd.conf.orig Sun Oct 26 00:05:54 2014
-+++ amavisd.conf Tue Feb 2 21:57:58 2016
-@@ -14,12 +14,12 @@ use strict;
- # $bypass_decode_parts = 1; # controls running of decoders&dearchivers
+Index: amavisd.conf
+--- amavisd.conf.orig
++++ amavisd.conf
+@@ -17,12 +17,12 @@ use strict;
+ # truncation in /proc/<pid>/stat and ps -e output
$max_servers = 2; # num of pre-forked children (2..30 is common), -m
-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
@@ -17,7 +18,7 @@ $OpenBSD: patch-amavisd_conf,v 1.9 2016/
$TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T
$ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc.
$QUARANTINEDIR = '/var/virusmails'; # -Q
-@@ -232,7 +232,7 @@ $banned_filename_re = new_RE(
+@@ -235,7 +235,7 @@ $banned_filename_re = new_RE(
qr'.\.(exe|vbs|pif|scr|cpl)$'i, # banned extension - basic
# qr'.\.(exe|vbs|pif|scr|cpl|bat|cmd|com)$'i, # banned extension - basic+cmd
@@ -26,7 +27,7 @@ $OpenBSD: patch-amavisd_conf,v 1.9 2016/
# inf|ini|ins|isp|js|jse|lib|lnk|mda|mdb|mde|mdt|mdw|mdz|msc|msi|
# msp|mst|ocx|ops|pcd|pif|prg|reg|scr|sct|shb|shs|sys|vb|vbe|vbs|vxd|
# wmf|wsc|wsf|wsh)$'ix, # banned extensions - long
-@@ -316,7 +316,7 @@ $banned_filename_re = new_RE(
+@@ -319,7 +319,7 @@ $banned_filename_re = new_RE(
@decoders = (
['mail', \&do_mime_decode],
# [[qw(asc uue hqx ync)], \&do_ascii], # not safe
@@ -35,7 +36,7 @@ $OpenBSD: patch-amavisd_conf,v 1.9 2016/
['Z', \&do_uncompress, ['uncompress', 'gzip -d', 'zcat'] ],
['gz', \&do_uncompress, 'gzip -d'],
['gz', \&do_gunzip],
-@@ -335,8 +335,8 @@ $banned_filename_re = new_RE(
+@@ -338,8 +338,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: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 16 Oct 2018 20:28:09 -0000 1.4
+++ pkg/PLIST-main 2 Aug 2019 16:42:45 -0000
@@ -42,6 +42,7 @@ share/doc/amavisd-new/README.policy-on-n
share/doc/amavisd-new/README.postfix
share/doc/amavisd-new/README.postfix.html
share/doc/amavisd-new/README.protocol
+share/doc/amavisd-new/README.rspamd
share/doc/amavisd-new/README.sendmail
share/doc/amavisd-new/README.sendmail-dual
share/doc/amavisd-new/README.sendmail-dual.old
@@ -62,3 +63,7 @@ share/examples/amavisd-new/amavisd.conf-
@sample /var/amavisd/db/
@sample /var/amavisd/var/
@sample /var/virusmails/
+@mode
+@owner
+@group
+share/snmp/
Index: pkg/PLIST-utils
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/pkg/PLIST-utils,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-utils
--- pkg/PLIST-utils 16 Oct 2018 20:28:09 -0000 1.2
+++ pkg/PLIST-utils 2 Aug 2019 16:42:45 -0000
@@ -7,4 +7,5 @@ bin/amavisd-snmp-subagent-zmq
bin/amavisd-status
sbin/amavis-mc
sbin/amavis-services
+share/snmp/mibs/
share/snmp/mibs/AMAVIS-MIB.txt
