From e748c2908494192b2956d2c4bd707ca23b068792 Mon Sep 17 00:00:00 2001
From: Florian Smeets <flo@FreeBSD.org>
Date: Wed, 17 Oct 2018 15:09:47 +0000
Subject: [PATCH] Update to 2.11.1

---
 security/amavisd-new/Makefile            |  5 ++---
 security/amavisd-new/distinfo            |  6 +++---
 security/amavisd-new/files/patch-amavisd | 10 +++++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 4d18d4cece3c..bdf05909b2f0 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	amavisd-new
-PORTVERSION=	2.11.0
-PORTREVISION=	3
+PORTVERSION=	2.11.1
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
@@ -23,7 +22,7 @@ RUN_DEPENDS=	p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog \
 		p5-Mail-DKIM>=0.33:mail/p5-Mail-DKIM \
 		p5-Net-LibIDN>=0:dns/p5-Net-LibIDN
 
-USES=		perl5 shebangfix tar:xz
+USES=		perl5 shebangfix tar:bz2
 USE_PERL5=	run
 SHEBANG_FILES=	amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl \
 		amavisd-snmp-subagent amavisd
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index 4d0e007f4243..928efa6288fd 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470555662
-SHA256 (amavisd-new-2.11.0.tar.xz) = b41de4f0796cb344120c9792c82fc25177cbf9f51aaa5f91536cdf34aea89906
-SIZE (amavisd-new-2.11.0.tar.xz) = 780548
+TIMESTAMP = 1539372344
+SHA256 (amavisd-new-2.11.1.tar.bz2) = 91e5dbe55354abcca14cedb26cbfa221866d2f897b0a7180b6dabea0bb948ad8
+SIZE (amavisd-new-2.11.1.tar.bz2) = 875204
diff --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd
index fac22b6161c7..9708825d686a 100644
--- a/security/amavisd-new/files/patch-amavisd
+++ b/security/amavisd-new/files/patch-amavisd
@@ -1,6 +1,14 @@
 --- amavisd.orig	2016-12-10 16:31:50 UTC
 +++ amavisd
-@@ -34338,6 +34338,7 @@ sub collect_some_dkim_info($) {
+@@ -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
+@@ -34357,6 +34358,7 @@ sub collect_some_dkim_info($) {
      $sig_ind++;
    }
    Amavis::load_policy_bank($_,$msginfo) for @bank_names;