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 2012/09/13 08:57:01 UTC

svn commit: r1384218 - /spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf

Author: khopesh
Date: Thu Sep 13 06:57:00 2012
New Revision: 1384218

URL: http://svn.apache.org/viewvc?rev=1384218&view=rev
Log:
auto-generated rules

Modified:
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf

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=1384218&r1=1384217&r2=1384218&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 Thu Sep 13 06:57:00 2012
@@ -1,4 +1,4 @@
-## khop-sc-neighbors.cf	v 20120912
+## khop-sc-neighbors.cf	v 201209132
 ## Khopesh's syndication of SpamCop's top offenders and top offending networks.
 ## 
 ## Spamassassin rules written by Adam Katz <antispamATkhopiscom>
@@ -20,7 +20,7 @@
 
 # http://spamcop.net/w3m?action=map;mask=4294967295;net=0;sort=56
 # Due to the massive block size, this rule only examines the last untrusted
-header __KHOP_SC_CIDR8  X-Spam-Relays-Untrusted =~ /^[^\]]* (?:by|ip)=___ FAILED TO POPULATE ___ /
+header __KHOP_SC_CIDR8  X-Spam-Relays-Untrusted =~ /^[^\]]* (?:by|ip)=(?-xism:\b(?:1(?:15|86|4)|59)(?:\.[012]?\d{1,2}){3}\b) /
 # and gets cleaned up a bit
 meta	 KHOP_SC_CIDR8	__KHOP_SC_CIDR8 && !(__VIA_ML||__freemail_safe||__RCVD_IN_DNSWL||RCVD_IN_HOSTKARMA_WL)
 describe KHOP_SC_CIDR8  Relay CIDR /8 is among worst in SpamCop
@@ -39,7 +39,7 @@ score	 KHOP_SC_CIDR8	0.3 0.1 0.3 0.1
 # 12.1449/0.0139 0.999 20100410  net, solo=12.1966/0.0197@0.998, ->.2 .1 .3 .2
 # 10.3554/0.0112 0.999 20110227@510k  solo=10.3717/0.0119@0.999, ->.3 .1 .3 .1
 
-header __KHOP_SC_TOP_CIDR8  X-Spam-Relays-Untrusted =~ /^[^\]]* (?:by|ip)=___ FAILED TO POPULATE ___ /
+header __KHOP_SC_TOP_CIDR8  X-Spam-Relays-Untrusted =~ /^[^\]]* (?:by|ip)=(?-xism:\b1(?:17|22|78|90)(?:\.[012]?\d{1,2}){3}\b) /
 meta	 KHOP_SC_TOP_CIDR8  __KHOP_SC_TOP_CIDR8 && !(__VIA_ML||__freemail_safe||__RCVD_IN_DNSWL||RCVD_IN_HOSTKARMA_WL)
 describe KHOP_SC_TOP_CIDR8  Relay CIDR /8 leads SpamCop in worst /8s
 tflags	 KHOP_SC_TOP_CIDR8  nopublish
@@ -74,7 +74,7 @@ score	 KHOP_SC_CIDR16  1.0 0.2 1.0 0.2
 # crap, still empty   20100410  bad scrape, script failed to populate rule
 # crap, still empty   20110227  this is due to safety net exclusions -> 1 .2 1 .2
 
-header	 KHOP_SC_TOP_CIDR16  Received =~ /___ FAILED TO POPULATE ___/
+header	 KHOP_SC_TOP_CIDR16  Received =~ /(?-xism:\b(?:182\.68|89\.123|59\.90|46\.1)(?:\.[012]?\d{1,2}){2}\b)/
 describe KHOP_SC_TOP_CIDR16  Relay CIDR /16 leads SpamCop in worst /16s
 tflags	 KHOP_SC_TOP_CIDR16  nopublish
 score	 KHOP_SC_TOP_CIDR16  2.0 0.3 2.0 0.4
@@ -92,7 +92,7 @@ score	 KHOP_SC_TOP_CIDR16  2.0 0.3 2.0 0
 
 
 # http://spamcop.net/w3m?action=map;net=cmaxcnt;mask=65535;sort=spamcnt
-header	 KHOP_SC_CIDR24  Received =~ /___ FAILED TO POPULATE ___/
+header	 KHOP_SC_CIDR24  Received =~ /(?-xism:\b(?:1(?:1(?:(?:2\.198\.6|3\.90\.4)4|5\.82\.207)|2(?:1\.54\.(?:32|54)|2\.201\.18))|(?:61\.245\.16|75\.65\.3)8|202\.29\.(?:184|237)|86\.111\.144|93\.91\.196)\.[012]?\d{1,2}\b)/
 describe KHOP_SC_CIDR24  Relay CIDR /24 is among worst in SpamCop
 tflags	 KHOP_SC_CIDR24  nopublish
 score	 KHOP_SC_CIDR24  0.1 0 0.1 0
@@ -111,7 +111,7 @@ score	 KHOP_SC_CIDR24  0.1 0 0.1 0
 # 0.4157/0.5009 0.454 20110227  something is wrong here! -> .1 0 .1 0
 
 
-header	 KHOP_SC_TOP_CIDR24  Received =~ /___ FAILED TO POPULATE ___/
+header	 KHOP_SC_TOP_CIDR24  Received =~ /(?-xism:\b(?:1(?:1(?:(?:5\.82\.19|7\.19\.22)7|2\.215\.(?:4[45]|63)|1\.224\.250|8\.97\.95)|(?:30\.193\.14|09\.236\.8)7|9(?:8\.15\.95|9\.30\.59)|23\.(?:136\.106|99\.63)|88\.13\.39)|2\.116\.105|98\.139\.91|41\.190\.3)\.[012]?\d{1,2}\b)/
 describe KHOP_SC_TOP_CIDR24  Relay CIDR /24 leads SpamCop in worst /24s
 tflags	 KHOP_SC_TOP_CIDR24  nopublish
 score	 KHOP_SC_TOP_CIDR24  2.7 0.5 2.7 0.5
@@ -129,7 +129,7 @@ score	 KHOP_SC_TOP_CIDR24  2.7 0.5 2.7 0
 
 
 # http://www.spamcop.net/w3m?action=hoshame
-header	 KHOP_SC_TOP200  Received =~ /___ FAILED TO POPULATE ___/
+header	 KHOP_SC_TOP200  Received =~ /(?-xism:\b(?:1(?:8(?:9\.(?:2(?:0(?:(?:2\.123\.1|5\.37\.14)8|3\.30\.71)|1(?:4\.134\.239|5\.38\.112))|101\.143\.5)|2\.(?:21(?:8\.(?:66\.101|31\.74)|5\.53\.158|0\.17\.72)|18\.179\.107|72\.127\.210)|7\.(?:10(?:5\.35\.126|4\.0\.49)|78\.132\.140|2\.106\.178|6\.253\.234)|1\.(?:133\.100\.169|50\.125\.87)|0\.(?:231\.123\.196|149\.97\.1)|3\.77\.147\.39|6\.82\.123\.48|8\.13\.39\.226)|1(?:5\.(?:82\.(?:2(?:0(?:4\.240|7\.37)|2(?:4\.25|2\.3))|197\.34)|1(?:36\.182\.156|18\.5\.5))|3\.(?:16(?:2\.125\.189|1\.161\.73|0\.148\.4)|90\.44\.215)|1\.2(?:24\.250\.(?:2(?:15|46)|13[14])|55\.86\.171)|7\.(?:1(?:9\.227\.122|03\.58\.65)|6\.132\.82)|2\.(?:151\.53\.133|219\.93\.195)|9\.161\.233\.138)|2(?:4\.(?:2(?:47\.240\.178|54\.234\.190)|(?:167\.246\.17|56\.121\.12)0|49\.40\.114)|1\.(?:1(?:54\.43\.30|83\.9\.225)|6\.213\.219|52\.152\.2)|3\.(?:1(?:99\.107\.58|76\.3\.1)|99\.63\.164|30\.74\.25)|5\.(?:178\.223\.170|248\.159\.146)|2\.(?:252\.234\.75|3\.187\.212))|9(?:0\.(?:2(
 ?:(?:19\.153\.8|36\.199\.3)4|20\.152\.170|55\.13\.115)|1(?:(?:8\.177\.1|66\.68\.)32|07\.139\.10)|66\.244\.44)|8\.15\.(?:9(?:5\.1(?:[57]4|60)|3\.206)|78\.152)|9\.(?:127\.103\.18|30\.59\.225)|5\.(?:88\.139\.7|26\.76\.9)8)|7(?:7\.(?:128\.164\.67|34\.162\.129|44\.5\.140)|8\.(?:239\.5(?:0\.198|4\.254)|143\.240\.29)|3\.163\.168\.233)|0(?:9\.(?:236\.87\.(?:2(?:28|42)|159|37|48|90)|110\.199\.214|86\.175\.68)|3\.3\.220\.67)|\.2(?:(?:10\.136\.18|51\.19\.)7|37\.14\.153)|4(?:1\.237\.127\.125|2\.196\.228\.103)|65\.123\.215\.178)|2(?:0(?:1\.(?:2(?:(?:32\.152\.14|40\.187\.25)2|13\.42\.231)|1(?:6(?:6\.41\.233|0\.35\.10)|74\.23\.18))|2\.(?:29\.(?:184\.(?:15|8)7|237\.14)|1(?:62\.220\.187|31\.227\.74))|0\.(?:2(?:14\.161\.101|\.147\.22)|32\.122\.254|87\.104\.58)|7\.232\.28\.234|9\.195\.112\.88|6\.71\.145\.80)|1(?:3\.(?:35\.230\.113|55\.89\.117)|1\.107\.139\.225|2\.174\.243\.174|0\.168\.50\.16)|2(?:0\.231\.105\.22|1\.143\.46\.20)|\.(?:116\.105\.242|232\.247\.126)|4\.(?:212\.75\.142|99\.88\.251)|
 7\.(?:100\.178\.41|3\.43\.187))|8(?:4\.(?:2(?:28\.49\.218|41\.38\.115)|111\.(?:138\.239|96\.198)|90\.97\.17)|2\.(?:1(?:39\.162\.14|60\.125\.25)|228\.152\.14)|8\.(?:1(?:00\.107\.218|82\.221\.173)|249\.27\.7)|6\.1(?:11\.144\.(?:1(?:79|98)|204)|50\.78\.185)|5\.1(?:93\.2(?:26\.171|55\.3)|32\.101\.253)|9\.(?:70\.135\.158|130\.57\.76|68\.41\.72)|1\.(?:190\.145\.211|9\.23\.226)|7\.(?:206\.79\.201|120\.105\.2)|0\.77\.134\.103)|9(?:4\.(?:15(?:6\.(?:80\.219|107\.1)|3\.88\.177)|73\.2(?:12\.124|50\.48)|97\.17\.173)|5\.(?:39\.221\.95|65\.29\.178|9\.74\.134|87\.93\.3)|8\.(?:244\.107\.194|148\.61\.51)|2\.(?:233\.38\.241|51\.79\.46)|0\.15(?:1\.160\.196|0\.9\.38)|1\.102\.161\.133|3\.113\.216\.19)|7(?:2\.(?:253\.189\.219|189\.245\.50|42\.186\.137)|8\.(?:131\.159\.66|93\.119\.41|29\.4\.78)|6\.(?:171\.149\.177|72\.170\.170)|4\.81\.191\.201|5\.65\.38\.80|9\.106\.0\.2)|4(?:1\.(?:(?:203\.92\.11|137\.24\.)4|89\.43\.21)|6\.1(?:19\.236\.226|85\.52\.59))|6(?:1\.(?:12\.2\.30|5\.192\.4)|9\.125\.242\.45|
 2\.42\.11\.248|8\.167\.44\.82)|5(?:8\.150\.141\.222|\.9\.73\.201))\b)/
 describe KHOP_SC_TOP200  Relay listed in SpamCop top 200 spammer IPs
 tflags	 KHOP_SC_TOP200  nopublish
 score	 KHOP_SC_TOP200  4 0 4 0	# unnecessary if DNSBLs work
@@ -146,14 +146,14 @@ score	 KHOP_SC_TOP200  4 0 4 0	# unneces
 
 
 # Spamhaus DROP, http://www.spamhaus.org/drop/
-header	 KHOP_SPAMHAUS_DROP	X-Spam-Relays-Untrusted =~ /___ FAILED TO POPULATE ___/
+header	 KHOP_SPAMHAUS_DROP	X-Spam-Relays-Untrusted =~ /(?-xism: (?:by|ip)=(?:(?:2(?:0(?:4\.(?:1(?:0(?:6\.(?:1(?:[3456789]\d|2[89])|2(?:2[0123]|[01]\d))|7\.208)|87\.(?:2(?:[01234]\d|5[01234])|1(?:5[56789]|[6789]\d))|4(?:7\.2(?:5[012345]|4\d)|\.[01234567])|94\.1(?:8[456789]|9[01])|26\.24[45]|30\.167)|2(?:36\.(?:[0456789]|[12]\d?|3[01]?)|25\.(?:159|210))|44\.(?:2(?:0[01234567]|2[456789]|3\d)|19[23456789])|5(?:7\.(?:1[6789]|3[01]|2\d)|2\.255)|89\.224)|5\.(?:1(?:4(?:4\.(?:[023456789]|1(?:[012345]|7[6789]|9[01]|8\d)?)|2\.10[4567])|7(?:5\.1(?:[678]\d|9[01])|2\.24[4567])|37\.(?:[023456789]|1[012345]?)|89\.7[123]|59\.180)|2(?:03\.2(?:2[456789]|5[012345]|[34]\d)|3(?:5\.(?:6[456789]|7\d)|6\.189)|14\.1(?:[345]\d|2[89])))|9\.(?:1(?:4(?:8\.(?:6[456789]|9[012345]|[78]\d)|5\.(?:[0456789]|[12]\d?|3[01]?))|82\.(?:6[456789]|9[012345]|[78]\d)|98\.1(?:7[6789]|9[01]|8\d))|95\.(?:2(?:2[0123]|[01]\d)|19[23456789])|205\.(?:19[23456789]|2[0123]\d)|51\.(?:3[23456789]|4[01234567]))|6\.(?:2(?:0(?:3\.(?:
 1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|1\.(?:6[0123]|4[89]|5\d))|2(?:7\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|4\.1(?:[678]\d|9[01])))|81\.(?:[0456789]|[12]\d?|3[01]?)|197\.(?:17[567]|2[89]))|0\.(?:50\.(?:2(?:2[0123]|[01]\d)|19[23456789])|22\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|105\.(?:3[23456789]|4[01234567])|3\.1(?:4[0123]|2[89]|3\d))|7\.(?:18(?:3\.(?:2(?:2[0123]|[01]\d)|19[23456789])|9\.(?:[0456789]|[12]\d?|3[01]?))|22\.(?:2(?:5[012345]|[01234]\d)|19[23456789]))|8\.(?:8(?:1\.1(?:3[6789]|4[0123])|5\.3[23456789])|9(?:3\.1(?:4[456789]|5[01])|0\.[01234567]))|1\.7(?:1\.(?:[023456789]|1[012345]?)|\.2(?:2[0123]|0[89]|1\d))|3\.3(?:1\.8[89]|4\.7[01])|2\.61\.108)|1(?:6\.(?:212\.(?:2(?:2[0123]|[01]\d)|19[23456789])|151\.(?:19[23456789]|20[01234567]))|3\.109\.(?:2(?:2[0123]|0[89]|1\d)|6[456789]|9[6789]|7\d)))|9(?:1\.(?:2(?:1(?:2\.(?:1(?:07|23|35|98)|2(?:01|20)|4[15]|65)|3\.(?:1(?:7[45]|21|57)|2(?:17|9)|9[34]|72)|7\.(?:1(?:62|78)|2(?:00|49))|1\.(?:6[4567]|8[89]|9[01])|6\.(?:1(?
 :22|90|1)|7?3)|0\.17[2345])|0(?:0\.(?:1(?:6[4567]|7[6789])|2(?:4[012389]|5[01]))|9\.(?:1(?:8[346]|4)|(?:[45]|23)8|63)|1\.(?:(?:12)?[4567]|23[6789])|4\.4[01234567]|8\.(?:162|228)|3\.9[2345])|3(?:7\.(?:9[123]|249)|0\.1(?:4[37]|11)|8\.(?:18[01]|82)|9\.(?:15|24)|6\.120|5\.2)|2(?:9\.(?:15[6789]|4[67]|248)|8\.(?:132|39)|0\.(?:62|90))|40\.165)|19(?:6\.2(?:1[6789]|3[2345])|3\.1(?:9[2345]|1[01])|5\.(?:25[45]|1[01])|4\.(?:[01]|21[45])|8\.1(?:09|27)|7\.9[6789]))|4\.(?:1(?:5(?:4\.1(?:[345678]\d|2[89]|9[01])|8\.2(?:5[012345]|4\d))|3[01]\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|6(?:3\.(?:1(?:4[679]|5[01])|24[0134567])|0\.12[123]|1\.247)|232\.2(?:5[012345]|4[89]))|3\.1(?:20\.(?:3[23456789]|6[0123]|[45]\d)|7(?:5\.2(?:5[012345]|4\d)|4\.164)|68\.(?:2[012345]|1[89])|88\.16[01234567])|5\.(?:21(?:[67]\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|5\.14[0123])|64\.(?:3[789]|1[13]|9[89]))|2\.249\.(?:[0789]|[12345]\d?|6[0123]?))|6(?:4\.(?:1(?:12\.(?:1(?:[012345678]\d?|9[01]?)?|[23456789]\d?|0)|5\.(?:[023456789]|1[0123
 45]?))|44\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|28\.1(?:7[6789]|9[01]|8\d))|7\.21(?:0\.(?:[023456789]|1[012345]?)|[18]\.2(?:2[0123]|0[89]|1\d)|3\.1(?:4[0123]|2[89]|3\d))|2\.1(?:22\.(?:3[23456789]|7[23])|82\.15[23456789])|8\.232\.(?:1(?:1[01]|0\d)|9[6789])|6\.231\.(?:6[456789]|7\d))|8(?:5\.(?:2(?:02\.(?:1(?:9[23456789]|7[012345]|6\d)|20[01234567])|55\.1(?:1[23456789]|2[01234567]))|12(?:0\.9[45]|1\.39))|4\.22\.(?:1(?:2[01234567]|[01]\d)|9[6789])|8\.135\.(?:1[6789]|3[01]|2\d)|9\.(?:114\.97?|45\.14)|6\.55\.(?:21[01]|140)|1\.22\.15[23])|7(?:9\.1(?:10\.(?:1(?:[678]\d?|9[01]?)|6[0123]|[25]\d|3[01]|4[89])|74\.(?:[0456789]|[12]\d?|3[01]?))|2\.(?:50\.(?:2(?:2[0123]|[01]\d)|19[23456789])|13\.(?:1[6789]|3[01]|2\d))|8\.31\.1(?:8[456789]|9[01]))|3(?:1\.(?:1(?:3(?:1\.2(?:5[012345]|4[89])|5\.[01234567])|(?:4\.10|1\.4)3|84\.242)|42\.1(?:[345]\d|2[89])|222\.20[01234567])|7\.(?:148\.2(?:1[6789]|2[0123])|230\.212|9\.58))|09\.(?:[023456789]|1[012345]?)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|5(?:8\.83\.(?:[
 89]|1[01])|\.34\.242)|46\.161\.41)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|1(?:(?:9(?:9\.(?:2(?:4(?:8\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|6\.(?:21[35]|137)|5\.138)|00\.(?:6[456789]|9[012345]|[78]\d)|30\.(?:6[456789]|10[0123]|[789]\d))|1(?:9(?:6\.(?:2(?:2[0123]|[01]\d)|19[23456789])|8\.1(?:8[01234589]|[67]\d|9[01]))|6(?:5\.(?:3[23456789]|6[0123]|[45]\d)|6\.20[0123])|20\.163)|8(?:4\.(?:6[456789]|9[012345]|[78]\d)|8\.(?:3[23456789]|5[01]|4\d))|3(?:4\.1(?:[345678]\d|2[89]|9[01])|3\.145)|46\.(?:3[23456789]|6[0123]|[45]\d)|71\.(?:19[23456789]|20[01234567])|5\.15[23]|60\.102)|8\.(?:1(?:8(?:1\.(?:6[456789]|9[012345]|[78]\d)|3\.(?:3[23456789]|6[0123]|[45]\d)|6\.25)|3\.(?:[023456789]|1[012345]?)|62\.2(?:2[0123]|0[89]|1\d)|51\.15[2345])|2(?:0(?:5\.(?:6[456789]|9[012345]|[78]\d)|\.(?:1[6789]|3[01]|2\d)|4\.[01234567])|3\.(?:3[23456789]|4[01234567]))|45\.(?:3[23456789]|4[01234567])|96\.2(?:2[456789]|3\d)|57\.(?:6[456789]|7\d))|2\.(?:2(?:2(?:3\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789
 ]\d)|9\.(?:3[23456789]|6[0123]|[45]\d))|19\.(?:2(?:1[012345]|0\d)|1[23456789]\d)|6\.25)|1(?:71\.(?:6[456789]|9[012345]|[78]\d)|12\.1(?:1[23456789]|2[01234567])|01\.2(?:0[01234567]|4\d)|6(?:0\.44|2\.19)|97\.87)|43\.1(?:5[3456789]|7[56789]|8[01234]|60)|31\.21[23]|67\.16|86\.85)|3\.(?:1(?:0(?:5\.(?:1(?:[24]1|[58]4)|2(?:07|10|45))|4\.(?:1(?:10|53|76|2)|[39]4|41)|6\.3[2345]|7\.1[6789])|6(?:\.(?:100|213)|9\.25[01])|1(?:0\.136|1\.235)|4(?:2\.244|8\.47)|78\.172)|2(?:2(?:7\.24[01]|8\.145)|3(?:8\.[0123]|\.126)|7\.2(?:3[23]|4[67])|01\.19[23]|43\.166)|4(?:3\.134|6\.211|1\.38)|0\.(?:14[67]|212))|5\.(?:1(?:4(?:9\.(?:88|90)|\.11[23])|9(?:1\.10[23]|0\.157)|8(?:4\.8[67]|2\.57)|14\.[89]|62\.[67])|2(?:2(?:6\.(?:197|220)|5\.17[6789])|3(?:4\.159|8\.242)|8\.1[01]|\.21[23]|46\.200)|9(?:3\.(?:18[45]|20[89])|5\.15[15])|8(?:8\.(?:19[01]|22[67])|5\.204)|5(?:4\.17[01]|\.161)|7(?:8\.10|4\.8)[89]|43\.128)|4\.(?:1(?:1(?:0\.16[0123]|6\.14[67])|4(?:6\.20[4567]|0\.229)|\.(?:22[01]|184)|26\.(?:193|251)|65\.[4
 5])|2(?:8\.4[4567]|42\.[23]|9\.185)|6(?:0\.2(?:05|42)|3\.14[4567])|5(?:4\.15[6789]|0\.116)|0\.221|44\.4)|6\.32\.2(?:1[6789]|2[0123]))|5(?:7\.2(?:3(?:2\.(?:1(?:[3456789]|2[01234567]?|[01]\d?)?|(?:[01]?\d?\d|2[0-4]\d|25[0-5])|[23456789]\d?|0)|1\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|26\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|(?:(?:1\.1|9\.2)23|0\.141|2\.147|5\.190)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|7(?:6\.(?:1(?:07\.7[23456789]|12\.8[01234567])|47\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|98\.(?:5[6789]|6[0123]))|8\.(?:159\.1(?:7[6789]|9[01]|8\d)|218\.1(?:4[0123]|2[89]|3\d))|0\.(?:1(?:06|13|20)|67)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|1\.25\.190)|4(?:(?:8\.(?:1(?:05|78)|248)|3\.(?:135|49)|0\.170)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|\.192\.(?:[06789]|[125]\d?|3[01]?|4[89]?)|1\.136\.(?:1[67]|2[27])|6\.185\.2(?:18|54))|6(?:7\.(?:2(?:8\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|24\.(?:[0456789]|[12]\d?|3[01]?))|97\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|2\.125\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|1(?:0\.(?:44\.1(?:4[0123]|2[8
 9]|3\d)|232\.1(?:7[012345]|6\d))|6\.19(?:9\.1(?:[345]\d|2[89])|7\.15[23456789])|3\.20\.1(?:[678]\d|9[01]))|0(?:3\.(?:10\.(?:6[89]|7[01])|246\.7[2345])|9\.94\.2(?:2[0123]|0[89]|1\d))|8(?:8\.2(?:47\.(?:135|230)|11\.2[45])|6\.190\.2(?:2[456789]|3[01])))\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|2(?:(?:(?:1\.4|9\.7)6\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|8\.1(?:68|99)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|2\.202\.(?:1(?:2[01234567]|[01]\d)|9[6789]))\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|\.0\.0\.0)|3(?:(?:4\.(?:1(?:27|72)|2(?:09|3)|33)|2\.(?:145|232)|0\.2(?:01|22)|6\.228|9\.167|8\.43)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|\.0\.0\.0)))\b)/
 describe KHOP_SPAMHAUS_DROP	Relay listed in Spamhaus Don't Route Or Peer List
 tflags	 KHOP_SPAMHAUS_DROP	nopublish
 score	 KHOP_SPAMHAUS_DROP	1 0.2 1 0.2
 #   spam/ham     s/o   corpus
 # 0.0349/0.0029 0.924  20110227@510k
 
-header	 KHOP_SPAMHAUS_DROP_LE	X-Spam-Relays-External =~ /^[^]]*___ FAILED TO POPULATE ___/
+header	 KHOP_SPAMHAUS_DROP_LE	X-Spam-Relays-External =~ /^[^]]*(?-xism: (?:by|ip)=(?:(?:2(?:0(?:4\.(?:1(?:0(?:6\.(?:1(?:[3456789]\d|2[89])|2(?:2[0123]|[01]\d))|7\.208)|87\.(?:2(?:[01234]\d|5[01234])|1(?:5[56789]|[6789]\d))|4(?:7\.2(?:5[012345]|4\d)|\.[01234567])|94\.1(?:8[456789]|9[01])|26\.24[45]|30\.167)|2(?:36\.(?:[0456789]|[12]\d?|3[01]?)|25\.(?:159|210))|44\.(?:2(?:0[01234567]|2[456789]|3\d)|19[23456789])|5(?:7\.(?:1[6789]|3[01]|2\d)|2\.255)|89\.224)|5\.(?:1(?:4(?:4\.(?:[023456789]|1(?:[012345]|7[6789]|9[01]|8\d)?)|2\.10[4567])|7(?:5\.1(?:[678]\d|9[01])|2\.24[4567])|37\.(?:[023456789]|1[012345]?)|89\.7[123]|59\.180)|2(?:03\.2(?:2[456789]|5[012345]|[34]\d)|3(?:5\.(?:6[456789]|7\d)|6\.189)|14\.1(?:[345]\d|2[89])))|9\.(?:1(?:4(?:8\.(?:6[456789]|9[012345]|[78]\d)|5\.(?:[0456789]|[12]\d?|3[01]?))|82\.(?:6[456789]|9[012345]|[78]\d)|98\.1(?:7[6789]|9[01]|8\d))|95\.(?:2(?:2[0123]|[01]\d)|19[23456789])|205\.(?:19[23456789]|2[0123]\d)|51\.(?:3[23456789]|4[01234567]))|6\.(?:2(?:0(
 ?:3\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|1\.(?:6[0123]|4[89]|5\d))|2(?:7\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|4\.1(?:[678]\d|9[01])))|81\.(?:[0456789]|[12]\d?|3[01]?)|197\.(?:17[567]|2[89]))|0\.(?:50\.(?:2(?:2[0123]|[01]\d)|19[23456789])|22\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|105\.(?:3[23456789]|4[01234567])|3\.1(?:4[0123]|2[89]|3\d))|7\.(?:18(?:3\.(?:2(?:2[0123]|[01]\d)|19[23456789])|9\.(?:[0456789]|[12]\d?|3[01]?))|22\.(?:2(?:5[012345]|[01234]\d)|19[23456789]))|8\.(?:8(?:1\.1(?:3[6789]|4[0123])|5\.3[23456789])|9(?:3\.1(?:4[456789]|5[01])|0\.[01234567]))|1\.7(?:1\.(?:[023456789]|1[012345]?)|\.2(?:2[0123]|0[89]|1\d))|3\.3(?:1\.8[89]|4\.7[01])|2\.61\.108)|1(?:6\.(?:212\.(?:2(?:2[0123]|[01]\d)|19[23456789])|151\.(?:19[23456789]|20[01234567]))|3\.109\.(?:2(?:2[0123]|0[89]|1\d)|6[456789]|9[6789]|7\d)))|9(?:1\.(?:2(?:1(?:2\.(?:1(?:07|23|35|98)|2(?:01|20)|4[15]|65)|3\.(?:1(?:7[45]|21|57)|2(?:17|9)|9[34]|72)|7\.(?:1(?:62|78)|2(?:00|49))|1\.(?:6[4567]|8[89]|9[01])|6
 \.(?:1(?:22|90|1)|7?3)|0\.17[2345])|0(?:0\.(?:1(?:6[4567]|7[6789])|2(?:4[012389]|5[01]))|9\.(?:1(?:8[346]|4)|(?:[45]|23)8|63)|1\.(?:(?:12)?[4567]|23[6789])|4\.4[01234567]|8\.(?:162|228)|3\.9[2345])|3(?:7\.(?:9[123]|249)|0\.1(?:4[37]|11)|8\.(?:18[01]|82)|9\.(?:15|24)|6\.120|5\.2)|2(?:9\.(?:15[6789]|4[67]|248)|8\.(?:132|39)|0\.(?:62|90))|40\.165)|19(?:6\.2(?:1[6789]|3[2345])|3\.1(?:9[2345]|1[01])|5\.(?:25[45]|1[01])|4\.(?:[01]|21[45])|8\.1(?:09|27)|7\.9[6789]))|4\.(?:1(?:5(?:4\.1(?:[345678]\d|2[89]|9[01])|8\.2(?:5[012345]|4\d))|3[01]\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|6(?:3\.(?:1(?:4[679]|5[01])|24[0134567])|0\.12[123]|1\.247)|232\.2(?:5[012345]|4[89]))|3\.1(?:20\.(?:3[23456789]|6[0123]|[45]\d)|7(?:5\.2(?:5[012345]|4\d)|4\.164)|68\.(?:2[012345]|1[89])|88\.16[01234567])|5\.(?:21(?:[67]\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|5\.14[0123])|64\.(?:3[789]|1[13]|9[89]))|2\.249\.(?:[0789]|[12345]\d?|6[0123]?))|6(?:4\.(?:1(?:12\.(?:1(?:[012345678]\d?|9[01]?)?|[23456789]\d?|0)|5\.(?:[023456789
 ]|1[012345]?))|44\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|28\.1(?:7[6789]|9[01]|8\d))|7\.21(?:0\.(?:[023456789]|1[012345]?)|[18]\.2(?:2[0123]|0[89]|1\d)|3\.1(?:4[0123]|2[89]|3\d))|2\.1(?:22\.(?:3[23456789]|7[23])|82\.15[23456789])|8\.232\.(?:1(?:1[01]|0\d)|9[6789])|6\.231\.(?:6[456789]|7\d))|8(?:5\.(?:2(?:02\.(?:1(?:9[23456789]|7[012345]|6\d)|20[01234567])|55\.1(?:1[23456789]|2[01234567]))|12(?:0\.9[45]|1\.39))|4\.22\.(?:1(?:2[01234567]|[01]\d)|9[6789])|8\.135\.(?:1[6789]|3[01]|2\d)|9\.(?:114\.97?|45\.14)|6\.55\.(?:21[01]|140)|1\.22\.15[23])|7(?:9\.1(?:10\.(?:1(?:[678]\d?|9[01]?)|6[0123]|[25]\d|3[01]|4[89])|74\.(?:[0456789]|[12]\d?|3[01]?))|2\.(?:50\.(?:2(?:2[0123]|[01]\d)|19[23456789])|13\.(?:1[6789]|3[01]|2\d))|8\.31\.1(?:8[456789]|9[01]))|3(?:1\.(?:1(?:3(?:1\.2(?:5[012345]|4[89])|5\.[01234567])|(?:4\.10|1\.4)3|84\.242)|42\.1(?:[345]\d|2[89])|222\.20[01234567])|7\.(?:148\.2(?:1[6789]|2[0123])|230\.212|9\.58))|09\.(?:[023456789]|1[012345]?)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|5(?:8\.
 83\.(?:[89]|1[01])|\.34\.242)|46\.161\.41)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|1(?:(?:9(?:9\.(?:2(?:4(?:8\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|6\.(?:21[35]|137)|5\.138)|00\.(?:6[456789]|9[012345]|[78]\d)|30\.(?:6[456789]|10[0123]|[789]\d))|1(?:9(?:6\.(?:2(?:2[0123]|[01]\d)|19[23456789])|8\.1(?:8[01234589]|[67]\d|9[01]))|6(?:5\.(?:3[23456789]|6[0123]|[45]\d)|6\.20[0123])|20\.163)|8(?:4\.(?:6[456789]|9[012345]|[78]\d)|8\.(?:3[23456789]|5[01]|4\d))|3(?:4\.1(?:[345678]\d|2[89]|9[01])|3\.145)|46\.(?:3[23456789]|6[0123]|[45]\d)|71\.(?:19[23456789]|20[01234567])|5\.15[23]|60\.102)|8\.(?:1(?:8(?:1\.(?:6[456789]|9[012345]|[78]\d)|3\.(?:3[23456789]|6[0123]|[45]\d)|6\.25)|3\.(?:[023456789]|1[012345]?)|62\.2(?:2[0123]|0[89]|1\d)|51\.15[2345])|2(?:0(?:5\.(?:6[456789]|9[012345]|[78]\d)|\.(?:1[6789]|3[01]|2\d)|4\.[01234567])|3\.(?:3[23456789]|4[01234567]))|45\.(?:3[23456789]|4[01234567])|96\.2(?:2[456789]|3\d)|57\.(?:6[456789]|7\d))|2\.(?:2(?:2(?:3\.(?:1(?:2[01234567]|[01]\d)|6[4567
 89]|[789]\d)|9\.(?:3[23456789]|6[0123]|[45]\d))|19\.(?:2(?:1[012345]|0\d)|1[23456789]\d)|6\.25)|1(?:71\.(?:6[456789]|9[012345]|[78]\d)|12\.1(?:1[23456789]|2[01234567])|01\.2(?:0[01234567]|4\d)|6(?:0\.44|2\.19)|97\.87)|43\.1(?:5[3456789]|7[56789]|8[01234]|60)|31\.21[23]|67\.16|86\.85)|3\.(?:1(?:0(?:5\.(?:1(?:[24]1|[58]4)|2(?:07|10|45))|4\.(?:1(?:10|53|76|2)|[39]4|41)|6\.3[2345]|7\.1[6789])|6(?:\.(?:100|213)|9\.25[01])|1(?:0\.136|1\.235)|4(?:2\.244|8\.47)|78\.172)|2(?:2(?:7\.24[01]|8\.145)|3(?:8\.[0123]|\.126)|7\.2(?:3[23]|4[67])|01\.19[23]|43\.166)|4(?:3\.134|6\.211|1\.38)|0\.(?:14[67]|212))|5\.(?:1(?:4(?:9\.(?:88|90)|\.11[23])|9(?:1\.10[23]|0\.157)|8(?:4\.8[67]|2\.57)|14\.[89]|62\.[67])|2(?:2(?:6\.(?:197|220)|5\.17[6789])|3(?:4\.159|8\.242)|8\.1[01]|\.21[23]|46\.200)|9(?:3\.(?:18[45]|20[89])|5\.15[15])|8(?:8\.(?:19[01]|22[67])|5\.204)|5(?:4\.17[01]|\.161)|7(?:8\.10|4\.8)[89]|43\.128)|4\.(?:1(?:1(?:0\.16[0123]|6\.14[67])|4(?:6\.20[4567]|0\.229)|\.(?:22[01]|184)|26\.(?:193|251
 )|65\.[45])|2(?:8\.4[4567]|42\.[23]|9\.185)|6(?:0\.2(?:05|42)|3\.14[4567])|5(?:4\.15[6789]|0\.116)|0\.221|44\.4)|6\.32\.2(?:1[6789]|2[0123]))|5(?:7\.2(?:3(?:2\.(?:1(?:[3456789]|2[01234567]?|[01]\d?)?|(?:[01]?\d?\d|2[0-4]\d|25[0-5])|[23456789]\d?|0)|1\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|26\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|(?:(?:1\.1|9\.2)23|0\.141|2\.147|5\.190)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|7(?:6\.(?:1(?:07\.7[23456789]|12\.8[01234567])|47\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|98\.(?:5[6789]|6[0123]))|8\.(?:159\.1(?:7[6789]|9[01]|8\d)|218\.1(?:4[0123]|2[89]|3\d))|0\.(?:1(?:06|13|20)|67)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|1\.25\.190)|4(?:(?:8\.(?:1(?:05|78)|248)|3\.(?:135|49)|0\.170)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|\.192\.(?:[06789]|[125]\d?|3[01]?|4[89]?)|1\.136\.(?:1[67]|2[27])|6\.185\.2(?:18|54))|6(?:7\.(?:2(?:8\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|24\.(?:[0456789]|[12]\d?|3[01]?))|97\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|2\.125\.(?:[01]?\d?\d|2[0-4]\d|25[0-5]))|1(?:0\.(?:44\.1(?:4[0
 123]|2[89]|3\d)|232\.1(?:7[012345]|6\d))|6\.19(?:9\.1(?:[345]\d|2[89])|7\.15[23456789])|3\.20\.1(?:[678]\d|9[01]))|0(?:3\.(?:10\.(?:6[89]|7[01])|246\.7[2345])|9\.94\.2(?:2[0123]|0[89]|1\d))|8(?:8\.2(?:47\.(?:135|230)|11\.2[45])|6\.190\.2(?:2[456789]|3[01])))\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|2(?:(?:(?:1\.4|9\.7)6\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|8\.1(?:68|99)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|2\.202\.(?:1(?:2[01234567]|[01]\d)|9[6789]))\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|\.0\.0\.0)|3(?:(?:4\.(?:1(?:27|72)|2(?:09|3)|33)|2\.(?:145|232)|0\.2(?:01|22)|6\.228|9\.167|8\.43)\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])\.(?:[01]?\d?\d|2[0-4]\d|25[0-5])|\.0\.0\.0)))\b)/
 describe KHOP_SPAMHAUS_DROP_LE	Relay listed in Spamhaus Don't Route Or Peer List
 tflags	 KHOP_SPAMHAUS_DROP_LE	nopublish
 score	 KHOP_SPAMHAUS_DROP_LE	2 0 2 0 	# adds to KHOP_SPAMHAUS_DROP
@@ -163,7 +163,7 @@ score	 KHOP_SPAMHAUS_DROP_LE	2 0 2 0 	# 
 
 # PSBL-neighbors:  any /24 with 73+ (2/7, 29%) IPs in the PSBL (not SpamCop),
 # as obtained from rsync://psbl-mirror.surriel.com::psbl/psbl.txt
-header	 KHOP_PSBL_CIDR24	X-Spam-Relays-Untrusted =~ /(?-xism:\b(?:1(?:8(?:8\.(?:5(?:1\.(?:1(?:26|4)|6[469]|9[36]|31|53)|3\.(?:1(?:09|22)|36|47|61|90)|2\.(?:8[34]|33|55|78|94)|0\.(?:118|65|80|9)|5\.(?:2[46]|97)|4\.(?:82|95))|4(?:9\.(?:1(?:1[01]|06)|7?3|45|52|99)|8\.(?:1[12]2|5[48]|48|66|97))|3\.224)|4\.105\.190)|7(?:6\.4(?:5\.(?:6[018]|7[13]?|8[017]|3[34]|121|58?|97|4)|4\.(?:49?|20))|3\.211\.(?:119|63)|7\.47\.106)|1(?:2\.(?:215\.(?:6[345]|4[45])|79\.36)|0\.52\.[67])|0(?:9\.(?:98\.(?:9[89]|107)|102\.184)|3\.1\.30)|2(?:1\.63\.1[789]|2\.155\.36)|9(?:4\.27\.24[01]|7\.252\.0)|30\.193\.14[57]|\.38\.16)|2(?:0(?:(?:7\.152\.14|5\.251\.7)7|4\.(?:74\.249|8\.87))|1(?:2\.96\.64|7\.76\.69)|\.88\.(?:[79]|32))|6(?:3\.141\.202|6\.227\.104|8\.170\.198|7\.221\.46)|8(?:5\.26\.(?:18[34]|241)|3\.149\.(?:48|3))|41\.(?:2(?:23\.162|54\.5)|190\.[23])|37\.1(?:0(?:5\.36|6\.13)|10\.211)|7(?:7\.30\.6[04]|9\.170\.53)|9(?:4\.98\.156|5\.65\.241))\.[012]?\d{1,2}\b)/
+header	 KHOP_PSBL_CIDR24	X-Spam-Relays-Untrusted =~ / (?:by|ip)=(?-xism:\b(?:1(?:1(?:7\.2(?:4(?:2\.(?:2[89]|144)|1\.(?:184|216))|15\.168)|2\.(?:215\.(?:6[345]|4[45])|79\.36))|2(?:3\.(?:136\.106|54\.188)|1\.63\.1[6789]|0\.168\.1)|9(?:4\.27\.24[01]|7\.252\.0)|7(?:8\.115\.248|3\.237\.71)|\.(?:38\.(?:16|24)|0\.24)|0(?:9\.127\.86|3\.1\.30)|30\.193\.14[567])|8(?:9\.37\.(?:10[0123]|9[6789])|5\.26\.(?:18[34]|241)|3\.149\.3)|2(?:0(?:7\.(?:188\.179|66\.34)|6\.206\.175)|12\.96\.65)|4(?:1\.(?:2(?:54\.[25]|23\.162)|190\.3)|6\.2\.179)|6(?:9\.22\.17[67]|4\.58\.114)|3(?:7\.110\.211|6\.37\.233)|59\.9(?:9\.20[89]|8\.200)|79\.170\.5[235]|94\.242\.233)\.[012]?\d{1,2}\b)/
 describe KHOP_PSBL_CIDR24	Relay's IP/24 CIDR contains many PSBL hits
 tflags	 KHOP_PSBL_CIDR24	nopublish
 score	 KHOP_PSBL_CIDR24	2 0.6 2 0.6