You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2004/04/25 12:21:44 UTC
svn commit: rev 10255 - incubator/spamassassin/trunk/rules
Author: quinlan
Date: Sun Apr 25 03:21:43 2004
New Revision: 10255
Modified:
incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf
incubator/spamassassin/trunk/rules/20_html_tests.cf
incubator/spamassassin/trunk/rules/25_uribl.cf
incubator/spamassassin/trunk/rules/70_testing.cf
Log:
promote T_URIBL_WS_SURBL to URIBL_WS_SURBL
promote T_URIBL_BE_SURBL to URIBL_BE_SURBL
promote SENDERBASE_NEW_BULK (hits about 8% of spam real-time)
promote HTML_BACKHAIR*
settle on a single T_BAD_TIMEZONE* version
Modified: incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_dnsbl_tests.cf Sun Apr 25 03:21:43 2004
@@ -191,13 +191,13 @@
tflags DNS_FROM_RFCI_DSN net
# sa-hil.habeas.com for SpamAssassin queries
-# hil.habeas.com for other filters
+# hil.habeas.com for other queries
header HABEAS_INFRINGER eval:check_rbl_swe('hil', 'sa-hil.habeas.com.')
describe HABEAS_INFRINGER Has Habeas warrant mark and on Infringer List
tflags HABEAS_INFRINGER net
# sa-hul.habeas.com for SpamAssassin queries
-# hul.habeas.com for other filters
+# hul.habeas.com for other queries
header HABEAS_USER eval:check_rbl_swe('hul', 'sa-hul.habeas.com.')
describe HABEAS_USER Has Habeas warrant mark and on User List
tflags HABEAS_USER net nice
@@ -211,10 +211,16 @@
tflags RCVD_IN_BSP_OTHER net nice
# SenderBase provides information about senders
+# http://www.senderbase.org/dnsresponses.html
# sa.senderbase.org for SpamAssassin queries
-# test.senderbase.org for everything else (until SenderBase is in production)
-#header __SENDERBASE eval:check_rbl_txt('senderbase', 'sa.senderbase.org.')
-#tflags __SENDERBASE net
+# query.senderbase.org for other queries
+header __SENDERBASE eval:check_rbl_txt('senderbase', 'sa.senderbase.org.')
+tflags __SENDERBASE net
+
+# S23 = domain daily magnitude
+# S25 = date of first message from this domain
+header SENDERBASE_NEW_BULK eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 120*86400)')
+describe SENDERBASE_NEW_BULK Sender domain is new and very high volume
# ---------------------------------------------------------------------------
# NOTE: donation tests, see README file for details
Modified: incubator/spamassassin/trunk/rules/20_html_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_html_tests.cf (original)
+++ incubator/spamassassin/trunk/rules/20_html_tests.cf Sun Apr 25 03:21:43 2004
@@ -186,6 +186,16 @@
describe HTML_OBFUSCATE_80_90 Message is 80% to 90% HTML obfuscation
describe HTML_OBFUSCATE_90_100 Message is 90% to 100% HTML obfuscation
+# backhair - idea from backhair set by Jennifer Wheeler and Adam Lopresto.
+body HTML_BACKHAIR_1 eval:html_range('backhair_count', '0', '1')
+body HTML_BACKHAIR_2 eval:html_range('backhair_count', '1', '4')
+body HTML_BACKHAIR_4 eval:html_range('backhair_count', '4', '8')
+body HTML_BACKHAIR_8 eval:html_range('backhair_count', '8', 'inf')
+describe HTML_BACKHAIR_1 HTML tags used to obfuscate words
+describe HTML_BACKHAIR_2 HTML tags used to obfuscate words
+describe HTML_BACKHAIR_4 HTML tags used to obfuscate words
+describe HTML_BACKHAIR_8 HTML tags used to obfuscate words
+
# HTML attribute testing
body HTML_ATTR_BAD eval:html_range('attr_bad','0.75','1.0')
describe HTML_ATTR_BAD HTML has many bad attributes in tags
Modified: incubator/spamassassin/trunk/rules/25_uribl.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/25_uribl.cf (original)
+++ incubator/spamassassin/trunk/rules/25_uribl.cf Sun Apr 25 03:21:43 2004
@@ -43,5 +43,15 @@
describe URIBL_SC_SURBL Contains a URL listed in the SC SURBL blocklist
tflags URIBL_SC_SURBL net
+urirhsbl URIBL_WS_SURBL ws.surbl.org. A
+header URIBL_WS_SURBL eval:check_uridnsbl('T_URIBL_WS_SURBL')
+describe URIBL_WS_SURBL Contains a URL listed in the WS SURBL blocklist
+tflags URIBL_WS_SURBL net
+
+urirhsbl URIBL_BE_SURBL be.surbl.org. A
+header URIBL_BE_SURBL eval:check_uridnsbl('T_URIBL_BE_SURBL')
+describe URIBL_BE_SURBL Contains a URL listed in the BE SURBL blocklist
+tflags URIBL_BE_SURBL net
+
endif # Mail::SpamAssassin::Plugin::URIDNSBL
Modified: incubator/spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_testing.cf (original)
+++ incubator/spamassassin/trunk/rules/70_testing.cf Sun Apr 25 03:21:43 2004
@@ -429,66 +429,6 @@
describe T_RCVD_IN_AHBL_RHSBL AHBL: From sender in DNSbl dnsbl.ahbl.org
tflags T_RCVD_IN_AHBL_RHSBL net
-# backhair - idea from backhair set by Jennifer Wheeler and Adam Lopresto.
-body T_BACKHAIR_1_1 eval:html_test('backhair_1_1')
-body T_BACKHAIR_1_2 eval:html_test('backhair_1_2')
-body T_BACKHAIR_1_3 eval:html_test('backhair_1_3')
-body T_BACKHAIR_1_4 eval:html_test('backhair_1_4')
-body T_BACKHAIR_1_5 eval:html_test('backhair_1_5')
-body T_BACKHAIR_1_6 eval:html_test('backhair_1_6')
-body T_BACKHAIR_1_7 eval:html_test('backhair_1_7')
-body T_BACKHAIR_2_1 eval:html_test('backhair_2_1')
-body T_BACKHAIR_2_2 eval:html_test('backhair_2_2')
-body T_BACKHAIR_2_3 eval:html_test('backhair_2_3')
-body T_BACKHAIR_2_4 eval:html_test('backhair_2_4')
-body T_BACKHAIR_2_5 eval:html_test('backhair_2_5')
-body T_BACKHAIR_2_6 eval:html_test('backhair_2_6')
-body T_BACKHAIR_2_7 eval:html_test('backhair_2_7')
-body T_BACKHAIR_3_1 eval:html_test('backhair_3_1')
-body T_BACKHAIR_3_2 eval:html_test('backhair_3_2')
-body T_BACKHAIR_3_3 eval:html_test('backhair_3_3')
-body T_BACKHAIR_3_4 eval:html_test('backhair_3_4')
-body T_BACKHAIR_3_5 eval:html_test('backhair_3_5')
-body T_BACKHAIR_3_6 eval:html_test('backhair_3_6')
-body T_BACKHAIR_3_7 eval:html_test('backhair_3_7')
-body T_BACKHAIR_4_1 eval:html_test('backhair_4_1')
-body T_BACKHAIR_4_2 eval:html_test('backhair_4_2')
-body T_BACKHAIR_4_3 eval:html_test('backhair_4_3')
-body T_BACKHAIR_4_4 eval:html_test('backhair_4_4')
-body T_BACKHAIR_4_5 eval:html_test('backhair_4_5')
-body T_BACKHAIR_4_6 eval:html_test('backhair_4_6')
-body T_BACKHAIR_4_7 eval:html_test('backhair_4_7')
-body T_BACKHAIR_5_1 eval:html_test('backhair_5_1')
-body T_BACKHAIR_5_2 eval:html_test('backhair_5_2')
-body T_BACKHAIR_5_3 eval:html_test('backhair_5_3')
-body T_BACKHAIR_5_4 eval:html_test('backhair_5_4')
-body T_BACKHAIR_5_5 eval:html_test('backhair_5_5')
-body T_BACKHAIR_5_6 eval:html_test('backhair_5_6')
-body T_BACKHAIR_5_7 eval:html_test('backhair_5_7')
-body T_BACKHAIR_6_1 eval:html_test('backhair_6_1')
-body T_BACKHAIR_6_2 eval:html_test('backhair_6_2')
-body T_BACKHAIR_6_3 eval:html_test('backhair_6_3')
-body T_BACKHAIR_6_4 eval:html_test('backhair_6_4')
-body T_BACKHAIR_6_5 eval:html_test('backhair_6_5')
-body T_BACKHAIR_6_6 eval:html_test('backhair_6_6')
-body T_BACKHAIR_6_7 eval:html_test('backhair_6_7')
-body T_BACKHAIR_7_1 eval:html_test('backhair_7_1')
-body T_BACKHAIR_7_2 eval:html_test('backhair_7_2')
-body T_BACKHAIR_7_3 eval:html_test('backhair_7_3')
-body T_BACKHAIR_7_4 eval:html_test('backhair_7_4')
-body T_BACKHAIR_7_5 eval:html_test('backhair_7_5')
-body T_BACKHAIR_7_6 eval:html_test('backhair_7_6')
-body T_BACKHAIR_7_7 eval:html_test('backhair_7_7')
-
-body T_BACKHAIR_1 eval:html_eval('backhair_count', '>= 1')
-body T_BACKHAIR_2 eval:html_eval('backhair_count', '>= 2')
-body T_BACKHAIR_3 eval:html_eval('backhair_count', '>= 3')
-body T_BACKHAIR_4 eval:html_eval('backhair_count', '>= 4')
-body T_BACKHAIR_5 eval:html_eval('backhair_count', '>= 5')
-body T_BACKHAIR_6 eval:html_eval('backhair_count', '>= 6')
-body T_BACKHAIR_7 eval:html_eval('backhair_count', '>= 7')
-body T_BACKHAIR_8 eval:html_eval('backhair_count', '>= 8')
-
# IADB
header __RCVD_IN_IADB eval:check_rbl('iadb', 'iadb.isipp.com.')
tflags __RCVD_IN_IADB net nice
@@ -512,171 +452,6 @@
header T_RCVD_ILLEGAL_IP Received =~ /[\s\(\[\:\=](?:(?:[01257]|22[3-9]|23[0-9]|24[0-9]|25[0-5])\.\d+\.\d+\.\d+|127\.[1-9]\.\d+\.\d+|127\.0\.[1-9]\.\d+|127\.0\.0\.(?:\d\d+|[2-9]))\b/
describe T_RCVD_ILLEGAL_IP Received contains illegal IP address
-# some SenderBase tests
-header __SENDERBASE eval:check_rbl_txt('senderbase', 'sa.senderbase.org.')
-
-# S23 = domain daily magnitude
-# S25 = date of first message from this domain
-header T_SB_23_6_2_25_060 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 060*86400)')
-header T_SB_23_6_2_25_070 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 070*86400)')
-header T_SB_23_6_2_25_080 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 080*86400)')
-header T_SB_23_6_2_25_090 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 090*86400)')
-header T_SB_23_6_2_25_100 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 100*86400)')
-header T_SB_23_6_2_25_110 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 110*86400)')
-header T_SB_23_6_2_25_120 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 120*86400)')
-header T_SB_23_6_2_25_130 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 130*86400)')
-header T_SB_23_6_2_25_140 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 140*86400)')
-header T_SB_23_6_2_25_150 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 150*86400)')
-header T_SB_23_6_2_25_160 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 160*86400)')
-header T_SB_23_6_2_25_170 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 170*86400)')
-header T_SB_23_6_2_25_180 eval:check_rbl_sub('senderbase', 'S23 > 6.2 && (time - S25 < 180*86400)')
-
-header T_SB_23_6_3_25_060 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 060*86400)')
-header T_SB_23_6_3_25_070 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 070*86400)')
-header T_SB_23_6_3_25_080 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 080*86400)')
-header T_SB_23_6_3_25_090 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 090*86400)')
-header T_SB_23_6_3_25_100 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 100*86400)')
-header T_SB_23_6_3_25_110 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 110*86400)')
-header T_SB_23_6_3_25_120 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 120*86400)')
-header T_SB_23_6_3_25_130 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 130*86400)')
-header T_SB_23_6_3_25_140 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 140*86400)')
-header T_SB_23_6_3_25_150 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 150*86400)')
-header T_SB_23_6_3_25_160 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 160*86400)')
-header T_SB_23_6_3_25_170 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 170*86400)')
-header T_SB_23_6_3_25_180 eval:check_rbl_sub('senderbase', 'S23 > 6.3 && (time - S25 < 180*86400)')
-
-header T_SB_23_6_4_25_060 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 060*86400)')
-header T_SB_23_6_4_25_070 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 070*86400)')
-header T_SB_23_6_4_25_080 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 080*86400)')
-header T_SB_23_6_4_25_090 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 090*86400)')
-header T_SB_23_6_4_25_100 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 100*86400)')
-header T_SB_23_6_4_25_110 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 110*86400)')
-header T_SB_23_6_4_25_120 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 120*86400)')
-header T_SB_23_6_4_25_130 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 130*86400)')
-header T_SB_23_6_4_25_140 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 140*86400)')
-header T_SB_23_6_4_25_150 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 150*86400)')
-header T_SB_23_6_4_25_160 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 160*86400)')
-header T_SB_23_6_4_25_170 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 170*86400)')
-header T_SB_23_6_4_25_180 eval:check_rbl_sub('senderbase', 'S23 > 6.4 && (time - S25 < 180*86400)')
-
-header T_SB_23_6_5_25_060 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 060*86400)')
-header T_SB_23_6_5_25_070 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 070*86400)')
-header T_SB_23_6_5_25_080 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 080*86400)')
-header T_SB_23_6_5_25_090 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 090*86400)')
-header T_SB_23_6_5_25_100 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 100*86400)')
-header T_SB_23_6_5_25_110 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 110*86400)')
-header T_SB_23_6_5_25_120 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 120*86400)')
-header T_SB_23_6_5_25_130 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 130*86400)')
-header T_SB_23_6_5_25_140 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 140*86400)')
-header T_SB_23_6_5_25_150 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 150*86400)')
-header T_SB_23_6_5_25_160 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 160*86400)')
-header T_SB_23_6_5_25_170 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 170*86400)')
-header T_SB_23_6_5_25_180 eval:check_rbl_sub('senderbase', 'S23 > 6.5 && (time - S25 < 180*86400)')
-
-header T_SB_23_6_6_25_060 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 060*86400)')
-header T_SB_23_6_6_25_070 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 070*86400)')
-header T_SB_23_6_6_25_080 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 080*86400)')
-header T_SB_23_6_6_25_090 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 090*86400)')
-header T_SB_23_6_6_25_100 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 100*86400)')
-header T_SB_23_6_6_25_110 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 110*86400)')
-header T_SB_23_6_6_25_120 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 120*86400)')
-header T_SB_23_6_6_25_130 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 130*86400)')
-header T_SB_23_6_6_25_140 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 140*86400)')
-header T_SB_23_6_6_25_150 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 150*86400)')
-header T_SB_23_6_6_25_160 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 160*86400)')
-header T_SB_23_6_6_25_170 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 170*86400)')
-header T_SB_23_6_6_25_180 eval:check_rbl_sub('senderbase', 'S23 > 6.6 && (time - S25 < 180*86400)')
-
-tflags T_SB_23_6_2_25_060 net
-tflags T_SB_23_6_2_25_070 net
-tflags T_SB_23_6_2_25_080 net
-tflags T_SB_23_6_2_25_090 net
-tflags T_SB_23_6_2_25_100 net
-tflags T_SB_23_6_2_25_110 net
-tflags T_SB_23_6_2_25_120 net
-tflags T_SB_23_6_2_25_130 net
-tflags T_SB_23_6_2_25_140 net
-tflags T_SB_23_6_2_25_150 net
-tflags T_SB_23_6_2_25_160 net
-tflags T_SB_23_6_2_25_170 net
-tflags T_SB_23_6_2_25_180 net
-
-tflags T_SB_23_6_3_25_060 net
-tflags T_SB_23_6_3_25_070 net
-tflags T_SB_23_6_3_25_080 net
-tflags T_SB_23_6_3_25_090 net
-tflags T_SB_23_6_3_25_100 net
-tflags T_SB_23_6_3_25_110 net
-tflags T_SB_23_6_3_25_120 net
-tflags T_SB_23_6_3_25_130 net
-tflags T_SB_23_6_3_25_140 net
-tflags T_SB_23_6_3_25_150 net
-tflags T_SB_23_6_3_25_160 net
-tflags T_SB_23_6_3_25_170 net
-tflags T_SB_23_6_3_25_180 net
-
-tflags T_SB_23_6_4_25_060 net
-tflags T_SB_23_6_4_25_070 net
-tflags T_SB_23_6_4_25_080 net
-tflags T_SB_23_6_4_25_090 net
-tflags T_SB_23_6_4_25_100 net
-tflags T_SB_23_6_4_25_110 net
-tflags T_SB_23_6_4_25_120 net
-tflags T_SB_23_6_4_25_130 net
-tflags T_SB_23_6_4_25_140 net
-tflags T_SB_23_6_4_25_150 net
-tflags T_SB_23_6_4_25_160 net
-tflags T_SB_23_6_4_25_170 net
-tflags T_SB_23_6_4_25_180 net
-
-tflags T_SB_23_6_5_25_060 net
-tflags T_SB_23_6_5_25_070 net
-tflags T_SB_23_6_5_25_080 net
-tflags T_SB_23_6_5_25_090 net
-tflags T_SB_23_6_5_25_100 net
-tflags T_SB_23_6_5_25_110 net
-tflags T_SB_23_6_5_25_120 net
-tflags T_SB_23_6_5_25_130 net
-tflags T_SB_23_6_5_25_140 net
-tflags T_SB_23_6_5_25_150 net
-tflags T_SB_23_6_5_25_160 net
-tflags T_SB_23_6_5_25_170 net
-tflags T_SB_23_6_5_25_180 net
-
-tflags T_SB_23_6_6_25_060 net
-tflags T_SB_23_6_6_25_070 net
-tflags T_SB_23_6_6_25_080 net
-tflags T_SB_23_6_6_25_090 net
-tflags T_SB_23_6_6_25_100 net
-tflags T_SB_23_6_6_25_110 net
-tflags T_SB_23_6_6_25_120 net
-tflags T_SB_23_6_6_25_130 net
-tflags T_SB_23_6_6_25_140 net
-tflags T_SB_23_6_6_25_150 net
-tflags T_SB_23_6_6_25_160 net
-tflags T_SB_23_6_6_25_170 net
-tflags T_SB_23_6_6_25_180 net
-
-# demoted for further testing
-# results for recent email (last 4 days of spam, ham ranging in ages
-# from 0 to 10 months) seem not so great:
-
-ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
-
-uridnsbl_timeout 2
-
-urirhsbl T_URIBL_WS_SURBL ws.surbl.org. A
-header T_URIBL_WS_SURBL eval:check_uridnsbl('T_URIBL_WS_SURBL')
-describe T_URIBL_WS_SURBL Contains a URL listed in the WS SURBL blocklist
-tflags T_URIBL_WS_SURBL net
-
-urirhsbl T_URIBL_BE_SURBL be.surbl.org. A
-header T_URIBL_BE_SURBL eval:check_uridnsbl('T_URIBL_BE_SURBL')
-describe T_URIBL_BE_SURBL Contains a URL listed in the BE SURBL blocklist
-tflags T_URIBL_BE_SURBL net
-
-endif # Mail::SpamAssassin::Plugin::URIDNSBL
-
# a couple to try out
header T_PC_CUR_DATE_TIME ALL =~ /%CURRENT_DATE_TIME/
header T_PC_RND_HEADER ALL =~ /%RA?ND_[A-Z]/
@@ -978,13 +753,6 @@
# I'm curious, may help explain more ALL_TRUSTED fps
body T_SA_MARKED_UP /Spam detection software, running on the system /
-header T_BAD_TIMEZONE_EST ALL =~ /[+-]\d\d[30]0(?<!-0500|-0300|\+1000|\+1100) \(EST\)/
-header T_BAD_TIMEZONE_CST ALL =~ /[+-]\d\d[30]0(?<!-0600|-0400|\+0800|\+0930) \(CST\)/
-header T_BAD_TIMEZONE_EST_2 ALL =~ /[+-]\d\d[30]0(?<!-0500|-0300|\+1000|\+1100) \(?EST\)?\b/
-header T_BAD_TIMEZONE_CST_2 ALL =~ /[+-]\d\d[30]0(?<!-0600|-0400|\+0800|\+0930) \(?CST\)?\b/
-header T_BAD_TIMEZONE_EST_3 ALL =~ /[+-]\d\d[30]0(?<!-0500|-0300|\+1000|\+1100) \(?EST\)?(?:\s|$)/
-header T_BAD_TIMEZONE_CST_3 ALL =~ /[+-]\d\d[30]0(?<!-0600|-0400|\+0800|\+0930) \(?CST\)?(?:\s|$)/
-header T_BAD_TIMEZONE_EST_4 ALL =~ /[+-]\d\d[30]0(?<!-0500|-0300|\+1000|\+1100) (?:\(?EST\)|EST\b)/
-header T_BAD_TIMEZONE_CST_4 ALL =~ /[+-]\d\d[30]0(?<!-0600|-0400|\+0800|\+0930) (?:\(?CST\)|CST\b)/
-header T_BAD_TIMEZONE_EST_5 ALL =~ /[+-]\d\d[30]0(?<!-0500|-0300|\+1000|\+1100) (?:\(?EST\)|EST(?:\s+|\b|$))/
-header T_BAD_TIMEZONE_CST_5 ALL =~ /[+-]\d\d[30]0(?<!-0600|-0400|\+0800|\+0930) (?:\(?CST\)|CST(?:\s+|\b|$))/
+# No, you can't make up those funny numbers.
+header T_BAD_TIMEZONE_EST ALL =~ /[+-]\d\d[30]0(?<!-0500|-0300|\+1000|\+1100) \(?EST\)?\b/
+header T_BAD_TIMEZONE_CST ALL =~ /[+-]\d\d[30]0(?<!-0600|-0400|\+0800|\+0930) \(?CST\)?\b/