diff options
-rw-r--r-- | mail/spamass-rules/Makefile | 20 | ||||
-rw-r--r-- | mail/spamass-rules/distinfo | 6 |
2 files changed, 12 insertions, 14 deletions
diff --git a/mail/spamass-rules/Makefile b/mail/spamass-rules/Makefile index 475a61d53616..bc113cb84932 100644 --- a/mail/spamass-rules/Makefile +++ b/mail/spamass-rules/Makefile @@ -6,7 +6,7 @@ # PORTNAME= spamass-rules -PORTVERSION= 20060203 +PORTVERSION= 20060926 CATEGORIES= mail MASTER_SITES= http://www.ranner.jawa.at/stuff/ @@ -17,7 +17,6 @@ RUN_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin OPTIONS= AHBL "Check AHBL Blacklist" off \ AIRMAX "Some custom rulesets" off \ - ANTIDRUG "Already included in SA 3.0" off \ BACKHAIR "Catch those ugly, unsightly HTML tags" on \ BOGUS_VIRUS "Catch 'collateral spam' caused by viruses" on \ BRAZILIAN "Catches spam written in Portuguese" off \ @@ -35,6 +34,7 @@ OPTIONS= AHBL "Check AHBL Blacklist" off \ SARE2 "Installs more cpu intensive SARE rules" off \ SARE3 "Installs aggressive SARE rules" off \ SAREH "Installs SARE high risk rules" off \ + SAREW "Installs SARE whitelist rules" off \ TRIPWIRE "Matches 3 chars that shouldn't be together" off \ WEEDS "Looks at alphanum, hex, lower-, uppercase chars" on \ WEEDS2 "More restrictive than WEEDS, dont use together" off @@ -56,10 +56,6 @@ SPAMASS_FILES+= 20_dnsbl_ahbl.cf SPAMASS_FILES+= airmax.cf .endif -.if defined(WITH_ANTIDRUG) -SPAMASS_FILES+= antidrug.cf -.endif - .if !defined(WITHOUT_BACKHAIR) SPAMASS_FILES+= backhair.cf .endif @@ -92,9 +88,7 @@ SPAMASS_FILES+= french_rules.cf .endif .if defined(WITH_GERMAN) -.for i in 24_de_wiki_BODY.cf 24_de_wiki_HEADER.cf 24_de_wiki_URI.cf -SPAMASS_FILES+= $i -.endfor +SPAMASS_FILES+= 70_zmi_german.cf .endif .if defined(WITH_MANGLED) @@ -116,7 +110,7 @@ SPAMASS_FILES+= blacklist_ro.cf .if !defined(WITHOUT_SARE) .for i in 70_sare_adult.cf 70_sare_bayes_poison_nxm.cf 70_sare_header0.cf \ 70_sare_html0.cf 70_sare_genlsubj0.cf 70_sare_oem.cf 70_sare_obfu0.cf \ - 70_sare_random.cf 70_sare_specific.cf 70_sare_spoof.cf \ + 70_sare_random.cf 70_sare_specific.cf 70_sare_spoof.cf 70_sare_stocks.cf \ 70_sare_unsub.cf 70_sare_uri0.cf 72_sare_redirect_post3.0.0.cf \ 72_sare_bml_post25x.cf 99_sare_fraud_post25x.cf SPAMASS_FILES+= $i @@ -130,7 +124,7 @@ SPAMASS_FILES+= $i .endif .if defined(WITH_SARE2) -.for i in 70_sare_header2.cf 70_sare_html2.cf 70_sare_genlsubj2.cf 70_sare_obfu2.cf +.for i in 70_sare_header2.cf 70_sare_html2.cf 70_sare_genlsubj2.cf 70_sare_obfu2.cf 70_sare_uri2.cf SPAMASS_FILES+= $i .endfor .endif @@ -145,6 +139,10 @@ SPAMASS_FILES+= $i SPAMASS_FILES+= 70_sare_highrisk.cf .endif +.if defined(WITH_SAREW) +SPAMASS_FILES+= 70_sare_whitelist.cf +.endif + .if defined(WITH_TRIPWIRE) SPAMASS_FILES+= 99_FVGT_Tripwire.cf .endif diff --git a/mail/spamass-rules/distinfo b/mail/spamass-rules/distinfo index 9aa4fc5bfdf2..440607f681e5 100644 --- a/mail/spamass-rules/distinfo +++ b/mail/spamass-rules/distinfo @@ -1,3 +1,3 @@ -MD5 (spamass-rules-20060203.tar.bz2) = afaeab3690e8e795550179aa142c5864 -SHA256 (spamass-rules-20060203.tar.bz2) = e1c6cb8b29a0ea4609c1d7820f1e0b8c46e39d88699a641d740e9d0b8a997593 -SIZE (spamass-rules-20060203.tar.bz2) = 243848 +MD5 (spamass-rules-20060926.tar.bz2) = 539a2d7541090641d42453fb2ea8e1f2 +SHA256 (spamass-rules-20060926.tar.bz2) = 7ba409455d20bdf2f035dab655df9d1ae9856ec022731e2b2068d925616089fa +SIZE (spamass-rules-20060926.tar.bz2) = 297485 |