You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2015/05/25 19:16:47 UTC
svn commit: r1681615 - in /spamassassin/trunk/rulesrc/sandbox:
jhardin/20_shared_subrules.cf khopesh/20_s25r.cf
Author: jhardin
Date: Mon May 25 17:16:47 2015
New Revision: 1681615
URL: http://svn.apache.org/r1681615
Log:
Migrate SPOOFED_FREEMAIL from khopesh to jhardin
Modified:
spamassassin/trunk/rulesrc/sandbox/jhardin/20_shared_subrules.cf
spamassassin/trunk/rulesrc/sandbox/khopesh/20_s25r.cf
Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_shared_subrules.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_shared_subrules.cf?rev=1681615&r1=1681614&r2=1681615&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_shared_subrules.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_shared_subrules.cf Mon May 25 17:16:47 2015
@@ -5,3 +5,11 @@
# originally from khopesh/20_khop_experimental.cf
rawbody __BUGGED_IMG m{<img\b[^>]{0,100}\ssrc=.?https?://[^>]{6,80}(?:\?[^>]{8}|[^a-z](?![a-f]{3}|20\d\d[01]\d[0-3]\d)[0-9a-f]{8})}i
+
+# originally from khopesh/20_s25r.cf
+# Sanity check: how much freemail lacks spf or dkim?
+# JHardin: convert to subrule and scored meta
+meta __SPOOFED_FREEMAIL !__NOT_SPOOFED && FREEMAIL_FROM
+meta SPOOFED_FREEMAIL __SPOOFED_FREEMAIL && !__FS_SUBJ_RE
+
+
Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_s25r.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_s25r.cf?rev=1681615&r1=1681614&r2=1681615&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_s25r.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_s25r.cf Mon May 25 17:16:47 2015
@@ -59,12 +59,6 @@ describe KHOP_BOTNET_UNCLEAN Relay looks
tflags KHOP_BOTNET_UNCLEAN nopublish
-
-# Sanity check: how much freemail lacks spf or dkim?
-# JHardin: convert to subrule and scored meta
-meta __SPOOFED_FREEMAIL !__NOT_SPOOFED && FREEMAIL_FROM
-meta SPOOFED_FREEMAIL __SPOOFED_FREEMAIL
-
-
# see if we can further reduce the FPs w/out impacting the spam hits too hard
header __RDNS_HEX9 X-Spam-Relays-External =~ /^[^\]]+ rdns=[^ .]*\d(?![0-9a-f]*[a-f]{3})[0-9a-f]{8}/
+