You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2017/04/15 04:38:57 UTC
svn commit: r1791448 - in /spamassassin/branches/3.4: rules/ rulesrc/
rulesrc/sandbox/kmcgrail/
Author: sidney
Date: Sat Apr 15 04:38:56 2017
New Revision: 1791448
URL: http://svn.apache.org/viewvc?rev=1791448&view=rev
Log:
Merged from trunk - Bug 7192 moving MILLION_USD, NA_DOLLARS & US_DOLLARS to sandbox for ruleqa/promotion, etc. [from revision 1679253]
Added:
spamassassin/branches/3.4/rulesrc/sandbox/kmcgrail/20_rules_to_sandbox.cf
- copied unchanged from r1679253, spamassassin/trunk/rulesrc/sandbox/kmcgrail/20_rules_to_sandbox.cf
Modified:
spamassassin/branches/3.4/rules/20_phrases.cf (contents, props changed)
spamassassin/branches/3.4/rules/30_text_de.cf (contents, props changed)
spamassassin/branches/3.4/rules/30_text_fr.cf (contents, props changed)
spamassassin/branches/3.4/rules/30_text_nl.cf (contents, props changed)
spamassassin/branches/3.4/rules/30_text_pl.cf (contents, props changed)
spamassassin/branches/3.4/rules/30_text_pt_br.cf (contents, props changed)
spamassassin/branches/3.4/rules/50_scores.cf (contents, props changed)
spamassassin/branches/3.4/rulesrc/10_force_active.cf (contents, props changed)
Modified: spamassassin/branches/3.4/rules/20_phrases.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/rules/20_phrases.cf?rev=1791448&r1=1791447&r2=1791448&view=diff
==============================================================================
--- spamassassin/branches/3.4/rules/20_phrases.cf (original)
+++ spamassassin/branches/3.4/rules/20_phrases.cf Sat Apr 15 04:38:56 2017
@@ -82,15 +82,15 @@ describe IMPOTENCE Impotenc
-
-body NA_DOLLARS /\b(?:\d{1,3})?Million\b.{0,40}\b(?:Canadian Dollar?s?|US\$|U\.? ?S\.? Dollar)/i
-describe NA_DOLLARS Talks about a million North American dollars
-
-body US_DOLLARS_3 /(?:\$|usd).?\d{1,3}[,.]\d{3}[,.]\d{3}(?:[,.]\d\d)?/i
-describe US_DOLLARS_3 Mentions millions of $ ($NN,NNN,NNN.NN)
-
-body MILLION_USD /Million\b.{0,40}\b(?:United States? Dollars?|USD)/i
-describe MILLION_USD Talks about millions of dollars
+#MOVED TO 20_rules_to_sandbox.cf - kmcgrail 2015-05-14
+#body NA_DOLLARS /\b(?:\d{1,3})?Million\b.{0,40}\b(?:Canadian Dollar?s?|US\$|U\.? ?S\.? Dollar)/i
+#describe NA_DOLLARS Talks about a million North American dollars
+#
+#body US_DOLLARS_3 /(?:\$|usd).?\d{1,3}[,.]\d{3}[,.]\d{3}(?:[,.]\d\d)?/i
+#describe US_DOLLARS_3 Mentions millions of $ ($NN,NNN,NNN.NN)
+#
+#body MILLION_USD /Million\b.{0,40}\b(?:United States? Dollars?|USD)/i
+#describe MILLION_USD Talks about millions of dollars
Propchange: spamassassin/branches/3.4/rules/20_phrases.cf
------------------------------------------------------------------------------
svn:mergeinfo = /spamassassin/trunk/rules/20_phrases.cf:1679253
Modified: spamassassin/branches/3.4/rules/30_text_de.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/rules/30_text_de.cf?rev=1791448&r1=1791447&r2=1791448&view=diff
==============================================================================
--- spamassassin/branches/3.4/rules/30_text_de.cf (original)
+++ spamassassin/branches/3.4/rules/30_text_de.cf Sat Apr 15 04:38:56 2017
@@ -259,9 +259,9 @@ lang de describe PREST_NON_ACCREDITED Ka
lang de describe BODY_ENHANCEMENT Informationen zur Penis-/Brustvergr��erung
lang de describe BODY_ENHANCEMENT2 Informationen zur Penis-/Brustvergr��erung
lang de describe IMPOTENCE Beseitigt Impotenz
-lang de describe NA_DOLLARS Handelt von einer Million Dollar aus den US oder Kanada
-lang de describe US_DOLLARS_3 Erw�hnt Millonen von Dollar
-lang de describe MILLION_USD Erw�hnt Millonen von Dollar
+#lang de describe NA_DOLLARS Handelt von einer Million Dollar aus den US oder Kanada
+#lang de describe US_DOLLARS_3 Erw�hnt Millonen von Dollar
+#lang de describe MILLION_USD Erw�hnt Millonen von Dollar
lang de describe URG_BIZ Dringende Gesch�fte
lang de describe MONEY_BACK Mit Geld-zur�ck Garantie
lang de describe FREE_QUOTE_INSTANT Kostenlos ein schnelles Preisangebot, ohne Verpflichtung
Propchange: spamassassin/branches/3.4/rules/30_text_de.cf
------------------------------------------------------------------------------
svn:mergeinfo = /spamassassin/trunk/rules/30_text_de.cf:1679253
Modified: spamassassin/branches/3.4/rules/30_text_fr.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/rules/30_text_fr.cf?rev=1791448&r1=1791447&r2=1791448&view=diff
==============================================================================
--- spamassassin/branches/3.4/rules/30_text_fr.cf (original)
+++ spamassassin/branches/3.4/rules/30_text_fr.cf Sat Apr 15 04:38:56 2017
@@ -175,7 +175,7 @@ lang fr describe LIVE_PORN
lang fr describe SUBJECT_DIET Le sujet parle de perte de poids
lang fr describe LOW_PRICE Contient "Lowest Price" (le prix le plus bas)
lang fr describe MARKETING_PARTNERS Pr�tend que vous vous �tes enregistr� aupr�s d'un "partenaire" quelconque
-lang fr describe MILLION_USD Phrase cl� d'escroquerie nig�rienne (millions of dollars)
+#lang fr describe MILLION_USD Phrase cl� d'escroquerie nig�rienne (millions of dollars)
lang fr describe __MIME_BASE64 Inclut un attachement en BASE64
lang fr describe MIME_BASE64_BLANKS Ligne blanches surnum�raires dans l'encodage BASE64
lang fr describe MIME_BASE64_TEXT Texte du message camoufl� par encodage en BASE64
@@ -193,7 +193,7 @@ lang fr describe MONEY_BACK Vous garant
lang fr describe MSGID_FROM_MTA_HEADER Message-ID ajout� par un relais
lang fr describe MSGID_OUTLOOK_INVALID Message-ID falsifi� (fortmat Outlook Express)
lang fr describe MULTI_FORGED les en-t�tes "Received" montrent de nombreuses falsifications
-lang fr describe NA_DOLLARS Parle d'un million de dollars "nord-am�ricains"
+#lang fr describe NA_DOLLARS Parle d'un million de dollars "nord-am�ricains"
lang fr describe NONEXISTENT_CHARSET Message r�dig� dans un jeu de caract�res inexistant
lang fr describe NOT_ADVISOR Contient "Not registered investment advisor"
lang fr describe NO_DNS_FOR_FROM Adresse From: inconnue en DNS (pas d'enregistrement MX)
@@ -253,7 +253,7 @@ lang fr describe USER_IN_DEF_WHITELIST E
lang fr describe USER_IN_MORE_SPAM_TO Destinataire sur la liste "more_spam_to" (config SA locale)
lang fr describe USER_IN_WHITELIST Exp�diteur sur la liste blanche (OK) (config SA locale)
lang fr describe USER_IN_WHITELIST_TO Destinataire sur la liste blanche (config SA)
-lang fr describe US_DOLLARS_3 Escroq. nig�rienne, version modifi�e, phrase cl� ($NN,NNN,NNN.NN)
+#lang fr describe US_DOLLARS_3 Escroq. nig�rienne, version modifi�e, phrase cl� ($NN,NNN,NNN.NN)
lang fr describe DRUG_ED_ONLINE Vente de Viagra par correspondance
lang fr describe WEIRD_PORT Lien HTTP vers un num�ro de port non standard
lang fr describe WEIRD_QUOTING Utilisation �trange de symboles de citations
Propchange: spamassassin/branches/3.4/rules/30_text_fr.cf
------------------------------------------------------------------------------
svn:mergeinfo = /spamassassin/trunk/rules/30_text_fr.cf:1679253
Modified: spamassassin/branches/3.4/rules/30_text_nl.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/rules/30_text_nl.cf?rev=1791448&r1=1791447&r2=1791448&view=diff
==============================================================================
--- spamassassin/branches/3.4/rules/30_text_nl.cf (original)
+++ spamassassin/branches/3.4/rules/30_text_nl.cf Sat Apr 15 04:38:56 2017
@@ -189,9 +189,9 @@ lang nl describe PREST_NON_ACCREDITED
lang nl describe BODY_ENHANCEMENT Informatie over het vergroten van lichaamsdelen
lang nl describe BODY_ENHANCEMENT2 Informatie over het vergroten van lichaamsdelen
lang nl describe IMPOTENCE Medicijn voor impotentie
-lang nl describe NA_DOLLARS Praat over een miljoen Noord-Amerikaanse dollars
-lang nl describe US_DOLLARS_3 Vermeldt miljoenen $ ($NN,NNN,NNN.NN)
-lang nl describe MILLION_USD Heeft het over miljoenen dollars
+#lang nl describe NA_DOLLARS Praat over een miljoen Noord-Amerikaanse dollars
+#lang nl describe US_DOLLARS_3 Vermeldt miljoenen $ ($NN,NNN,NNN.NN)
+#lang nl describe MILLION_USD Heeft het over miljoenen dollars
lang nl describe MONEY_BACK Niet-goed-geld-terug garantie
lang nl describe FREE_QUOTE_INSTANT Gratis offerte
lang nl describe BAD_CREDIT Los al uw leningen op
Propchange: spamassassin/branches/3.4/rules/30_text_nl.cf
------------------------------------------------------------------------------
svn:mergeinfo = /spamassassin/trunk/rules/30_text_nl.cf:1679253
Modified: spamassassin/branches/3.4/rules/30_text_pl.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/rules/30_text_pl.cf?rev=1791448&r1=1791447&r2=1791448&view=diff
==============================================================================
--- spamassassin/branches/3.4/rules/30_text_pl.cf (original)
+++ spamassassin/branches/3.4/rules/30_text_pl.cf Sat Apr 15 04:38:56 2017
@@ -162,7 +162,7 @@ lang pl describe KOREAN_UCE_SUBJECT Tema
lang pl describe LIVE_PORN Prawdopodobnie porno - Porno na �ywo
lang pl describe LOW_PRICE Najni�sza cena
lang pl describe MARKETING_PARTNERS Twierdzi, �e jeste� zarejestrowany jako partner
-lang pl describe MILLION_USD O milionach dolar�w
+#lang pl describe MILLION_USD O milionach dolar�w
lang pl describe MIME_BASE64_BLANKS Dodatkowe puste linie kodowane w Base64
lang pl describe MIME_BASE64_TEXT Tekst wiadomo�ci zakamuflowany przy u�yciu kodowania Base64
lang pl describe __MIME_BASE64 Zawiera za��cznik kodowany w Base64
@@ -180,7 +180,7 @@ lang pl describe MONEY_BACK Gwarancja z
lang pl describe MSGID_FROM_MTA_HEADER Message-Id zosta� dodany przez relay
lang pl describe MSGID_OUTLOOK_INVALID Sfa�szowany Message-Id (w formacie Outlook Express)
lang pl describe MULTI_FORGED Nag��wki Received: wykazuj� wielokrotne fa�szowanie
-lang pl describe NA_DOLLARS O milionie P�nocno Ameryka�skich dolar�w
+#lang pl describe NA_DOLLARS O milionie P�nocno Ameryka�skich dolar�w
lang pl describe NO_DNS_FOR_FROM Domena w nag��wku Do: nie posiada wpisu w DNS (MX lub A)
lang pl describe NO_MEDICAL Bez bada� medycznych
lang pl describe NONEXISTENT_CHARSET Nieznany zestaw znak�w (j�zyk).
@@ -231,7 +231,7 @@ lang pl describe UNCLAIMED_MONEY (ludzie
lang pl describe UPPERCASE_50_75 Tre�� jest w 50-75% wielkimi literami
lang pl describe UPPERCASE_75_100 Tre�� jest w 75-100% wielkimi literami
lang pl describe URG_BIZ Pilna sprawa
-lang pl describe US_DOLLARS_3 Wspomina miliony $ ($NN,NNN,NNN.NN)
+#lang pl describe US_DOLLARS_3 Wspomina miliony $ ($NN,NNN,NNN.NN)
lang pl describe USER_IN_ALL_SPAM_TO U�ytkownik jest wymieniony w 'all_spam_to'
lang pl describe USER_IN_BLACKLIST Od: zawiera adres z Twojej "czarnej listy"
lang pl describe USER_IN_BLACKLIST_TO U�ytkownik jest wymieniony w 'blacklist_to'
Propchange: spamassassin/branches/3.4/rules/30_text_pl.cf
------------------------------------------------------------------------------
svn:mergeinfo = /spamassassin/trunk/rules/30_text_pl.cf:1679253
Modified: spamassassin/branches/3.4/rules/30_text_pt_br.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/rules/30_text_pt_br.cf?rev=1791448&r1=1791447&r2=1791448&view=diff
==============================================================================
--- spamassassin/branches/3.4/rules/30_text_pt_br.cf (original)
+++ spamassassin/branches/3.4/rules/30_text_pt_br.cf Sat Apr 15 04:38:56 2017
@@ -378,9 +378,9 @@ lang pt_BR describe PREST_NON_ACCREDITED
lang pt_BR describe BODY_ENHANCEMENT Informa��o sobre como aumentar partes do corpo
lang pt_BR describe BODY_ENHANCEMENT2 Informa��o sobre como aumentar partes do corpo
lang pt_BR describe IMPOTENCE Fala sobre cura da impot�ncia
-lang pt_BR describe NA_DOLLARS Fala sobre milh�es de d�lares norte americanos ou canadenses
-lang pt_BR describe US_DOLLARS_3 Cont�m $($NN,NNN,NNN.NN)
-lang pt_BR describe MILLION_USD Fala sobre milh�es de d�lares
+#lang pt_BR describe NA_DOLLARS Fala sobre milh�es de d�lares norte americanos ou canadenses
+#lang pt_BR describe US_DOLLARS_3 Cont�m $($NN,NNN,NNN.NN)
+#lang pt_BR describe MILLION_USD Fala sobre milh�es de d�lares
lang pt_BR describe URG_BIZ Cont�m: "urgent matter"
lang pt_BR describe MONEY_BACK Cont�m: "Money back guarantee"
lang pt_BR describe FREE_QUOTE_INSTANT Cont�m: "Free express or no-obligation quote"
Propchange: spamassassin/branches/3.4/rules/30_text_pt_br.cf
------------------------------------------------------------------------------
svn:mergeinfo = /spamassassin/trunk/rules/30_text_pt_br.cf:1679253
Modified: spamassassin/branches/3.4/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/rules/50_scores.cf?rev=1791448&r1=1791447&r2=1791448&view=diff
==============================================================================
--- spamassassin/branches/3.4/rules/50_scores.cf (original)
+++ spamassassin/branches/3.4/rules/50_scores.cf Sat Apr 15 04:38:56 2017
@@ -221,7 +221,7 @@ score L_SPAM_TOOL_13 0.539 0.485 0.494 1
score MALE_ENHANCE 3.100 3.099 3.099 0.851
score MARKETING_PARTNERS 0.553 0.235 0.689 0.001
score MID_DEGREES 0 # n=0 n=1 n=2 n=3
-score MILLION_USD 3.799 2.477 3.221 3.247
+#score MILLION_USD 3.799 2.477 3.221 3.247
score MIME_BOUND_DD_DIGITS 3.016 0.349 2.417 1.373
score MIME_BOUND_DIGITS_15 0.432 1.225 1.241 0.798
score MIME_BOUND_EQ_REL 0 # n=0 n=1 n=2 n=3
@@ -245,7 +245,7 @@ score MSGID_SPAM_LETTERS 0 # n=0 n=1 n=2
score MSGID_YAHOO_CAPS 0.797 1.413 2.278 1.411
score MSOE_MID_WRONG_CASE 0.993 3.373 0.960 2.584 # n=2
score MULTI_FORGED 0 # n=0 n=1 n=2 n=3
-score NA_DOLLARS 3.599
+#score NA_DOLLARS 3.599
score NONEXISTENT_CHARSET 0 # n=0 n=1 n=2 n=3
score NORMAL_HTTP_TO_IP 0.159 0.001 0.795 0.001
score NOT_ADVISOR 0 # n=0 n=1 n=2 n=3
@@ -373,7 +373,7 @@ score URI_NO_WWW_BIZ_CGI 2.399 2.399 2.4
score URI_NO_WWW_INFO_CGI 2.299 2.299 0.292 2.071
score URI_OBFU_WWW 3.099 3.099 2.306 2.475
score URI_UNSUBSCRIBE 0 # n=0 n=1 n=2 n=3
-score US_DOLLARS_3 2.599 2.523 1.780 1.754
+#score US_DOLLARS_3 2.599 2.523 1.780 1.754
score VIA_GAP_GRA 0 # n=0 n=1 n=2 n=3
score WEIRD_PORT 0.001 0.001 0.097 0.001
score WEIRD_QUOTING 0.001 0.001 0.001 0.001
Propchange: spamassassin/branches/3.4/rules/50_scores.cf
------------------------------------------------------------------------------
svn:mergeinfo = /spamassassin/trunk/rules/50_scores.cf:1679253
Modified: spamassassin/branches/3.4/rulesrc/10_force_active.cf
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/rulesrc/10_force_active.cf?rev=1791448&r1=1791447&r2=1791448&view=diff
==============================================================================
--- spamassassin/branches/3.4/rulesrc/10_force_active.cf (original)
+++ spamassassin/branches/3.4/rulesrc/10_force_active.cf Sat Apr 15 04:38:56 2017
@@ -348,7 +348,7 @@ publish MALE_ENHANCE
publish MARKETING_PARTNERS
publish MICROSOFT_EXECUTABLE
publish MID_DEGREES
-publish MILLION_USD
+#publish MILLION_USD
publish MIME_BAD_ISO_CHARSET
publish MIME_BASE64_BLANKS
publish MIME_BASE64_TEXT
@@ -387,7 +387,7 @@ publish MSGID_YAHOO_CAPS
publish MSOE_MID_WRONG_CASE
publish MULTI_FORGED
publish MULTIPART_ALT_NON_TEXT
-publish NA_DOLLARS
+#publish NA_DOLLARS
publish NML_ADSP_CUSTOM_HIGH
publish NML_ADSP_CUSTOM_LOW
publish NML_ADSP_CUSTOM_MED
@@ -641,7 +641,7 @@ publish URI_NO_WWW_INFO_CGI
publish URI_OBFU_WWW
publish URI_TRUNCATED
publish URI_UNSUBSCRIBE
-publish US_DOLLARS_3
+#publish US_DOLLARS_3
publish USER_IN_ALL_SPAM_TO
publish USER_IN_BLACKLIST
publish USER_IN_BLACKLIST_TO
Propchange: spamassassin/branches/3.4/rulesrc/10_force_active.cf
------------------------------------------------------------------------------
svn:mergeinfo = /spamassassin/trunk/rulesrc/10_force_active.cf:1679253