add more rules by blars from bts

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-listmaster/trunk/spamassassin_config@87 0b7a5b0c-1f2c-0410-bd74-c376f8064c91

diff --git a/common/misc_spam b/common/misc_spam
index f9af48095a1169f00e31258b3c05fb4c4aef4fa8..4ca4af566c6b810fe08eabf8d50a825653209f80 100644 (file)
--- a/common/misc_spam
+++ b/common/misc_spam
@@ -271,4 +271,8 @@ header XMSATT               X-MS-Has-Attach =~ /yes/i
 describe XMSATT                more pdf spam
 score XMSATT           2
 
+# blarson 2007-10-27
+body ICQ               /^icq\:/i
+describe ICQ           icq:
+score ICQ              2
 

diff --git a/common/phrase_spam b/common/phrase_spam
index f4e8c28c4cde0f6a70f9f04a1d4fbf1f1344867f..0d53bc9188860f22d0f179181ccbc6906356d1b9 100644 (file)
--- a/common/phrase_spam
+++ b/common/phrase_spam
@@ -348,7 +348,7 @@ describe ACRO8PR0   sales spam
 score ACRO8PR0         4       
 
 # blarson 2007-10-05
-body WBRS              /\b(WBRS|FPMC|ADYN|AFML|MISJ|HXPN|WHKA|CBFE|HSBC|PCAI|MPRG|HPRS|AUNI|TGVI|MHII|TAMG|GDKI|ACEN|CDYV|G7Q\.F|mbwc|CHFR|CDPN|DSDI|UTEV|P-S-U-D|GPSI|SGXI|CAON|SREA|ERMX|VPSN|SZSN|PAYI\.OB|LTDI|C\W\W?Y\W\W?T\W\W?V|E\WX\WM\WT|CYTV|VGPM|V\s?G\s?P\s?M(\.PK)?|wwng|WWNG|F\WD\WE\WG|FDEG|UTYW|M\s*I\s*H\s*I|O\W?N\W?C\W?O|P\W?P\W?Y\W?H|S\W?R\W?E\W?A|A\W?C\W?G\W?U|S\W?C\W?Y\W?F|C\W?H\W?V\W?C|D\W?M\W?X\W?C|F\W?R\W?L\W?E|M\W?A\W?K\W?U|C\W?W\W?T\W?E|F\W?R\W?L\W?E|M\W?X\W?X\W?R|P\W?R\W?T\W?H|A\W?L\W?L\W?U|C\W?W\W?T\W?D|T\W?A\W?D\W?F|D\W?M\W?H\W?N|C\W?A\W?O\W?N)\b/
+body WBRS              /\b(WBRS|FPMC|ADYN|AFML|MISJ|HXPN|WHKA|CBFE|HSBC|PCAI|MPRG|HPRS|AUNI|TGVI|MHII|TAMG|GDKI|ACEN|CDYV|G7Q\.F|mbwc|CHFR|CDPN|DSDI|UTEV|P-S-U-D|GPSI|SGXI|CAON|SREA|ERMX|VPSN|SZSN|PAYI\.OB|LTDI|C\W\W?Y\W\W?T\W\W?V|E\WX\WM\WT|CYTV|VGPM|V\s?G\s?P\s?M(\.PK)?|wwng|WWNG|F\WD\WE\WG|FDEG|UTYW|M\s*I\s*H\s*I|O\W?N\W?C\W?O|P\W?P\W?Y\W?H|S\W?R\W?E\W?A|A\W?C\W?G\W?U|S\W?C\W?Y\W?F|C\W?H\W?V\W?C|D\W?M\W?X\W?C|F\W?R\W?L\W?E|M\W?A\W?K\W?U|C\W?W\W?T\W?E|F\W?R\W?L\W?E|M\W?X\W?X\W?R|P\W?R\W?T\W?H|A\W?L\W?L\W?U|C\W?W\W?T\W?D|T\W?A\W?D\W?F|D\W?M\W?H\W?N|C\W?A\W?O\W?N|Cwtd)\b/
 describe WBRS          stock spam
 score WBRS             4
 
@@ -559,6 +559,31 @@ full STILLSINGLE   /\bstill\s+single\b/i
 describe STILLSINGLE   still single
 score STILLSINGLE      2
 
+# blarson 2007-10-26
+header PERSONALCRED    subject =~ /\bPersonal\s+Credit/i
+describe PERSONALCRED  Personal Credit
+score PERSONALCRED     2
+
+# blarson 2007-10-26
+body XMASGIFT          /\b(?:christ|x)mas gift\b/
+describe XMASGIFT      christmas gift
+score XMASGIFT         2
+
+# blarson 2007-10-26
+body RONPAUL           /\bRon Paul\b/
+describe RONPAUL       Ron Paul
+score RONPAUL          3
+
+# blarson 2007-10-27
+body YOURJOB           /your Job Verification Number/
+describe YOURJOB       your Job Verification Number
+score YOURJOB          3
+
+# blason 2007-10-28
+body PASTERESUME       /\bPASTE your resume\b/i
+describe PASTERESUME   PASTE your resume
+score PASTERESUME      3
+
 body LETHIHELO         /\{Let\:HI,Hi,Hello,hEllo,heLlo,helLo,hellO,HEllo\} how are you/
 describe LETHIHELO     Hello, how are you
 score LETHIHELO                4

diff --git a/common/url_spam b/common/url_spam
index 88ba64f1a239a3a85543c96ad702c3d6868fa767..2afdd4ee2c6be2f81e487b845cc9c9215106aab2 100644 (file)
--- a/common/url_spam
+++ b/common/url_spam
@@ -251,3 +251,18 @@ score BETWEENTO            4
 body MASZON            /mc?a(szon|yvidol|ttk)\.(com|org|net)/i
 describe MASZON                pron spam
 score MASZON           4
+
+# blarson 2007-10-26
+full GEOCITIES         /\bhttp\:\/\/geocities\.com\b/i
+describe GEOCITIES     http://geocities.com/
+score GEOCITIES                1
+
+# blarson 2007-10-27
+body GMAIL             /\@gmail\.com\b/i
+describe GMAIL         @gmail.com
+score GMAIL            1
+
+# blarson 2007-10-28
+body MAILRU            /\@mail\.ru\b/i
+describe MAILRU                @mail.ru
+score MAILRU           3

diff --git a/update_spamassassin b/update_spamassassin
index 1a8c41af509e62a5a3979f996ab623420c9ed5d5..41cf2bc1c958998ce6608e55db974da8f55cd9e4 100755 (executable)
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -52,10 +52,16 @@ function report_failure(){
     if [ -e "$SACONFIG/failed_update" ]; then
        exit 0;
     fi;
-    echo "$FAILURE_MESSAGE" >> "$SACONFIG/failed_update"
-    echo "$FAILURE_MESSAGE";
-    echo
-    echo "update_spamassassin will not report any additional errors until this is fixed"
+    echo "$FAILUREMESSAGE" >> "$SACONFIG/failed_update"
+    echo "$FAILUREMESSAGE";
+    cat - <<EOF;
+
+Update_spamassassin will not report any additional errors until this
+is fixed.
+
+Please fix the problem and then remove
+$SACONFIG/failed_update
+EOF
     exit 1;
 }