From c0d08bde3a741174a51e9fe68a5a7636b2c3171f Mon Sep 17 00:00:00 2001
From: Juan Orti Alcaine <j.orti.alca...@gmail.com>
Date: Thu, 18 Aug 2016 11:28:42 +0200
Subject: Add patch to fix detection of originating emails (RHBZ#1364730)

---
 amavisd-new-2.11.0-detect_originating_email.patch | 24 +++++++++++++++++++++++
 amavisd-new.spec                                  |  8 +++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 amavisd-new-2.11.0-detect_originating_email.patch

diff --git a/amavisd-new-2.11.0-detect_originating_email.patch 
b/amavisd-new-2.11.0-detect_originating_email.patch
new file mode 100644
index 0000000..80cf481
--- /dev/null
+++ b/amavisd-new-2.11.0-detect_originating_email.patch
@@ -0,0 +1,24 @@
+From giovanni at paclan.it  Fri Jul  1 09:35:49 2016
+From: giovanni at paclan.it (Giovanni)
+Date: Fri, 1 Jul 2016 07:35:49 +0000 (UTC)
+Subject: dkim not working after upgrading to 2.11.0
+Message-ID: <nl56gl$f40$1...@ger.gmane.org>
+
+Hi,
+after upgrading to 2.11.0, DKIM signing does not work anymore because
+the email is no more detected as ORIGINATING.
+This diff fixes the issue.
+ Cheers
+  Giovanni
+
+
+--- amavisd.orig    Tue Apr 26 21:24:33 2016
++++ amavisd Fri Jul  1 01:03:15 2016
+@@ -34338,6 +34329,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
diff --git a/amavisd-new.spec b/amavisd-new.spec
index 0207fe9..85e4435 100644
--- a/amavisd-new.spec
+++ b/amavisd-new.spec
@@ -3,7 +3,7 @@
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
 Version:        2.11.0
-Release:        3%{?prerelease:.%{prerelease}}%{?dist}
+Release:        4%{?prerelease:.%{prerelease}}%{?dist}
 # LDAP schema is GFDL, some helpers are BSD, core is GPLv2+
 License:        GPLv2+ and BSD and GFDL
 Group:          Applications/System
@@ -29,6 +29,8 @@ Patch2:         amavisd-condrestart.patch
 # and it can't be relied upon to exist in recent Fedora builds. Mail
 # sent upstream to amavis-users ML 2013-05-10. -adamw
 Patch3:         amavisd-new-2.8.0-init_network.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1364730
+Patch4:         amavisd-new-2.11.0-detect_originating_email.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl-generators
@@ -171,6 +173,7 @@ It supports communicating through 0MQ sockets.
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p0
 
 install -p -m 644 %{SOURCE4} %{SOURCE5} README_FILES/
 sed -e 
's,/var/amavis/amavisd.sock\>,%{_localstatedir}/spool/amavisd/amavisd.sock,' -i 
amavisd-release
@@ -313,6 +316,9 @@ systemctl start amavisd-clean-quarantine.timer >/dev/null 
2>&1 || :
 %{_sbindir}/amavisd-snmp-subagent-zmq
 
 %changelog
+* Thu Aug 18 2016 Juan Orti Alcaine <jo...@fedoraproject.org> 2.11.0-4
+- Add patch to fix detection of originating emails (RHBZ#1364730)
+
 * Thu Jun 30 2016 Juan Orti Alcaine <jo...@fedoraproject.org> 2.11.0-3
 - Additional systemd hardening (RHBZ#1351354)
 
-- 
cgit v0.12


        
http://pkgs.fedoraproject.org/cgit/amavisd-new.git/commit/?h=master&id=c0d08bde3a741174a51e9fe68a5a7636b2c3171f
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org

Reply via email to