X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=debian%2Fpostinst;h=6bcb8901949f1d3e17dcb02562e690a559f09f36;hb=HEAD;hp=01c8da1367d0c6c9ad3a3b4929ac0c9ad62a30bc;hpb=3b7b43b4ebd18caed1d19c8583699dc73750b084;p=amavisd-cn.git

diff --git a/debian/postinst b/debian/postinst
index 01c8da1..6bcb890 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -51,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
@@ -114,14 +122,8 @@ if [ -n "$chown_ahome" ]; then
 fi
 
 restart_daemon="1"
-if [ "$restart_daemon" -a -x /etc/init.d/amavis ]; then
-  if [ -x "/etc/init.d/amavis" ]; then
-    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-      invoke-rc.d amavis restart
-    else
-      /etc/init.d/amavis restart
-    fi
-  fi
+if [ "$restart_daemon" ]; then
+  service amavis restart
 fi
 # always check that the daemons are running