You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2020/01/14 15:56:25 UTC

svn commit: r1872784 - in /spamassassin/trunk/rulesrc/sandbox: fredt/99_zFVGT_FakeReply.cf jhardin/20_misc_testing.cf khopesh/20_khop_experimental.cf khopesh/20_rcd_rdns.cf

Author: hege
Date: Tue Jan 14 15:56:25 2020
New Revision: 1872784

URL: http://svn.apache.org/viewvc?rev=1872784&view=rev
Log:
Fix some rules

Modified:
    spamassassin/trunk/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf
    spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_rcd_rdns.cf

Modified: spamassassin/trunk/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf?rev=1872784&r1=1872783&r2=1872784&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/fredt/99_zFVGT_FakeReply.cf Tue Jan 14 15:56:25 2020
@@ -4,7 +4,7 @@ header   __MISSING_REF		References =~ /^
 header   __MISSING_THREAD	Thread-Index =~ /^UNSET$/ [if-unset: UNSET]
 
 #From FreddyT
-header   __SUBJ_RE		Subject =~ /^R[eE]:/
+header   __SUBJ_RE		Subject =~ /^(?:R[eE]|S[vV]|V[sS]|A[wW]):/
 #header   __SUBJ_FW		Subject =~ /^F[wW][dD]?:/
 
 #From http://marc2.theaimsgroup.com/?l=fop-dev&m=104335769809427&w=2
@@ -23,9 +23,9 @@ header   __UA_OPERA7		User-Agent =~ /^Op
 meta     __BOTH_INR_AND_REF	(__XM_BALSA || __XM_CALYPSO || __XM_FORTE || __XM_MHE || __XM_SQRLMAIL || __XM_SYLPHEED || __THEBAT_MUA || __XM_VM || __XM_XIMEVOL || __UA_KMAIL || __UA_MOZ5 || __UA_OPERA7)
 
 meta     NICE_REPLY_A		(__SUBJ_RE && !__MISSING_REPLY && !__MISSING_REF && __BOTH_INR_AND_REF)
-describe NICE_REPLY_A		Looks like a legit relpy (A)
+describe NICE_REPLY_A		Looks like a legit reply (A)
 ## score    NICE_REPLY_A		-0.444
-tflags     NICE_REPLY_A		nopublish
+tflags   NICE_REPLY_A		nice
 #counts   NICE_REPLY_A             0s/45h of 43776 corpus (34010s/9766h FVGT) 11/29/06
 
 
@@ -61,7 +61,7 @@ header   __UA_MSENTOUR		User-Agent =~ /^
 meta     __INR_AND_NO_REF	(__XM_IMAIL || __XM_APPLEMAIL || __XM_COMMUNIG || __XM_EDMAX || __XM_ELM || __XM_EMUMAIL || __XM_EXMH || __XM_LOTUSN || __XM_MAILCITY || __XM_MAILSMITH || __XM_MSCDO || __XM_MSOUT || __XM_MIMETOOLS || __XM_OPERA6 || __XM_PEGASUS || __XM_QUALCOM || __UA_IMP || __UA_MSOEMAC || __UA_MSENTOUR || __UA_OPERA7)
 
 meta     NICE_REPLY_B		(__SUBJ_RE && !__MISSING_REPLY && __MISSING_REF && __INR_AND_NO_REF)
-tflags     NICE_REPLY_B		nopublish
+tflags     NICE_REPLY_B		nice
 ## score    NICE_REPLY_B		-0.333
 #counts   NICE_REPLY_B             1s/156h of 43776 corpus (34010s/9766h FVGT) 11/29/06
 
@@ -96,7 +96,7 @@ header   __UA_XNEWS		User-Agent =~ /^Xne
 meta     __NO_INR_YES_REF	(__XM_GNUS || __XM_MSOE5 || __XM_MSOE6 || __XM_MOZ4 || __XM_SKYRI || __XM_WWWMAIL || __UA_GNUS || __UA_KNODE || __UA_MUTT || __UA_PAN || __UA_XNEWS)
 
 meta     NICE_REPLY_C		(__SUBJ_RE && __MISSING_REPLY && !__MISSING_REF && __NO_INR_YES_REF)
-tflags    NICE_REPLY_C		nopublish
+tflags    NICE_REPLY_C		nice
 ## score    NICE_REPLY_C		-0.444
 #counts   NICE_REPLY_C             3s/544h of 43776 corpus (34010s/9766h FVGT) 11/29/06
 
@@ -132,11 +132,11 @@ meta     __BROKE_MUAS		(__XM_AOL || __XM
 
 
 
-meta     FAKE_REPLY_SURE_A	(__SUBJ_RE && (!FAKE_REPLY_A && !FAKE_REPLY_A1 && !FAKE_REPLY_A2 && !FAKE_REPLY_B && !FAKE_REPLY_C) && (!NICE_REPLY_A && !NICE_REPLY_B && !NICE_REPLY_C) && !__BROKE_MUAS && __MISSING_THREAD)
+#meta     FAKE_REPLY_SURE_A	(__SUBJ_RE && (!FAKE_REPLY_A1 && !FAKE_REPLY_B && !FAKE_REPLY_C) && (!NICE_REPLY_A && !NICE_REPLY_B && !NICE_REPLY_C) && !__BROKE_MUAS && __MISSING_THREAD)
 ## score    FAKE_REPLY_SURE_A	0.001
 #counts   FAKE_REPLY_SURE_A        468s/823h of 43776 corpus (34010s/9766h FVGT) 11/29/06
 
-meta     FAKE_REPLY_SURE_B	(__SUBJ_RE && (!FAKE_REPLY_A && !FAKE_REPLY_A1 && !FAKE_REPLY_A2 && !FAKE_REPLY_B && !FAKE_REPLY_C) && (!NICE_REPLY_A && !NICE_REPLY_B && !NICE_REPLY_C) && !__BROKE_MUAS)
+#meta     FAKE_REPLY_SURE_B	(__SUBJ_RE && (!FAKE_REPLY_A1 && !FAKE_REPLY_B && !FAKE_REPLY_C) && (!NICE_REPLY_A && !NICE_REPLY_B && !NICE_REPLY_C) && !__BROKE_MUAS)
 ## score    FAKE_REPLY_SURE_B	0.001
 #counts   FAKE_REPLY_SURE_B        552s/969h of 43776 corpus (34010s/9766h FVGT) 11/29/06
 

Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf?rev=1872784&r1=1872783&r2=1872784&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_misc_testing.cf Tue Jan 14 15:56:25 2020
@@ -2954,6 +2954,6 @@ meta       __DOTGOV_MONEY              _
 meta       __DOTGOV_IMAGE              __URI_DOTGOV && __REMOTE_IMAGE 
 
 meta       __DOTGOV_NXDKIM             __URI_DOTGOV && DKIM_ADSP_NXDOMAIN 
-meta       __DOTGOV_NXDKIM             net
+tflags     __DOTGOV_NXDKIM             net
 
 

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf?rev=1872784&r1=1872783&r2=1872784&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf Tue Jan 14 15:56:25 2020
@@ -177,7 +177,7 @@ meta	 SUBJ_ALL_CAPS3	SUBJ_ALL_CAPS && __
 header	 __HOTMAIL_HELO	Received =~ /from ([A-Z]{3})\d[^.]+ [^\n]+ by \1\d+-[^\n ]+\.\1\d+\.hotmail\.com with Microsoft/i
 tflags	 __HOTMAIL_HELO 	nice
 # 1 & 2 are in 20_head_tests.cf ... this one doesn't use eval rules
-meta	 FORGED_HOTMAIL_RCVD3	__HOST_HOTMAIL && (!__HOTMAIL_HELO || __DOS_SINGLE_EXT_RELAY)
+#meta	 FORGED_HOTMAIL_RCVD3	__HOST_HOTMAIL && (!__HOTMAIL_HELO || __DOS_SINGLE_EXT_RELAY)
 
 # A blend of sidney's UPPERCASE_HTTP and jhardin's URI_UC for bug 6408
 # This one avoids Http: which I think is the biggest problem.

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_rcd_rdns.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_rcd_rdns.cf?rev=1872784&r1=1872783&r2=1872784&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_rcd_rdns.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_rcd_rdns.cf Tue Jan 14 15:56:25 2020
@@ -38,7 +38,7 @@ tflags __RCD_RDNS_MAIL nice
 
 meta RCD_RDNS_SERVER __RCD_RDNS_MX || __RCD_RDNS_SMTP || __RCD_RDNS_MTA || __RCD_RDNS_STATIC || __RCD_RDNS_OB || __RCD_RDNS_MAIL
 tflags RCD_RDNS_SERVER nice nopublish
-meta RCD_RDNS_SERVER_MESSY __RCD_RDNS_MX_MESSY_MESSY || __RCD_RDNS_SMTP_MESSY || __RCD_RDNS_MTA_MESSY || __RCD_RDNS_STATIC_MESSY || __RCD_RDNS_OB_MESSY || __RCD_RDNS_MAIL_MESSY
+meta RCD_RDNS_SERVER_MESSY __RCD_RDNS_MX_MESSY || __RCD_RDNS_SMTP_MESSY || __RCD_RDNS_MTA_MESSY || __RCD_RDNS_STATIC_MESSY || __RCD_RDNS_OB_MESSY || __RCD_RDNS_MAIL_MESSY
 tflags RCD_RDNS_SERVER_MESSY nice nopublish
 
 # expected to be fully overlapped and eclipsed by __RDNS_INDICATOR_TYPE