* update paketa za Wheezy

* uklonjena SARE pravila
* dodan high-precision SoughtRules kanal

diff --git a/README.CARNet b/README.CARNet
index beb7d7c..85f778a 100644 (file)
--- a/README.CARNet
+++ b/README.CARNet
@@ -4,9 +4,8 @@ spamassassin-cn
 Ovo je dodatak na standardni SpamAssassin paket. Glavne razlike su u
 mogucnosti upravljanja postavkama (Bayes klasifikator, Razor2, Pyzor) u
 local.cf te potpuniji local.cf predlozak sa postavkama spremnim za
 Ovo je dodatak na standardni SpamAssassin paket. Glavne razlike su u
 mogucnosti upravljanja postavkama (Bayes klasifikator, Razor2, Pyzor) u
 local.cf te potpuniji local.cf predlozak sa postavkama spremnim za

-produkciju. Takodjer, koriste se popularna SARE pravila kroz sa-update
-mehanizam (GPG potpisani updateovi), a i sam SpamAssassin se automatski
-nadogradjuje kroz receni mehanizam.
+produkciju. Takodjer SpamAssassin se automatski nadogradjuje kroz
+sa-update mehanizam (GPG potpisani updateovi).

 
 Logovi koji se generiraju kroz nadogradjivanje SpamAssassina se standardno
 spremaju u /var/log/sa-update.log. Daljnje modifikacije pravila koja se
 
 Logovi koji se generiraju kroz nadogradjivanje SpamAssassina se standardno
 spremaju u /var/log/sa-update.log. Daljnje modifikacije pravila koja se

diff --git a/debian/changelog b/debian/changelog
index 929d29b..4a758a6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+spamassassin-cn (2:3.3.4) stable; urgency=low
+
+  * update paketa za Wheezy
+  * uklonjena SARE pravila
+  * dodan high-precision SoughtRules kanal
+
+ -- Dinko Korunic <kreator@carnet.hr>  Wed, 23 Oct 2013 10:51:23 +0200
+

 spamassassin-cn (2:3.3.3) stable; urgency=low
 
   * #52904 pokreci sa-update u pozadini, s obzirom na nedavnu pojavu
 spamassassin-cn (2:3.3.3) stable; urgency=low
 
   * #52904 pokreci sa-update u pozadini, s obzirom na nedavnu pojavu

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/debian/control b/debian/control
index 343232d..387dcc9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: spamassassin-cn
 Section: mail
 Priority: optional
 Maintainer: Dinko Korunic <kreator@CARNet.hr>
 Section: mail
 Priority: optional
 Maintainer: Dinko Korunic <kreator@CARNet.hr>

-Build-Depends: debhelper (>= 7), po-debconf
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9.20120909), po-debconf
+Standards-Version: 3.9.4

 
 Package: spamassassin-cn
 Architecture: all
 
 Package: spamassassin-cn
 Architecture: all

-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}
+Depends: spamassassin (>= 3.3.2-5), razor (>= 1:2.85-4+b1), libnet-dns-perl (>= 0.66-2+b2), carnet-tools-cn (>= 3.0.4), gnupg (>= 1.4.12-7+deb7u1), libmail-dkim-perl (>= 0.39-1), libcrypt-openssl-bignum-perl (>= 0.04-3), libmail-spf-perl (>= 2.8.0-1), adduser (>= 3.113+nmu3), ${misc:Depends}

 Recommends: amavisd-new
 Description: Perl-based spam filter using text analysis
  SpamAssassin is a very powerful and fully configurable spam filter
 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/copyright b/debian/copyright
index 5350ae7..b8602d4 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Copyright 2011 CARNet 
+Copyright 2013 CARNet 

 
 You are free to distribute this software package under the terms of the
 GNU General Public License.
 
 You are free to distribute this software package under the terms of the
 GNU General Public License.

diff --git a/debian/cron.daily b/debian/cron.daily
index 5ec40d4..4acf67e 100755 (executable)
--- a/debian/cron.daily
+++ b/debian/cron.daily
@@ -7,11 +7,12 @@ exec 2>&1
 # announce
 echo "$(date +'%d-%m-%Y %T'): Fetching new SA rules..."
 
 # announce
 echo "$(date +'%d-%m-%Y %T'): Fetching new SA rules..."
 

-# update SA from normal SA updates + SARE channels
+# update SA

 if [ -e /etc/spamassassin/sa-update.channels ]; then
     sa-update \
         --channelfile /etc/spamassassin/sa-update.channels \
 if [ -e /etc/spamassassin/sa-update.channels ]; then
     sa-update \
         --channelfile /etc/spamassassin/sa-update.channels \

-        --gpgkey 856AA88A \
+        --allowplugins \
+        --gpgkey 6C6191E3 \

         --gpgkey 24F434CE \
         --gpgkey BDE9DC10 || \
     ( echo "$(date +'%d-%m-%Y %T'): No new rules. Exiting now."; exit )
         --gpgkey 24F434CE \
         --gpgkey BDE9DC10 || \
     ( echo "$(date +'%d-%m-%Y %T'): No new rules. Exiting now."; exit )

diff --git a/debian/postinst b/debian/postinst
index 98a24b1..e5d5a8f 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -367,7 +367,7 @@ if getent passwd amavis >/dev/null 2>&1; then
 fi
 
 # import SA keys
 fi
 
 # import SA keys

-echo "CN: Importing SpamAssassin and SARE public PGP keys"
+echo "CN: Importing SpamAssassin channels' public PGP keys"

 echo "$(date +'%d-%m-%Y %T'): Importing new SA keys..." >> \
     /var/log/sa-update.log
 if [ ! -d /etc/spamassassin/sa-update-keys ]; then
 echo "$(date +'%d-%m-%Y %T'): Importing new SA keys..." >> \
     /var/log/sa-update.log
 if [ ! -d /etc/spamassassin/sa-update-keys ]; then

@@ -382,6 +382,8 @@ sa-update --import /etc/spamassassin/sa-keys.pgp \
 # clean old RulesDuJour rules
 echo "CN: Cleaning old RulesDuJour and SARE rules..."
 rm -rf /etc/spamassassin/*_sare_*.cf /etc/spamassassin/RulesDuJour
 # clean old RulesDuJour rules
 echo "CN: Cleaning old RulesDuJour and SARE rules..."
 rm -rf /etc/spamassassin/*_sare_*.cf /etc/spamassassin/RulesDuJour

+find /var/lib/spamassassin -iname \*_sare_\* -print0| xargs -0r rm -rf
+sed -i -e '/dostech.net/d' /etc/spamassassin/sa-update.channels

 echo "CN: Please use /etc/spamassassin/sa-update.channels in future!"
     
 # get/update the rules
 echo "CN: Please use /etc/spamassassin/sa-update.channels in future!"
     
 # get/update the rules

@@ -390,7 +392,8 @@ echo "$(date +'%d-%m-%Y %T'): Fetching new SA rules..." >> \
     /var/log/sa-update.log
 sa-update \
     --channelfile /etc/spamassassin/sa-update.channels \
     /var/log/sa-update.log
 sa-update \
     --channelfile /etc/spamassassin/sa-update.channels \

-    --gpgkey 856AA88A \
+    --allowplugins \
+    --gpgkey 6C6191E3 \

     --gpgkey 24F434CE \
     --gpgkey BDE9DC10 >>/var/log/sa-update.log 2>&1 &
 echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"
     --gpgkey 24F434CE \
     --gpgkey BDE9DC10 >>/var/log/sa-update.log 2>&1 &
 echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"

diff --git a/sa-keys.pgp b/sa-keys.pgp
index 2f690b7..88b6fe4 100644 (file)
--- a/sa-keys.pgp
+++ b/sa-keys.pgp
@@ -65,42 +65,41 @@ SH6QWe0MBuOpEYmJwfcNpVFguvU=
 -----END PGP PUBLIC KEY BLOCK-----
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 -----END PGP PUBLIC KEY BLOCK-----
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: SKS 1.1.4

 
 

-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
-=eTcH
+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
+sNt3fw==
+=HY+n

 -----END PGP PUBLIC KEY BLOCK-----
 -----END PGP PUBLIC KEY BLOCK-----

diff --git a/sa-update.channels b/sa-update.channels
index 41aa654..7c53bfb 100644 (file)
--- a/sa-update.channels
+++ b/sa-update.channels
@@ -1,22 +1,3 @@
 updates.spamassassin.org
 saupdates.openprotect.com
 updates.spamassassin.org
 saupdates.openprotect.com

-70_sare_adult.cf.sare.sa-update.dostech.net
-70_sare_bayes_poison_nxm.cf.sare.sa-update.dostech.net
-70_sare_evilnum0.cf.sare.sa-update.dostech.net
-70_sare_evilnum1.cf.sare.sa-update.dostech.net
-70_sare_genlsubj.cf.sare.sa-update.dostech.net
-70_sare_header.cf.sare.sa-update.dostech.net
-70_sare_html.cf.sare.sa-update.dostech.net
-70_sare_obfu0.cf.sare.sa-update.dostech.net
-70_sare_obfu1.cf.sare.sa-update.dostech.net
-70_sare_oem.cf.sare.sa-update.dostech.net
-70_sare_random.cf.sare.sa-update.dostech.net
-70_sare_specific.cf.sare.sa-update.dostech.net
-70_sare_spoof.cf.sare.sa-update.dostech.net
-70_sare_stocks.cf.sare.sa-update.dostech.net
-70_sare_unsub.cf.sare.sa-update.dostech.net
-70_sare_uri0.cf.sare.sa-update.dostech.net
-70_sare_uri1.cf.sare.sa-update.dostech.net
-72_sare_bml_post25x.cf.sare.sa-update.dostech.net
-72_sare_redirect_post3.0.0.cf.sare.sa-update.dostech.net
-99_sare_fraud_post25x.cf.sare.sa-update.dostech.net
+sought.rules.yerp.org