You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by kh...@apache.org on 2009/12/04 06:16:20 UTC

svn commit: r887064 - in /spamassassin/trunk/rulesrc/sandbox/khopesh: 20_khop_bl.cf 20_khop_experimental.cf 20_khop_general.cf 20_khop_lists.cf 20_khop_sc_bug_6114.cf

Author: khopesh
Date: Fri Dec  4 05:16:19 2009
New Revision: 887064

URL: http://svn.apache.org/viewvc?rev=887064&view=rev
Log:
khop updates

Modified:
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_general.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf?rev=887064&r1=887063&r2=887064&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_bl.cf Fri Dec  4 05:16:19 2009
@@ -38,6 +38,11 @@
 
 # Some tests:
 
+# This should be a cleaner representation of __DOS_RELAYED_EXT:
+header	 __MULTIPLE_EXT 	X-Spam-Relays-External =~ /...\[/
+
+ifplugin Mail::SpamAssassin::Plugin::DNSEval # {
+
 # The DNSBL side of the Manitu iXhash zone, http://www.dnsbl.manitu.net/
 # Out-performs PSBL (72.98/0.12 spam/ham to PSBL's 48.69/0.36) at Intra2net:
 # http://www.intra2net.com/en/support/antispam/blacklist.php_dnsbl=RCVD_IN_NIX_SPAM.html
@@ -53,3 +58,11 @@
 describe RCVD_IN_SPAMCOP	Received via a relay in bl.spamcop.net
 tflags	 RCVD_IN_SPAMCOP	net nopublish	# 20091123
 
+# we have the non-lastext data; let's see how good it is if we clean it up a bit
+# we'll exclude anything that might have too much info relaying (mailling lists
+# and freemail).  my intuition is 35-50% spam, 2-4% ham, but we could get lucky.
+meta	 DNSBL_INDIRECT		__LAST_EXTERNAL_RELAY_NO_AUTH && __MULTIPLE_EXT && (RCVD_IN_BL_SPAMCOP_NET||__RCVD_IN_BRBL) && !(__VIA_ML||__DOS_HAS_LIST_UNSUB||__SENDER_BOT||__freemail_safe||RCVD_IN_SPAMCOP||RCVD_IN_BRBL_LASTEXT)
+describe DNSBL_INDIRECT		Received indirectly through a relay in a DNSBL
+tflags	 DNSBL_INDIRECT		net nopublish	# 20091203
+
+endif # } Mail::SpamAssassin::Plugin::DNSEval

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=887064&r1=887063&r2=887064&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_experimental.cf Fri Dec  4 05:16:19 2009
@@ -1,18 +1,33 @@
 # experiments based on masscheck results
 
-# also in khop-general
-# Looking at daterev 20091107-r833654-n (the latest network test),
-# __HELO_NO_DOMAIN is 17.7782/1.2064 with 08/69 overlap with HELO_LOCALHOST
-# so nodom+!localhost should translate to 16.3559/0.3740 (S/O=0.978)
-# looking at daterev 20091113-r835775-n (latest std test),
-# __HELO_NO_DOMAIN is 17.6557/0.5898 with 07/98 overlap with HELO_LOCALHOST
-# this translates to a whopping 16.4198/0.118 (S/O=0.993)
-meta     HELO_NO_DOMAIN	__HELO_NO_DOMAIN && !HELO_LOCALHOST
-describe HELO_NO_DOMAIN	Relay reports its domain incorrectly
-#score	 HELO_NO_DOMAIN	2.375 0.327 1.497 0.884
-# scores derived from 90% of RDNS_DYNAMIC's sa3.3 proposal (attachment 4565)
-# because they have such similar definitions, numbers, and merits
-
-meta     MALFORMED_FREEMAIL	(MISSING_HEADERS||__HDRS_LCASE) && FREEMAIL_FROM
+meta	 MALFORMED_FREEMAIL	(MISSING_HEADERS||__HDRS_LCASE) && FREEMAIL_FROM
 describe MALFORMED_FREEMAIL	Bad headers on message from free email service
-#score    MALFORMED_FREEMAIL	0.1
+#score	 MALFORMED_FREEMAIL	0.1
+
+header	 __FROM_THE	From:name =~ /\b(?:THE|[Tt]he)\b/
+meta	 FROM_THE	__FROM_THE && !(__VIA_ML || __SENDER_BOT || __DOS_HAS_LIST_UNSUB || __REPLYTO_EXISTS)
+describe FROM_THE	Non-bulk sender is "The" something
+# I don't actually expect this to do well.  maybe s/o around 0.450?
+# There's also the argument that Bayes should handle this, since (iirc) it codifies tokens like "from:the" indicating that "the" occurs in "From" headers...
+
+header	 KHOP_BIG_TO_CC      ToCc =~ /(?:[^,\@]{1,60}\@[^,]{4,25},){10,19}/
+describe KHOP_BIG_TO_CC      Sent to 10+ recipients instaed of Bcc or a list
+score	 KHOP_BIG_TO_CC      0.3 # 20090527
+
+header	 __KHOP_EBAY_ADDY	From:addr =~ /\@(?:.+\.)?ebay\..{3,5}$/i
+meta	 KHOP_FAKE_EBAY 	__KHOP_EBAY_ADDY && !__NOT_SPOOFED
+describe KHOP_FAKE_EBAY	Sender falsely claims to be from eBay
+#score	 KHOP_FAKE_EBAY	2.25 # 20090408
+
+ifplugin Mail::SpamAssassin::Plugin::URIDetail
+  uri_detail KHOP_CLIQUEZ_ICI	text =~ /^cliquez\Wici\b/i
+else
+  rawbody  KHOP_CLIQUEZ_ICI	/>cliquez\Wici\b/i
+endif
+describe KHOP_CLIQUEZ_ICI	Click here link in French
+score    KHOP_CLIQUEZ_ICI	1.1	# 20090526 see also SARE_UN7
+
+# I don't think this ever fires
+uri      URI_HIDDEN	/.{7}\/\../
+describe URI_HIDDEN	Contains a hidden directory
+#score    URI_HIDDEN	0.7 # 20090515 13:29 by Adam Katz (me) on sa-users list

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_general.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_general.cf?rev=887064&r1=887063&r2=887064&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_general.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_general.cf Fri Dec  4 05:16:19 2009
@@ -10,6 +10,7 @@
 meta	 TWO_IPS_RCVD	__TWO_IPS_RCVD && !ALL_TRUSTED
 describe TWO_IPS_RCVD	Received: Relay identifies itself as wrong IP
 #score	 1.25	# 20050729
+# 100% overlap with RCVD_NUMERIC_HELO ...
 
 # Sendmail's FCrDNS, see http://www.sendmail.org/faq/section3#3.38
 header __MAY_BE_FORGED	Received =~ /\(may be forged\)/
@@ -24,6 +25,12 @@
 #score	 KHOP_HELO_FCRDNS	0.4 # 20090603, currently scoring 0.001
 score	 KHOP_HELO_FCRDNS	0.001
 
+meta     HELO_NO_DOMAIN	__HELO_NO_DOMAIN && !HELO_LOCALHOST
+describe HELO_NO_DOMAIN	Relay reports its domain incorrectly
+#score	 HELO_NO_DOMAIN	2.375 0.327 1.497 0.884
+# scores derived from 90% of RDNS_DYNAMIC's sa3.3 proposal (attachment 4565)
+# because they have such similar definitions, numbers, and merits
+
 # This doesn't fire often after greylisting ... how about w/out it?
 # renamed from KHOP_NO_FQDN
 meta	 KHOP_HELO_BOT	__HELO_NO_DOMAIN && KHOP_BOTNET
@@ -62,6 +69,11 @@
 describe FORGED_URL_DOM	Link domain has a TLD as a subdomain
 
 ifplugin Mail::SpamAssassin::Plugin::MIMEHeader # {
+
+  mimeheader DSCL4_PNG    Content-Type =~ /name\=\"DS[CL]\d{4,5}\.(?:png|PNG)\"/
+  describe   DSCL4_PNG		Digital camera filename is PNG
+  score      DSCL4_PNG		0.9 # 1.6->0.9 20091019 no recent hits
+
   ifplugin Mail::SpamAssassin::Plugin::ImageInfo
     # __JPEG_ATTACH is in sandbox/jhardin/20_tbird_image_spam.cf
     # __GIF_ATTACH is in sandbox/felicity/70_other.cf

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf?rev=887064&r1=887063&r2=887064&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_lists.cf Fri Dec  4 05:16:19 2009
@@ -3,17 +3,22 @@
 
 ### select rules from khop-lists
 
-header	 __SENDER_BOT	ALL =~ /(?:not?\W?repl[yi]|bounce|subscrib|news|nobody)[^@ >]*@\w/i
+header	 __SENDER_BOT	ALL =~ /(?:not?\W?repl[yi]|bounce|subscrib|news|nobody)[^@ >]{0,4}@\w/i
 uri	 __UNSUB_LINK	/\b(?:(?:un)?subscri(?:ber?|ptions?)|abuses?|opt(?:ing)?.?out)\b/i
 uri	 __MAIL_LINK	/\?.{0,200}\w@[\w-]{1,20}.\w\w\w?\b/i
 
+body     KHOP_NEWSLETTER	/\b(?:e?newsletters?|(?:un)?(?:subscrib|register)|you(?:r| are) subscri(?:b|ption)|opt(?:.|ing)?out\b|further info|you do ?n[o']t w(?:ish|ant)|remov\w{1,3}.{1,9}\blists?\b|to your white.?list)/i
+describe KHOP_NEWSLETTER	Is a newsletter or has list managing details
+score    KHOP_NEWSLETTER	0.4 0.5 0.6 0.7 # 20090219
+tflags	 KHOP_NEWSLETTER	nopublish
+
 #meta	 KHOP_UNSUB_LINK    __UNSUB_LINK && !(SARE_UNI||__VIA_ML||__SENDER_BOT)
-meta	 KHOP_UNSUB_LINK	__UNSUB_LINK && !(__VIA_ML||__SENDER_BOT)
+meta	 KHOP_UNSUB_LINK	__UNSUB_LINK && !(__VIA_ML||__DOS_HAS_LIST_UNSUB||__SENDER_BOT)
 describe KHOP_UNSUB_LINK	Non-list message has unsusbscribe link
 tflags	 KHOP_UNSUB_LINK	nopublish
 score    KHOP_UNSUB_LINK	0.5 0.6 0.7 0.8
 
-meta	 KHOP_MAIL_LINK	__MAIL_LINK && !(__UNSUB_LINK||__VIA_ML||__SENDER_BOT)
+meta	 KHOP_MAIL_LINK	__MAIL_LINK && !(__UNSUB_LINK||__VIA_ML||__DOS_HAS_LIST_UNSUB||__SENDER_BOT)
 describe KHOP_MAIL_LINK	A link contains an email address in the URL
 tflags	 KHOP_MAIL_LINK	nopublish
 #score	 KHOP_MAIL_LINK	0.1 0.2 0.3 0.4
@@ -23,7 +28,7 @@
 # From: must start w/ ~uppercase, ~letters, space/punctuation, then ~uppercase.
 header	 __FROM_FULL_NAME	From:name =~ /^[^a-z[:punct:][:cntrl:]\d\s][^[:punct:][:cntrl:]\d\s]*[[:punct:]\s]+[^a-z[:punct:][:cntrl:]\d\s]/
 tflags	 __FROM_FULL_NAME	nice
-meta	 KHOP_NO_FULL_NAME	!(__VIA_ML || __SENDER_BOT || __FROM_ENCODED_QP || __FROM_NEEDS_MIME || __FROM_FULL_NAME)
+meta	 KHOP_NO_FULL_NAME	!(__VIA_ML || __SENDER_BOT || __DOS_HAS_LIST_UNSUB || __FROM_ENCODED_QP || __FROM_NEEDS_MIME || __FROM_FULL_NAME)
 describe KHOP_NO_FULL_NAME	Sender does not have both First and Last names
 #score	 KHOP_NO_FULL_NAME	0.259 # keep low! 20090220, sa-users @20090514
 score	 KHOP_NO_FULL_NAME	0.001 # apparently hits the same on ham v spam

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf?rev=887064&r1=887063&r2=887064&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf Fri Dec  4 05:16:19 2009
@@ -1,4 +1,4 @@
-## khop-sc-neighbors.cf	v 200912221
+## khop-sc-neighbors.cf	v 20091240
 ## Khopesh's syndication of SpamCop's top offenders and top offending networks.
 ## 
 ## Spamassassin rules written by Adam Katz <antispamATkhopiscom>
@@ -33,11 +33,11 @@
 
 
 # http://www.spamcop.net/w3m?action=map;net=bmaxcnt;mask=16777215;sort=spamcnt
-header   KHOP_SC_CIDR16  Received =~ /(?-xism:\b(?:1(?:(?:23\.[12]|18\.9)6|8(?:9\.111|7\.4))|203\.210)(?:\.[012]?[0-9]{1,2}){2}\b)/
+header   KHOP_SC_CIDR16  Received =~ /(?-xism:\b(?:1(?:(?:23\.[12]|18\.9)6|87\.4)|203\.210|92\.85)(?:\.[012]?[0-9]{1,2}){2}\b)/
 describe KHOP_SC_CIDR16  Relay listed in SpamCop top 12 IP/16 CIDRs
 score    KHOP_SC_CIDR16  0.6 0.5 0.9 0.75
 
-header   KHOP_SC_TOP_CIDR16  Received =~ /(?-xism:\b(?:1(?:23\.2[37]|13\.22)|222\.25[34]|92\.85)(?:\.[012]?[0-9]{1,2}){2}\b)/
+header   KHOP_SC_TOP_CIDR16  Received =~ /(?-xism:\b(?:1(?:23\.2[37]|89\.111|13\.22)|222\.25[34])(?:\.[012]?[0-9]{1,2}){2}\b)/
 describe KHOP_SC_TOP_CIDR16  Relay listed in SpamCop top 6 IP/16 CIDRs
 score    KHOP_SC_TOP_CIDR16  0.9 0.8 1.3 1.2
 # http://ruleqa.spamassassin.org/week/KHOP_SC_TOP_CIDR16/detail
@@ -53,7 +53,7 @@
 
 
 # http://spamcop.net/w3m?action=map;net=cmaxcnt;mask=65535;sort=spamcnt
-header   KHOP_SC_CIDR24  Received =~ /(?-xism:\b(?:6(?:(?:8\.168\.13|0\.213\.4)8|2\.61\.164)|113\.160\.113|213\.233\.64|91\.132\.70)\.[012]?[0-9]{1,2}\b)/
+header   KHOP_SC_CIDR24  Received =~ /(?-xism:\b(?:6(?:8\.168\.138|2\.61\.164)|113\.16(?:0\.113|1\.17)|213\.233\.64|41\.140\.251)\.[012]?[0-9]{1,2}\b)/
 describe KHOP_SC_CIDR24  Relay listed in SpamCop top 12 IP/24 CIDRs
 score    KHOP_SC_CIDR24  0.9 0.8 1.3 1.2
 # http://ruleqa.spamassassin.org/week/KHOP_SC_CIDR24/detail
@@ -64,13 +64,13 @@
 #counts  KHOP_SC_CIDR24  240s/0h of 928863 corpus (899498s/29365h dos) 05/25/09
 #counts  KHOP_SC_CIDR24  0s/0h of 35258 corpus (10292s/24966h jm) 05/25/09
 
-header   KHOP_SC_TOP_CIDR24  Received =~ /(?-xism:\b(?:2(?:(?:20\.231\.12|02\.75\.3)7|16\.66\.78)|(?:111\.224\.25|0\.0\.)0|58\.18\.168)\.[012]?[0-9]{1,2}\b)/
+header   KHOP_SC_TOP_CIDR24  Received =~ /(?-xism:\b(?:2(?:20\.231\.12|02\.75\.3)7|(?:58\.18\.16|60\.213\.4)8|(?:111\.224\.25|0\.0\.)0)\.[012]?[0-9]{1,2}\b)/
 describe KHOP_SC_TOP_CIDR24  Relay listed in SpamCop top 6 IP/24 CIDRs
 score    KHOP_SC_TOP_CIDR24  1.7 1.5 1.9 1.8
 
 
 # http://www.spamcop.net/w3m?action=hoshame
-header   KHOP_SC_TOP200  Received =~ /(?-xism:\b(?:2(?:0(?:0\.(?:1(?:(?:95\.158\.16|41\.87\.13)5|(?:37\.132\.8|63\.249\.)3)|2(?:53\.218\.194|1\.18\.189|6\.148\.62)|8(?:9\.135\.157|0\.140\.61|8\.115\.30)|91\.248\.82|32\.8\.28)|1\.(?:1(?:16\.198\.1|34\.153\.2)14|45\.106\.130|251\.250\.3|59\.14\.107)|9\.(?:1(?:72\.(?:35\.112|44\.13)|1\.164\.39)|94\.196\.170)|3\.(?:210\.2(?:53\.154|49\.19)|101\.104\.2|90\.137\.18)|2\.75\.37\.(?:2(?:4[03]|27|52)|125)|6\.1(?:69\.30\.117|24\.17\.4)|5\.139\.241\.165|8\.84\.169\.157)|1(?:9\.(?:2(?:34\.88\.16|54\.35\.4)5|15(?:0\.139\.18|1\.41\.)6)|3\.(?:186\.(?:57\.18|62\.5)9|227\.219\.58|55\.78\.23)|0\.(?:1(?:27\.253\.121|10\.49\.39)|212\.248\.222)|2\.(?:2(?:35\.111\.208|44\.73\.232)|111\.199\.30)|1\.(?:1(?:52\.12\.114|76\.84\.225)|94\.138\.45)|8\.(?:(?:248\.44\.19|38\.12\.24)6|191\.33\.248)|6\.66\.7(?:8\.(?:125|54)|6\.224)|7\.19(?:4\.197\.245|9\.231\.249))|2(?:0\.(?:2(?:31\.(?:1(?:27\.(?:13|9)|01\.214)|69\.13)|27\.(?:170\.197|35\.234))|124\.249\.1)|
 2\.(?:2(?:5(?:5\.29\.143|2\.223\.2)|37\.(?:162\.200|78\.177))|124\.203\.27)|1\.214\.164\.240)|4\.1(?:56\.108\.188|99\.205\.252))|1(?:1(?:8\.(?:9(?:6\.2(?:16\.235|4\.156)|1\.117\.165|8\.214\.236)|130\.112\.235)|3\.(?:16(?:0\.113\.1(?:81|5)|9\.176\.24)|255\.7\.234)|6\.(?:47\.133\.40|1\.10\.195|50\.249\.2)|0\.(?:172\.167\.37|45\.146\.169)|9\.(?:39\.253\.25|93\.11\.126)|1\.224\.250\.(?:6[56]|133|70)|7\.25\.129\.200)|9(?:0\.(?:1(?:4(?:4\.(?:93\.154|176\.2)|5\.6\.20)|07\.134\.202)|47\.186\.250|6\.172\.98|81\.54\.33)|5\.(?:1(?:6(?:1\.(?:8\.1|9\.2)|0\.253\.4)|89\.45\.11)|2(?:45\.211\.3|52\.70\.14)6)|3\.1(?:08\.38\.228|98\.8\.211)|6\.28\.237\.185)|2(?:1\.1(?:0\.1(?:27\.158|74\.122)|85\.156\.185|41\.76\.191|66\.183\.29)|5\.(?:234\.18\.130|46\.73\.179)|4\.(?:124\.52\.162|0\.18\.130)|2\.252\.234\.74)|8(?:9\.(?:5(?:(?:5\.166\.12|2\.28\.13)2|9\.236\.19|\.120\.185)|35\.10\.164|60\.39\.162)|8\.217\.20\.96|6\.24\.19\.3)|4(?:0\.113\.(?:121\.101|203\.84)|8\.233\.80\.145)|52\.26\.20\.72)|8(?:3\
 .1(?:4(?:2\.111\.228|3\.151\.165|\.240\.146)|67\.114\.73)|8\.(?:255\.(?:108\.215|225\.114)|188\.37\.185|84\.200\.97)|2\.(?:2(?:39\.205\.187|28\.64\.89)|193\.140\.168)|0\.(?:(?:25\.174\.11|93\.125\.18)6|84\.120\.242)|4\.(?:22\.140\.186|17\.11\.114|32\.238\.19)|9\.(?:165\.244\.221|47\.164\.17|36\.3\.23)|5\.1(?:70\.32\.154|92\.33\.96)|(?:1\.112|6\.28)\.190\.195)|9(?:1\.(?:1(?:21\.1(?:20\.108|61\.101)|9(?:3\.199\.4|7\.5\.1)|32\.70\.11|44\.144\.9)|214\.16\.42)|(?:5\.154\.146\.9|2\.50\.244\.7)7|4\.(?:23\.45\.154|77\.48\.5)|3\.122\.135\.(?:19|4)|8\.116\.37\.60)|6(?:(?:8\.168\.138\.5|7\.11\.55\.13)4|1\.1(?:58\.163\.112|78\.126\.206)|2\.1(?:40\.137\.175|68\.65\.170)|5\.204\.173\.139|9\.179\.187\.187|0\.213\.48\.250|4\.150\.138\.18|6\.98\.69\.145)|7(?:7\.(?:22(?:2\.149\.7|3\.130\.8)4|48\.106\.146|70\.54\.81)|9\.1(?:(?:72\.39\.25|24\.13\.7)4|65\.208\.16)|2\.(?:71\.33\.237|21\.6\.22)|4\.208\.167\.189)|5(?:8\.(?:18\.168\.16[23456]|211\.218\.74)|9\.(?:160\.177\.27|4\.157\.16)))\b)/
+header   KHOP_SC_TOP200  Received =~ /(?-xism:\b(?:2(?:0(?:0\.(?:1(?:(?:37\.132\.8|63\.249\.)3|07\.127\.10|41\.87\.135)|2(?:53\.218\.194|1\.18\.189|6\.148\.62)|8(?:9\.135\.157|0\.140\.61|8\.115\.30)|32\.8\.28)|1\.(?:1(?:16\.198\.1|34\.153\.2)14|45\.106\.130|251\.250\.3|59\.14\.107)|3\.(?:1(?:67\.201\.13|01\.104\.)2|210\.2(?:53\.154|49\.19)|90\.137\.18)|8\.(?:8(?:4\.169\.157|9\.219\.153)|53\.99\.19)|2\.75\.37\.(?:2(?:4[03]|27)|125)|6\.1(?:69\.30\.117|24\.17\.4)|5\.139\.241\.165|7\.112\.121\.43|9\.94\.196\.170)|1(?:1\.(?:1(?:7(?:6\.84\.225|5\.239\.2)|91\.174\.141|52\.12\.114)|94\.138\.45)|0\.(?:1(?:27\.253\.121|10\.49\.39)|21(?:2\.248\.22|9\.173\.6)2)|9\.(?:2(?:34\.88\.16|54\.35\.4)5|15(?:0\.139\.18|1\.41\.)6)|2\.(?:2(?:35\.111\.208|44\.73\.232)|111\.199\.30)|3\.(?:227\.219\.58|186\.62\.59|55\.78\.23)|6\.66\.7(?:8\.(?:125|54)|6\.224)|8\.(?:191\.33\.248|248\.44\.196)|7\.194\.197\.245)|2(?:0\.(?:2(?:31\.(?:1(?:01\.(?:214|86)|27\.(?:13|9))|69\.13)|27\.(?:170\.197|35\.234))|124\.2
 49\.1|95\.232\.26)|2\.(?:2(?:5(?:5\.29\.143|2\.223\.2)|37\.(?:162\.200|78\.177))|124\.203\.27)|1\.214\.164\.240)|4\.1(?:56\.108\.188|99\.205\.252))|1(?:1(?:8\.(?:9(?:6\.2(?:16\.235|4\.156)|1\.117\.165|8\.214\.236)|130\.112\.235)|3\.(?:16(?:0\.113\.15|1\.26\.104)|255\.7\.234)|0\.(?:172\.167\.37|45\.146\.169)|7\.(?:25\.129\.200|74\.62\.49)|9\.(?:39\.253\.25|93\.11\.126)|6\.(?:47\.133\.40|50\.249\.2)|1\.224\.250\.(?:133|65|70)|4\.45\.57\.160|5\.78\.0\.21)|9(?:5\.(?:1(?:6(?:1\.(?:8\.1|9\.2)|0\.253\.4)|89\.45\.11)|2(?:45\.211\.3|52\.70\.14)6)|0\.(?:1(?:07\.134\.202|44\.93\.154)|47\.186\.250|6\.172\.98|81\.54\.33)|3\.(?:1(?:08\.38\.228|98\.8\.211)|253\.217\.21)|6\.2(?:8\.237\.185|1\.63\.111|5\.42\.162))|2(?:1\.1(?:0\.1(?:27\.158|74\.122)|85\.156\.185|66\.183\.29)|5\.(?:234\.18\.130|46\.73\.179)|4\.(?:124\.52\.162|0\.18\.130)|2\.252\.234\.74)|8(?:9\.(?:5(?:(?:5\.166\.12|2\.28\.13)2|\.120\.185)|35\.10\.164|60\.39\.162)|(?:6\.24\.19|8\.50\.76)\.3)|4(?:0\.113\.203\.84|8\.233\.80\.145)
 |52\.26\.20\.72)|8(?:3\.1(?:4(?:2\.111\.228|3\.151\.165|\.240\.146)|67\.114\.73)|0\.(?:(?:25\.174\.11|93\.125\.18)6|84\.120\.242)|8\.(?:(?:255\.108\.21|188\.37\.18)5|84\.200\.97)|5\.(?:1(?:70\.32\.154|53\.6\.43)|217\.201\.115)|4\.(?:22\.140\.186|17\.11\.114|32\.238\.19)|9\.(?:165\.244\.221|47\.164\.17|36\.3\.23)|2\.(?:193\.140\.168|228\.64\.89)|(?:1\.112|6\.28)\.190\.195)|7(?:7\.(?:22(?:2\.149\.7|3\.130\.8)4|48\.106\.146|70\.54\.81)|2\.(?:52\.239\.50|71\.33\.237|21\.6\.22)|4\.(?:208\.167\.189|77\.141\.143)|5\.(?:126\.49\.149|64\.138\.57)|9\.1(?:72\.39\.25|24\.13\.7)4)|6(?:(?:0\.213\.48\.25|2\.168\.65\.17)0|(?:8\.168\.138\.5|7\.11\.55\.13)4|1\.1(?:58\.163\.112|78\.126\.206)|9\.179\.(?:187\.18|27\.10)7|5\.204\.173\.139|4\.150\.138\.18|6\.98\.69\.145)|9(?:1\.(?:1(?:21\.(?:1(?:20\.108|61\.101)|23\.205)|32\.70\.11|44\.144\.9|93\.199\.4)|214\.16\.42)|(?:5\.154\.146\.9|2\.50\.244\.7)7|3\.122\.135\.(?:19|4)|8\.116\.37\.60|4\.77\.48\.5)|5(?:8\.(?:2(?:11\.218\.74|6\.2\.212)|18\.168\.1
 6[2356])|9\.(?:160\.177\.27|4\.157\.16)))\b)/
 describe KHOP_SC_TOP200  Relay listed in SpamCop top 200 spammer IPs
 score    KHOP_SC_TOP200  3.4 3.2 3.7 3.5
 # http://ruleqa.spamassassin.org/week/KHOP_SC_TOP200/detail
@@ -81,7 +81,7 @@
 #counts  KHOP_SC_TOP200  1s/0h of 35244 corpus (10278s/24966h jm) 05/25/09
 # assumed overlap: 98+% of hits also hit RCVD_IN_BL_SPAMCOP_NET (1.960)
 
-#header   KHOP_SC_TOP100  Received =~ /(?-xism:\b(?:2(?:0(?:0\.(?:1(?:(?:95\.158\.16|41\.87\.13)5|63\.249\.3)|8(?:9\.135\.157|0\.140\.61)|21\.18\.189)|1\.(?:116\.198\.114|59\.14\.107)|3\.(?:210\.249\.19|90\.137\.18)|6\.1(?:69\.30\.117|24\.17\.4)|2\.75\.37\.2(?:4[03]|27|52)|9\.172\.35\.112)|1(?:1\.(?:1(?:52\.12\.114|76\.84\.225)|94\.138\.45)|0\.(?:212\.248\.222|110\.49\.39)|2\.(?:111\.199\.30|244\.73\.232)|9\.(?:234\.88\.165|151\.41\.6)|6\.66\.7(?:6\.22|8\.5)4|8\.248\.44\.196|3\.186\.62\.59)|2(?:0\.(?:2(?:27\.(?:170\.197|35\.234)|31\.101\.214)|124\.249\.1)|1\.214\.164\.240|2\.252\.223\.2)|4\.156\.108\.188)|1(?:9(?:0\.(?:144\.93\.154|47\.186\.250|6\.172\.98|81\.54\.33)|5\.1(?:89\.45\.11|61\.9\.2)|3\.108\.38\.228|6\.28\.237\.185)|1(?:9\.(?:39\.253\.25|93\.11\.126)|8\.96\.2(?:16\.235|4\.156)|1\.224\.250\.66|6\.50\.249\.2)|2(?:(?:1\.10\.174\.12|4\.124\.52\.16)2|2\.252\.234\.74)|89\.52\.28\.132)|8(?:8\.(?:(?:255\.108\.21|188\.37\.18)5|84\.200\.97)|2\.2(?:39\.205\.187|28\.64\.89)|1
 \.112\.190\.195|3\.142\.111\.228|4\.17\.11\.114|9\.36\.3\.23)|9(?:1\.121\.1(?:20\.108|61\.101)|5\.154\.146\.97|3\.122\.135\.4|8\.116\.37\.60|4\.77\.48\.5)|5(?:8\.(?:18\.168\.16[35]|211\.218\.74)|9\.160\.177\.27)|7(?:(?:7\.223\.130\.8|9\.172\.39\.25)4|4\.208\.167\.189)|6(?:5\.204\.173\.139|2\.168\.65\.170|7\.11\.55\.134))\b)/
+#header   KHOP_SC_TOP100  Received =~ /(?-xism:\b(?:2(?:0(?:0\.(?:1(?:41\.87\.135|63\.249\.3)|8(?:9\.135\.157|0\.140\.61)|2(?:1\.18\.189|6\.148\.62))|1\.(?:116\.198\.114|59\.14\.107)|2\.75\.37\.(?:2(?:27|43)|125)|6\.1(?:69\.30\.117|24\.17\.4)|3\.210\.249\.19|7\.112\.121\.43)|1(?:0\.(?:1(?:27\.253\.121|10\.49\.39)|212\.248\.222)|1\.(?:152\.12\.114|94\.138\.45)|9\.(?:234\.88\.165|151\.41\.6)|2\.111\.199\.30|8\.248\.44\.196|3\.186\.62\.59|6\.66\.78\.54)|2(?:0\.(?:227\.(?:170\.197|35\.234)|124\.249\.1)|2\.2(?:37\.78\.177|52\.223\.2)|1\.214\.164\.240)|4\.1(?:56\.108\.188|99\.205\.252))|1(?:9(?:0\.(?:144\.93\.154|6\.172\.98|81\.54\.33)|5\.1(?:89\.45\.11|61\.9\.2)|3\.108\.38\.228|6\.28\.237\.185)|1(?:(?:8\.96\.216\.23|9\.39\.253\.2)5|4\.45\.57\.160|6\.50\.249\.2)|2(?:(?:1\.10\.174\.12|4\.124\.52\.16)2|2\.252\.234\.74)|8(?:9\.5(?:2\.28\.132|\.120\.185)|8\.50\.76\.3))|8(?:8\.(?:(?:255\.108\.21|188\.37\.18)5|84\.200\.97)|1\.112\.190\.195|3\.142\.111\.228|0\.25\.174\.116|4\.17\.11\.114
 |9\.36\.3\.23)|9(?:1\.(?:121\.1(?:20\.108|61\.101)|214\.16\.42)|3\.122\.135\.(?:19|4)|5\.154\.146\.97|8\.116\.37\.60|4\.77\.48\.5)|6(?:5\.204\.173\.139|2\.168\.65\.170|4\.150\.138\.18|6\.98\.69\.145|7\.11\.55\.134)|7(?:7\.(?:223\.130\.84|48\.106\.146)|4\.208\.167\.189|9\.172\.39\.254)|5(?:8\.(?:18\.168\.16[35]|211\.218\.74)|9\.160\.177\.27))\b)/
 #describe KHOP_SC_TOP100  Relay listed in SpamCop top 100 spammer IPs
 #score    KHOP_SC_TOP100  1.4 1.3 1.8 1.7
 # http://ruleqa.spamassassin.org/week/KHOP_SC_TOP100/detail
@@ -95,12 +95,12 @@
 # notable overlap: 98% of hits also hit RCVD_IN_XBL (3.033)
 # notable overlap: 80% of hits also hit RCVD_IN_SORBS_WEB (0.619)
 
-#header   KHOP_SC_TOP20  Received =~ /(?-xism:\b(?:1(?:2(?:1\.10\.127\.158|5\.46\.73\.179)|11\.224\.250\.(?:133|65|70))|7(?:7\.70\.54\.81|2\.21\.6\.22)|219\.254\.35\.45|58\.18\.168\.162|80\.93\.125\.186)\b)/
+#header   KHOP_SC_TOP20  Received =~ /(?-xism:\b(?:1(?:2(?:1\.10\.127\.158|5\.46\.73\.179)|11\.224\.250\.(?:133|65))|7(?:7\.70\.54\.81|2\.21\.6\.22)|58\.18\.168\.16[26]|219\.254\.35\.45|80\.93\.125\.186)\b)/
 #describe KHOP_SC_TOP20  Relay listed in SpamCop top 20 spammer IPs
 #score    KHOP_SC_TOP20  1.9 1.7 2.2 2.0
 # assumed overlap: 99+% of hits also hit RCVD_IN_BL_SPAMCOP_NET (1.960)
 
-#header   KHOP_SC_TOP10  Received =~ /(?-xism:\b(?:2(?:1(?:3\.227\.219\.58|6\.66\.78\.125)|09\.94\.196\.170)|6(?:1\.158\.163\.112|0\.213\.48\.250|8\.168\.138\.54)|(?:58\.18\.168\.16|84\.22\.140\.18)6|117\.25\.129\.200|91\.132\.70\.11)\b)/
+#header   KHOP_SC_TOP10  Received =~ /(?-xism:\b(?:2(?:1(?:3\.227\.219\.58|6\.66\.78\.125)|09\.94\.196\.170)|6(?:1\.158\.163\.112|0\.213\.48\.250|8\.168\.138\.54)|11(?:1\.224\.250\.7|7\.25\.129\.20)0|84\.22\.140\.186|91\.132\.70\.11)\b)/
 #describe KHOP_SC_TOP10  Relay listed in SpamCop top 10 spammer IPs
 #score    KHOP_SC_TOP10  2.2 2.0 2.6 2.4
 # assumed overlap: 99+% of hits also hit RCVD_IN_BL_SPAMCOP_NET (1.960)