summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2010-04-07 04:13:24 +0000
committerJeremy Olexa <darkside@gentoo.org>2010-04-07 04:13:24 +0000
commit00eab7ad60e4a27ca5307257e344a7cae6fdcdba (patch)
tree43ffa59ab97670cf06054c7549d389f88dd798de /mail-filter
parentExpose the actual build commands to confirm proper behavior (diff)
downloadgentoo-2-00eab7ad60e4a27ca5307257e344a7cae6fdcdba.tar.gz
gentoo-2-00eab7ad60e4a27ca5307257e344a7cae6fdcdba.tar.bz2
gentoo-2-00eab7ad60e4a27ca5307257e344a7cae6fdcdba.zip
Revision bump to fix the init script. New behavior reports if it didn't start properly instead of always reporting it started. Thanks to Polynomial-C for reporting
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/spamassassin/ChangeLog10
-rw-r--r--mail-filter/spamassassin/files/3.3.1-spamd.init7
-rw-r--r--mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild (renamed from mail-filter/spamassassin/spamassassin-3.3.1.ebuild)2
3 files changed, 14 insertions, 5 deletions
diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 28188fcc71d1..442401bc3954 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for mail-filter/spamassassin
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.176 2010/04/06 01:46:38 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.177 2010/04/07 04:13:24 darkside Exp $
+
+*spamassassin-3.3.1-r1 (07 Apr 2010)
+
+ 07 Apr 2010; Jeremy Olexa <darkside@gentoo.org> files/3.3.1-spamd.init,
+ -spamassassin-3.3.1.ebuild, +spamassassin-3.3.1-r1.ebuild:
+ Revision bump to fix the init script. New behavior reports if it didn't
+ start properly instead of always reporting it started. Thanks to
+ Polynomial-C for reporting
*spamassassin-3.3.1 (06 Apr 2010)
diff --git a/mail-filter/spamassassin/files/3.3.1-spamd.init b/mail-filter/spamassassin/files/3.3.1-spamd.init
index 32c4e0b5c7ff..ed2526708591 100644
--- a/mail-filter/spamassassin/files/3.3.1-spamd.init
+++ b/mail-filter/spamassassin/files/3.3.1-spamd.init
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.3.1-spamd.init,v 1.1 2010/04/06 01:46:38 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.3.1-spamd.init,v 1.2 2010/04/07 04:13:24 darkside Exp $
# NB: Config is in /etc/conf.d/spamd
@@ -25,11 +25,12 @@ start() {
--nicelevel ${SPAMD_NICELEVEL:-0} \
--pidfile ${PIDFILE} \
--exec /usr/sbin/spamd -- -d -r ${PIDFILE} \
- ${SPAMD_OPTS}
+ ${SPAMD_OPTS}
+ retval=$?
if ! [ -f "${PIDFILE}" ]; then
sleep 1
fi
- eend $? "Failed to start spamd"
+ eend ${retval} "Failed to start spamd"
}
stop() {
diff --git a/mail-filter/spamassassin/spamassassin-3.3.1.ebuild b/mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild
index 5a0c189b2c61..9e2c69303c54 100644
--- a/mail-filter/spamassassin/spamassassin-3.3.1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.1.ebuild,v 1.1 2010/04/06 01:46:38 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.3.1-r1.ebuild,v 1.1 2010/04/07 04:13:24 darkside Exp $
EAPI="2"