X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=ddf4581b3ffcea69604ff23380cf583f3902e246;hb=HEAD;hp=10a632c27ce8c64f9b250423537f2a50d53a5945;hpb=0f9aadf4ee95ffa43d2b554a7550aa6777d99713;p=amavisd-cn.git

diff --git a/debian/postinst b/debian/postinst
index 10a632c..6bcb890 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,7 +1,22 @@
 #!/bin/sh
+# postinst script for amavisd-cn
+#
+# see: dh_installdeb(1)
 
 set -e
 
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
 [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
 
 case "$1" in
@@ -36,17 +51,25 @@ domain=$RET
 
 update_postfix $*
 
+# Patchiramo /usr/sbin/amavisd-new zbog warninga:
+# (!!)collect_results from (/usr/bin/ripole): exit 102 File <> is not OLE2 format\n
+
+if ! grep -q '\[0,102\]);' /usr/sbin/amavisd-new; then
+	sed -i.BAK '33055s/\[0\]/[0,102]/' /usr/sbin/amavisd-new
+	echo "CN: Patchiram /usr/sbin/amavisd-new"
+fi
+
 # amavisd.conf
 if [ -f "$ACONFOLD" ]; then
   cp_echo "CN: Amavisd configuration is now in $ACONF."
   noisy_backup "$ACONFOLD"
   rm -f "$ACONFOLD"
   cp_echo ""
-  cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNet."
+  cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNET."
 elif [ -f "$ACONFOLD.disabled" ]; then
   noisy_backup "$ACONFOLD.disabled" "$(basename $ACONFOLD)"
   rm -f "$ACONFOLD.disabled"
-  cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNet."
+  cp_echo "CN: Please read /usr/share/doc/amavisd-cn/README.CARNET."
 fi
 
 if [ -f $ACONF ]; then
@@ -57,22 +80,14 @@ fi
 if [ ! -f $ACONF -o ! -s $ACONF ]; then
   # Create fresh config from template
   conf_from_template
+  restart_daemon=1
 fi
 
-# check for SAVI:
-# if not there, comment it out, if there, uncomment and restart
-if ! dpkg -l libsavi-perl 2> /dev/null | egrep -q '^.i' || ! [ -f /usr/lib/libsavi.so ]; then
-  if cp_check_and_sed "^\['Sophos SAVI'" \
-     "s/^\(\['Sophos SAVI', ..sophos_savi \]\)/#\1/" $ACONF; then
-    cp_echo "CN: Disabled SAVI::Perl usage in ${ACONF}."
-    cp_echo "    To enable it, run sophos-sweep-update, uncomment and restart amavis."
-  fi
-else
-  if cp_check_and_sed "^#\['Sophos SAVI'" \
-     "s/^#\(\['Sophos SAVI', ..sophos_savi \]\)/\1/" $ACONF; then
-    cp_echo "CN: Enabled SAVI::Perl usage in ${ACONF}."
-    restart_daemon=1
-  fi
+# disable SAVI as proven problematic
+if cp_check_and_sed "^[[:blank:]]*\['Sophos SAVI'" \
+ "s/^[[:blank:]]*\(\['Sophos SAVI', ..sophos_savi \]\)/#\1/" $ACONF; then
+  cp_echo "CN: Disabled SAVI::Perl usage in ${ACONF}."
+  restart_daemon=1
 fi
 
 check_and_add_alias virusalert root
@@ -96,17 +111,7 @@ fi
 :
 
 # Fix missing redirection in cron files for amavisd-new-cronjob
-add_redirection /etc/cron.d/amavisd-new /etc/cron.daily/amavisd-new
-
-# Cleanup and finalization
-if dpkg --compare-versions "$2" lt 2:20030616p10-4; then
-  update-rc.d -f amavisd remove > /dev/null
-  restart_daemon=1
-  chown_ahome=1
-  # a complicated way to say chmod 750
-  dpkg-statoverride --remove $AHOME > /dev/null || true
-  dpkg-statoverride --update --add amavis amavis 750 $AHOME
-fi
+add_redirection /etc/cron.d/amavisd-new
 
 if [ -n "$chown_ahome" ]; then
   # might be slow
@@ -116,29 +121,11 @@ if [ -n "$chown_ahome" ]; then
   cp_echo -mailonly "CN: Fixed ownerships in /var/*/amavis."
 fi
 
-# kill naughty pyzor descendants -- XXX needed for 2.4 or not?
-if dpkg --compare-versions "$2" lt 2:20030616p10-7 && \
-    pgrep -u amavis -f '/usr/bin/pyzor check' > /dev/null; then
-  /etc/init.d/amavisd-cn stop
-  pkill -9 -u amavis -f '/usr/bin/pyzor check' > /dev/null || true
-  /etc/init.d/amavisd-cn start
-  restart_daemon=
-  restart_mta=
-fi
-
-# START AMAVISD
-# about a half of amavisd-cn script is here
-if [ "$restart_daemon" -a -x /etc/init.d/amavis.amavisd-new ]; then
-  /etc/init.d/amavis.amavisd-new restart
+restart_daemon="1"
+if [ "$restart_daemon" ]; then
+  service amavis restart
 fi
 # always check that the daemons are running
-if ! wait_for_fds amavis; then
-  /etc/init.d/amavis.amavisd-new start
-  wait_for_fds amavis
-fi
-if [ "$restart_mta" ]; then
-  /etc/init.d/$mta restart
-fi
 
 # this needs to be updated when $CRONTAB file changes
 if dpkg --compare-versions "$2" lt "2:20030616p10-4"; then
@@ -148,13 +135,7 @@ if dpkg --compare-versions "$2" lt "2:20030616p10-4"; then
   cp_echo "CN: Deleting virus-mail older than 7 days every day at 04:25 AM"
   cp_echo "    (can be changed in $CRONTAB)"
 fi
-# This script is, hopefully, not needed any more.  Hide it.
-## display this message just once... maybe use debconf instead
-#if dpkg --compare-versions "$2" lt "2:20030616p10-4"; then
-#  cp_echo ""
-#  cp_echo "CN: To stop, start or restart all of the clamav+amavis+mta components,"
-#  cp_echo "CN: use the /etc/init.d/amavisd-cn script."
-#fi
+
 if [ "$failed" ]; then
   cp_echo ""
   cp_echo "CN: Services $failed failed to restart!"
@@ -174,4 +155,19 @@ if [ -n "$2" -a -z "$changed_config" ] && \
   cp_echo "    perl -pi -e 's/_CN_DOMAIN_/$domain/g' $ACONF"
 fi
 
+# Delete old conffiles...
+for conffile in /etc/logcheck/violations.ignore.d/amavisd-new \
+         /etc/logcheck/ignore.d.server/amavisd-new \
+         /etc/logcheck/ignore.d.workstation/amavisd-new \
+         /etc/cron.daily/amavisd-new; do
+  if [ -f ${conffile} ]; then
+    cp_echo "CN: Deleting old conffile ${conffile}..."
+    rm -f ${conffile}
+  fi
+done
+
 cp_mail $PKG $VERSION
+
+exit 0
+
+#DEBHELPER#