You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/03/06 00:45:05 UTC

svn commit: rev 7023 - incubator/spamassassin/trunk/rules

Author: felicity
Date: Fri Mar  5 15:45:03 2004
New Revision: 7023

Modified:
   incubator/spamassassin/trunk/rules/20_phrases.cf
   incubator/spamassassin/trunk/rules/20_porn.cf
   incubator/spamassassin/trunk/rules/30_text_de.cf
   incubator/spamassassin/trunk/rules/30_text_fr.cf
   incubator/spamassassin/trunk/rules/50_scores.cf
Log:
fix more rule hitting itself issues...

Modified: incubator/spamassassin/trunk/rules/20_phrases.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_phrases.cf	(original)
+++ incubator/spamassassin/trunk/rules/20_phrases.cf	Fri Mar  5 15:45:03 2004
@@ -39,8 +39,8 @@
 body REMOVE_FROM_LIST		/to be removed from (?:the|my|our) (?:mailing|e.?mail|opt[ -]?in)? ?list/i
 describe REMOVE_FROM_LIST	To be removed from list
 
-body REMOVE_REMOVAL_1WORD	/remov\S{0,64}remov/i
-describe REMOVE_REMOVAL_1WORD	List removal information
+body MULTI_REMOVAL_1WORD	/remov\S{0,64}remov/i
+describe MULTI_REMOVAL_1WORD	List removal information
 
 # bug 1022: MGM_POSTCARD #2 original
 body REMOVE_POSTAL		/(?:Send(?:ing)? a (?:postal mail|postcard) to (?:Unsubscribe|Customer ?Service|remove)|unsubscribe by (?:postal mail|postcard))/i
@@ -438,8 +438,8 @@
 body BAD_CREDIT		        /\b(?:bad|poor|no\b|eliminate|repair|(?:re)?establish|damag).{0,10} (?:credit|debt)\b/i
 describe BAD_CREDIT		Eliminate Bad Credit
 
-body UNSECURED_CREDIT	        /\bunsecured.{0,10}(?:master ?card|visa|credit|loans|debt)\b/i
-describe UNSECURED_CREDIT	Unsecured Credit/Debt
+body NONSECURED_CREDIT	        /\bunsecured.{0,10}(?:master ?card|visa|credit|loans|debt)\b/i
+describe NONSECURED_CREDIT	Non-secured Credit/Debt
 
 body LOW_INTEREST	        /\blow.{0,20} interest rates?\b/i
 describe LOW_INTEREST		Lower Interest Rates
@@ -614,7 +614,7 @@
 describe FORWARD_LOOKING	Stock Disclaimer Statement
 
 body SATISFACTION		/\bsatisfaction .{0,9}g(?:ua|au)ranteed\b/i
-describe SATISFACTION		Satisfaction Guaranteed
+describe SATISFACTION		Mail guarantees satisfaction
 
 # Avoid an FP noted by NISHIJIMA Takanori: 'Japanese string sequence:
 # "Su" "Ku" "Na"  "I" "Ko" "Su" "To" "De" "Yo" "Ri" ...
@@ -785,8 +785,8 @@
 describe START_NOW_CAPS 	Talks about 'starting now' with capitals
 body WORRY_FREE                 /worry free/i
 describe WORRY_FREE             No Worries, Mate
-body INCREASE_SEX               /increased?.{0,9}(?:sex|stamina)/i
-describe INCREASE_SEX 		Talks about a bigger drive for sex
+body MORE_SEX               /increased?.{0,9}(?:sex|stamina)/i
+describe MORE_SEX 		Talks about a bigger drive for sex
 
 body BANG_GUARANTEE		/\bguaranteed?\!/i
 describe BANG_GUARANTEE		Something is emphatically guaranteed

Modified: incubator/spamassassin/trunk/rules/20_porn.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_porn.cf	(original)
+++ incubator/spamassassin/trunk/rules/20_porn.cf	Fri Mar  5 15:45:03 2004
@@ -42,8 +42,8 @@
 body CUM_SHOT                   /\bcum[ -]?shots?\b/i
 describe CUM_SHOT               Possible porn - Cum Shot
 
-body ALL_CAP_PORN               /\b(?:ORGY|FUCKING|FETISH|WEBCAM|VOYEUR|ANAL|CUM|SNATCH|COCK|CUNT|PORN)\b/
-describe ALL_CAP_PORN           Possible porn - in ALL CAPS
+body ALL_CAP_FOR_ADULTS         /\b(?:ORGY|FUCKING|FETISH|WEBCAM|VOYEUR|ANAL|CUM|SNATCH|COCK|CUNT|PORN)\b/
+describe ALL_CAP_FOR_ADULTS     Possible porn - in ALL CAPS
 
 body PAY_SITE                   /\bpay[ -]?sites?\b/i
 describe PAY_SITE               Possible porn - Pay Site
@@ -73,8 +73,8 @@
 body PORN_CELEBRITY		/\bceleb(?:rity|rities|s).{0,15}(?=[cenps])(?:sex|porn|pics|caught|nude|exposed|content)|\b(?=[fhns])(?:steamy|hot|nude|shocking|free|h[a\@]rdcore) celeb(?:rity|rities|s)/i
 describe PORN_CELEBRITY		Possible porn - Celebrity Porn
 
-body ADULT_SITE                 /\badult.{0,9}(?:entertainment|sites?|industry|only|business|membership)/i
-describe ADULT_SITE             Possible porn - Adult Web Sites
+body SOMETHING_FOR_ADULTS       /\badult.{0,9}(?:entertainment|sites?|industry|only|business|membership)/i
+describe SOMETHING_FOR_ADULTS   Possible porn - Adult Web Sites
 
 body MUST_BE_18                 /\bmust be (?:at least|over) 18\b/i
 describe MUST_BE_18             Possible porn - Must be 18

Modified: incubator/spamassassin/trunk/rules/30_text_de.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_de.cf	(original)
+++ incubator/spamassassin/trunk/rules/30_text_de.cf	Fri Mar  5 15:45:03 2004
@@ -448,7 +448,7 @@
 lang de describe SUBJ_REMOVE Anleitung zur Entfernung aus der Adressliste
 lang de describe REPLY_REMOVE_SUBJECT Anleitung zur Entfernung aus der Adressliste
 lang de describe REMOVE_FROM_LIST Anleitung zur Entfernung aus der Adressliste
-lang de describe REMOVE_REMOVAL_1WORD Anleitung zur Entfernung aus der Adressliste
+lang de describe MULTI_REMOVAL_1WORD Anleitung zur Entfernung aus der Adressliste
 lang de describe REMOVE_POSTAL Senden Sie Brief/Postkarte um aus der Liste entfernt zu werden...
 lang de describe CLICK_BELOW_CAPS Aufforderung zum Mausklick in Gro�buchstaben
 lang de describe CLICK_BELOW Aufforderung zum Mausklick
@@ -583,7 +583,7 @@
 lang de describe BANKRUPTCY Vermeiden Sie den Bankrott
 lang de describe ACCEPT_CREDIT_CARDS Kreditkarten werden akzeptiert
 lang de describe BAD_CREDIT Erw�hnt geplatzte Kredite oder Kreditw�rdigkeit
-lang de describe UNSECURED_CREDIT Erw�hnt ungesicherte Kredite
+lang de describe NONSECURED_CREDIT Erw�hnt ungesicherte Kredite
 lang de describe LOW_INTEREST niedrige Zinss�tze
 lang de describe COMPARE_RATES Vergleichen Sie die Raten/Geb�hren/Zinsen
 lang de describe SAVE_UP_TO Sparen Sie bis zu...
@@ -704,7 +704,7 @@
 lang de describe ACT_NOW_CAPS Reagieren Sie jetzt (in Gro�buchstaben)
 lang de describe START_NOW_CAPS Starten Sie jetzt (in Gro�buchstaben)
 lang de describe WORRY_FREE Seien Sie ohne Sorge
-lang de describe INCREASE_SEX Werden Sie sexuell aktiver
+lang de describe MORE_SEX Werden Sie sexuell aktiver
 lang de describe BANG_GUARANTEE Eine Garantie mit Ausrufezeichen
 lang de describe WE_HATE_SPAM2 Wir lehnen doch alle Spam ab...
 lang de describe UP_TO_OR_MORES Bis zu ... und mehr
@@ -720,7 +720,7 @@
 lang de describe BARELY_LEGAL Eventuell Pornowerbung: knapp im erlaubten Alter
 lang de describe MEGA_SITE Eventuell Pornowerbung: Mega-Pornos
 lang de describe CUM_SHOT Eventuell Pornowerbung: "cum shot"
-lang de describe ALL_CAP_PORN Eventuell Pornowerbung: Alles in Gro�buchstaben
+lang de describe ALL_CAP_FOR_ADULTS Eventuell Pornowerbung: Alles in Gro�buchstaben
 lang de describe PAY_SITE Eventuell Pornowerbung: Bezahlen Sie daf�r
 lang de describe SEX_FEST Eventuell Pornowerbung: Sexorgien
 lang de describe LIVE_PORN Eventuell Pornowerbung: Seien Sie live dabei
@@ -730,7 +730,7 @@
 lang de describe NASTY_GIRLS Eventuell Pornowerbung: Ungezogene M�dchen
 lang de describe AMATEUR_PORN Eventuell Pornowerbung: Amateurpornos
 lang de describe PORN_CELEBRITY Eventuell Pornowerbung: neugierig auf Prominente?
-lang de describe ADULT_SITE Eventuell Pornowerbung: Webseiten nur f�r Erwachsene
+lang de describe SOMETHING_FOR_ADULTS Eventuell Pornowerbung: Webseiten nur f�r Erwachsene
 lang de describe MUST_BE_18 Eventuell Pornowerbung: Sie m�ssen mindestens 18 sein
 lang de describe LESBIAN Eventuell Pornowerbung: Lesbischer Sex
 lang de describe PORN_15 Worte und Phrasen weisen auf Pornographie hin

Modified: incubator/spamassassin/trunk/rules/30_text_fr.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/30_text_fr.cf	(original)
+++ incubator/spamassassin/trunk/rules/30_text_fr.cf	Fri Mar  5 15:45:03 2004
@@ -97,10 +97,10 @@
 lang fr describe ADDR_FREE		L'adresse de l'exp�diteur contient le mot "FREE"
 lang fr describe ADDR_NUMS_AT_BIGSITE	Utilise une adresse ayant de nombreux chiffres, chez un gros F.S.I.
 lang fr describe ADDRESSES_ON_CD	Propose des adresses sur CD-Rom qui ne servent qu'aux spammeurs
-lang fr describe ADULT_SITE		Pornographie probable: "site pour adultes"
+lang fr describe SOMETHING_FOR_ADULTS	Pornographie probable: "site pour adultes"
 lang fr describe ADVERT_CODE		Le champ "Subject:" contient l'identificateur 'ADV' (publicit�)
 lang fr describe ADVERT_CODE2		Le sujet contient une marque de publicit�
-lang fr describe ALL_CAP_PORN		Possible pornographie, TOUT EN MAJUSCULES
+lang fr describe ALL_CAP_FOR_ADULTS	Possible pornographie, TOUT EN MAJUSCULES
 lang fr describe ALL_NATURAL		Offre un produit "100% naturel"
 lang fr describe AMATEUR_PORN		Pornographie probable: "amateur porn"
 lang fr describe AMAZING_STUFF		Contient "Amazing Stuff"
@@ -432,7 +432,7 @@
 lang fr describe IDENT_NOBODY		Un en-t�te Received comporte une cha�ne "IDENT:nobody"
 lang fr describe IMPOTENCE		Pr�tend permettre de combattre l'impuissance
 lang fr describe INCOME			Contient "Additional Income" (revenu additionnel)
-lang fr describe INCREASE_SEX 		Parle d'augmenter le d�sir sexuel
+lang fr describe MORE_SEX 		Parle d'augmenter le d�sir sexuel
 lang fr describe INITIAL_INVEST		Demande un investissement initial
 lang fr describe INSTANT_ACCESS         Pornographie probable - Propose un acc�s imm�diat
 lang fr describe INTL_DRIVERS_LICENSE	Parle de permis de conduire international
@@ -697,7 +697,7 @@
 lang fr describe REMOVE_FROM_LIST	Contient des instructions pour �tre "retir� de la liste"
 lang fr describe REMOVE_PAGE		Contient une URL pointant sur une page de nom "remove"
 lang fr describe REMOVE_POSTAL		Demande l'envoi d'un courrier papier pour �tre (soi-disant) retir� de la liste
-lang fr describe REMOVE_REMOVAL_1WORD	Contient des informations de d�sabonnement
+lang fr describe MULTI_REMOVAL_1WORD	Contient des informations de d�sabonnement
 lang fr describe REMOVE_SUBJ		Contient des instructions pour �tre "retir� de la liste"
 lang fr describe REPLY_REMOVE_SUBJECT	Contient des instructions pour �tre "retir� de la liste"
 lang fr describe REPLY_TO_EMPTY		Contient un en-t�te Reply-To: vide
@@ -776,7 +776,7 @@
 lang fr describe UNDER_BILL_1618	Pr�tend �tre conforme � l'arr�t� anti-spam U.S. Senate Bill 1618
 lang fr describe UNDISC_RECIPS		Le champ To: contient une adresse "Undisclosed-Recipients:" valide
 lang fr describe UNIVERSITY_DIPLOMAS	Propose des dipl�mes universitaires bidons
-lang fr describe UNSECURED_CREDIT	Contient "Unsecured Credit/Debt"
+lang fr describe NONSECURED_CREDIT	Contient "Non-secured Credit/Debt"
 lang fr describe UNSUB_PAGE		Contient un lien vers une page web appel�e "unsubscribe"
 lang fr describe UNSUB_SCRIPT		Contient un lien vers un script CGI appel� "unsubscribe"
 lang fr describe UNWANTED_LANGUAGE_BODY	Message dans une langue non d�sir�e (config locale)

Modified: incubator/spamassassin/trunk/rules/50_scores.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/50_scores.cf	(original)
+++ incubator/spamassassin/trunk/rules/50_scores.cf	Fri Mar  5 15:45:03 2004
@@ -103,8 +103,8 @@
 score ACT_NOW_CAPS 0.545 1.343 0.001 0.699
 score ADDR_FREE 1.506 1.804 2.596 2.599
 score ADDR_NUMS_AT_BIGSITE 1.044 0.724 1.087 2.699
-score ADULT_SITE 0.226 0.242 0.001 2.299
-score ALL_CAP_PORN 0.650 0.669 0.001 0.001
+score SOMETHING_FOR_ADULTS 0.226 0.242 0.001 2.299
+score ALL_CAP_FOR_ADULTS 0.650 0.669 0.001 0.001
 score ALL_NATURAL 0.661 1.325 1.001 2.402
 score AMAZING_STUFF 2.008 2.596 1.279 1.854
 score AOL_USERS_LINK 1.700 1.497 1.338 2.299
@@ -291,7 +291,7 @@
 score HTTP_EXCESSIVE_ESCAPES 0.153 0.748 0.502 0.777
 score HTTP_WITH_EMAIL_IN_URL 0.569 0.156 0.249 0.200
 score IMPOTENCE 3.415 4.243 1.000 1.327
-score INCREASE_SEX 1.784 1.856 1.595 1.730
+score MORE_SEX 1.784 1.856 1.595 1.730
 score INITIAL_INVEST 2.799 2.797 0.001 1.504
 score INVALID_DATE 0.042 0.001 0.001 0.001
 score INVALID_DATE_TZ_ABSURD 1.746 1.737 1.749 1.779
@@ -398,7 +398,7 @@
 score REMOVAL_INSTRUCTIONS 0.870 0.692 0.959 2.599
 score REMOVE_FROM_LIST 0.166 0.001 0.001 0.001
 score REMOVE_PAGE 1.052 0.822 1.189 0.501
-score REMOVE_REMOVAL_1WORD 1.101 1.100 0.500 1.891
+score MULTI_REMOVAL_1WORD 1.101 1.100 0.500 1.891
 score REMOVE_SUBJ 0.343 0.054 0.001 0.355
 score REPLY_REMOVE_SUBJECT 0.412 0.757 1.432 2.097
 score REPLY_TO_EMPTY 0.065 0.888 1.663 2.599
@@ -441,7 +441,7 @@
 score TO_MALFORMED 0.345 0.274 0.907 0.640
 score TRACKER_ID 2.528 3.527 3.261 3.784
 score UNCLAIMED_MONEY 1.056 1.897 0.001 0.001
-score UNSECURED_CREDIT 0.761 2.299 0.001 1.461
+score NONSECURED_CREDIT 0.761 2.299 0.001 1.461
 score UNSUB_SCRIPT 0.865 0.691 1.156 1.999
 score UPPERCASE_25_50 0.691 0.261 0.001 0.001
 score UPPERCASE_50_75 0.794 1.137 0.001 0.001