Mailing-List: contact commits-help@spamassassin.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "SpamAssassin Dev" <dev@spamassassin.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r936600 - in /spamassassin/trunk/rulesrc/sandbox/khopesh:
 20_khop_sc_bug_6114.cf 20_spamdb_subjects.cf
Date: Thu, 22 Apr 2010 02:58:06 -0000
To: commits@spamassassin.apache.org
From: khopesh@apache.org
Message-Id: <20100422025806.E6602238899B@eris.apache.org>

Author: khopesh
Date: Thu Apr 22 02:58:06 2010
New Revision: 936600

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

Modified:
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_khop_sc_bug_6114.cf
    spamassassin/trunk/rulesrc/sandbox/khopesh/20_spamdb_subjects.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=936600&r1=936599&r2=936600&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 Apr 22 02:58:06 2010
@@ -1,4 +1,4 @@
-## khop-sc-neighbors.cf	v 2010042022
+## khop-sc-neighbors.cf	v 2010042122
 ## 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[89]|9[45])(?:\.[012]?\d{1,2}){3}\b) /
+header __KHOP_SC_CIDR8  X-Spam-Relays-Untrusted =~ /^[^\]]* (?:by|ip)=(?-xism:\b(?:9[45]|188|41)(?:\.[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
@@ -57,7 +57,7 @@ score	 KHOP_SC_TOP_CIDR8  0.9 0.1 0.9 0.
 # 11.6286/0.0475 0.996 20100410  net, solo=11.7224/0.6900@0.944, ->LE as above
 
 # http://www.spamcop.net/w3m?action=map;net=bmaxcnt;mask=16777215;sort=spamcnt
-header	 KHOP_SC_CIDR16  Received =~ /(?-xism:\b(?:1(?:2(?:(?:1\.24|3\.1)7|2\.162)|15\.240|86\.87)|59\.92)(?:\.[012]?\d{1,2}){2}\b)/
+header	 KHOP_SC_CIDR16  Received =~ /(?-xism:\b(?:1(?:2(?:1\.24|3\.1)|86\.8)7|41\.249|95\.133|59\.92)(?:\.[012]?\d{1,2}){2}\b)/
 describe KHOP_SC_CIDR16  Relay CIDR /16 is among worst in SpamCop
 tflags	 KHOP_SC_CIDR16  nopublish
 score	 KHOP_SC_CIDR16  1.6 0.5 1.6 0.5
@@ -72,7 +72,7 @@ score	 KHOP_SC_CIDR16  1.6 0.5 1.6 0.5
 # 0     /0      0     20100409  (wha!?)
 # crap, still empty   20100410  bad scrape, script failed to populate rule
 
-header	 KHOP_SC_TOP_CIDR16  Received =~ /(?-xism:\b(?:1(?:2(?:2\.16[38]|3\.27)|1(?:7\.197|8\.96)|83\.87)|220\.225|95\.133|59\.94)(?:\.[012]?\d{1,2}){2}\b)/
+header	 KHOP_SC_TOP_CIDR16  Received =~ /(?-xism:\b(?:1(?:2(?:2\.16[238]|3\.27)|1(?:7\.197|8\.96)|83\.87)|220\.225|59\.94)(?:\.[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.5 2.0 0.5
@@ -89,7 +89,7 @@ score	 KHOP_SC_TOP_CIDR16  2.0 0.5 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\.(?:163\.127|233\.64)|0\.127\.209|7\.118\.82)|05\.209\.97)|1(?:1(?:3\.160\.112|0\.45\.144)|9(?:3\.108\.38|6\.40\.10))|6(?:7\.205\.10|1\.19\.7)1|78\.138\.1(?:6[89]|71)|59\.97\.168|89\.211\.46)\.[012]?\d{1,2}\b)/
+header	 KHOP_SC_CIDR24  Received =~ /(?-xism:\b(?:1(?:9(?:3\.108\.38|6\.40\.10)|13\.160\.112|23\.140\.193)|2(?:1(?:0\.127\.209|3\.233\.64|7\.118\.82)|05\.209\.97)|6(?:7\.205\.10|1\.19\.7)1|78\.138\.1(?:69|71)|59\.97\.168|89\.211\.46)\.[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  2.5 0.6 2.5 0.6
@@ -106,7 +106,7 @@ score	 KHOP_SC_CIDR24  2.5 0.6 2.5 0.6
 # 0.2960/0      1.000 20100409
 # 0.2905/0      1.000 20100410  net
 
-header	 KHOP_SC_TOP_CIDR24  Received =~ /(?-xism:\b(?:2(?:1(?:3\.(?:(?:163\.11|87\.7)6|233\.64)|7\.118\.90)|0(?:2\.(?:152\.243|70\.54)|3\.82\.9[24]))|1(?:1(?:1\.224\.250|5\.147\.237|3\.22\.69|2\.76\.5)|96\.12\.2(?:3[36]|45)|73\.45\.96)|8(?:5\.26\.(?:1(?:6[45]|83)|23[2345])|3\.149\.(?:28|3)|9\.232\.105|2\.178\.69)|7(?:2\.(?:52\.137|21\.6)|8\.138\.1(?:68|70))|9(?:5\.129\.166|1\.203\.67|4\.23\.20)|41\.(?:140\.25|254\.)1|62\.61\.164)\.[012]?\d{1,2}\b)/
+header	 KHOP_SC_TOP_CIDR24  Received =~ /(?-xism:\b(?:1(?:1(?:1\.224\.250|5\.147\.237|0\.45\.144|3\.22\.69|2\.76\.5)|96\.12\.2(?:3[36]|45)|73\.45\.96)|8(?:5\.26\.(?:2(?:3[2345]|41)|1(?:6[45]|83))|3\.149\.(?:28|3)|9\.232\.105|2\.178\.69)|2(?:1(?:3\.(?:163\.11|87\.7)6|7\.(?:118\.90|8\.236))|02\.(?:152\.243|70\.54))|7(?:2\.(?:52\.137|21\.6)|8\.138\.1(?:68|70))|9(?:5\.129\.166|1\.203\.67|4\.23\.20)|41\.(?:140\.25|254\.)1|62\.61\.164)\.[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.6 2.7 0.6
@@ -123,7 +123,7 @@ score	 KHOP_SC_TOP_CIDR24  2.7 0.6 2.7 0
 
 
 # http://www.spamcop.net/w3m?action=hoshame
-header	 KHOP_SC_TOP200  Received =~ /(?-xism:\b(?:1(?:9(?:0\.(?:2(?:07\.163\.52|4\.150\.68|6\.67\.230|7\.80\.93)|1(?:91\.129\.191|61\.14\.132|7\.212\.73)|8(?:6\.207\.218|0\.156\.14)|41\.(?:171\.154|223\.167)|34\.154\.204|96\.68\.179)|5\.(?:1(?:(?:17\.26\.8|74\.4\.20)9|61\.(?:8\.1|9\.2)|89\.46\.253)|2(?:02\.81\.154|38\.191\.68))|6\.(?:1\.209\.(?:69|83)|201\.207\.169|40\.10\.246)|4\.(?:1(?:64\.247\.14|50\.96\.20)4|54\.52\.239)|3\.1(?:0(?:7\.184\.192|8\.38\.228)|98\.8\.211)|9\.237\.202\.232|2\.129\.3\.191)|2(?:2\.(?:2(?:20\.255\.172|52\.234\.74)|34\.215\.210)|4\.(?:1(?:07\.16\.66|24\.43\.32)|217\.216\.112)|3\.(?:140\.193\.203|204\.217\.128)|1\.1(?:68\.226\.231|\.18\.244)|5\.7\.192\.146)|1(?:8\.(?:169\.2(?:22\.230|17\.26)|68\.212\.26)|1\.224\.250\.13[34]|0\.45\.144\.227|4\.32\.100\.128)|7(?:3\.(?:45\.96\.(?:1(?:9[249]|0[02])|2(?:0[179]|1[68]))|161\.201\.157|77\.241\.20)|5\.116\.8\.24)|8(?:9\.(?:1(?:60\.217\.246|14\.16\.187|95\.16\.84)|84\.174\.253)|7\.16\.28\.18)|6(?:3\.152\.106
 \.152|5\.98\.153\.46)|51\.44\.239\.62)|2(?:0(?:0\.(?:11(?:1\.161\.194|6\.243\.197|7\.254\.129)|(?:49\.157\.5|80\.140\.6)1|5(?:8\.200\.171|0\.72\.66)|3\.170\.217)|1\.(?:2(?:(?:00\.178|45\.162)\.50|15\.112\.231|32\.107\.46)|1(?:34\.103\.236|0\.176\.43)|43\.13\.86|7\.225\.15)|9\.(?:2(?:22\.0\.(?:1[36]|27|4)|54\.56\.106)|94\.196\.170)|3\.(?:194\.220\.54|255\.220\.41|59\.95\.113)|2\.1(?:84\.124\.1[349]|64\.52\.100)|(?:4\.10\.139\.16|6\.48\.103\.22)2|5\.209\.97\.173)|1(?:7\.(?:1(?:29\.104\.252|74\.229\.221)|20\.138\.113|76\.2\.129)|(?:(?:0\.127\.209|2\.156\.16)\.|8\.111\.179\.1)34|3\.(?:163\.116\.230|251\.164\.123|33\.209\.158)|9\.(?:95\.(?:227\.218|148\.97)|75\.44\.207)|6\.(?:155\.39\.(?:19|22)|230\.133\.69)|1\.1(?:71\.31\.100|89\.39\.169))|2(?:2\.12(?:4\.156\.231|0\.16\.15)|1\.143\.46\.33|0\.67\.24\.30)|4\.(?:1(?:06\.135\.238|58\.180\.30)|59\.252\.246))|8(?:3\.(?:1(?:09\.75\.242|6\.167\.14|9\.164\.58)|3\.237\.195|69\.117\.81)|2\.1(?:7(?:8\.173\.197|7\.53\.4)|14\.(?:65|90)\.246|4
 0\.91\.41)|5\.(?:1(?:4\.94\.254|75\.6\.123|54\.6\.71)|221\.151\.97)|0\.(?:179\.212\.151|93\.125\.186)|9\.(?:211\.46\.21[08]|74\.181\.6)|7\.(?:126\.68\.215|212\.137\.20)|4\.2(?:42\.142\.94|2\.56\.50)|1\.21\.115\.38)|6(?:4\.(?:1(?:64\.228\.206|91\.134\.147)|233\.207\.54|46\.21\.153|70\.190\.10)|1\.(?:1(?:00\.228\.61|9\.71\.74)|7\.241\.70|9\.6\.245)|(?:2\.103\.171\.2|9\.151\.79\.23)8|7\.(?:115\.179\.198|205\.101\.49)|3\.253\.107\.166|6\.110\.120\.27|5\.183\.14\.22)|7(?:7\.(?:1(?:20\.251\.37|92\.142\.63)|2(?:51\.98\.175|2\.162\.99)|73\.139\.2)|6\.(?:1(?:03\.160\.74|72\.157\.10)|227\.84\.105)|2\.(?:52\.1(?:37\.166|16\.44)|21\.6\.24)|(?:1\.252\.246\.6|4\.92\.90\.5)8|9\.187\.150\.122|8\.109\.36\.16)|9(?:1\.(?:1(?:(?:20\.21\.24|50\.127\.9)3|99\.116\.9)|214\.128\.24)|4\.(?:23\.(?:20\.147|55\.42)|85\.241\.193|76\.213\.81)|3\.(?:186\.96\.40|91\.196\.99)|8\.224\.242\.240|2\.105\.94\.99|7\.66\.79\.81)|41\.(?:2(?:06\.61\.243|15\.18\.110)|190\.239\.178)|59\.90\.214\.99)\b)/
+header	 KHOP_SC_TOP200  Received =~ /(?-xism:\b(?:1(?:9(?:0\.(?:2(?:07\.163\.52|4\.150\.68|6\.67\.230|7\.80\.93)|1(?:91\.129\.191|61\.14\.132|7\.212\.73)|8(?:6\.207\.218|0\.156\.14)|41\.(?:171\.154|223\.167)|34\.154\.204|96\.68\.179)|5\.(?:1(?:(?:17\.26\.8|74\.4\.20)9|61\.(?:8\.1|9\.2)|89\.46\.253)|2(?:02\.81\.154|38\.191\.68))|6\.(?:1(?:\.209\.(?:69|83)|2\.228\.253)|201\.207\.169|40\.10\.246)|4\.(?:1(?:64\.247\.14|50\.96\.20)4|54\.52\.239)|3\.1(?:0(?:7\.184\.192|8\.38\.228)|98\.8\.211)|9\.237\.202\.232|2\.129\.3\.191)|2(?:2\.(?:2(?:52\.2(?:46\.23|34\.7)4|20\.255\.172)|34\.215\.210)|3\.(?:140\.193\.203|204\.217\.128)|4\.(?:217\.216\.11|124\.43\.3)2|1\.1(?:68\.226\.231|\.18\.244)|5\.7\.192\.146)|1(?:8\.(?:169\.2(?:22\.230|17\.26)|217\.216\.132|68\.212\.26)|1\.224\.250\.1(?:3[34]|29)|2\.221\.100\.172|0\.45\.144\.227)|7(?:3\.(?:45\.96\.(?:1(?:9[489]|0[02])|2(?:0[19]|1[68]))|161\.201\.157|77\.241\.20)|(?:4\.51\.89\.10|5\.116\.8\.2)4)|8(?:9\.1(?:60\.217\.246|14\.16\.187|95\.16\.8
 4)|7\.16\.28\.18)|6(?:3\.152\.106\.152|5\.98\.153\.46)|(?:09\.188\.1\.22|51\.44\.239\.6)2|32\.248\.142\.39)|2(?:0(?:0\.(?:11(?:1\.161\.194|6\.243\.197|7\.254\.129)|(?:49\.157\.5|80\.140\.6)1|5(?:8\.200\.171|0\.72\.66)|3\.170\.217)|1\.(?:2(?:(?:00\.178|45\.162)\.50|32\.107\.46)|1(?:34\.103\.236|0\.176\.43)|43\.13\.86)|2\.(?:1(?:84\.124\.1[349]|64\.52\.100)|7(?:1\.161\.235|9\.25\.162))|3\.(?:1(?:71\.240\.10|94\.220\.54)|255\.220\.41|59\.95\.113)|9\.(?:2(?:22\.0\.(?:16|4)|54\.56\.106)|94\.196\.170)|(?:4\.10\.139\.16|6\.48\.103\.22)2|5\.209\.97\.173)|1(?:(?:(?:0\.127\.209|2\.156\.16)\.|8\.111\.179\.1)34|1\.(?:1(?:71\.31\.100|89\.39\.169)|23\.16\.75)|7\.(?:174\.229\.221|20\.138\.113|76\.2\.129)|6\.(?:230\.133\.6|155\.39\.1)9|9\.(?:75\.44\.20|95\.148\.9)7|3\.251\.164\.123)|2(?:2\.12(?:4\.156\.231|0\.16\.15)|1\.143\.46\.33|0\.67\.24\.30)|4\.(?:1(?:06\.135\.238|58\.180\.30)|59\.252\.246|66\.12\.248))|8(?:3\.(?:1(?:09\.75\.242|6\.167\.14|9\.164\.58)|3\.237\.195|69\.117\.81)|2\.(?:1(?
 :14\.(?:65|90)\.246|78\.173\.197|40\.91\.41)|225\.162\.240)|5\.(?:1(?:4\.94\.254|75\.6\.123|54\.6\.71)|90\.193\.240)|0\.(?:179\.212\.151|93\.125\.186)|9\.(?:211\.46\.21[08]|74\.181\.6)|7\.(?:126\.68\.215|212\.137\.20)|4\.2(?:42\.142\.94|2\.56\.50)|1\.21\.115\.38)|7(?:7\.(?:2(?:32\.133\.13|51\.98\.175|2\.162\.99)|1(?:20\.251\.37|92\.142\.63)|73\.139\.2)|6\.(?:1(?:03\.160\.74|72\.157\.10)|227\.84\.105)|2\.(?:52\.1(?:16\.4[46]|37\.166)|21\.6\.24)|(?:1\.252\.246\.6|4\.92\.90\.5)8|9\.187\.150\.122|8\.109\.36\.16)|6(?:4\.(?:1(?:64\.228\.206|91\.134\.147)|233\.207\.54|46\.21\.153|70\.190\.10)|1\.(?:19\.71\.74|7\.241\.70|9\.6\.245)|(?:2\.103\.171\.2|9\.151\.79\.23)8|7\.(?:115\.179\.198|205\.101\.49)|3\.253\.107\.166|6\.110\.120\.27|5\.183\.14\.22)|9(?:1\.(?:1(?:(?:20\.21\.24|50\.127\.9)3|99\.116\.9)|214\.128\.24)|4\.(?:23\.(?:20\.147|55\.42)|85\.241\.193|76\.213\.81)|3\.(?:186\.96\.40|91\.196\.99)|8\.224\.242\.240|7\.66\.79\.81)|41\.(?:2(?:06\.61\.243|15\.18\.110)|190\.239\.178)|59\
 .90\.214\.99)\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
@@ -140,7 +140,7 @@ score	 KHOP_SC_TOP200  4 0 4 0	# unneces
 
 # 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(?:7\.(?:2(?:4(?:1\.(?:[09]|1(?:7[678]|2[08]|9[23]|[48]4|52|68)?|2(?:4[01]?|5[23]?|2[48]|00|17|32)|8[012]?|6[45]|56)|2\.(?:[08]|1(?:4[04]|3?2|9?6|08|7)|2(?:4?8|04)|4[04]?|5[67]?|6[089]|7[23]))|0(?:0\.(?:1(?:6[12]?|2[89]|7[79]|30|44)|2(?:0[89]|43))|4\.(?:1(?:1[235]|44)|8[12345]|9[67])|6\.(?:[028]|3[45]?|16|51)|5\.(?:1(?:00|45)|9[689])))|1(?:9(?:9\.(?:[036]|1(?:[67]|4[4567]|81|94)?|4[89]|21|52)|6\.(?:1(?:3[03]|8[01]|28|62)|2(?:11|25))|7\.(?:6[4568]|9[678]|242)|8\.(?:3[23]|146))|\.23[23])|44\.2[01])|3\.(?:16(?:7\.(?:1(?:1[5789]|8[0123]|6[014]|7[678]|2?9|56)?|2(?:4[158]|08?|35|9)|3[23467]|48|96|0)|8\.(?:[0459]|1(?:0[478]?|4[0467]|1[246]|3[679]|2)|2(?:4[45]|28)?|8[0245]?|64?)|2\.(?:2[24]5|[79]7|64|80)|6\.(?:[0235689]|1[1234])|9\.8)|22\.(?:2(?:[67]|49)|6[89]|[13]0|4?8|9)|56\.28)|8\.(?:68\.(?:2(?:4[89]|5[23])|1(?:9[26]|66))|71\.(?:1(?:7[01]|0)|6?8|9))|9\.(?:100\.(?:1(?:4[457]|6[45])|21[234])|48\.19[23456789])|5\
 .147\.(?:2(?:3[0127]|0[123]|29)|192)|6\.71\.(?:21[04]|7[29]|147|44|58)|1\.181\.1(?:4[0123]|3[789])|2\.76\.5)|2(?:3\.(?:1(?:8\.(?:1(?:6[234567]|7[02456]|9[23457]|5[689])|24[01])|7\.(?:1(?:4[79]|6[25]|9[35])|2(?:4[023569]|50))|6\.1(?:6?0|75)|9\.1(?:66|70))|2(?:7\.(?:2(?:[56]|1[012346789]|0[89])|8[01235678]|3[3456]|9[0123])|8\.1(?:4[0123]|11|86)|2\.55))|2\.1(?:6(?:8\.(?:2(?:[789]|3[012345689]?|0[012456789]|2[01236789]?|4[012346789]|5[0345]?|1\d?)|1(?:[249]|6[34568]?|71?)|7[013459]?|6[89]?|9[78]?|30|4)|1\.(?:1[18]|68)|3\.185)|72\.1(?:1[236789]|2[12356]))|0\.89\.79)|8(?:3\.87\.(?:2(?:1[789]|20|3)|115)|8\.(?:48\.(?:76|2)|50\.[39]1))|9(?:6\.(?:12\.2(?:4[2345]|3[36])|28\.247)|0\.104\.162)|75\.107\.3)|5(?:9\.(?:9(?:9\.(?:1(?:[67]|8[4567]|2[89]|3[01]|5[23])|2(?:[456]|0[089]|1[01])|4[08]|5[67]|6[45]|[37]2)|8\.(?:1(?:2[89]|9[23]|36|44|52|60)|(?:20)?0|8)|7\.(?:2(?:0[089]|1[67]|2[45])|1(?:2[08]|12))|3\.(?:[256]|1(?:2[89]|30)?|3[59])|5\.(?:10[234]|9[89]|67)|4\.11[2345])|164\.(?:[2389]|1[01
 23]?))|8\.18(?:7\.(?:3[45]|6[49]|85?|9)|6\.(?:1[2345]|21[678])))|2(?:2(?:2\.25(?:2\.(?:1(?:5[1789]|19|45|84)|2(?:1[79]|01))|4\.(?:(?:21|6)[68]|1(?:08|10)|7[479])|3\.2[67]?)|1\.234\.(?:[78]4|16|20))|1(?:9\.13(?:9\.12[013]|8\.21[18])|7\.(?:8\.2(?:25|36)|118\.90)|3\.(?:132\.255|87\.76))|0(?:2\.(?:70\.5[489]|152\.243)|3\.82\.(?:9[234]|8[01])))|8(?:5\.26\.(?:1(?:6[45]|8[36])|2(?:3[2345]|41))|9\.(?:1(?:65\.73|89\.66)|232\.105)|4\.36\.1(?:5[2345678]|3[13])|3\.149\.(?:4[45]|28|3)|1\.192\.211|2\.178\.69)|41\.(?:1(?:3(?:1\.2(?:2[456789]|3[0145])|0\.13)|9(?:9\.18[23]|1\.2[07])|40\.251|76\.182|89\.193)|2(?:0(?:9\.(?:114|78)|3\.224)|54\.[0123]|23\.201))|7(?:8\.(?:93\.(?:1(?:5[01]|49|77)|226|68)|138\.1(?:7[01]|68))|7\.(?:64\.1(?:1[789]?|21)|232\.142)|9\.106\.109)|6(?:1\.19\.6[567]|2\.61\.164)|9(?:1\.203\.6|2\.39\.7)7)\.[012]?\d{1,2}\b)/
+header	 KHOP_PSBL_CIDR24	X-Spam-Relays-Untrusted =~ /(?-xism:\b(?:1(?:1(?:7\.(?:2(?:4(?:1\.(?:1(?:7[678]|[159]2|2[08]|[48]4|36|68)?|2(?:2[489]|4[01]?|5[23]?|00|17|32)|8[012]?|6[45]|4?0|56|9)|2\.(?:[08]|1(?:[78]|0[48]|4[04]|3?2|9?6)|2(?:4?8|04)|4[04]?|6[089]|7[234]|56?))|0(?:0\.(?:1(?:4[4567]|6[12]?|2[89]|3[01]|79)|2(?:0[89]|1[01]|26|43))|4\.(?:1(?:1[23456]|44)|8[1234567]|9[067]|225)|6\.(?:[024]|1[678]?|5[01]?|34?)|5\.(?:1(?:4[45]|00|6)|9[6789])|3\.0))|1(?:9(?:9\.(?:[0367]|1(?:4[45678]|7[78]?|92?|19|81|6)?|4[89]?|21?|52?)|6\.(?:1(?:3[0123]|6[12]|7[79]|8[01]|28)|2(?:1[0157]|0[89]))|7\.(?:6[45678]|24[029]|9[678]|50)|8\.(?:1(?:4[456]|51|60)|33|85))|\.2(?:3[23]|21|48))|44\.2[01])|3\.(?:1(?:6(?:7\.(?:1(?:1[235789]|8[01234]?|4[45689]|5[03567]|6[0134]?|7[6789]?|2[289]|92?)?|2(?:[589]|4[0123578]|3[35]|08?|10)?|3[023456789]|8[0467]|9[678]|48|0)|8\.(?:[034579]|1(?:1[023456]|4[045678]|0[4789]?|3[6789]|54|2)?|2(?:4[2456]|2[458])?|8[0123456]?|64?)|9\.(?:1(?:0[467]|8[13])|8?8|90|2)|2\.(?:7
 [179]|225|64|80|97)|6\.(?:[02345689]|1[1234]))|90\.(?:156|220)|70\.4)|22\.(?:[89]|2(?:[67]|4?9)|6[5689]|4[89]|[13]0)|56\.28)|8\.(?:68\.(?:2(?:4[89]|5[23])|1(?:9[26]|66))|71\.(?:1(?:7[017]|0)|6?8|9))|6\.7(?:1\.(?:2(?:1[06]|22|9)|5[089]|7[29]?|3[03]|16|44|62)|2\.251)|9\.(?:100\.(?:1(?:4[57]|6[45])|212)|48\.19[23456789])|5\.147\.(?:2(?:3[0127]|0[123]|29)|192)|1\.181\.1(?:4[23]|38))|2(?:3\.(?:1(?:7\.(?:1(?:4[0789]|6[125]|9[357]|31|54)|2(?:4[012345689]|5[023]|2[47]))|8\.(?:1(?:6[123456789]|7[0123456]|9[2345678]|5[3689])|24[012]|96)|6\.(?:1(?:[04]|6[034]|7[45])|2(?:1[37]?|09?|22))|9\.1(?:6[1367]|7[03]|21))|2(?:7\.(?:2(?:[456]|0[89]|1\d)|8[012345678]|9[012347]|3[2345])|8\.(?:1(?:4[0123]|1[01]|86)|31)|2\.5[45]))|2\.1(?:6(?:8\.(?:[48]|2(?:[6789]|2[012345678]?|3[012456789]?|5[01345]?|[14]\d?|0\d)|1(?:[123458]|6[234568]?|7[0124]?)|7[012349]?|6[89]?|9[78]?|3[01])|1\.(?:1[18]|68|82)|3\.185|2\.23)|72\.1(?:1[23456789]|2[123567]))|0\.(?:61\.[36]|89\.79))|8(?:8\.(?:48\.(?:1(?:0[28]|16|40)|7[
 346]?|27?|35?|52|68|93)|50\.(?:6[02]|[39]1|47))|3\.87\.(?:2(?:1[789]|20)|115))|9(?:6\.(?:12\.2(?:4[2345]|3[36])|28\.247)|0\.104\.162|5\.246\.48)|75\.107\.[03])|5(?:9\.(?:9(?:9\.(?:1(?:3[01236]|8[4567]|2[89]|5[23]|60?|76?)|2(?:[456]|0[089]|1[01])|4[08]|5[67]|6[45]|7[23]|32)|8\.(?:1(?:2[89]|3[16]|9[23]|[48]4|52|60)|(?:20)?0|8)|3\.(?:[0256]|1(?:2[89]|13|30|4)?|3[259]?|41?)|7\.(?:2(?:0[089]|1[067]|2[45])|1(?:2[08]|12))|5\.(?:1(?:0[023]|30)|9[789]|6[47]|28|70)|4\.(?:1(?:1[23456]|30)|41)|2\.245)|164\.(?:[02389]|1[012345]?))|8\.18(?:7\.(?:3[3456]|6[479]|85?|9)|6\.(?:21[6789]|1[2345])))|2(?:2(?:2\.25(?:2\.(?:1(?:5[013789]|8[149]|06|19|45|91)|2(?:1[379]|0[12]|47))|4\.(?:1(?:08|10)|6[46789]|21[68]|7[479]|92)|3\.2[567]?)|1\.234\.84)|1(?:7\.(?:8\.2(?:25|36)|118\.90|52\.24|77\.75)|3\.(?:132\.255|87\.76)|2\.49\.79)|0(?:3\.(?:82\.(?:8[01]|9[24])|171\.196)|2\.(?:70\.5[489]|152\.243)))|41\.(?:1(?:3(?:1\.2(?:2[456789]|3[0145])|0\.(?:13|46))|9(?:9\.18[23]|1\.2[07])|7(?:6\.18[23]|8\.186)|4(?:0\
 .251|1\.124)|89\.193)|2(?:0(?:9\.(?:114|78)|3\.22[456])|5(?:4\.[0123]|1\.66)|23\.201))|8(?:5\.26\.(?:1(?:6[45]|8[36])|2(?:3[2345]|41))|9\.(?:1(?:65\.(?:73|98)|89\.66)|232\.105)|4\.36\.1(?:5[2345678]|3[13]|29)|2\.1(?:14\.176|78\.69)|3\.149\.(?:4[45]|28|3)|1\.192\.211|7\.252\.243)|7(?:8\.(?:93\.(?:1(?:5[012]|7[67]|49)|22[167]|6[689])|138\.1(?:7[01]|68))|7\.(?:64\.1(?:1[789]?|21)|232\.142)|9\.106\.109)|9(?:1\.(?:193\.62|203\.67)|4\.99\.(?:119|30)|2\.39\.77)|6(?:1\.19\.6[567]|2\.61\.164))\.[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	1.8 0.8 1.8 0.8

Modified: spamassassin/trunk/rulesrc/sandbox/khopesh/20_spamdb_subjects.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/khopesh/20_spamdb_subjects.cf?rev=936600&r1=936599&r2=936600&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/khopesh/20_spamdb_subjects.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/khopesh/20_spamdb_subjects.cf Thu Apr 22 02:58:06 2010
@@ -1,6 +1,6 @@
 # Tests of suject data from Phil Tom's SPAMDB
 # (as compiled into rules by Adam Katz)
-# Last updated Wed Apr 21 02:57:05 UTC 2010
+# Last updated Thu Apr 22 02:58:20 UTC 2010
 
 header	 KHOP_SPAMDB_SUBJ Subject =~ m{(?-xism:^(?:(?:H(?:e(?:llo(?:. (?:long time did not communicate. please contact me. your beautiful Sonia|you have a nice picture in the dating site. would you mind to chat|my gentle sun. let's talk)| here. do you like girls from russia. I hope so :)|y - tell me your mobile - Katya from Russia)|i(?:. I(?:'m (?:from Russia - a dream to live abroad. my name is Mary. can we get started. .I'm on this dating site - come in to me|like blond and cute. can I talk with you)| like your picture in the dating site. Let's communicate)| sweety. Remember me)|ydrocodone(?: is available at your fingertips and many more|. Vicodin. Phentermin. 100 percent reliable ..)|ave (?:no more weight problems with Phentermin|Great Focus with Adderall)|undreds of profiles of Russian hotties|ow about Russian bride)|I(?: (?:am (?:your Russian pussy - you remember my nickname|Julia. 28 y.o. Russia .dating)|sexual Russian blonde. want to see. come closer|want you now. tell
  me reciprocate and get me|can do for you is - what can not no girl)|'ll (?:see you I really liked - let's get acquainted. I am from Russia|like you. Remember that night in the hotel)|f you are disappointed in its second half. bold. come in)|A(?:(?:ny designer knows that Quark XPress 8 for Mac is one of the best programs to create image|dderall is one of the best mental enhancer)s| (?:year ago you came to Russia. I remember you. write me|great tool for great focus. Adderall)|mbien. Soma. Phentermin. and more without a prescription )|F(?:ind (?:a (?:perfect (?:soul mate among the good-looking Russian women right her|Russian wif)|Russian wife her)|your Russian soul-mat|Oxycodone Her)e|ed up with overpriced pharmacy costs)|T(?:(?:he most beautiful Russian women are|rim some pounds. RxMedications) available here|ell me how you live. as a new wife. .Your Russian friend)|G(?:et (?:RxMeds online with 3 day UPS Shipping|Percocet(?: online|Today))|reat Deal on Phentermine here)|Phent
 ermin (?:is (?:availabl|her)e at your fingertips and many more|helps (?:get off the weigh|melt fa)t)|Lo(?:ts of decent Russian women to choose from|se_weight fast with Phentermin.|oking for Percocet)|1(?:000 singleladies from Russia are online now. have ineterst|1 new ladies profiles .dating)|(?:7 new messages from ladies for you .|9 ladies are online now .Russia. )dating|order hydrocodone online without prescription - cheap ..|Do you want me again. I love you madly I want|we sell Phentermin here).|You(?: (?:(?:remember that day at the beach. .I'll immediately noticed|are my good. my handsome - write me. I'm waiting|can buy Phentermin On-Line Today).|have (?:little joy in life. Lacks warmth and affection. Come to me.|new mail from Olga(?: 26 y.o. Russia. dating)?))|'re saying that you come to Russia - I've been expecting you like a fool. but you do not come.)|W(?:(?:ork with images easily using tools of Quark XPress 8 for Mac|ant to know what the real Russian girls love and 
 warmth|hy we stopped our communication. I expected more. Olga).|e have (?:brand name Phentermin available with trackable shipping.|Percocet available here))|R(?:ussian (?:(?:w(?:omen need a prince|ives are the best)|(?:beautie|queen)s are waiting|ladies for any taste).|dating site)|e(?:al Deal Phentermin available here.|plica Watches)|E: Home Warranty)|B(?:(?:e(?:autiful Russian women(?: waiting to meet YOU)?|come very focused with Adderall)|rand name Phentermin is available here).|uy Hydrocodone Online from a US Pharmacy)|M(?:ar(?:ia is online now. waiting for your reply. Russian dating|ry a gorgeous Russian girl.)|eet (?:and marry a gorgeous Russian queen|Russian women here).)|N(?:eed (?:Phentermin. Purchase meds here online|pain killers..Get them Here.)|oPRESCRIPTION for Hydrocodone Needed|atali Russia. updated her profile)|S(?:ave (?:up to 70% on (?:Life Insurance.|RxMedications)|huge on Hydrocodone.)|till single.look at my profile. Olga from Russia)|O(?:ne of the best p
 ain killers is here. Percocet.|xycodone is available here)|E(?:nhance your focus with Adderall.|xquisite Replica)|you have 6 unread messages from ladies|Julia sent new message for you|greatDeal on Percocet)$)}
 describe KHOP_SPAMDB_SUBJ Matches one of the SPAMDB top 100 spam subjects