From: Don Armstrong Date: Mon, 12 Nov 2007 05:14:22 +0000 (+0000) Subject: even more changes from blars X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=commitdiff_plain;h=86668f97d485012630c4028ca4440cb470e0ca33 even more changes from blars git-svn-id: svn+ssh://svn.debian.org/svn/pkg-listmaster/trunk/spamassassin_config@93 0b7a5b0c-1f2c-0410-bd74-c376f8064c91 --- diff --git a/common/drug_spam b/common/drug_spam index 484139b..b1564ef 100644 --- a/common/drug_spam +++ b/common/drug_spam @@ -247,3 +247,8 @@ score HGH 2 body BRACKVIAG /\b\[V(?:\]\w\[)?I(?:\]\w\[)?A(?:\]\w\[)?G(?:\]\w\[)?R(?:]\w\[)?A\]\b/i describe BRACKVIAG [viagra] score BRACKVIAG 4 + +# blarson 2007-11-09 +header PHARMORD subject =~ /\bPharmacy\b.*\border\b/i +describe PHARMORD Pharmacy order +score PHARMORD 4 diff --git a/common/phrase_spam b/common/phrase_spam index da9786e..1f12e72 100644 --- a/common/phrase_spam +++ b/common/phrase_spam @@ -80,7 +80,7 @@ describe AFFILIATEID affiliate id score AFFILIATEID 3 # blarson 2007-07-13 -header REFWD subject =~ /\b(?:RE|FWD?)\:\s*$/i +header REFWD subject =~ /\b(?:RE|FWD?|AW)(?:\[\d+\])?\:\s*$/i describe REFWD re or fwd nothing score REFWD 3.5 @@ -343,7 +343,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|Cwtd|N\W?C\W?S\W?H)\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|N\W?C\W?S\W?H|F\W?R\W?L\W?E|M\W?A\W?K\W?U)\b/ describe WBRS stock spam score WBRS 4 @@ -632,3 +632,13 @@ score REPRESENT 2 header NOFEE subject =~ /\bNo\s+fee\b/i describe NOFEE No fee score NOFEE 2 + +# blarson 2007-11-07 +body NEEDED /\b(?:manager|executive)\b.*\bneeded\b/i +describe NEEDED manager needed +score NEEDED 2 + +# blarson 2007-11-10 +body CRETPROF /\b(?:creative|perceptive)\b.*\bprofessionals?\b/i +describe CRETPROF creative and perceptive professionals +score CRETPROF 2 diff --git a/common/url_spam b/common/url_spam index 6272733..a97943e 100644 --- a/common/url_spam +++ b/common/url_spam @@ -179,7 +179,7 @@ tflags URIBL_SBL net score URIBL_SBL 3.5 # blarson 2007-09-17 -body MYCHEAP /\b(?:my)?cheap(?:xp|adobe)?(?:oem|soft)(?:now|ware)?(?:(?:4|for)?less)?\s*\.\s*com\b/i +body MYCHEAP /\b(?:my)?cheap(?:xp|adobe)?(?:oem|soft)(?:now|ware)?(?:(?:4|for)?less)?\d*\s*\.\s*com\b/i describe MYCHEAP software spam score MYCHEAP 4 diff --git a/update_spamassassin b/update_spamassassin index 2200421..3b25d6a 100755 --- a/update_spamassassin +++ b/update_spamassassin @@ -75,14 +75,14 @@ if svn status |grep -q '^C'; then fi; cd - >/dev/null 2>&1 -FAILUREMESSAGE="$(spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint)" -if [ "$?" != "0" ]; then - FAILUREMESSAGE="$(echo -e 'spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n')$FAILUREMESSAGE"; +if ! spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_lint 2>&1; then + FAILUREMESSAGE="$(echo -e 'spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n'| cat - $TMPDIR/sa_lint)"; report_failure fi; mv "$SACONFIG" "$BAKDIR/spamassassin_config_r$ORIGREV" mv "$TMPDIR/spamassassin_config" "$SACONFIG" trap ERR +remove_pidfile rm -rf "$TMPDIR" if [ "$HOSTNAME" == "rietz" ]; then @@ -95,4 +95,4 @@ else fi; -exit 0; \ No newline at end of file +exit 0;