bugfix update to 2.11.1

mail/amavisd-new/Makefile

@@ -1,14 +1,12 @@
-# $OpenBSD: Makefile,v 1.47 2018/01/11 19:27:02 rpe Exp $
+# $OpenBSD: Makefile,v 1.48 2018/10/16 20:28:09 giovanni Exp $
 
 COMMENT-main=		interface between mailer MTA and content checkers
 COMMENT-utils=		utilities to monitor amavisd-new server
 
-V=			2.11.0
+V=			2.11.1
 DISTNAME=		amavisd-new-${V}
 PKGNAME-main=		${DISTNAME}
 PKGNAME-utils=		amavisd-new-utils-${V}
-REVISION-main=		3
-REVISION-utils=		2
 CATEGORIES=		mail security
 
 HOMEPAGE=		http://www.amavis.org/
@@ -23,7 +21,7 @@ MASTER_SITES=		${HOMEPAGE} \
 			http://mirror.cedratnet.com/amavisd-new/ \
 			http://mirror.omroep.nl/amavisd-new/
 
-EXTRACT_SUFX=		.tar.xz
+EXTRACT_SUFX=		.tar.bz2
 
 RUN_DEPENDS=		archivers/arc \
 			archivers/bzip2 \

mail/amavisd-new/distinfo

@@ -1,2 +1,2 @@
-SHA256 (amavisd-new-2.11.0.tar.xz) = tB3k8Hlss0QSDJeSyC/CUXfL+fUaql+RU2zfNK6omQY=
-SIZE (amavisd-new-2.11.0.tar.xz) = 780548
+SHA256 (amavisd-new-2.11.1.tar.bz2) = keXb5VNUq8yhTO2ybL+iIYZtL4l7CnGAttq+oLuUitg=
+SIZE (amavisd-new-2.11.1.tar.bz2) = 875204

mail/amavisd-new/patches/patch-amavisd

@@ -1,11 +1,12 @@
-$OpenBSD: patch-amavisd,v 1.15 2016/08/05 12:53:57 giovanni Exp $
+$OpenBSD: patch-amavisd,v 1.16 2018/10/16 20:28:09 giovanni Exp $
 
 Hunks 1, 4: Disable File::LibMagic in favour of safer file(1) from base.
 Hunks 2, 5: fix DKIM signing
 
---- amavisd.orig	Tue Apr 26 21:24:33 2016
-+++ amavisd	Fri Aug  5 12:32:39 2016
-@@ -12928,7 +12928,7 @@ sub after_chroot_init() {
+Index: amavisd
+--- amavisd.orig
++++ amavisd
+@@ -12934,7 +12934,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
@@ -14,7 +15,7 @@ Hunks 2, 5: fix DKIM signing
        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
-@@ -22806,6 +22806,7 @@ sub process_smtp_request($$$$) {
+@@ -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;
@@ -22,7 +23,7 @@ Hunks 2, 5: fix DKIM signing
  
          $msginfo->client_addr($cl_ip);      # ADDR
          $msginfo->client_port($cl_port);    # PORT
-@@ -30584,7 +30585,7 @@ sub new_SpamAssassin_instance {
+@@ -30592,7 +30593,7 @@ sub new_SpamAssassin_instance {
  #   PREFIX            => '/usr/local',
  #   DEF_RULES_DIR     => '/usr/local/share/spamassassin',
  #   LOCAL_RULES_DIR   => '/etc/mail/spamassassin',
@@ -31,7 +32,7 @@ Hunks 2, 5: fix DKIM signing
  #see Mail::SpamAssassin man page for other options
    };
    if ($sa_version_num < 3.001005 && !defined $sa_args->{LOCAL_STATE_DIR})
-@@ -31348,17 +31349,8 @@ BEGIN {
+@@ -31367,17 +31368,8 @@ BEGIN {
    import Amavis::Unpackers::NewFilename qw(consumed_bytes);
  }
  
@@ -49,7 +50,7 @@ Hunks 2, 5: fix DKIM signing
  
  use subs @EXPORT_OK;
  
-@@ -34338,6 +34330,7 @@ sub collect_some_dkim_info($) {
+@@ -34357,6 +34349,7 @@ sub collect_some_dkim_info($) {
      $sig_ind++;
    }
    Amavis::load_policy_bank($_,$msginfo) for @bank_names;

mail/amavisd-new/pkg/PLIST-main

@@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2017/12/16 18:01:47 zhuk Exp $
+@comment $OpenBSD: PLIST-main,v 1.4 2018/10/16 20:28:09 giovanni Exp $
 @pkgpath mail/amavisd-new
 @newgroup _vscan:530
 @newuser _vscan:530:_vscan:daemon:Amavisd-new Daemon:/var/empty:/sbin/nologin
 @extraunexec rm -fr /var/amavisd/*
 @extraunexec rm -fr /var/virusmails/*
+@rcscript ${RCDIR}/amavisd
 bin/amavisd-release
 bin/amavisd-signer
 bin/amavisd-submit
@@ -61,7 +62,3 @@ share/examples/amavisd-new/amavisd.conf-default
 @sample /var/amavisd/db/
 @sample /var/amavisd/var/
 @sample /var/virusmails/
-@mode
-@owner
-@group
-@rcscript ${RCDIR}/amavisd

mail/amavisd-new/pkg/PLIST-utils

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST-utils,v 1.1 2014/11/19 19:00:50 giovanni Exp $
+@comment $OpenBSD: PLIST-utils,v 1.2 2018/10/16 20:28:09 giovanni Exp $
+@rcscript ${RCDIR}/amavis_mc
 bin/amavisd-agent
 bin/amavisd-nanny
 bin/amavisd-snmp-subagent
@@ -6,7 +7,4 @@ bin/amavisd-snmp-subagent-zmq
 bin/amavisd-status
 sbin/amavis-mc
 sbin/amavis-services
-share/snmp/
-share/snmp/mibs/
 share/snmp/mibs/AMAVIS-MIB.txt
-@rcscript ${RCDIR}/amavis_mc