diff options
Diffstat (limited to 'mail-filter/amavisd-new')
| -rw-r--r-- | mail-filter/amavisd-new/ChangeLog | 5 | ||||
| -rw-r--r-- | mail-filter/amavisd-new/files/amavisd.initd | 20 |
2 files changed, 5 insertions, 20 deletions
diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog index 4aca2da663fe..0b7f306279c4 100644 --- a/mail-filter/amavisd-new/ChangeLog +++ b/mail-filter/amavisd-new/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for mail-filter/amavisd-new # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.175 2012/01/06 11:38:35 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.176 2012/01/10 13:46:47 eras Exp $ + + 10 Jan 2012; Eray Aslan <eras@gentoo.org> files/amavisd.initd: + don't try to parse the config file - bug #397763 06 Jan 2012; Eray Aslan <eras@gentoo.org> files/amavisd.initd: fix in init script - bug #397763 diff --git a/mail-filter/amavisd-new/files/amavisd.initd b/mail-filter/amavisd-new/files/amavisd.initd index bd47bc9a79f4..ce3a447eb3f9 100644 --- a/mail-filter/amavisd-new/files/amavisd.initd +++ b/mail-filter/amavisd-new/files/amavisd.initd @@ -1,14 +1,13 @@ #!/sbin/runscript # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.3 2012/01/06 11:38:35 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.4 2012/01/10 13:46:47 eras Exp $ extra_started_commands="reload" extra_commands="debug debug_sa" prog="/usr/sbin/amavisd" progname="amavisd-new" -conffile="/etc/amavisd.conf" depend() { need net @@ -16,23 +15,8 @@ depend() { before mta } -checkconfig() { - local piddir pidfile - if [ -r "${conffile}" ] ; then - pidfile=$(grep -m1 ^[^#].*pid_file "${conffile}"|sed -e 's/.*"\(.*\)".*/\1/') - piddir=${pidfile%/*} - if [ ! -d "${piddir:=/var/amavis}" ] ; then - checkpath -q -d -o root:amavis -m 0770 "${piddir}" || return 1 - fi - else - eerror "Missing conf file." - return 1 - fi -} - start() { ebegin "Starting ${progname}" - checkconfig || return 1 "${prog}" start eend $? } @@ -59,14 +43,12 @@ restart() { debug() { ebegin "Starting ${progname} in debug mode" - checkconfig || return 1 "${prog}" debug eend $? } debug_sa() { ebegin "Starting ${progname} in debug-sa mode" - checkconfig || return 1 "${prog}" debug-sa eend $? } |