Author: jm
Date: Wed Feb 18 18:45:11 2004
New Revision: 6754
Modified:
incubator/spamassassin/trunk/rules/20_phrases.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:
bug 2935: PENIS_ENLARGE rule name rephrased more diplomatically, fix by Rich Puhek
Modified: incubator/spamassassin/trunk/rules/20_phrases.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_phrases.cf (original)
+++ incubator/spamassassin/trunk/rules/20_phrases.cf Wed Feb 18 18:45:11 2004
@@ -285,11 +285,13 @@
# "inches", because that seems to be another typical word in the pattern.
# Feb 11 2003 jm: removed "PP" from pattern, since "pp. 234-237" is std usage
# in academic circles. I don't think the hit-rate will be affected. ;)
-body PENIS_ENLARGE /\b(?:enlarge|increase|grow|lengthen|larger\b|bigger\b|longer\b|thicker\b|\binches\b).{0,50}\b(?:penis|male organ|pee[ -]?pee|dick|sc?hlong|wh?anger|breast)/i
-describe PENIS_ENLARGE Information on getting larger penis/breasts
+# Feb 18 2004 rap: Changed rule name PENIS_ENLARGE to BODY_ENHANCEMENT. Some found the
+# old rule name offensive.
+body BODY_ENHANCEMENT /\b(?:enlarge|increase|grow|lengthen|larger\b|bigger\b|longer\b|thicker\b|\binches\b).{0,50}\b(?:penis|male organ|pee[ -]?pee|dick|sc?hlong|wh?anger|breast)/i
+describe BODY_ENHANCEMENT Information on growing body parts
-body PENIS_ENLARGE2 /\b(?:penis|male organ|pee[ -]?pee|dick|sc?hlong|wh?anger|breast).{0,50}\b(?:enlarge|increase|grow|lengthen|larger\b|bigger\b|longer\b|thicker\b|\binches\b)/i
-describe PENIS_ENLARGE2 Information on getting larger penis/breasts
+body BODY_ENHANCEMENT2 /\b(?:penis|male organ|pee[ -]?pee|dick|sc?hlong|wh?anger|breast).{0,50}\b(?:enlarge|increase|grow|lengthen|larger\b|bigger\b|longer\b|thicker\b|\binches\b)/i
+describe BODY_ENHANCEMENT2 Information on getting larger body parts
body IMPOTENCE /\b(?:impotence (?:problem|cure|solution)|Premature Ejaculation|erectile dysfunction)/i
describe IMPOTENCE Impotence cure
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 Wed Feb 18 18:45:11 2004
@@ -561,8 +561,8 @@
lang de describe REMOVAL_INSTRUCTIONS Anleitung zur Entfernung aus der Adressliste
lang de describe CANNOT_BE_SPAM Angeblich kann dies auf keinen Fall Spam sein...
lang de describe THIS_IS_AN_AD Nachricht sagt selbst, dass es sich um Werbung handelt.
-lang de describe PENIS_ENLARGE Informationen zur Penis-/Brustvergrößerung (1)
-lang de describe PENIS_ENLARGE2 Informationen zur Penis-/Brustvergrößerung (2)
+lang de describe BODY_ENHANCEMENT Informationen zur Penis-/Brustvergrößerung (1)
+lang de describe BODY_ENHANCEMENT2 Informationen zur Penis-/Brustvergrößerung (2)
lang de describe IMPOTENCE Beseitigt Impotenz
lang de describe WORK_AT_HOME Informationen über Heimarbeit (1)
lang de describe HOME_EMPLOYMENT Informationen über Heimarbeit (2)
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 Wed Feb 18 18:45:11 2004
@@ -653,8 +653,8 @@
lang fr describe OUR_STRICT_ANTI Mentionne leur "stricte antipathie" pour quelque chose
lang fr describe OVERWHELMING_GROWTH Mentionne leur "extraordinaire croissance"
lang fr describe PAY_SITE Pornographie probable - Site payant
-lang fr describe PENIS_ENLARGE Arnaque prétendant augmenter la taile de votre pénis
-lang fr describe PENIS_ENLARGE2 Arnaque prétendant augmenter la taile de votre pénis
+lang fr describe BODY_ENHANCEMENT Arnaque prétendant augmenter la taile de votre pénis
+lang fr describe BODY_ENHANCEMENT2 Arnaque prétendant augmenter la taile de votre pénis
lang fr describe PENNIES_A_DAY Contient la formule "for only pennies a day"
lang fr describe PHONE_CANCER Escroquerie à propos de "cancers provoqués par téléphones mobiles"
lang fr describe PLING_PLING Le sujet contient plusieurs points d'exclamation
Modified: incubator/spamassassin/trunk/rules/50_scores.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/50_scores.cf (original)
+++ incubator/spamassassin/trunk/rules/50_scores.cf Wed Feb 18 18:45:11 2004
@@ -397,8 +397,8 @@
score ORDER_NOW 0.358 0.282 0.001 0.346
score OUR_AFFILIATE_PARTNERS 2.900 2.800 2.217 0.053
score PAY_SITE 2.699 2.599 0.001 2.230
-score PENIS_ENLARGE 1.101 1.101 0.500 2.692
-score PENIS_ENLARGE2 0.500 0.590 0.001 0.501
+score BODY_ENHANCEMENT 1.101 1.101 0.500 2.692
+score BODY_ENHANCEMENT2 0.500 0.590 0.001 0.501
score PLING_PLING 1.047 1.325 1.157 0.650
score PLING_QUERY 0.014 0.238 0.001 0.001
score PORN_15 1.782 2.136 2.696 1.950
Date: Wed Feb 18 18:45:11 2004
New Revision: 6754
Modified:
incubator/spamassassin/trunk/rules/20_phrases.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:
bug 2935: PENIS_ENLARGE rule name rephrased more diplomatically, fix by Rich Puhek
Modified: incubator/spamassassin/trunk/rules/20_phrases.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_phrases.cf (original)
+++ incubator/spamassassin/trunk/rules/20_phrases.cf Wed Feb 18 18:45:11 2004
@@ -285,11 +285,13 @@
# "inches", because that seems to be another typical word in the pattern.
# Feb 11 2003 jm: removed "PP" from pattern, since "pp. 234-237" is std usage
# in academic circles. I don't think the hit-rate will be affected. ;)
-body PENIS_ENLARGE /\b(?:enlarge|increase|grow|lengthen|larger\b|bigger\b|longer\b|thicker\b|\binches\b).{0,50}\b(?:penis|male organ|pee[ -]?pee|dick|sc?hlong|wh?anger|breast)/i
-describe PENIS_ENLARGE Information on getting larger penis/breasts
+# Feb 18 2004 rap: Changed rule name PENIS_ENLARGE to BODY_ENHANCEMENT. Some found the
+# old rule name offensive.
+body BODY_ENHANCEMENT /\b(?:enlarge|increase|grow|lengthen|larger\b|bigger\b|longer\b|thicker\b|\binches\b).{0,50}\b(?:penis|male organ|pee[ -]?pee|dick|sc?hlong|wh?anger|breast)/i
+describe BODY_ENHANCEMENT Information on growing body parts
-body PENIS_ENLARGE2 /\b(?:penis|male organ|pee[ -]?pee|dick|sc?hlong|wh?anger|breast).{0,50}\b(?:enlarge|increase|grow|lengthen|larger\b|bigger\b|longer\b|thicker\b|\binches\b)/i
-describe PENIS_ENLARGE2 Information on getting larger penis/breasts
+body BODY_ENHANCEMENT2 /\b(?:penis|male organ|pee[ -]?pee|dick|sc?hlong|wh?anger|breast).{0,50}\b(?:enlarge|increase|grow|lengthen|larger\b|bigger\b|longer\b|thicker\b|\binches\b)/i
+describe BODY_ENHANCEMENT2 Information on getting larger body parts
body IMPOTENCE /\b(?:impotence (?:problem|cure|solution)|Premature Ejaculation|erectile dysfunction)/i
describe IMPOTENCE Impotence cure
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 Wed Feb 18 18:45:11 2004
@@ -561,8 +561,8 @@
lang de describe REMOVAL_INSTRUCTIONS Anleitung zur Entfernung aus der Adressliste
lang de describe CANNOT_BE_SPAM Angeblich kann dies auf keinen Fall Spam sein...
lang de describe THIS_IS_AN_AD Nachricht sagt selbst, dass es sich um Werbung handelt.
-lang de describe PENIS_ENLARGE Informationen zur Penis-/Brustvergrößerung (1)
-lang de describe PENIS_ENLARGE2 Informationen zur Penis-/Brustvergrößerung (2)
+lang de describe BODY_ENHANCEMENT Informationen zur Penis-/Brustvergrößerung (1)
+lang de describe BODY_ENHANCEMENT2 Informationen zur Penis-/Brustvergrößerung (2)
lang de describe IMPOTENCE Beseitigt Impotenz
lang de describe WORK_AT_HOME Informationen über Heimarbeit (1)
lang de describe HOME_EMPLOYMENT Informationen über Heimarbeit (2)
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 Wed Feb 18 18:45:11 2004
@@ -653,8 +653,8 @@
lang fr describe OUR_STRICT_ANTI Mentionne leur "stricte antipathie" pour quelque chose
lang fr describe OVERWHELMING_GROWTH Mentionne leur "extraordinaire croissance"
lang fr describe PAY_SITE Pornographie probable - Site payant
-lang fr describe PENIS_ENLARGE Arnaque prétendant augmenter la taile de votre pénis
-lang fr describe PENIS_ENLARGE2 Arnaque prétendant augmenter la taile de votre pénis
+lang fr describe BODY_ENHANCEMENT Arnaque prétendant augmenter la taile de votre pénis
+lang fr describe BODY_ENHANCEMENT2 Arnaque prétendant augmenter la taile de votre pénis
lang fr describe PENNIES_A_DAY Contient la formule "for only pennies a day"
lang fr describe PHONE_CANCER Escroquerie à propos de "cancers provoqués par téléphones mobiles"
lang fr describe PLING_PLING Le sujet contient plusieurs points d'exclamation
Modified: incubator/spamassassin/trunk/rules/50_scores.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/50_scores.cf (original)
+++ incubator/spamassassin/trunk/rules/50_scores.cf Wed Feb 18 18:45:11 2004
@@ -397,8 +397,8 @@
score ORDER_NOW 0.358 0.282 0.001 0.346
score OUR_AFFILIATE_PARTNERS 2.900 2.800 2.217 0.053
score PAY_SITE 2.699 2.599 0.001 2.230
-score PENIS_ENLARGE 1.101 1.101 0.500 2.692
-score PENIS_ENLARGE2 0.500 0.590 0.001 0.501
+score BODY_ENHANCEMENT 1.101 1.101 0.500 2.692
+score BODY_ENHANCEMENT2 0.500 0.590 0.001 0.501
score PLING_PLING 1.047 1.325 1.157 0.650
score PLING_QUERY 0.014 0.238 0.001 0.001
score PORN_15 1.782 2.136 2.696 1.950