aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNishant Limbachia <nishant@mnspace.net>2019-03-13 07:35:42 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-03-16 06:53:21 +0700
commit02de470e08129ca4aa229b5839ef9de58d2aca9f (patch)
treeead3abf72410ea23c8f995d97638ce771ff2f9f5
parentf1372af0ef05be43dfb0c27dc4273c7f680d12bc (diff)
network/amavisd-new: Added DKIM patch.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--network/amavisd-new/README.patches5
-rw-r--r--network/amavisd-new/amavisd-new.SlackBuild4
-rw-r--r--network/amavisd-new/patches/outbound_dkim_signing_fix.patch18
-rw-r--r--network/amavisd-new/rc.amavisd-new2
4 files changed, 26 insertions, 3 deletions
diff --git a/network/amavisd-new/README.patches b/network/amavisd-new/README.patches
new file mode 100644
index 000000000000..c8ad0e6e809d
--- /dev/null
+++ b/network/amavisd-new/README.patches
@@ -0,0 +1,5 @@
+README.patches
+
+3/12/2019 - Applied DKIM outbound signing patch mentioned here:
+https://gitlab.com/amavis/amavis/merge_requests/1
+
diff --git a/network/amavisd-new/amavisd-new.SlackBuild b/network/amavisd-new/amavisd-new.SlackBuild
index 9328f3c8ba1f..b0d31f79dc32 100644
--- a/network/amavisd-new/amavisd-new.SlackBuild
+++ b/network/amavisd-new/amavisd-new.SlackBuild
@@ -3,7 +3,7 @@
# Slackware Package Build Script for amavisd-new
# Home Page http://www.ijs.si/software/amavisd/
-# Copyright (c) 2009-2018, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2009-2019, Nishant Limbachia, Hoffman Estates, IL, USA
# (nishant _AT_ mnspace _DOT_ net)
# All rights reserved.
@@ -28,7 +28,7 @@
PRGNAM="amavisd-new"
VERSION=${VERSION:-2.11.1}
ARCH="noarch"
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
diff --git a/network/amavisd-new/patches/outbound_dkim_signing_fix.patch b/network/amavisd-new/patches/outbound_dkim_signing_fix.patch
new file mode 100644
index 000000000000..77c991fb314b
--- /dev/null
+++ b/network/amavisd-new/patches/outbound_dkim_signing_fix.patch
@@ -0,0 +1,18 @@
+--- amavisd 2018-10-09 07:41:10.000000000 -0500
++++ amavisd.new 2019-03-12 11:20:03.926164315 -0500
+@@ -22814,6 +22814,7 @@
+ }
+ # 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 @@
+ $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
diff --git a/network/amavisd-new/rc.amavisd-new b/network/amavisd-new/rc.amavisd-new
index 433a81edb01b..f7b7c37adca7 100644
--- a/network/amavisd-new/rc.amavisd-new
+++ b/network/amavisd-new/rc.amavisd-new
@@ -2,7 +2,7 @@
# Startup script for amavisd-new daemon for use on Slackware Linux x86|x86_64
-# Copyright (c) 2008-2018, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2008-2019, Nishant Limbachia, Hoffman Estates, IL, USA
# (nishant _AT_ mnspace _DOT_ net)
# Usage: /etc/rc.d/rc.amavisd-new start|stop|restart|reload|status
# For automatic startup at boot, call this script from rc.local