Hello community,
here is the log from the commit of package amavisd-new for openSUSE:Factory
checked in at Thu Jan 8 14:49:14 CET 2009.
--------
--- amavisd-new/amavisd-new.changes 2008-10-28 15:12:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/amavisd-new/amavisd-new.changes 2008-12-29 17:18:45.000000000 +0100
@@ -1,0 +2,29 @@
+Mon Dec 29 12:27:56 CET 2008 - lrupp@suse.de
+
+- update to 2.6.2:
+ + bounce killer: improved detection of nonstandard bounces
+ + bounces to be killed no longer waste SpamAssassin time
+ + tool to convert dkim-filter keysfile into amavisd configuration
+ + compatibility with SpamAssassin 3.3 (CVS head) regained
+ + rewritten and expanded documentation section on DKIM signing and
+ verification in amavisd-new-docs.html
+ + the %sql_clause default has changed in detail, if its value
+ is overridden in a configuration file the setting may need
+ updating
+- don't patch it: use a regexp in the specfile to get rid of
+ amavisd-new-suse.{dif,patch}
+- package p0f-analyzer.pl
+ (a program to interface amavisd with a p0f utility)
+- remove outdated Obsoletes
+- dont enable clamd per default - its a user decision
+- added probe option to init script
+- compress the Release-Notes
+- Recommend clamav perl-spamassassin perl-ldap perl-Authen-SASL
+ perl-DBI and perl-Mail-ClamAV - they are needed just in
+ special cases
+- use package names in PreReq
+- split up amavisd-new-docs subpackage and package additional files
+- dont create the vscan user in the build system (not needed)
+- added amavisd-new-rpmlintrc
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
amavisd-new-2.6.1.tar.gz
amavisd-new-suse.diff
RELEASE_NOTES.2.6.1
New:
----
amavisd-new-2.6.2.tar.bz2
amavisd-new-rpmlintrc
RELEASE_NOTES.2.6.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amavisd-new.spec ++++++
--- /var/tmp/diff_new_pack.b11178/_old 2009-01-08 14:49:03.000000000 +0100
+++ /var/tmp/diff_new_pack.b11178/_new 2009-01-08 14:49:03.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package amavisd-new (Version 2.6.1)
+# spec file for package amavisd-new (Version 2.6.2)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,34 +19,93 @@
Name: amavisd-new
-BuildRequires: sendmail sendmail-devel
+Summary: High-Performance E-Mail Virus Scanner
+Version: 2.6.2
+Release: 1
License: GPL v2 or later
Group: Productivity/Networking/Security
Url: http://www.ijs.si/software/amavisd/
-Obsoletes: amavisd-postfix amavis-postfix amavis-sendmail amavisd-sendmail
-Requires: gzip bzip2 lha unarj unrar zoo sharutils perl-Compress-Zlib perl-Convert-UUlib perl-IO-stringy perl-MIME-tools perl-MailTools perl-Archive-Tar perl-Unix-Syslog perl-Convert-TNEF perl-Archive-Zip perl-Net-Server perl-spamassassin file perl-BerkeleyDB perl-Mail-DKIM
-PreReq: /usr/sbin/useradd /bin/hostname /bin/sed /bin/cp /bin/mv %insserv_prereq
-AutoReqProv: on
-Summary: High-Performance E-Mail Virus Scanner
-Version: 2.6.1
-Release: 41
-Source0: amavisd-new-%{version}.tar.gz
+BuildRequires: sendmail sendmail-devel
+Requires: gzip bzip2 lha unarj unrar zoo sharutils file
+Requires: perl-Compress-Zlib perl-Convert-UUlib perl-IO-stringy
+Requires: perl-MIME-tools perl-MailTools perl-Archive-Tar perl-Unix-Syslog
+Requires: perl-Convert-TNEF perl-Archive-Zip perl-Net-Server perl-spamassassin
+Requires: perl-BerkeleyDB perl-Mail-DKIM
+Requires: smtp_daemon
+Recommends: clamav perl-spamassassin
+Recommends: perl-DBI
+Recommends: perl-ldap
+Recommends: perl-Authen-SASL
+Recommends: perl-Mail-ClamAV
+Recommends: %{name}-docs = %{version}
+PreReq: coreutils net-tools sed pwdutils
+PreReq: %insserv_prereq
+PreReq: util-linux
+Source0: amavisd-new-%{version}.tar.bz2
Source1: sysconfig.amavis
Source2: rc.amavis
Source3: README.SuSE
-Source4: RELEASE_NOTES.2.6.1
-Patch: amavisd-new-suse.diff
+Source4: RELEASE_NOTES.%{version}.tar.bz2
+Source5: amavisd-new-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define avspool /var/spool/amavis
+%define avdb /var/spool/amavis/db
%define avquarantine /var/spool/amavis/virusmails
%define miltersockdir /var/run/amavis
+%define logmsg logger -t %{name}/rpm
%define avuser vscan
%define avgroup vscan
-# ---------------------------------------------------------------------------
+
+%description
+Amavisd-new is a high-performance interface between mailer (MTA) and
+content checkers: virus scanners or SpamAssassin. It talks to the MTA
+via (E)SMTP, LMTP, or by using helper programs. It works with the
+following MTAs:
+
+- postfix
+
+- sendmail (sendmail-milter)
+
+- exim
+
+
+
+Authors:
+--------
+ Mark Martinec
+
+%package docs
+Summary: Documentation for the High-Performance E-Mail Virus Scanner
+Group: Documentation/Other
+License: GPL v2 or later
+Recommends: %{name} = %{version}
+
+%description docs
+Amavisd-new is a high-performance interface between mailer (MTA) and
+content checkers: virus scanners or SpamAssassin. It talks to the MTA
+via (E)SMTP, LMTP, or by using helper programs.
+
+This package contains the documentation and Relase-Notes.
+
+
+
+Authors:
+--------
+ Mark Martinec
%prep
-%setup -q -n amavisd-new-%{version}
-%patch -p 1
+%setup -q -a4
+for i in $(ls amavisd*); do
+ if [[ $i == *patch ]] ; then continue; fi
+ if [[ $i == *spec ]] ; then continue; fi
+ sed -i "s|\$daemon_user = 'vscan';|\$daemon_user = '%{avuser}';|g; \
+ s|\$daemon_group = 'vscan';|\$daemon_group = '%{avgroup}';|g; \
+ s|^# \$MYHOME =.*|\$MYHOME = '%{avspool}';|g; \
+ s|/var/amavis/db|%{avdb}|g; \
+ s|/var/virusmails|%{avquarantine}|g; \
+ s|/var/amavis/amavisd.sock|%{avspool}/amavisd.sock|g; \
+ s|/var/run/clamav/clamd|/var/lib/clamav/clamd-socket|g" $i
+done
# ---------------------------------------------------------------------------
%build
@@ -55,77 +114,63 @@
--with-runtime-dir=%{avspool} \
--with-sockname=%{avspool}/amavisd.sock \
--with-milterlib=%{_libdir}
-make
+make %{?jobs:-j%jobs}
# ---------------------------------------------------------------------------
%install
-# create the vscan user in the build system
-/usr/sbin/groupadd -r %{avgroup} 2> /dev/null || :
-/usr/sbin/useradd -r -o -g %{avgroup} -u 65 -s /bin/false -c "Vscan account" -d %{avspool} %{avuser} 2> /dev/null || :
mkdir -p $RPM_BUILD_ROOT/%{avquarantine}
-mkdir -p $RPM_BUILD_ROOT/%{avspool}/tmp
-mkdir -p $RPM_BUILD_ROOT/%{avspool}/db
+mkdir -p $RPM_BUILD_ROOT/%{avspool}/{tmp,var}
+mkdir -p $RPM_BUILD_ROOT/%{avdb}
mkdir -p $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
+mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema
+mkdir -p $RPM_BUILD_ROOT/%{miltersockdir}
+mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib}
install -m 644 $RPM_SOURCE_DIR/sysconfig.amavis $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 755 amavisd $RPM_BUILD_ROOT/usr/sbin/amavisd
-install -m 755 amavisd-agent $RPM_BUILD_ROOT/usr/sbin/amavisd-agent
-install -m 755 amavisd-nanny $RPM_BUILD_ROOT/usr/sbin/amavisd-nanny
-install -m 755 amavisd-release $RPM_BUILD_ROOT/usr/sbin/amavisd-release
+install -m 755 amavisd $RPM_BUILD_ROOT/%{_sbindir}/amavisd
+install -m 755 amavisd-agent $RPM_BUILD_ROOT/%{_sbindir}/amavisd-agent
+install -m 755 amavisd-nanny $RPM_BUILD_ROOT/%{_sbindir}/amavisd-nanny
+install -m 755 amavisd-release $RPM_BUILD_ROOT/%{_sbindir}/amavisd-release
+install -m 755 p0f-analyzer.pl $RPM_BUILD_ROOT/%{_sbindir}/p0f-analyzer.pl
install -m 644 amavisd.conf $RPM_BUILD_ROOT/etc/amavisd.conf
-install -m 755 $RPM_SOURCE_DIR/rc.amavis $RPM_BUILD_ROOT/etc/init.d/amavis
-ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/usr/sbin/rcamavis
-install -m 755 helper-progs/amavis $RPM_BUILD_ROOT/usr/sbin/amavis
-install -m 755 helper-progs/amavis-milter $RPM_BUILD_ROOT/usr/sbin/amavis-milter
+install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/amavis
+ln -s ../../etc/init.d/amavis $RPM_BUILD_ROOT/%{_sbindir}/rcamavis
+install -m 755 helper-progs/amavis $RPM_BUILD_ROOT/%{_sbindir}/amavis
+install -m 755 helper-progs/amavis-milter $RPM_BUILD_ROOT/%{_sbindir}/amavis-milter
# copy README.SuSE
install -m 644 %{S:3} .
-install -m 644 %{S:4} .
-mkdir -p $RPM_BUILD_ROOT/%{miltersockdir}
install -m 644 LDAP.schema $RPM_BUILD_ROOT/etc/openldap/schema/amavisd-new.schema
-mkdir -p $RPM_BUILD_ROOT/%{perl_vendorlib}
install -m 644 JpegTester.pm $RPM_BUILD_ROOT/%{perl_vendorlib}/JpegTester.pm
%pre
/usr/sbin/groupadd -r %{avgroup} 2> /dev/null || :
+%{logmsg} "Added group %{avgroup} for package %{name}"
/usr/sbin/useradd -r -o -g %{avgroup} -u 65 -s /bin/false -c "Vscan account" -d %{avspool} %{avuser} 2> /dev/null || :
/usr/sbin/usermod %{avuser} -g %{avgroup} 2> /dev/null || :
+%{logmsg} "Added user %{avuser} for package %{name}"
%preun
%stop_on_removal amavis
%post
-BAKSUFFIX=$(date +%Y-%m-%d)
-AVCF=/etc/amavisd.conf
-cp $AVCF $AVCF.NEW
-FQHN=$(hostname -f)
-if [ $1 -le 1 ]; then
- AVDOMAIN=$(echo $FQHN | sed 's/[^\.]*\.//')
- if [ -n "$AVDOMAIN" ]; then
- perl -pi -e "s/mydomain =.*;/mydomain = '$AVDOMAIN';/" $AVCF.NEW
- if ! cmp -s $AVCF $AVCF.NEW ; then
- echo "setting \$mydomain to $AVDOMAIN in $AVCF"
- fi
+%{fillup_and_insserv -n amavis amavis}
+# Update ?
+if [ ${1:-0} -gt 1 ]; then
+ : OK currently nothing to do
+else
+ if [ -r etc/aliases ]; then
+ if ! grep -q "^virusalert:" etc/aliases; then
+ echo -e "virusalert:\troot" >> etc/aliases
+ %{logmsg} "Added alias for user virusalert to /etc/aliases"
+ if [ -x usr/bin/newaliases ]; then
+ usr/bin/newaliases &>/dev/null || true
+ else
+ %{logmsg} "Cannot execute newaliases. Please run it manually."
fi
-fi
-if [ -n "$FQHN" ]; then
- if ! grep ^\$myhostname $AVCF > /dev/null; then
- sed -ie "s%^#*[[:space:]]*\$myhostname[[:space:]]\+=.*%\$myhostname = '$FQHN';%" $AVCF.NEW
- if ! cmp -s $AVCF $AVCF.NEW ; then
- echo "setting \$myhostname to $FQHN in $AVCF"
fi
fi
fi
-if [ -f $AVCF.NEW ]; then
- if cmp -s $AVCF $AVCF.NEW ; then
- rm -f $AVCF.NEW
- else
- cp --remove-destination $AVCF $AVCF.$BAKSUFFIX
- mv $AVCF.NEW $AVCF
- fi
-fi
-%{fillup_and_insserv -n amavis amavis}
%postun
%restart_on_update amavis
@@ -136,51 +181,66 @@
%files
%defattr(-,root,root)
-%config /etc/init.d/amavis
-%config(noreplace) /etc/amavisd.conf
+%doc AAAREADME.first LICENSE INSTALL
+%doc README.SuSE LDAP.ldif
%dir /etc/openldap
%dir /etc/openldap/schema
-/etc/openldap/schema/amavisd-new.schema
+%config /etc/init.d/amavis
+%config(noreplace) /etc/amavisd.conf
+%config(noreplace) /etc/openldap/schema/amavisd-new.schema
/var/adm/fillup-templates/sysconfig.amavis
-/usr/sbin/*
+%{_sbindir}/*
%{perl_vendorlib}/JpegTester.pm
-%dir %attr(0700, %{avuser}, root) %{avspool}
-%dir %attr(0700, %{avuser}, root) %{avspool}/tmp
-%dir %attr(0700, %{avuser}, root) %{avspool}/db
-%dir %attr(0700, %{avuser}, root) %{avquarantine}
-%dir %attr(0700, %{avuser}, root) %{miltersockdir}
-%doc AAAREADME.first INSTALL LDAP.schema LICENSE MANIFEST RELEASE_NOTES TODO
-%doc amavisd.conf-* JpegTester.pm
+%defattr(0700,%{avuser},root)
+%dir %{avspool}
+%dir %{avspool}/tmp
+%dir %{avspool}/db
+%dir %{avspool}/var
+%dir %{avquarantine}
+%dir %{miltersockdir}
+
+%files docs
+%defattr(-,root,root)
+%doc RELEASE_NOTES*
%doc README_FILES
%doc test-messages
-%doc README.SuSE
-%doc RELEASE_NOTES.2.6.1
-
-%description
-Amavisd-new is a high-performance interface between mailer (MTA) and
-content checkers: virus scanners or SpamAssassin. It talks to the MTA
-via (E)SMTP, LMTP, or by using helper programs. It works with the
-following MTAs:
-
-- postfix
-
-- sendmail (sendmail-milter)
-
-- exim
-
-
-
-Authors:
---------
- Mark Martinec
+%doc amavisd.conf-*
+%doc MANIFEST TODO
+%doc test-messages
%changelog
+* Mon Dec 29 2008 lrupp@suse.de
+- update to 2.6.2:
+ + bounce killer: improved detection of nonstandard bounces
+ + bounces to be killed no longer waste SpamAssassin time
+ + tool to convert dkim-filter keysfile into amavisd configuration
+ + compatibility with SpamAssassin 3.3 (CVS head) regained
+ + rewritten and expanded documentation section on DKIM signing and
+ verification in amavisd-new-docs.html
+ + the %%sql_clause default has changed in detail, if its value
+ is overridden in a configuration file the setting may need
+ updating
+- don't patch it: use a regexp in the specfile to get rid of
+ amavisd-new-suse.{dif,patch}
+- package p0f-analyzer.pl
+ (a program to interface amavisd with a p0f utility)
+- remove outdated Obsoletes
+- dont enable clamd per default - its a user decision
+- added probe option to init script
+- compress the Release-Notes
+- Recommend clamav perl-spamassassin perl-ldap perl-Authen-SASL
+ perl-DBI and perl-Mail-ClamAV - they are needed just in
+ special cases
+- use package names in PreReq
+- split up amavisd-new-docs subpackage and package additional files
+- dont create the vscan user in the build system (not needed)
+- added amavisd-new-rpmlintrc
* Tue Oct 28 2008 varkoly@suse.de
- Require perl-Mail-DKIM
- (bnc#439292) - amavisd.conf comes with wrong path to clamd socket
* Mon Sep 01 2008 kukuk@suse.de
- Don't require unace, amavis does not know about it.
-* Wed Aug 13 2008 crrodriguez@suse.de
+* Tue Aug 12 2008 crrodriguez@suse.de
- fix init scripts
* Tue Jul 01 2008 varkoly@suse.de
- update to version 2.6.1
@@ -655,7 +715,7 @@
- added spamassassin to Requires (Bugzilla ID#29731)
* Fri Aug 29 2003 kukuk@suse.de
- Add -r option to useradd for systemaccounts [Bug #29611]
-* Fri Aug 29 2003 mmj@suse.de
+* Thu Aug 28 2003 mmj@suse.de
- Add sysconfig metadata [#28812]
* Wed Jul 30 2003 choeger@suse.de
- new macros for stop/restart of services on rpm update/removal
++++++ amavisd-new-rpmlintrc ++++++
# use the old name for init script
addFilter("incoherent-init-script-name.*amavis")
# amavis depends on a lot of perl-modules, so this is not really needed:
addFilter("no-dependency-on.*perl-base")
# dont rename the package for one single perl module:
addFilter("perl5-naming-policy-not-applied.*JpegTester.pm")
++++++ rc.amavis ++++++
--- /var/tmp/diff_new_pack.b11178/_old 2009-01-08 14:49:03.000000000 +0100
+++ /var/tmp/diff_new_pack.b11178/_new 2009-01-08 14:49:03.000000000 +0100
@@ -1,98 +1,131 @@
#! /bin/sh
-# Copyright (c) 2003 SuSE Linux AG Nuernberg, Germany.
+# Copyright (c) 2008 SuSE Linux AG Nuernberg, Germany.
#
# Author: Carsten Hoeger , 2003
#
+# /etc/init.d/amavis
+# and its symbolic link
+# /usr/sbin/rcamavis
#
### BEGIN INIT INFO
-# Provides: amavis
-# Required-Start: $remote_fs
-# Should-Start: $named clamd
-# Should-Stop: $named clamd
-# Required-Stop: $remote_fs
-# Default-Start: 3 5
-# Default-Stop:
-# Description: Start amavisd-new
+# Provides: amavis
+# Required-Start: $remote_fs
+# Should-Start: $named clamd
+# Should-Stop: $named clamd
+# Required-Stop: $remote_fs
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 6
+# Short-Description: Start amavisd-new
+# Description: Amavisd-new is a high-performance interface between mailer (MTA) and
+# content checkers: virus scanners or SpamAssassin. It talks to the MTA
+# via (E)SMTP, LMTP, or by using helper programs.
### END INIT INFO
AMAVISD_BIN=/usr/sbin/amavisd
AMAVIS_MILTER_BIN=/usr/sbin/amavis-milter
-test -x $AMAVISD_BIN || exit 5
-test -x $AMAVIS_MILTER_BIN || exit 5
+AMAVIS_SYSCONFIG=/etc/sysconfig/amavis
+AMAVIS_CONF=/etc/amavisd.conf
+AMAVIS_PID=/var/spool/amavis/amavisd.pid
+AMAVIS_MILTER_SOCK=local:/var/run/amavis/amavis-milter.sock
-test -s /etc/sysconfig/amavis && \
- . /etc/sysconfig/amavis
+# Check for missing binaries (stale symlinks should not happen)
+# Note: Special treatment of stop for LSB conformance
+test -x $AMAVISD_BIN || { echo "$AMAVIS_BIN not installed";
+ if [ "$1" = "stop" ]; then exit 0;
+ else exit 5; fi; }
-# First reset status of this service
+test -x $AMAVIS_MILTER_BIN || { echo "$AMAVIS_MILTER_BIN not installed";
+ if [ "$1" = "stop" ]; then exit 0;
+ else exit 5; fi; }
+
+# Check for existence of needed config file and read it
+test -r $AMAVIS_SYSCONFIG || { echo "$AMAVIS_SYSCONFIG not existing";
+ if [ "$1" = "stop" ]; then exit 0;
+ else exit 6; fi; }
+
+test -r $AMAVIS_CONF || { echo "$AMAVIS_CONF not existing";
+ if [ "$1" = "stop" ]; then exit 0;
+ else exit 6; fi; }
+
+# Read config
+. $AMAVIS_SYSCONFIG
+
+# Shell functions sourced from /etc/rc.status
. /etc/rc.status
+# First reset status of this service
rc_reset
case "$1" in
start)
- echo -n "Starting virus-scanner (amavisd-new):"
+ echo -n "Starting virus-scanner (amavisd-new): "
$AMAVISD_BIN start
- if ! checkproc amavisd; then
- rc_failed 7
- fi
- rc_status -v
- if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then
- rc_reset
- echo -n "Starting amavis-milter:"
- startproc -u vscan $AMAVIS_MILTER_BIN -p local:/var/run/amavis/amavis-milter.sock > /dev/null 2>&1
- rc_status -v
- fi
+ if ! checkproc amavisd; then
+ rc_failed 7
+ fi
+ rc_status -v
+ if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then
+ rc_reset
+ echo -n "Starting amavis-milter:"
+ startproc -u vscan $AMAVIS_MILTER_BIN -p $AMAVIS_MILTER_SOCK > /dev/null 2>&1
+ rc_status -v
+ fi
;;
stop)
- echo -n "Shutting down virus-scanner (amavisd-new):"
- if checkproc amavisd; then
- rc_reset
- $AMAVISD_BIN stop
- else
- rc_reset
- fi
- rc_status -v
- if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then
- rc_reset
- echo -n "Shutting down amavis-milter:"
- killproc -TERM $AMAVIS_MILTER_BIN
- rc_status -v
- fi
+ echo -n "Shutting down virus-scanner (amavisd-new): "
+ if checkproc amavisd; then
+ rc_reset
+ $AMAVISD_BIN stop
+ else
+ rc_reset
+ fi
+ rc_status -v
+ if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then
+ rc_reset
+ echo -n "Shutting down amavis-milter: "
+ killproc -TERM $AMAVIS_MILTER_BIN
+ rc_status -v
+ fi
;;
try-restart)
$0 status >/dev/null && $0 restart
rc_status
- ;;
+ ;;
restart)
- $0 stop
+ $0 stop
$0 start
rc_status
;;
force-reload)
- echo -n "Reload virus-scanner (amavisd-new)"
- $AMAVISD_BIN reload 2>/dev/null
+ echo -n "Reload virus-scanner (amavisd-new): "
+ $AMAVISD_BIN reload 2>/dev/null
rc_status -v
- ;;
+ ;;
reload)
- echo -n "Reload virus-scanner (amavisd-new)"
- $AMAVISD_BIN reload 2>/dev/null
+ echo -n "Reload virus-scanner (amavisd-new): "
+ $AMAVISD_BIN reload 2>/dev/null
rc_status -v
- ;;
+ ;;
status)
- echo -n "Checking for service amavis (amavisd-new):"
- checkproc -p /var/spool/amavis/amavisd.pid amavisd
- rc_status -v
- if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then
- rc_reset
- echo -n "Checking for service amavis-milter:"
- checkproc $AMAVIS_MILTER_BIN
- rc_status -v
- fi
- ;;
+ echo -n "Checking for service amavis (amavisd-new): "
+ checkproc -p $AMAVIS_PID amavisd
+ rc_status -v
+ if [ "$AMAVIS_SENDMAIL_MILTER" == "yes" ]; then
+ rc_reset
+ echo -n "Checking for service amavis-milter: "
+ checkproc $AMAVIS_MILTER_BIN
+ rc_status -v
+ fi
+ ;;
+ probe)
+ ## Optional: Probe for the necessity of a reload, print out the
+ ## argument to this init script which is required for a reload.
+ test $AMAVIS_CONF -nt /var/spool/amavis/amavisd.pid && echo reload
+ ;;
*)
- echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
- exit 1
+ echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
+ exit 1
+ ;;
esac
-
# Inform the caller not only verbosely and set an exit status.
rc_exit
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org