X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=debian%2Fpostinst;h=bff2dbb451aabe22d4b3f087772029d839580bfd;hb=1b913e6347489d65569a7651a569ed7ad3f1a432;hp=50a2959607873c0786c4d8eaa8a51c0af73f5e51;hpb=ecbb68c462b873939ded49cd9b0aae58190b03e7;p=clamav-cn.git

diff --git a/debian/postinst b/debian/postinst
index 50a2959..bff2dbb 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -8,29 +8,11 @@ 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" \
+# 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...)
@@ -38,14 +20,7 @@ getent group amavis > /dev/null && usermod -G amavis clamav && restart="yes"
 
 # restart if needed
 [ "$restart" = "yes" ] || exit 0
-if [ -x /usr/sbin/invoke-rc.d ]; then
-  [ -x /etc/init.d/clamav-daemon ] && invoke-rc.d clamav-daemon restart
-else
-  [ -x /etc/init.d/clamav-daemon ] && /etc/init.d/clamav-daemon restart
-fi
-
-if [ -x /usr/sbin/invoke-rc.d ]; then
-  [ -x /etc/init.d/clamav-freshclam ] && invoke-rc.d clamav-freshclam restart
-else
-  [ -x /etc/init.d/clamav-freshclam ] && /etc/init.d/clamav-freshclam restart
-fi
+service clamav-daemon restart
+service clamav-freshclam restart
+
+#DEBHELPER#