From: Ivan Rako <irako@nekkar.carnet.hr>
Date: Wed, 16 May 2012 10:05:27 +0000 (+0200)
Subject: izbacen msrbl
X-Git-Tag: debian/3%0.97.3~1
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=4636304b8e720844b617a5036db8a681b81e4e50;p=clamav-cn.git

izbacen msrbl
---

diff --git a/debian/changelog b/debian/changelog
index 628762b..593b91e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+clamav-cn (3:0.97.3) stable; urgency=medium
+
+  * Ovisnost o novom clamav-unofficial-sigs sa backportsa (zbog gasenja
+    MSRBL)
+
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Wed, 16 May 2012 12:00:33 +0200
+
 clamav-cn (3:0.97.2) stable; urgency=medium
 
   * Brisanje stare cron datoteke /etc/cron.hourly/clamav-sanesecurity
diff --git a/debian/control b/debian/control
index f47b864..3cab18e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.1
 
 Package: clamav-cn
 Architecture: all
-Depends: carnet-tools-cn (>= 2.3), rsync, curl, clamav-unofficial-sigs, ${misc:Depends}
+Depends: carnet-tools-cn (>= 2.3), rsync, curl, clamav-unofficial-sigs (>= 3.7.1-1~bpo60+1), ${misc:Depends}
 Pre-Depends: clamav-daemon (>= 0.97.3), clamav-freshclam (>= 0.97.3), clamav (>= 0.97.3)
 Conflicts: amavisd-cn (<< 2:20030616p5-0), libclamav1, libclamav2, libclamav3, libclamav4, libclamav5
 Description: antivirus scanner for Unix
diff --git a/debian/postinst b/debian/postinst
index 40eb973..6b3e950 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -8,20 +8,6 @@ set -e
 # Load CARNet functions
 . /usr/share/carnet-tools/functions.sh
 
-#if dpkg --compare-versions "$2" lt 2:0.91.1-1 ; then
-#  cp_backup_conffile /etc/clamav/clamd.conf
-#  rm -f /etc/clamav/clamd.conf
-#  cp -a /usr/share/doc/clamav-cn/examples/clamd.conf /etc/clamav/clamd.conf
-#  restart="yes"
-#fi
-#
-#if dpkg --compare-versions "$2" lt 2:0.91.1-1 ; then
-#  cp_backup_conffile /etc/clamav/freshclam.conf
-#  rm -f /etc/clamav/freshclam.conf
-#  cp -a /usr/share/doc/clamav-cn/examples/freshclam.conf /etc/clamav/freshclam.conf
-#  restart="yes"
-#fi
-
 cp_check_and_sed "^AllowSupplementaryGroups false" \
                  "s/AllowSupplementaryGroups false/AllowSupplementaryGroups true/g" \
                  /etc/clamav/clamd.conf && restart="yes" || true
@@ -48,6 +34,11 @@ if [ -f /etc/amavis/conf.d/15-av_scanners ]; then
   fi
 fi
 
+# izbaciti MSRBL
+if ! grep -q "^unset msrbl_dbs" /etc/clamav-unofficial-sigs.conf; then
+  echo "unset msrbl_dbs" >> /etc/clamav-unofficial-sigs.conf
+fi
+
 if [ "$restart_amavis" = "yes" ]; then
   if [ -x /usr/sbin/invoke-rc.d ]; then
     [ -x /etc/init.d/amavisd-cn ] && invoke-rc.d amavisd-cn restart