This update was to allow us to enable sa-update again in a couple of
days. I did not experience this problem in my SA instances because I
had manually patched the DKIM.pm plugin to test out the new
DKIM_VALID_EF rule. Someone on the users list noted this so I did this
minor commit 1813573 until bug 7416 is deployed in SA 3.4.2.
https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7416
Thanks,
Dave
On 10/27/2017 03:53 PM, da...@apache.org wrote:
Author: davej
Date: Fri Oct 27 20:53:15 2017
New Revision: 1813573
URL: http://svn.apache.org/viewvc?rev=1813573&view=rev
Log:
Added version check for rule DKIM_VALID_EF to fix lint errors until SA 3.4.2
include patch for bug 7146.
Modified:
spamassassin/trunk/rules/25_dkim.cf
spamassassin/trunk/rules/50_scores.cf
Modified: spamassassin/trunk/rules/25_dkim.cf
URL:
http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_dkim.cf?rev=1813573&r1=1813572&r2=1813573&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_dkim.cf (original)
+++ spamassassin/trunk/rules/25_dkim.cf Fri Oct 27 20:53:15 2017
@@ -47,7 +47,11 @@ header DKIM_ADSP_CUSTOM_HIGH eval:check_
tflags DKIM_SIGNED net
tflags DKIM_VALID net nice
tflags DKIM_VALID_AU net nice
-tflags DKIM_VALID_EF net nice
+
+if (version >= 3.004002)
+ tflags DKIM_VALID_EF net nice
+endif
+
tflags DKIM_ADSP_NXDOMAIN net
tflags DKIM_ADSP_DISCARD net
tflags DKIM_ADSP_ALL net
Modified: spamassassin/trunk/rules/50_scores.cf
URL:
http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1813573&r1=1813572&r2=1813573&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Fri Oct 27 20:53:15 2017
@@ -729,7 +729,11 @@ score USER_IN_DEF_DKIM_WL -7.500
score DKIM_SIGNED 0.1
score DKIM_VALID -0.1
score DKIM_VALID_AU -0.1
+
+if (version >= 3.004002)
score DKIM_VALID_EF -0.1
+endif
+
score DKIM_VERIFIED 0
score DKIM_POLICY_SIGNALL 0
score DKIM_POLICY_SIGNSOME 0
