From 56293621f442f02c17dc4ca1711ae5cd2359f24e Mon Sep 17 00:00:00 2001 From: Dinko Korunic Date: Sat, 2 Apr 2011 15:10:15 +0200 Subject: [PATCH] - razlicite promjene s obzirom na Debian Squeeze - #23256: insserv i init skripta - vise se ne koristi /etc/init.d/amavis, vec samo /etc/init.d/amavisd-cn --- NEWS.CARNet | 7 ++++++- debian/changelog | 7 +++++++ debian/compat | 2 +- debian/control | 8 ++++---- debian/cron.d | 8 ++++---- debian/init | 16 ++++++++++++++++ debian/preinst | 4 ++-- 7 files changed, 40 insertions(+), 12 deletions(-) diff --git a/NEWS.CARNet b/NEWS.CARNet index 4e69bd1..c643f90 100644 --- a/NEWS.CARNet +++ b/NEWS.CARNet @@ -1,3 +1,8 @@ +amavisd-cn (3:2.6.4-1) stable; urgency=low + + * S obzirom na insserv u Debian Squeezeu, vise se ne koristi + /etc/init.d/amavis vec samo /etc/init.d/amavisd-cn. + amavisd-cn (3:2.6.1-1) stable; urgency=low * Nova verzija Debianovog paketa ima sasvim izmijenjenu @@ -21,4 +26,4 @@ Za vise detalja pogledajte dokumentaciju u: /usr/share/doc/amavisd-cn/README.CARNet /usr/share/doc/amavisd-new/README.Debian - -- Dinko Korunic Sun, 12 Apr 2009 14:05:40 +0200 + -- Dinko Korunic Sat, 02 Apr 2011 15:04:12 +0200 diff --git a/debian/changelog b/debian/changelog index c689f40..207d736 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +amavisd-cn (3:2.6.4-1) stable; urgency=low + + * #23256: insserv i init skripta + * vise se ne koristi /etc/init.d/amavis, vec samo /etc/init.d/amavisd-cn + + -- Dinko Korunic Sat, 02 Apr 2011 12:28:15 +0200 + amavisd-cn (3:2.6.1-1) stable; urgency=low * Gasi se SAVI po defaultu zbog dosadasnjih raznoraznih problema s istim diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index 1615d8f..a843ebe 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,14 @@ Source: amavisd-cn Section: mail Priority: optional Maintainer: Dinko Korunic -Build-Depends: debhelper (>= 4), sed -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 7), sed +Standards-Version: 3.9.1 Package: amavisd-cn Architecture: all Provides: amavisd-new-cn -Depends: amavisd-new (>= 1:2.6.1.dfsg-1), postfix, clamav-cn (>= 3:0.94-5), spamassassin-cn (>= 2:3.2.5-6), debianutils, carnet-tools-cn (>= 2.8.1), procps, arj | unarj, rar | unrar | unrar-free, zoo, nomarch, cpio, lzop, cabextract, zip, unzip, bzip2 -Pre-Depends: amavisd-new (>= 1:2.6.1.dfsg-1) +Depends: amavisd-new (>= 1:2.6.4-3), postfix, clamav-cn (>= 3:0.94-5), spamassassin-cn (>= 2:3.2.5-6), debianutils, carnet-tools-cn (>= 2.8.1), procps, arj | unarj, rar | unrar | unrar-free, zoo, nomarch, cpio, lzop, cabextract, zip, unzip, bzip2 +Pre-Depends: amavisd-new (>= 1:2.6.4-3) Recommends: postfix-cn Conflicts: libsavi-perl (<< 0.15), bunch-perl-modules-cn Description: Easy setup for a postfix/amavisd-new/clamav/spamassassin configuration diff --git a/debian/cron.d b/debian/cron.d index f822153..28bcea6 100644 --- a/debian/cron.d +++ b/debian/cron.d @@ -1,8 +1,8 @@ # Deleting temp files from quarantine area every day at 01:15 -15 1 * * * amavis find /var/lib/amavis -type d -mtime +1 -name "amavis-milter-*" -print0 | xargs -0r rm -fr +15 1 * * * amavis find /var/lib/amavis -type d -mtime +1 -name "amavis-milter-*" -print0 | xargs -0r rm -fr >/dev/null 2>&1 # Deleting virus mails from quarantine area at 02:15 every day -15 2 * * * amavis find /var/lib/amavis/virusmails -type f -mtime +7 -name "virus-*" -print0 | xargs -0r rm -f +15 2 * * * amavis find /var/lib/amavis/virusmails -type f -mtime +7 -name "virus-*" -print0 | xargs -0r rm -f >/dev/null 2>&1 # Deleting spam mails from quarantine area every day at 03:15 -15 3 * * * amavis find /var/lib/amavis/virusmails -type f -mtime +7 -name "spam-*" -print0 | xargs -0r rm -f +15 3 * * * amavis find /var/lib/amavis/virusmails -type f -mtime +7 -name "spam-*" -print0 | xargs -0r rm -f >/dev/null 2>&1 # Deleting bah header mails from quarantine area every day at 04:15 -15 4 * * * amavis find /var/lib/amavis/virusmails -type f -mtime +7 -name "badh-*" -print0 | xargs -0r rm -f +15 4 * * * amavis find /var/lib/amavis/virusmails -type f -mtime +7 -name "badh-*" -print0 | xargs -0r rm -f >/dev/null 2>&1 diff --git a/debian/init b/debian/init index 5ca8c67..b689825 100755 --- a/debian/init +++ b/debian/init @@ -1,5 +1,21 @@ #!/bin/sh +# amavisd-cn /etc/init.d/ initscript wrapper for CARNetized amavisd-new +# +# Start and stop Amavis, ClamAV and Postfix/Sendmail + +### BEGIN INIT INFO +# Provides: amavisd-cn +# Required-Start: $local_fs $remote_fs $syslog $named $network $time +# Required-Stop: $local_fs $remote_fs $syslog $named $network +# Should-Start: +# Should-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: start and stop Amavis, ClamAV and Postfix/Sendmail +# Description: wrapper for starting/stopping MTA and related services +### END INIT INFO + set -e # options for daemons: diff --git a/debian/preinst b/debian/preinst index 1767ee1..f172844 100755 --- a/debian/preinst +++ b/debian/preinst @@ -18,11 +18,11 @@ if [ "$1" = install -o "$1" = upgrade ]; then echo "CN: Found unknown file at /etc/init.d/amavis." mv_init fi - ln -s amavisd-cn /etc/init.d/amavis + #ln -s amavisd-cn /etc/init.d/amavis elif ! readlink /etc/init.d/amavis | grep -q '^amavisd-cn$'; then # Symlink in place, but does it point to us? echo "CN: Shouldn't happen: found strange /etc/init.d/amavis link." mv_init - ln -s amavisd-cn /etc/init.d/amavis + #ln -s amavisd-cn /etc/init.d/amavis fi fi -- 1.7.10.4