Merge ~paelzer/ubuntu/+source/amavisd-new:lp-1770532-dkim-1792293-socketname-cosmic into ubuntu/+source/amavisd-new:ubuntu/cosmic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

As this is for two bugs at once please See the bugs for per-case details.
Test PPA available at https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3436

[Robie Basak (racb)]

ltgm except for one inline comment. +1 to upload once fixed.

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the catch, yeah I'll update that.
Also the Debian bug is already accepted in their git - so this Delta will drop for sure.

[Christian Ehrhardt  (paelzer)]

Tag pushed with the cleanups
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/amavisd-new
 * [new tag] upload/1%2.11.0-1ubuntu2 -> upload/1%2.11.0-1ubuntu2

[Christian Ehrhardt  (paelzer)]

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading amavisd-new_2.11.0-1ubuntu2.dsc: done.
  Uploading amavisd-new_2.11.0-1ubuntu2.debian.tar.xz: done.
  Uploading amavisd-new_2.11.0-1ubuntu2_source.buildinfo: done.
  Uploading amavisd-new_2.11.0-1ubuntu2_source.changes: done.
Successfully uploaded packages.

Due to the beta iso freeze it is in c-unapproved [1] for now.

[1]: https://launchpad.net/ubuntu/cosmic/+queue?queue_state=1

diff --git a/debian/changelog b/debian/changelog
index 8423d57..5b13d0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+amavisd-new (1:2.11.0-1ubuntu2) cosmic; urgency=medium
+
+  * d/p/100_more_amavisd_helpers_fixes: Fix Debian/Ubuntu pathing in
+    amavisd-release (LP: #1792293)
+  * d/p/105_amavisd_fix_originating_dkim_signing.patch: Fix DKIM signing
+    in 2.11.0 (LP: #1770532)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 24 Sep 2018 14:05:01 +0200
+
 amavisd-new (1:2.11.0-1ubuntu1) bionic; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/patches/100_more_amavisd_helpers_fixes b/debian/patches/100_more_amavisd_helpers_fixes
new file mode 100644
index 0000000..fa4e5cf
--- /dev/null
+++ b/debian/patches/100_more_amavisd_helpers_fixes
@@ -0,0 +1,19 @@
+Description: Fix Debian/Ubuntu pathing in amavisd-release
+
+Forwarded: not-needed
+Author: Christian Ehrhardt <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1792293
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909478
+Last-Update: 2019-09-24
+
+--- a/amavisd-release
++++ b/amavisd-release
+@@ -87,7 +87,7 @@ BEGIN {
+   $log_level = 1;
+ # $socketname = '127.0.0.1:9998';
+ # $socketname = '[::1]:9998';
+-  $socketname = '/var/amavis/amavisd.sock';
++  $socketname = '/var/lib/amavis/amavisd.sock';
+ 
+ ### END OF USER CONFIGURABLE
+ }
diff --git a/debian/patches/105_amavisd_fix_originating_dkim_signing.patch b/debian/patches/105_amavisd_fix_originating_dkim_signing.patch
new file mode 100644
index 0000000..822f290
--- /dev/null
+++ b/debian/patches/105_amavisd_fix_originating_dkim_signing.patch
@@ -0,0 +1,22 @@
+Description: Fix DKIM signing in 2.11.0 lacking originating status
+.
+Version 2.11 has control flows that reach DKIM signing without originating
+being set. Various reports upstream have very similar changes, but no upstream
+response so far. Pick one of the changes to fix this in Ubuntu.
+.
+Forwarded: yes
+Author: Adam Jacobs <[e-mail]>
+Origin: https://lists.amavis.org/pipermail/amavis-users/2018-May/005364.html
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1770532
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882324
+Last-Update: 2018-09-24
+--- a/amavisd
++++ b/amavisd
+@@ -33570,6 +33570,7 @@ sub dkim_make_signatures($$;$) {
+   my $allowed_hdrs = cr('allowed_added_header_fields');
+   my $from_str = join(', ', qquote_rfc2821_local(@rfc2822_from));  # logging
+   substr($from_str,100) = '[...]'  if length($from_str) > 100;
++  $msginfo->originating(c('originating'));
+   if (!$allowed_hdrs || !$allowed_hdrs->{lc('DKIM-Signature')}) {
+     do_log(5, "dkim: inserting a DKIM-Signature header field disabled");
+   } elsif (!$msginfo->originating) {
diff --git a/debian/patches/series b/debian/patches/series
index 141aac4..ca493c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,5 @@
 85-clarify_fqdn_error.patch
 90_fix_snmp_subagent_warning
 95_amavisd_helpers_fixes
+100_more_amavisd_helpers_fixes
+105_amavisd_fix_originating_dkim_signing.patch