You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2012/12/18 04:26:32 UTC
svn commit: r1423268 - /spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf
Author: kmcgrail
Date: Tue Dec 18 03:26:31 2012
New Revision: 1423268
URL: http://svn.apache.org/viewvc?rev=1423268&view=rev
Log:
Lowered score and added condition for 3.4 because From:name works differently prior - bug 6817
Modified:
spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf
Modified: spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf?rev=1423268&r1=1423267&r2=1423268&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/hege/20_hk.cf Tue Dec 18 03:26:31 2012
@@ -124,15 +124,25 @@ score TAB_IN_FROM 0.5
ifplugin Mail::SpamAssassin::Plugin::FreeMail
-header __HK_NAME_MR_MRS From:name =~ /^M(?:RS?|ISS)\b/mi
+#REQUIRING VERSION 3.4 BECAUSE From:name works improperly prior to that version.
+if (version >= 3.004000)
+ header __HK_NAME_MR_MRS From:name =~ /^M(?:RS?|ISS)\b/mi
+ meta HK_NAME_MR_MRS __HK_NAME_MR_MRS && !FREEMAIL_FROM
+ score HK_NAME_MR_MRS 1.0
+ meta HK_NAME_FM_MR_MRS __HK_NAME_MR_MRS && FREEMAIL_FROM
+ score HK_NAME_FM_MR_MRS 1.5
+endif
+
header __HK_NAME_DR From:name =~ /^DR\b/mi
header __HK_NAME_FROM From:name =~ /^FROM\b/mi
-meta HK_NAME_MR_MRS __HK_NAME_MR_MRS && !FREEMAIL_FROM
-meta HK_NAME_FM_MR_MRS __HK_NAME_MR_MRS && FREEMAIL_FROM
meta HK_NAME_DR __HK_NAME_DR && !FREEMAIL_FROM
+score HK_NAME_DR 1.0
meta HK_NAME_FM_DR __HK_NAME_DR && FREEMAIL_FROM
+score HK_NAME_FM_DR 1.5
meta HK_NAME_FROM __HK_NAME_FROM && !FREEMAIL_FROM
+score HK_NAME_FROM 1.0
meta HK_NAME_FM_FROM __HK_NAME_FROM && FREEMAIL_FROM
+score HK_NAME_FM_FROM 1.5
endif