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
:
# 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
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
- if [ -x "/etc/init.d/amavisd-cn" ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d amavisd-cn stop
- else
- /etc/init.d/amavisd-cn stop
- fi
- fi
- pkill -9 -u amavis -f '/usr/bin/pyzor check' > /dev/null || true
- if [ -x "/etc/init.d/amavisd-cn" ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d amavisd-cn start
- else
- /etc/init.d/amavisd-cn start
- fi
- fi
- restart_daemon=
- restart_mta=
-fi
-
-# register for automatic start
-update-rc.d -f amavis remove >/dev/null || true
-update-rc.d amavisd-cn defaults 19 21 >/dev/null
-
-# START AMAVISD
-# about a half of amavisd-cn script is here
-if [ "$restart_daemon" -a -x /etc/init.d/amavis.amavisd-new ]; then
- if [ -x "/etc/init.d/amavis.amavisd-new" ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d amavis.amavisd-new restart
- else
- /etc/init.d/amavis.amavisd-new restart
- fi
- fi
+restart_daemon="1"
+if [ "$restart_daemon" ]; then
+ service amavis restart
fi
# always check that the daemons are running
-if ! wait_for_fds amavis; then
- if [ -x "/etc/init.d/amavis.amavisd-new" ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d amavis.amavisd-new start
- else
- /etc/init.d/amavis.amavisd-new start
- fi
- fi
- wait_for_fds amavis
-fi
-if [ "$restart_mta" ]; then
- if [ -x "/etc/init.d/$mta" ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d $mta restart
- else
- /etc/init.d/$mta restart
- fi
- fi
-fi
# this needs to be updated when $CRONTAB file changes
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!"
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
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
+exit 0
#DEBHELPER#
-
-exit 0