From b53b2da9f6854a9e093c347247b5eeb0334be6ec Mon Sep 17 00:00:00 2001 From: Dinko Korunic Date: Sat, 2 Apr 2011 19:24:36 +0200 Subject: [PATCH] - upgrade paketa za Debian Squeeze - prilagodba promjenama u amavisd-cn za Squeeze - paljenje AWL mogucnosti (koja je u 3.1 verzijama bila tipicno upaljena) - novo CN_SPAM4 lokalno pravilo - ispravke raznih manjih Lintian gresaka --- 99_carnet.cf | 12 +++++++++--- README.CARNet | 2 +- debian/changelog | 10 ++++++++++ debian/compat | 2 +- debian/control | 6 +++--- debian/postinst | 18 +++++++++++++++++- debian/templates | 8 ++++---- 7 files changed, 45 insertions(+), 13 deletions(-) diff --git a/99_carnet.cf b/99_carnet.cf index 52dcafb..c0fd49e 100644 --- a/99_carnet.cf +++ b/99_carnet.cf @@ -2,7 +2,7 @@ header __CN_PHISH1_SUB Subject =~ /^Confirm your email identity/i body __CN_PHISH1_BODY /Confirm your email identity below/i body __CN_PHISH1_CODE /Warning Code:[a-zA-Z0-9]+/ body __CN_PHISH1_CODE2 /network system with error code [a-zA-Z0-9]+/ -meta CN_PHISH1 (__CN_PHISH1_SUB && __CN_PHISH1_BODY && __CN_PHISH1_CODE && __CN_PHISH1_CODE2) +meta CN_PHISH1 __CN_PHISH1_SUB && __CN_PHISH1_BODY && __CN_PHISH1_CODE && __CN_PHISH1_CODE2 score CN_PHISH1 10.0 describe CN_PHISH1 CARNet-Debian phish signature 1 @@ -10,7 +10,7 @@ header __CN_PHISH2_SUB Subject =~ /^Message from/i body __CN_PHISH2_BODY /account update our account/i body __CN_PHISH2_BODY2 /authomatically spam free/i body __CN_PHISH2_CODE /error code [a-zA-Z0-9]+/i -meta CN_PHISH2 (__CN_PHISH2_SUB && __CN_PHISH2_BODY && __CN_PHISH2_BODY2 && __CN_PHISH2_CODE) +meta CN_PHISH2 __CN_PHISH2_SUB && __CN_PHISH2_BODY && __CN_PHISH2_BODY2 && __CN_PHISH2_CODE score CN_PHISH2 10.0 describe CN_PHISH2 CARNet-Debian phish signature 2 @@ -18,6 +18,12 @@ header __CN_PHISH3_SUB Subject =~ /^Dear.*Account.*User/i body __CN_PHISH3_BODY /Internet Webmail message center/i body __CN_PHISH3_BODY2 /You are advice to verify/i body __CN_PHISH3_BODY3 /lose his or her account permanently/i -meta CN_PHISH3 (__CN_PHISH3_SUB && __CN_PHISH3_BODY && __CN_PHISH3_BODY2 && __CN_PHISH3_BODY3) +meta CN_PHISH3 __CN_PHISH3_SUB && __CN_PHISH3_BODY && __CN_PHISH3_BODY2 && __CN_PHISH3_BODY3 score CN_PHISH3 10.0 describe CN_PHISH3 CARNet-Debian phish signature 3 + +header __CN_SPAM4_SUB Received =~ /CommuniGate Pro SMTP/i +body __CN_SPAM4_CODE /westeur-consult\.com/ +meta CN_SPAM4 __CN_SPAM4_SUB && __CN_SPAM4_CODE +score CN_SPAM4 10.0 +describe CN_SPAM4 CARNet-Debian spam signature 4 diff --git a/README.CARNet b/README.CARNet index 46e9c0e..beb7d7c 100644 --- a/README.CARNet +++ b/README.CARNet @@ -18,4 +18,4 @@ timeoutaju i time ne predstavljaju ozbiljan izbor za klasifikaciju, Takodjer se standardno ne omogucuje ni SpamAssassin daemon odnosno spamd, buduci da je na instalacijama sa Amavis posluziteljem suvisan. - -- Dinko Korunic Mon, 13 Apr 2009 12:17:38 +0200 + -- Dinko Korunic Sat, 02 Apr 2011 16:42:59 +0200 diff --git a/debian/changelog b/debian/changelog index a390675..73f7767 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +spamassassin-cn (2:3.3.1-1) stable; urgency=low + + * upgrade paketa za Debian Squeeze + * prilagodba promjenama u amavisd-cn za Squeeze + * paljenje AWL mogucnosti (koja je u 3.1 verzijama bila tipicno upaljena) + * novo CN_SPAM4 lokalno pravilo + * ispravke raznih manjih Lintian gresaka + + -- Dinko Korunic Sat, 02 Apr 2011 19:24:09 +0200 + spamassassin-cn (2:3.2.5-7lenny1) stable; urgency=low * Upgrade paketa za Lenny diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index a95ae82..22f074b 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Source: spamassassin-cn Section: mail Priority: optional Maintainer: Dinko Korunic -Build-Depends: debhelper (>= 4) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 7) +Standards-Version: 3.9.1 Package: spamassassin-cn Architecture: all -Depends: spamassassin (>= 3.2.5-2), razor (>= 1:2.85-1), libnet-dns-perl (>= 0.63-2), carnet-tools-cn (>= 2.8.1), gnupg (>= 1.4.9-3), libmail-dkim-perl (>= 0.32-1), libcrypt-openssl-bignum-perl (>= 0.04-1+b1), libmail-spf-query-perl (>= 1:1.999.1-3), ${misc:Depends} +Depends: spamassassin (>= 3.3.1-1), razor (>= 1:2.85-3), libnet-dns-perl (>= 0.66-2), carnet-tools-cn (>= 2.8.1), gnupg (>= 1.4.10-4), libmail-dkim-perl (>= 0.38-1), libcrypt-openssl-bignum-perl (>= 0.04-2), libmail-spf-perl (>= 2.007-1), adduser (>= 3.112+nmu2), ${misc:Depends} Recommends: amavisd-new Description: Perl-based spam filter using text analysis SpamAssassin is a very powerful and fully configurable spam filter diff --git a/debian/postinst b/debian/postinst index ff854eb..7f549cc 100755 --- a/debian/postinst +++ b/debian/postinst @@ -287,6 +287,16 @@ for i in $list; do mv -f $i.$$ $i fi rm -f $i.$$ + + # enable AWL + cp -f $i $i.$$ + plugin="loadplugin Mail::SpamAssassin::Plugin::AWL" + cp_check_and_sed "^#$plugin.*$" \ + "s/^#$plugin.*$/$plugin/g" $i.$$ || true + if ! cmp -s $i.$$ $i; then + mv -f $i.$$ $i + fi + rm -f $i.$$ done # check and replace /etc/default/spamasassin if needed @@ -396,7 +406,13 @@ if [ "x$restart" = "xyes" ]; then fi # restart the amavis -if [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then +if [ "x$restart" = "xyes" -a -x /etc/init.d/amavisd-cn ]; then + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d --quiet amavisd-cn restart + else + /etc/init.d/amavisd-cn restart + fi +elif [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then if [ -x /usr/sbin/invoke-rc.d ]; then invoke-rc.d --quiet amavis restart else diff --git a/debian/templates b/debian/templates index 6890256..5cf9f9f 100644 --- a/debian/templates +++ b/debian/templates @@ -1,7 +1,7 @@ Template: spamassassin-cn/usebayes Type: boolean Default: true -Description: Zelite li Bayesian klasifikator: +Description: Zelite li Bayesian klasifikator? SpamAssassin moze koristiti naivni Bayesian klasifikator poste. Receni statisticki filtar predstavlja dodatni vid zastite od spama, medjutim podrazumijeva intenzivno inicijalno i kasnije @@ -12,7 +12,7 @@ Description: Zelite li Bayesian klasifikator: Template: spamassassin-cn/userazor2 Type: boolean Default: true -Description: Zelite li koristiti Razor2: +Description: Zelite li koristiti Razor2? SpamAssassin moze koristiti Vipul Razor2 mrezu. Recena je komercijalna mreza zatvorenog koda, namijenjena distribuiranom klasificiranju i filtriranju spama. Receno predstavlja @@ -21,7 +21,7 @@ Description: Zelite li koristiti Razor2: Template: spamassassin-cn/runservice Type: boolean Default: false -Description: Zelite li imati spamd servis: +Description: Zelite li imati spamd servis? SpamAssassin moze biti uvijek aktivan kao spamd servis. U slucaju da imate vec centralno aktivan Amavis, spamd je nepotreban buduci da se SpamAssassin koristi interno unutar @@ -32,7 +32,7 @@ Template: spamassassin-cn/runasuser Type: select Choices: non-root, root Default: non-root -Description: Zelite li spamd pod ovlastima: +Description: Zelite li spamd pod ovlastima? SpamAssassin spamd servis nije nuzno pokretati pod ovlastima privilegiranog korisnika (root). Ako na sistemu nema korisnika koji koriste SpamAssassin iz komadne linije, bolje ga je ne -- 1.7.10.4