DKIM signing breaks 2.10.0 -> 2.11.0

[Adam Jacobs]

DKIM signing worked in 2.10.0, but was broken in 2.11.0.  This has 
already been discussed on this list more than once:


https://lists.amavis.org/pipermail/amavis-users/2016-July/004428.html 
<https://lists.amavis.org/pipermail/amavis-users/2016-July/004428.html>

https://lists.amavis.org/pipermail/amavis-users/2018-February/005292.html 
<https://lists.amavis.org/pipermail/amavis-users/2018-February/005292.html>


I've just hit this bug upgrading to Ubuntu 18.04, which is the first 
Ubuntu release to include 2.11.0.

The previous posts on this list propose two possible patches; I've come 
up with my own, similar patch, that I think is more comprehensive than 
the ones previously proposed

--- amavisd-new.orig 2018-05-10 18:35:58.566308979 -0700
+++ amavisd-new 2018-05-15 18:09:57.749070821 -0700
@@ -33570,6 +33570,7 @@
    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) {

I'm running this on my system and it seems to work well. Thoughts?

Separately, is amavisd maintained any more?  There haven't been any 
releases in about two years, just wondering we can ever expect there to be?



Adam

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.amavis.org/pipermail/amavis-users/attachments/20180525/e958b4bf/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3984 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.amavis.org/pipermail/amavis-users/attachments/20180525/e958b4bf/attachment.bin>