diff --git a/ipasserelle-base.spec b/ipasserelle-base.spec index deac7f0..eb65c2d 100644 --- a/ipasserelle-base.spec +++ b/ipasserelle-base.spec @@ -1,4 +1,4 @@ -%define version 0.2.32 +%define version 0.2.33 %define release 1 %define name ipasserelle-base @@ -47,6 +47,9 @@ Based on SMEServer, iPasserelle is a specially configured SME Server, with some additionnal modules %changelog +* Thu Sep 26 2013 Daniel Berteaud 0.2.33-1 +- Reduce a few spamassassin score, which were too agressive + * Wed Sep 25 2013 Daniel Berteaud 0.2.32-1 - Fix the purge-home-recycle script diff --git a/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/90SpamFr b/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/90SpamFr index 86f3394..3255ab6 100644 --- a/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/90SpamFr +++ b/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/90SpamFr @@ -52,17 +52,17 @@ score FR_ONLINEMEDS 2.5 ###### # Tell me why -body FR_REASON_SUBSCRIBE /\bVous recevez ce(t|tte)? (message|mail|m.+l|lettre|news.+) (car|parce que)\b/i +body FR_REASON_SUBSCRIBE /\bVous recevez ce(t|tte)? (message|mail|m.+l|lettre|news.+|information) (car|parce que)\b/i describe FR_REASON_SUBSCRIBE French: you subscribed to my spam. lang fr describe FR_REASON_SUBSCRIBE Indique pourquoi vous recevez le courrier. -score FR_REASON_SUBSCRIBE 1 +score FR_REASON_SUBSCRIBE 0.8 ##### # How to unsubscribe body FR_HOWTOUNSUBSCRIBE /\b(souhaitez|d.+sirez|pour).\{1,10\}(plus.\{1,\}recevoir|d.+sincrire|d.+sinscription|d.+sabonner).\{0,10\}(information|email|mail|mailing|newsletter|lettre|liste|message|offre|promotion|programme)(s)?\b/i describe FR_HOWTOUNSUBSCRIBE French: how to unsubscribe lang fr describe FR_HOWTOUNSUBSCRIBE Indique comment se desabonner. -score FR_HOWTOUNSUBSCRIBE 1.0 +score FR_HOWTOUNSUBSCRIBE 0.8 #### # Various "CRM" (Could Remove Me) diff --git a/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/91Scores b/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/91Scores index 4adb3fa..eca2851 100644 --- a/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/91Scores +++ b/root/etc/e-smith/templates/etc/mail/spamassassin/local.cf/91Scores @@ -1,16 +1,16 @@ # Ajustement de scores divers -score HTML_MESSAGE 0.3 +score HTML_MESSAGE 0.2 score DKIM_VALID 0.1 score DKIM_SIGNED 0.1 score SPF_PASS -0.001 score RP_MATCHES_RCVD -0.001 score DKIM_VALID_AU 0.1 -score T_KHOP_FOREIGN_CLICK 0.5 +score T_KHOP_FOREIGN_CLICK 0.4 score HTML_IMAGE_RATIO_02 1 score URIBL_BLACK 2.0 score SPF_FAIL 2 -score SPF_SOFTFAIL 1.5 -score MIME_QP_LONG_LINE 0.4 +score SPF_SOFTFAIL 1.0 +score MIME_QP_LONG_LINE 0.2 score FREEMAIL_FROM 0.3 score HTML_IMAGE_RATIO_06 0.4 score HTML_IMAGE_RATIO_04 0.4