From f1c24e07b91f6827b6386b3ab53fab882c5f0d0e Mon Sep 17 00:00:00 2001
From: Ivan Rako <irako@nekkar.carnet.hr>
Date: Fri, 22 Jul 2016 00:55:43 +0200
Subject: [PATCH] izmjene za novi clamav-unofficial-sigs

---
 debian/changelog |    6 ++++++
 debian/control   |    8 ++++----
 debian/postinst  |   37 +++----------------------------------
 3 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index be4d9cd..17e27f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+clamav-cn (4:0.99.2~cn0) stable; urgency=medium
+
+  * Ovisnost o novoj verziji clamav-unofficial-sigs
+
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Fri, 22 Jul 2016 00:47:34 +0200
+
 clamav-cn (4:0.98.7~cn0) stable; urgency=medium
 
   * Prvo izdanje za jessie
diff --git a/debian/control b/debian/control
index 17f366f..783c43f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: net
 Priority: optional
 Maintainer: Ivan Rako <Ivan.Rako@CARNet.hr>
 Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.6
 
 Package: clamav-cn
 Architecture: all
-Depends: ${misc:Depends}, carnet-tools-cn (>= 2.3), rsync, curl, clamav-unofficial-sigs (>= 3.7.1-3)
-Pre-Depends: clamav-daemon (>= 0.97.8+dfsg-1), clamav-freshclam (>= 0.97.8+dfsg-1), clamav (>= 0.97.8+dfsg-1)
-Conflicts: amavisd-cn (<< 2:20030616p5-0), libclamav1, libclamav2, libclamav3, libclamav4, libclamav5
+Depends: ${misc:Depends}, carnet-tools-cn (>= 2.3), clamav-unofficial-sigs (>= 5.4.1~cn0)
+Pre-Depends: clamav-daemon (>= 0.99.2), clamav-freshclam (>= 0.99.2), clamav (>= 0.99.2)
+Conflicts: amavisd-cn (<< 2:20030616p5-0), libclamav1, libclamav2, libclamav3, libclamav4, libclamav5, libclamav6
 Description: antivirus scanner for Unix
  Clam AntiVirus is an anti-virus toolkit for Unix. The main purpose of this
  software is the integration with mail servers (attachment scanning). The
diff --git a/debian/postinst b/debian/postinst
index a219653..bff2dbb 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -8,47 +8,16 @@ set -e
 # Load CARNet functions
 . /usr/share/carnet-tools/functions.sh
 
-cp_check_and_sed "^AllowSupplementaryGroups false" \
-                 "s/AllowSupplementaryGroups false/AllowSupplementaryGroups true/g" \
+# obsolete option
+cp_check_and_sed "^AllowSupplementaryGroups" \
+                 "s/^AllowSupplementaryGroups/#AllowSupplementaryGroups/g" \
                  /etc/clamav/clamd.conf && restart="yes" || true
 
-if ! grep -q ^AllowSupplementaryGroups /etc/clamav/clamd.conf; then
-  echo "AllowSupplementaryGroups true" >> /etc/clamav/clamd.conf
-  reload="yes"
-fi
-
 chown -R clamav:clamav /var/run/clamav /var/lib/clamav /var/log/clamav
 
 # dodaj korisnika clamav u grupu amavis (ako postoji...)
 getent group amavis > /dev/null && usermod -G amavis clamav && restart="yes"
 
-# ispravi opciju od clamscana u amavis konfi
-# --disable-summary -> --no-summary
-if [ -f /etc/amavis/conf.d/15-av_scanners ]; then
-  cp_check_and_sed "\-\-disable-summary" \
-  		   "s/--disable-summary/--no-summary/g" \
-		   /etc/amavis/conf.d/15-av_scanners && restart_amavis="yes" || true
-
-  if [ -f /etc/amavis/conf.d/15-av_scanners.cn-old ]; then
-    rm -f /etc/amavis/conf.d/15-av_scanners.cn-old
-  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
-  else
-    [ -x /etc/init.d/amavisd-cn ] && /etc/init.d/amavisd-cn restart
-  fi
-  # nije potreban restart clamava
-  restart="no"
-fi
-
 # restart if needed
 [ "$restart" = "yes" ] || exit 0
 service clamav-daemon restart
-- 
1.7.10.4