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 2011/07/26 07:57:35 UTC

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

Author: khopesh
Date: Tue Jul 26 05:57:34 2011
New Revision: 1150992

URL: http://svn.apache.org/viewvc?rev=1150992&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=1150992&r1=1150991&r2=1150992&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 Tue Jul 26 05:57:34 2011
@@ -1,4 +1,4 @@
-## khop-sc-neighbors.cf	v 201107251
+## khop-sc-neighbors.cf	v 201107261
 ## Khopesh's syndication of SpamCop's top offenders and top offending networks.
 ## 
 ## Spamassassin rules written by Adam Katz <antispamATkhopiscom>
@@ -21,7 +21,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)=(?-xism:\b(?:18[279]|201)(?:\.[012]?\d{1,2}){3}\b) /
+header __KHOP_SC_CIDR8  X-Spam-Relays-Untrusted =~ /^[^\]]* (?:by|ip)=(?-xism:\b(?:1(?:8[79]|90)|201)(?:\.[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
@@ -40,7 +40,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)=(?-xism:\b(?:1(?:17|78|90)|41)(?:\.[012]?\d{1,2}){3}\b) /
+header __KHOP_SC_TOP_CIDR8  X-Spam-Relays-Untrusted =~ /^[^\]]* (?:by|ip)=(?-xism:\b(?:1(?:17|78|82)|41)(?:\.[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
@@ -75,7 +75,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:\b178\.123(?:\.[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
@@ -93,7 +93,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 =~ /(?-xism:\b(?:2(?:1(?:3\.233\.64|7\.118\.81)|20\.190\.(?:44|56|62)|00\.88\.234)|1(?:2(?:5\.110\.(?:1(?:13|20)|9[67])|4\.11\.146)|14\.37\.111)|60\.181\.161)\.[012]?\d{1,2}\b)/
+header	 KHOP_SC_CIDR24  Received =~ /(?-xism:\b(?:2(?:1(?:3\.233\.64|7\.118\.81)|00\.88\.234|20\.190\.60)|12(?:5\.110\.(?:1(?:2[0123]|1[13]|01)|96)|4\.11\.146))\.[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
@@ -112,7 +112,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 =~ /(?-xism:\b(?:1(?:25\.(?:110\.1(?:2[136]|1[47])|234\.144)|11\.2(?:24\.250|49\.193)|75\.96\.(?:113|56)|80\.232\.10[45]|09\.127\.86)|2(?:1(?:7\.(?:118\.(?:83|90)|66\.146)|3\.87\.74)|20\.190\.4[12])|8(?:5\.(?:26\.(?:2(?:3[12345]|41)|18[46])|115\.248)|3\.149\.3)|46\.249\.0)\.[012]?\d{1,2}\b)/
+header	 KHOP_SC_TOP_CIDR24  Received =~ /(?-xism:\b(?:1(?:25\.(?:110\.1(?:1[47]|26)|234\.144)|11\.2(?:24\.250|49\.193)|75\.96\.(?:113|56)|80\.232\.10[45]|09\.127\.86)|2(?:1(?:7\.(?:118\.(?:83|90)|66\.146)|3\.87\.74)|20\.190\.(?:4[12]|56))|8(?:5\.(?:26\.(?:2(?:3[12345]|41)|18[46])|115\.248)|3\.149\.3)|60\.181\.161|46\.249\.0)\.[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
@@ -130,7 +130,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 =~ /(?-xism:\b(?:1(?:2(?:5\.(?:110\.(?:1(?:2(?:1\.(?:1(?:36|87)|[28]1|55)|6\.(?:2(?:18|54)|160)|0\.(?:172|209)|2\.141|3\.205)|1(?:3\.(?:1(?:40|59)|22)|4\.(?:22[07]|187)|2\.(?:13|79)|7\.[12]15|1\.180)|0(?:7\.(?:180|213)|1\.214|3\.200|6\.242))|9(?:6\.1(?:47|3)|7\.(?:62|89)))|229\.119\.183)|2\.(?:1(?:(?:83\.228\.3|55\.7\.12)8|26\.128\.(?:15|86)|60\.25\.121)|(?:248\.11\.5|55\.106\.)4)|4\.(?:30\.164\.138|11\.146\.99|9\.131\.122|7\.20\.77)|1\.(?:1(?:49\.122\.44|80\.50\.96)|50\.16\.11)|3\.194\.16\.16)|1(?:4\.(?:4(?:(?:2\.110\.1|6\.106\.)61|4\.13(?:1\.205|5\.13))|3(?:5\.215\.126|7\.111\.232|3\.177\.8))|8\.(?:4(?:5\.(?:115\.1(?:33|42)|243\.3)|1\.231\.58)|(?:171\.208\.18|232\.98\.9)8)|1\.2(?:49\.(?:193\.155|73\.219)|51\.178\.62)|9\.20(?:1\.63\.110|6\.166\.22)|3\.193\.186\.90|7\.211\.85\.186|5\.23\.14\.112)|9(?:5\.(?:1(?:8(?:9\.234\.244|6\.81\.82)|61\.9\.2)|2(?:10\.173\.227|22\.40\.198)|7(?:0\.47\.165|8\.124\.19))|3\.(?:226\.105\.54|39\.118\.30)|0\.147\
 .157\.171|4\.126\.183\.120)|7(?:8\.(?:175\.(?:105\.253|90\.72)|76\.235\.102|63\.11\.20)|5\.96\.(?:113\.233|56\.221)|7\.10\.192\.86)|8(?:6\.(?:114\.175\.6|6\.107\.22)6|3\.105\.182\.238|9\.33\.245\.57)|09\.(?:70\.184\.22|96\.47\.11)|58\.250\.33\.227|63\.15\.203\.2)|9(?:3\.(?:7(?:2\.(?:183\.254|239\.221)|(?:9\.87\.15|3\.16\.6)3|5\.46\.121)|1(?:57\.148\.102|90\.107\.236)|94\.217\.36)|2\.(?:8(?:(?:0\.181\.15|3\.115\.)5|2\.14\.126)|1(?:27\.141\.206|14\.65\.149)|(?:48\.124\.3|54\.124\.4)4)|5\.(?:1(?:8(?:0\.162\.234|1\.2\.129)|67\.74\.42|91\.153\.7)|226\.174\.13|77\.144\.99|83\.130\.82)|1\.(?:1(?:92\.165\.162|21\.80\.194)|20(?:5\.147\.194|3\.67\.208))|4\.(?:159\.174\.188|62\.190\.134))|2(?:2(?:0\.(?:1(?:90\.(?:4(?:1\.(?:140|208)|4\.158|2\.9)|6(?:0\.193|2\.254|3\.20)|56\.(?:72|96))|20\.139\.247)|71\.140\.2)|2\.(?:231\.57\.191|99\.35\.49))|1(?:3\.(?:151\.124\.193|229\.109\.225|79\.99\.118)|(?:7\.114\.13\.12|9\.84\.210\.13)7|1\.152\.51\.126)|0(?:(?:0\.111\.134\.1|9\.239\.40\.)14|2\.1(?
 :64\.49\.210|42\.100\.2)))|8(?:9\.(?:1(?:8(?:9\.169\.77|4\.1\.232)|05\.158\.103|41\.4\.180)|(?:73\.215\.22|204\.8\.6)6)|5\.(?:1(?:(?:98\.186\.2|20\.66\.)34|0\.136\.151)|233\.131\.2|9\.72\.33)|7\.(?:1(?:18\.120\.240|03\.211\.65)|251\.173\.211)|0\.(?:227\.12\.166|90\.171\.122)|2\.1(?:14\.65\.118|58\.136\.80)|4\.53\.196\.245)|6(?:1\.(?:(?:59\.241\.15|79\.24\.12)4|(?:66\.28\.16|35\.56\.)2|19\.(?:121\.50|250\.69)|224\.206\.197)|2\.(?:2(?:(?:04\.132\.21|17\.232\.)6|20\.33\.139)|(?:165\.53\.12|33\.191\.6)6)|0\.181\.16(?:1\.142|4\.37)|6\.96\.128\.(?:63|72|84)|4\.244\.58\.58|9\.67\.31\.6)|7(?:7\.(?:1(?:06\.232\.17|20\.241\.2)8|91\.203\.129)|9\.1(?:71\.126\.188|08\.241\.22|24\.92\.164)|8\.(?:128\.26\.19|30\.133\.70|96\.86\.133))|4(?:6\.16(?:0\.(?:89\.17|5\.5)6|4\.168\.213)|1\.137\.(?:2[04]|56)\.4)|58\.114\.143\.57)\b)/
+header	 KHOP_SC_TOP200  Received =~ /(?-xism:\b(?:1(?:2(?:5\.110\.(?:1(?:2(?:1\.(?:1(?:36|87)|[28]1|55)|6\.(?:2(?:18|54)|160)|0\.(?:172|209)|2\.141|3\.205)|1(?:3\.(?:1(?:40|59)|22)|4\.(?:22[07]|187)|2\.(?:1[23]|79)|1\.180|7\.115)|0(?:7\.(?:180|213|59)|1\.214|3\.200|6\.242))|9(?:6\.1(?:47|3)|7\.(?:62|89)|8\.67))|2\.(?:1(?:26\.1(?:30\.242|28\.15)|60\.25\.121|55\.7\.128)|(?:248\.11\.5|55\.106\.)4)|4\.(?:30\.164\.138|11\.146\.99|9\.131\.122|7\.20\.77)|1\.1(?:49\.122\.44|80\.50\.96)|3\.(?:194\.16|204\.79)\.16)|1(?:8\.(?:4(?:5\.(?:115\.1(?:33|42)|243\.3)|1\.231\.58)|168\.166\.234|232\.98\.98)|1\.(?:2(?:49\.(?:193\.155|73\.219)|51\.178\.62)|185\.231\.71)|4\.(?:4(?:4\.131\.205|6\.106\.61)|3(?:7\.111\.232|3\.177\.8))|5\.(?:23\.14\.112|91\.153\.84)|9\.20(?:1\.63\.110|6\.166\.22)|3\.193\.186\.90|7\.211\.85\.186)|9(?:5\.(?:2(?:10\.173\.227|06\.40\.163|22\.40\.198)|1(?:8(?:9\.234\.244|6\.81\.82)|61\.9\.2)|7(?:8\.124\.(?:19|20)|0\.47\.165))|(?:4\.126\.183\.12|3\.39\.118\.3)0|0\.147\.157\.
 171)|7(?:8\.(?:175\.105\.253|63\.11\.20)|5\.96\.(?:113\.233|56\.221)|7\.10\.192\.86)|8(?:(?:6\.(?:114\.175\.6|6\.107\.22)|2\.93\.52\.20)6|3\.105\.182\.238)|09\.(?:(?:230\.58\.11|70\.184\.2)2|172\.59\.153|96\.47\.11)|58\.250\.33\.227|63\.15\.203\.2)|9(?:2\.(?:8(?:(?:0\.181\.15|3\.115\.)5|2\.14\.126)|127\.(?:141\.206|208\.210)|48\.1(?:05\.248|24\.34)|54\.124\.44)|5\.(?:1(?:8(?:0\.162\.234|1\.2\.129)|67\.74\.42|91\.153\.7)|226\.174\.13|77\.144\.99|83\.130\.82)|3\.(?:7(?:2\.(?:183\.254|239\.221)|(?:9\.87\.15|3\.16\.6)3)|157\.148\.102|94\.217\.36)|1\.(?:2(?:0(?:5\.147\.194|3\.67\.208)|19\.88\.30)|1(?:92\.165\.162|21\.80\.194))|4\.(?:127\.223\.112|62\.190\.134))|2(?:2(?:0\.(?:1(?:90\.(?:4(?:1\.(?:140|208)|4\.158|2\.9)|6(?:0\.193|2\.254|3\.20)|56\.(?:118|72|96))|20\.139\.247)|71\.140\.2)|2\.(?:231\.57\.191|99\.35\.49))|1(?:3\.(?:151\.124\.193|229\.109\.225|79\.99\.118)|(?:8\.186\.90\.7|9\.85\.84\.11)5|1\.(?:152\.51\.126|45\.156\.111)|7\.114\.13\.127)|0(?:2\.1(?:64\.49\.210|42\.100\
 .2)|9\.239\.40\.14)|4\.12\.107\.121)|8(?:9\.(?:1(?:8(?:9\.169\.77|4\.1\.232)|05\.158\.103|41\.4\.180)|(?:73\.215\.22|204\.8\.6)6)|5\.(?:1(?:(?:98\.186\.2|20\.66\.)34|0\.136\.151)|233\.131\.2|9\.72\.33)|7\.(?:2(?:28\.107\.124|51\.173\.211)|118\.120\.240)|0\.(?:227\.12\.166|90\.171\.122)|4\.53\.196\.245|2\.195\.2\.121)|6(?:2\.(?:2(?:(?:04\.132\.21|17\.232\.)6|20\.33\.139)|1(?:50\.226\.219|65\.53\.126)|33\.191\.66)|1\.(?:(?:59\.241\.15|79\.24\.12)4|19\.(?:121\.50|250\.69)|35\.56\.2)|0\.181\.16(?:1\.(?:142|248)|3\.66|4\.37)|6\.96\.128\.(?:63|72|84))|7(?:8\.(?:128\.(?:26\.19|75\.7)|96\.86\.133)|9\.1(?:71\.126\.188|24\.92\.164)|7\.1(?:06\.232\.17|20\.241\.2)8)|4(?:6\.(?:16(?:0\.(?:89\.17|5\.5)6|4\.168\.213)|39\.18\.33)|1\.137\.(?:2[04]|56)\.4|9\.158\.26\.200))\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
@@ -147,14 +147,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 =~ /(?-xism: (?:by|ip)=(?:1(?:9(?:8\.(?:1(?:8(?:1\.(?:6[456789]|9[012345]|[78]\d)|3\.(?:3[23456789]|6[0123]|[45]\d)|6\.(?:1[6789]|3[01]|2\d))|2\.(?:3[23456789]|6[0123]|[45]\d)|3\.(?:[023456789]|1[012345]?)|62\.2(?:2[0123]|0[89]|1\d)|43\.1(?:[345]\d|2[89])|51\.15[2345])|2(?:0(?:5\.(?:6[456789]|9[012345]|[78]\d)|\.(?:1[6789]|3[01]|2\d)|4\.[01234567])|52\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|3\.(?:3[23456789]|4[01234567]))|45\.(?:3[23456789]|4[01234567])|96\.2(?:2[456789]|3\d)|57\.(?:6[456789]|7\d))|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[23456
 789]|6[0123]|[45]\d)|5\.15[23]|60\.102)|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(?:0(?:1\.(?:2(?:0[01234567]|4\d)|177)|0\.5)|71\.(?:6[456789]|9[012345]|[78]\d)|12\.1(?:1[23456789]|2[01234567])|60\.44|97\.87)|43\.1(?:5[3456789]|7[56789]|8[01234]|60)|31\.21[23]|67\.16|86\.85)|3\.(?:1(?:0(?:4\.(?:1(?:[47]6|10|2)|2(?:2[4567]|53)|[39]4|41)|5\.(?:1(?:[24]1|[78]4|32)|2(?:07|45))|6\.3[2345])|6(?:\.(?:100|213)|9\.25[01])|1(?:0\.136|1\.235)|4(?:2\.244|8\.47)|78\.172|86\.9)|2(?:2(?:7\.24[01]|8\.145)|3(?:8\.[0123]|\.126)|7\.2(?:3[23]|4[67])|01\.19[23])|4(?:3\.134|6\.211|1\.38))|5\.(?:2(?:2(?:6\.(?:197|220)|5\.17[6789])|3(?:4\.159|8\.242)|8\.1[01]|\.21[23])|1(?:9(?:1\.10[23]|0\.157)|4(?:\.11[23]|9\.88)|14\.[89]|62\.[67]|82\.57)|8(?:8\.(?:1(?:4[45]|9[01])|22[67])|0\.1(?:4[89]|5[01])|5\.204)|9(?:3\.(?:18[45]|20[89])|5\.15[15])|5(?:4\.17[01]|\.161)|7(?:8\.10|4\.8)[89])|4\.(?:1(?:4(?:6\
 .20[4567]|3\.13[01]|0\.229)|1(?:0\.16[0123]|6\.14[67])|26\.(?:193|251)|65\.[45]|\.22[01])|2(?:8\.(?:11[2345]|4[4567])|47\.58)|6(?:3\.14[4567]|0\.205)|8\.(?:25[01]|7[45])|0\.2(?:21|45)|54\.15[6789])|6\.(?:1\.1(?:7[6789]|9[01]|8\d)|32\.2(?:1[6789]|2[0123])))|1(?:0\.(?:44\.1(?:4[0123]|2[89]|3\d)|232\.1(?:7[012345]|6\d))|6\.(?:68\.1(?:3[6789]|4[0123])|199\.1(?:[345]\d|2[89]))|3\.20\.1(?:[678]\d|9[01]))|6(?:9\.131\.(?:2(?:5[012345]|[01234]\d)|1(?:[3456789]\d|2[89]))|7\.(?:2(?:24\.(?:[0456789]|[12]\d?|3[01]?)|8)|97)|2\.125|8\.151)|7(?:3\.225\.1(?:1[23456789]|2[01234567])|8\.218\.1(?:4[0123]|2[89]|3\d)|0\.(?:1(?:06|20|97)|67|75)|4\.138\.1(?:4[456789]|5\d))|2(?:(?:1\.4|9\.7)6\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|2\.202\.(?:1(?:2[01234567]|[01]\d)|9[6789])|8\.1(?:68|99))|4(?:\.1(?:\.(?:1(?:2[01234567]|[01]\d)|9[6789])|02\.1(?:[678]\d|9[01]))|8\.(?:1(?:05|78)|248)|3\.(?:(?:13|9)5|49)|0\.170)|5(?:7\.2(?:32\.(?:1(?:[3456789]|2[01234567]?|[01]\d?)?|[23456789]\d?|0)|26)|(?:1\.1|
 9\.2)23|0\.(?:141|230)|2\.147|5\.190)|88\.(?:2(?:29\.(?:9[012347]|[45678]\d|13|35)|12\.(?:[023456789]|1[012345]?))|1(?:70\.19[23456789]|30\.25[01]))|3(?:4\.(?:1(?:27|72)|2(?:09|3)|33)|2\.(?:2(?:32|40)|145)|0\.2(?:01|22)|6\.228|9\.167|8\.43)|09\.(?:94\.21[2345]|196\.140))|2(?:0(?:4\.(?:1(?:87\.(?:2(?:2[456789]|5[01234]|[34]\d)|1(?:5[56789]|[678]\d|9[01]))|0(?:6\.(?:1(?:[3456789]\d|2[89])|2(?:2[0123]|[01]\d))|7\.208)|94\.1(?:8[456789]|9[01])|26\.24[45]|30\.167)|2(?:36\.(?:[0456789]|[12]\d?|3[01]?)|8\.1(?:0[456789]|1[01])|25\.(?:159|210))|48\.(?:6[456789]|9[012345]|[78]\d)|63\.1(?:4[456789]|5[01])|52\.255|89\.224)|5\.(?:1(?:4(?:5\.(?:2(?:2[0123]|[01]\d)|19[23456789])|4\.(?:[023456789]|1[012345]?)|2\.10[4567])|7(?:5\.1(?:[678]\d|9[01])|2\.24[4567])|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(?:82\.(?:6[456789]|9[012345]|[78]\d)|45\.(?:[0456789]|[12]\d?|3[01]?)|98\.1(?:7[6789]|9[01]|8\d))|2(?:05\.(?:19[2345678
 9]|2[0123]\d)|13\.(?:6[0123]|4[89]|5\d))|95\.(?:2(?:2[0123]|[01]\d)|19[23456789])|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\.(?:1(?:15\.1(?:1[23456789]|2[01234567])|06\.1(?:4[0123]|2[89]|3\d)|25\.1(?:7[012345]|6[89]))|50\.(?:2(?:2[0123]|[01]\d)|19[23456789])|3\.1(?:4[0123]|2[89]|3\d)|22)|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])|90\.[01234567])|1\.71\.(?:[023456789]|1[012345]?)|3\.3(?:1\.8[89]|4\.7[01])|2\.(?:59\.236|61\.127))|1(?:6\.(?:2(?:45\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|12\.(?:2(?:2[0123]|[01]\d)|19[23456789]))|151\.(?:19[23456789]|20[01234567]))|3\.(?:109\.(?:2(?:2[0123]|0[89]|1\d)|9[6789])|247\.(?:[045678
 9]|[12]\d?|3[01]?))))|9(?:1\.(?:2(?:0(?:1\.(?:[4567]|1(?:2[4567]|9[6789])|2(?:1[2345]|3[6789]))|0\.(?:1(?:6[4567]|8[89]|9[01])|2(?:4[012389]|5[01]))|9\.(?:1(?:8[346]|4)|(?:[45]|23)8)|4\.(?:5[01]|4\d)|8\.(?:162|228|0)|3\.9[2345]|5\.4[0123]|7\.11[67])|1(?:2\.(?:1(?:2[37]|3[25]|07|63|98)|2(?:01|20)|4[15]|65)|3\.(?:1(?:21|57|74)|2(?:17|9)|7[25]|9[34])|6\.(?:1(?:4?1|22|90)|232|7?3)|1\.(?:6[4567]|8[89]|9[01])|7\.(?:1(?:53|62)|249)|0\.17[2345])|2(?:0\.(?:(?:11|9)0|62)|3\.201))|19(?:8\.(?:1(?:2[57]|09)|217)|(?:3\.19|6\.23)[2345]|9\.1(?:12|23|57)|7\.9[6789]|4\.[01]))|4\.(?:1(?:5(?:4\.1(?:[345678]\d|2[89]|9[01])|8\.2(?:5[012345]|4\d))|26\.1(?:7[6789]|8[0123])|3[01])|6(?:3\.(?:1(?:4[69]|5[01])|24[0134567])|0\.12[123])|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\.(?:64\.(?:1[013]|3[789]|9[89]?|4[45]|5[59]|61)|21(?:[67]|5\.14[0123])))|6(?:4\.(?:1(?:12\.(?:1(?:[012345678]\d?|9[01]?)?|[23
 456789]\d?|0)|5\.(?:[023456789]|1[012345]?))|2(?:50\.(?:1(?:1[01]|0\d)|9[6789])|8\.1(?:7[6789]|9[01]|8\d))|44)|2\.1(?:9\.(?:[0789]|2(?:[01236789]|5[012345]?|4[89]?)?|6[01234567]?|[1345]\d?)|8(?:2\.15[23456789]|\.252)|22\.(?:3[23456789]|7[23]))|7\.21(?:0\.(?:[023456789]|1[012345]?)|[18]\.2(?:2[0123]|0[89]|1\d)|3\.1(?:4[0123]|2[89]|3\d))|6\.231\.(?:6[456789]|7\d))|7(?:9\.1(?:10\.(?:1(?:4[456789]|[678]\d?|9[01]?|5\d)|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)|2\.1(?:7[6789]|9[01]|8\d))|\.0\.0\.(?:1(?:[3456789]|2[01234567]?|[01]\d?)?|[23456789]\d?|0)|8\.(?:31\.1(?:8[456789]|9[01])|155\.22[01]))|8(?:5\.(?:2(?:02\.(?:1(?:9[23456789]|7[012345]|6\d)|20[01234567])|55\.1(?:1[23456789]|2[01234567]))|121\.39)|8\.(?:135\.(?:6[456789]|7\d)|214\.211)|6\.55\.(?:2(?:1[01]|43)|140)|9\.(?:114\.97?|45\.14)|1\.22\.15[23])|4(?:6\.(?:252\.1(?:3[0123]|2[89])|51\.10[0123]|161\.2[89])|1\.221\.1(?:1[23456789]|2
 [01234567]))|58\.83\.(?:[89]|1[012345])|31\.222\.20[01234567])\b)/
+header	 KHOP_SPAMHAUS_DROP	X-Spam-Relays-Untrusted =~ /___ FAILED TO POPULATE ___/
 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 =~ /^[^]]*(?-xism: (?:by|ip)=(?:1(?:9(?:8\.(?:1(?:8(?:1\.(?:6[456789]|9[012345]|[78]\d)|3\.(?:3[23456789]|6[0123]|[45]\d)|6\.(?:1[6789]|3[01]|2\d))|2\.(?:3[23456789]|6[0123]|[45]\d)|3\.(?:[023456789]|1[012345]?)|62\.2(?:2[0123]|0[89]|1\d)|43\.1(?:[345]\d|2[89])|51\.15[2345])|2(?:0(?:5\.(?:6[456789]|9[012345]|[78]\d)|\.(?:1[6789]|3[01]|2\d)|4\.[01234567])|52\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|3\.(?:3[23456789]|4[01234567]))|45\.(?:3[23456789]|4[01234567])|96\.2(?:2[456789]|3\d)|57\.(?:6[456789]|7\d))|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)|5\.15[23]|60\.102)|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(?:0(?:1\.(?:2(?:0[01234567]|4\d)|177)|0\.5)|71\.(?:6[456789]|9[012345]|[78]\d)|12\.1(?:1[23456789]|2[01234567])|60\.44|97\.87)|43\.1(?:5[3456789]|7[56789]|8[01234]|60)|31\.21[23]|67\.16|86\.85)|3\.(?:1(?:0(?:4\.(?:1(?:[47]6|10|2)|2(?:2[4567]|53)|[39]4|41)|5\.(?:1(?:[24]1|[78]4|32)|2(?:07|45))|6\.3[2345])|6(?:\.(?:100|213)|9\.25[01])|1(?:0\.136|1\.235)|4(?:2\.244|8\.47)|78\.172|86\.9)|2(?:2(?:7\.24[01]|8\.145)|3(?:8\.[0123]|\.126)|7\.2(?:3[23]|4[67])|01\.19[23])|4(?:3\.134|6\.211|1\.38))|5\.(?:2(?:2(?:6\.(?:197|220)|5\.17[6789])|3(?:4\.159|8\.242)|8\.1[01]|\.21[23])|1(?:9(?:1\.10[23]|0\.157)|4(?:\.11[23]|9\.88)|14\.[89]|62\.[67]|82\.57)|8(?:8\.(?:1(?:4[45]|9[01])|22[67])|0\.1(?:4[89]|5[01])|5\.204)|9(?:3\.(?:18[45]|20[89])|5\.15[15])|5(?:4\.17[01]|\.161)|7(?:8\.10|4\.8)[89])|4\.(?:1(
 ?:4(?:6\.20[4567]|3\.13[01]|0\.229)|1(?:0\.16[0123]|6\.14[67])|26\.(?:193|251)|65\.[45]|\.22[01])|2(?:8\.(?:11[2345]|4[4567])|47\.58)|6(?:3\.14[4567]|0\.205)|8\.(?:25[01]|7[45])|0\.2(?:21|45)|54\.15[6789])|6\.(?:1\.1(?:7[6789]|9[01]|8\d)|32\.2(?:1[6789]|2[0123])))|1(?:0\.(?:44\.1(?:4[0123]|2[89]|3\d)|232\.1(?:7[012345]|6\d))|6\.(?:68\.1(?:3[6789]|4[0123])|199\.1(?:[345]\d|2[89]))|3\.20\.1(?:[678]\d|9[01]))|6(?:9\.131\.(?:2(?:5[012345]|[01234]\d)|1(?:[3456789]\d|2[89]))|7\.(?:2(?:24\.(?:[0456789]|[12]\d?|3[01]?)|8)|97)|2\.125|8\.151)|7(?:3\.225\.1(?:1[23456789]|2[01234567])|8\.218\.1(?:4[0123]|2[89]|3\d)|0\.(?:1(?:06|20|97)|67|75)|4\.138\.1(?:4[456789]|5\d))|2(?:(?:1\.4|9\.7)6\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|2\.202\.(?:1(?:2[01234567]|[01]\d)|9[6789])|8\.1(?:68|99))|4(?:\.1(?:\.(?:1(?:2[01234567]|[01]\d)|9[6789])|02\.1(?:[678]\d|9[01]))|8\.(?:1(?:05|78)|248)|3\.(?:(?:13|9)5|49)|0\.170)|5(?:7\.2(?:32\.(?:1(?:[3456789]|2[01234567]?|[01]\d?)?|[23456789]\d?|0)|26)|
 (?:1\.1|9\.2)23|0\.(?:141|230)|2\.147|5\.190)|88\.(?:2(?:29\.(?:9[012347]|[45678]\d|13|35)|12\.(?:[023456789]|1[012345]?))|1(?:70\.19[23456789]|30\.25[01]))|3(?:4\.(?:1(?:27|72)|2(?:09|3)|33)|2\.(?:2(?:32|40)|145)|0\.2(?:01|22)|6\.228|9\.167|8\.43)|09\.(?:94\.21[2345]|196\.140))|2(?:0(?:4\.(?:1(?:87\.(?:2(?:2[456789]|5[01234]|[34]\d)|1(?:5[56789]|[678]\d|9[01]))|0(?:6\.(?:1(?:[3456789]\d|2[89])|2(?:2[0123]|[01]\d))|7\.208)|94\.1(?:8[456789]|9[01])|26\.24[45]|30\.167)|2(?:36\.(?:[0456789]|[12]\d?|3[01]?)|8\.1(?:0[456789]|1[01])|25\.(?:159|210))|48\.(?:6[456789]|9[012345]|[78]\d)|63\.1(?:4[456789]|5[01])|52\.255|89\.224)|5\.(?:1(?:4(?:5\.(?:2(?:2[0123]|[01]\d)|19[23456789])|4\.(?:[023456789]|1[012345]?)|2\.10[4567])|7(?:5\.1(?:[678]\d|9[01])|2\.24[4567])|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(?:82\.(?:6[456789]|9[012345]|[78]\d)|45\.(?:[0456789]|[12]\d?|3[01]?)|98\.1(?:7[6789]|9[01]|8\d))|2(?:05\.(?:19
 [23456789]|2[0123]\d)|13\.(?:6[0123]|4[89]|5\d))|95\.(?:2(?:2[0123]|[01]\d)|19[23456789])|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\.(?:1(?:15\.1(?:1[23456789]|2[01234567])|06\.1(?:4[0123]|2[89]|3\d)|25\.1(?:7[012345]|6[89]))|50\.(?:2(?:2[0123]|[01]\d)|19[23456789])|3\.1(?:4[0123]|2[89]|3\d)|22)|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])|90\.[01234567])|1\.71\.(?:[023456789]|1[012345]?)|3\.3(?:1\.8[89]|4\.7[01])|2\.(?:59\.236|61\.127))|1(?:6\.(?:2(?:45\.(?:1(?:2[01234567]|[01]\d)|6[456789]|[789]\d)|12\.(?:2(?:2[0123]|[01]\d)|19[23456789]))|151\.(?:19[23456789]|20[01234567]))|3\.(?:109\.(?:2(?:2[0123]|0[89]|1\d)|9[6789])|247\.(?
 :[0456789]|[12]\d?|3[01]?))))|9(?:1\.(?:2(?:0(?:1\.(?:[4567]|1(?:2[4567]|9[6789])|2(?:1[2345]|3[6789]))|0\.(?:1(?:6[4567]|8[89]|9[01])|2(?:4[012389]|5[01]))|9\.(?:1(?:8[346]|4)|(?:[45]|23)8)|4\.(?:5[01]|4\d)|8\.(?:162|228|0)|3\.9[2345]|5\.4[0123]|7\.11[67])|1(?:2\.(?:1(?:2[37]|3[25]|07|63|98)|2(?:01|20)|4[15]|65)|3\.(?:1(?:21|57|74)|2(?:17|9)|7[25]|9[34])|6\.(?:1(?:4?1|22|90)|232|7?3)|1\.(?:6[4567]|8[89]|9[01])|7\.(?:1(?:53|62)|249)|0\.17[2345])|2(?:0\.(?:(?:11|9)0|62)|3\.201))|19(?:8\.(?:1(?:2[57]|09)|217)|(?:3\.19|6\.23)[2345]|9\.1(?:12|23|57)|7\.9[6789]|4\.[01]))|4\.(?:1(?:5(?:4\.1(?:[345678]\d|2[89]|9[01])|8\.2(?:5[012345]|4\d))|26\.1(?:7[6789]|8[0123])|3[01])|6(?:3\.(?:1(?:4[69]|5[01])|24[0134567])|0\.12[123])|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\.(?:64\.(?:1[013]|3[789]|9[89]?|4[45]|5[59]|61)|21(?:[67]|5\.14[0123])))|6(?:4\.(?:1(?:12\.(?:1(?:[012345678]\d?|9[01
 ]?)?|[23456789]\d?|0)|5\.(?:[023456789]|1[012345]?))|2(?:50\.(?:1(?:1[01]|0\d)|9[6789])|8\.1(?:7[6789]|9[01]|8\d))|44)|2\.1(?:9\.(?:[0789]|2(?:[01236789]|5[012345]?|4[89]?)?|6[01234567]?|[1345]\d?)|8(?:2\.15[23456789]|\.252)|22\.(?:3[23456789]|7[23]))|7\.21(?:0\.(?:[023456789]|1[012345]?)|[18]\.2(?:2[0123]|0[89]|1\d)|3\.1(?:4[0123]|2[89]|3\d))|6\.231\.(?:6[456789]|7\d))|7(?:9\.1(?:10\.(?:1(?:4[456789]|[678]\d?|9[01]?|5\d)|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)|2\.1(?:7[6789]|9[01]|8\d))|\.0\.0\.(?:1(?:[3456789]|2[01234567]?|[01]\d?)?|[23456789]\d?|0)|8\.(?:31\.1(?:8[456789]|9[01])|155\.22[01]))|8(?:5\.(?:2(?:02\.(?:1(?:9[23456789]|7[012345]|6\d)|20[01234567])|55\.1(?:1[23456789]|2[01234567]))|121\.39)|8\.(?:135\.(?:6[456789]|7\d)|214\.211)|6\.55\.(?:2(?:1[01]|43)|140)|9\.(?:114\.97?|45\.14)|1\.22\.15[23])|4(?:6\.(?:252\.1(?:3[0123]|2[89])|51\.10[0123]|161\.2[89])|1\.221\.1(?:1[234
 56789]|2[01234567]))|58\.83\.(?:[89]|1[012345])|31\.222\.20[01234567])\b)/
+header	 KHOP_SPAMHAUS_DROP_LE	X-Spam-Relays-External =~ /^[^]]*___ FAILED TO POPULATE ___/
 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
@@ -164,7 +164,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(?:1(?:4\.112\.2(?:2[456789]|3[16])|1\.224\.250|2\.196\.254|3\.10\.168)|2(?:5\.23(?:4\.144|5\.192)|0\.86\.19[6789]|3\.146\.117|2\.155\.36)|(?:78\.172\.1|09\.127\.)86|80\.232\.105)|2(?:1(?:3\.87\.(?:1(?:2[012389]|3[467]|42)|74)|7\.(?:118\.(?:83|90)|66\.146))|23\.252\.1(?:6[1468]|7[0135])|02\.152\.243)|8(?:5\.(?:26\.(?:2(?:3[12345]|41)|1(?:8[46]|55))|115\.248)|3\.149\.(?:[89]|4[4567]|38?))|46\.249\.0|61\.19\.66)\.[012]?\d{1,2}\b)/
+header	 KHOP_PSBL_CIDR24	X-Spam-Relays-Untrusted =~ /(?-xism:\b(?:1(?:1(?:4\.112\.2(?:2[456789]|3[16])|1\.224\.250|2\.196\.254)|2(?:0\.86\.19[6789]|3\.146\.117|5\.234\.144|2\.155\.36)|(?:78\.172\.1|09\.127\.)86|80\.232\.105)|2(?:1(?:3\.87\.(?:1(?:2[012389]|3[467]|4[12])|74)|7\.(?:118\.(?:83|90)|66\.146))|23\.252\.1(?:6[1467]|7[15])|02\.152\.243)|8(?:5\.(?:26\.(?:2(?:3[12345]|41)|1(?:8[46]|55))|115\.248)|3\.149\.(?:[89]|4[4567]|38?))|46\.249\.0|61\.19\.66)\.[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