auto-generated rules

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1481709 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf b/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf
index 57f9080..db8c1e7 100644
--- a/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf
+++ b/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf
@@ -1,4 +1,4 @@
-## khop-sc-neighbors.cf	v 201305122
+## khop-sc-neighbors.cf	v 201305132
 ## Khopesh's syndication of SpamCop's top offenders and top offending networks.
 ## 
 ## Spamassassin rules written by Adam Katz <antispamATkhopiscom>
@@ -92,7 +92,7 @@
 
 
 # http://spamcop.net/w3m?action=map;net=cmaxcnt;mask=65535;sort=spamcnt
-header	 KHOP_SC_CIDR24  Received =~ /(?-xism:\b(?:1(?:0(?:8\.174\.20|3\.30\.7)2|73\.(?:192\.144|212\.250)|2(?:0\.84\.13|1\.54\.54)|12\.90\.197|84\.82\.29)|58\.25(?:3\.216|4\.168)|46\.244\.10|66\.96\.213)\.[012]?\d{1,2}\b)/
+header	 KHOP_SC_CIDR24  Received =~ /(?-xism:\b(?:1(?:0(?:8\.174\.20|3\.30\.7)2|73\.(?:192\.144|212\.250)|2(?:0\.84\.13|1\.54\.54)|12\.90\.197|84\.82\.29)|58\.25(?:3\.216|4\.168)|66\.96\.213|80\.36\.130)\.[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 @@
 # 0.4157/0.5009 0.454 20110227  something is wrong here! -> .1 0 .1 0
 
 
-header	 KHOP_SC_TOP_CIDR24  Received =~ /(?-xism:\b(?:1(?:78\.172\.(?:1(?:5[23]|83)|229)|84\.(?:82\.1(?:09|54)|22\.108)|20\.(?:128\.2|84\.13)|12\.9(?:0\.90|7\.33))|2(?:08\.82\.114|10\.21\.225|\.139\.178)|6(?:4\.120\.170|5\.60\.15)|98\.139\.44)\.[012]?\d{1,2}\b)/
+header	 KHOP_SC_TOP_CIDR24  Received =~ /(?-xism:\b(?:1(?:1(?:2\.9(?:0\.90|7\.33)|9\.39\.19[57])|78\.172\.(?:1(?:5[234]|83)|229)|84\.(?:82\.1(?:09|54)|22\.108)|20\.(?:128\.2|84\.13))|2(?:08\.82\.114|10\.21\.225|\.139\.178)|6(?:4\.120\.170|5\.60\.15)|98\.139\.44)\.[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 @@
 
 
 # http://www.spamcop.net/w3m?action=hoshame
-header	 KHOP_SC_TOP200  Received =~ /(?-xism:\b(?:1(?:1(?:2\.(?:1(?:64\.62\.8|86\.16\.5)|90\.90\.1[6789]|217\.218\.218)|0\.(?:165\.125\.152|45\.244\.44)|8\.(?:129\.166\.86|97\.196\.163)|7\.2(?:39\.144\.70|0\.3\.231)|5\.88\.(?:119\.132|247\.131)|4\.141\.253\.13?4|1\.185\.166\.86|3\.98\.254\.177|9\.193\.93\.25)|8(?:4\.(?:82\.(?:1(?:09\.14|54\.51)|29\.3[34])|22\.108\.1(?:64|80))|8\.(?:1(?:27\.230\.28|68\.46\.53)|252\.0\.237)|9\.(?:100\.193\.84|39\.35\.168)|5\.12\.1(?:2\.25|4\.17)4|3\.98\.94\.67)|9(?:5\.(?:1(?:(?:28\.253\.15|91\.184\.8)2|38\.195\.125)|29\.81\.30)|9\.(?:180\.113\.12[04]|255\.11\.29)|2\.(?:210\.220\.57|162\.24\.71)|0\.69\.155\.100|8\.55\.110\.138|3\.6\.1\.169)|7(?:3\.(?:2(?:12\.250\.230|00\.90\.196)|1(?:92\.144\.105|3\.9\.9))|7\.(?:34\.246\.25|80\.102\.21)4|5\.196\.73\.189|6\.53\.233\.76)|0(?:8\.(?:6(?:1\.43\.7[12]|2\.42\.103)|174\.202\.7[2345])|3\.9\.15(?:7\.181|8\.150|6\.89)|9\.236\.87\.176)|2(?:1\.1(?:81\.251\.188|45\.120\.75)|3\.193\.66\.191|0\.128\.2\.172)|53\.127\.232\.158|\.172\.126\.166)|2(?:1(?:0\.(?:2(?:1\.225\.2(?:4[01245689]|2[79]|5[24]|3\d)|45\.89\.69)|5(?:1\.44\.199|6\.23\.100)|117\.6\.135)|3\.(?:2(?:03\.236\.133|30\.128\.226|51\.186\.229)|1(?:71\.39\.154|86\.39\.43)|81\.164\.57)|(?:6\.153\.136\.12|8\.22\.17\.23)5|1\.(?:147\.211\.16|222\.53\.83)|7\.1(?:7\.35\.146|98\.3\.238)|2\.6\.152\.211)|0(?:2\.(?:1(?:(?:36\.158\.4|42\.203\.1)9|58\.39\.250)|71\.136\.200|44\.53\.64)|0\.(?:7(?:2\.11\.132|9\.27\.60)|247\.100\.178|142\.133\.21)|8\.(?:82\.114\.(?:4[35679]|5[1357]|2[359])|113\.254\.39)|9\.223\.3(?:6\.2(?:5[13]|26|47)|5\.16[2346])|1\.(?:22\.7\.225|45\.114\.3)|3\.155\.102\.2)|2(?:0\.94\.235\.200|2\.236\.16\.14)|\.139\.178\.(?:184|81))|6(?:1\.(?:2(?:8\.114\.3[36]|52\.138\.195)|1(?:64\.42\.158|9\.97\.69)|98\.131\.141)|6\.(?:84\.(?:50\.133|49\.9)|96\.213\.13[48]|35\.84\.198)|4\.(?:120\.1(?:34\.120|70\.138|81\.94)|203\.238\.6[47])|5\.60\.15\.1(?:73|86)|7\.222\.148\.43|9\.90\.120\.188|8\.115\.192\.7)|5(?:8\.25(?:4\.168\.(?:5[6789]|6[0123])|3\.216\.1(?:36|43))|\.255\.67\.(?:49|8)|9\.150\.255\.35)|8(?:(?:1\.(?:15\.172\.14|23\.106\.7)|3\.238\.208\.5)5|7\.236\.232\.231|\.20\.39\.3)|7(?:5\.127\.110\.39|6\.74\.186\.237|1\.188\.63\.88|2\.35\.20\.131|4\.9\.203\.186)|4(?:6\.(?:244\.10\.1(?:51|72)|180\.223\.73)|1\.137\.24\.4)|9(?:5\.(?:215\.63\.6[49]|48\.24\.10)|4\.23\.108\.78)|37\.206\.210\.130)\b)/
+header	 KHOP_SC_TOP200  Received =~ /(?-xism:\b(?:1(?:1(?:2\.(?:90\.90\.1[6789]|164\.62\.8)|0\.(?:165\.125\.152|45\.244\.44)|8\.(?:129\.166\.86|97\.196\.163)|7\.2(?:39\.144\.70|0\.3\.231)|4\.141\.253\.13?4|1\.185\.166\.86|3\.98\.254\.177|5\.88\.247\.131|9\.193\.93\.25)|9(?:9\.(?:1(?:80\.113\.(?:1(?:2[24]|00)|98)|68\.141\.98)|255\.11\.29)|5\.(?:1(?:(?:28\.253\.15|91\.184\.8)2|38\.195\.125)|29\.81\.30)|2\.(?:210\.220\.57|162\.24\.71)|0\.69\.155\.100|8\.55\.110\.138)|8(?:4\.(?:82\.(?:1(?:09\.14|54\.51)|29\.3[34])|22\.108\.1(?:64|80))|8\.(?:1(?:27\.230\.28|68\.46\.53)|252\.0\.237)|(?:5\.12\.1(?:2\.25|4\.17)|9\.100\.193\.8)4|3\.98\.94\.67)|7(?:3\.(?:2(?:12\.250\.230|00\.90\.196)|1(?:92\.144\.105|3\.9\.9))|7\.(?:34\.246\.25|80\.102\.21)4|6\.53\.233\.76)|0(?:3\.9\.15(?:6\.(?:67|89)|7\.181|8\.150)|8\.(?:174\.202\.7[2345]|61\.43\.7[12])|9\.236\.87\.176)|(?:21\.181\.251\.18|53\.127\.232\.15)8|\.172\.126\.166)|2(?:1(?:0\.(?:2(?:1\.225\.2(?:4[01245689]|5[234]|2[79]|3\d)|45\.89\.69)|5(?:1\.44\.199|6\.23\.100)|91\.133\.143|117\.6\.135)|3\.(?:2(?:30\.128\.226|51\.186\.229)|1(?:71\.39\.154|86\.39\.43)|81\.164\.57)|1\.(?:1(?:47\.211\.16|15\.68\.32)|222\.53\.83)|8\.(?:153\.247\.68|22\.17\.235)|7\.1(?:7\.35\.146|98\.3\.238)|6\.153\.136\.125|2\.6\.152\.211)|0(?:2\.(?:1(?:(?:36\.158\.4|42\.203\.1)9|58\.39\.250)|71\.136\.200|44\.53\.64)|0\.(?:7(?:2\.11\.132|9\.27\.60)|247\.100\.178|142\.133\.21)|8\.(?:82\.114\.(?:5[1234579]|4[5679]|2[35])|113\.254\.39)|9\.223\.3(?:6\.2(?:2[689]|5[13]|47)|5\.16[23456])|1\.(?:22\.7\.225|45\.114\.3)|3\.155\.102\.2)|2(?:0\.94\.235\.200|2\.236\.16\.14)|\.139\.178\.81)|6(?:6\.(?:84\.(?:50\.133|49\.9)|96\.213\.13[48]|55\.140\.182|35\.84\.198)|1\.(?:2(?:8\.114\.3[346]|52\.138\.195)|1(?:64\.42\.158|9\.97\.69))|4\.(?:120\.1(?:34\.120|70\.138|81\.94)|203\.238\.6[47])|5\.60\.15\.1(?:73|86)|7\.222\.148\.43|8\.115\.192\.7)|5(?:8\.25(?:4\.168\.(?:5[6789]|6[0123])|3\.216\.136)|9\.15(?:0\.255\.35|\.76\.97)|\.255\.67\.(?:49|8))|7(?:5\.127\.110\.39|6\.74\.186\.237|1\.188\.63\.88|2\.35\.20\.131|4\.9\.203\.186)|8(?:(?:1\.(?:15\.172\.14|23\.106\.7)|3\.238\.208\.5)5|7\.236\.232\.231)|4(?:6\.(?:244\.10\.1(?:5[14]|72)|180\.223\.73)|1\.137\.24\.4)|9(?:5\.(?:215\.63\.6[49]|48\.24\.10)|4\.23\.108\.78)|37\.206\.210\.130)\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