rpms/spamassassin/devel spamassassin-3.0.4-4655-initrd-kill-ppid.patch, NONE, 1.1 spamassassin.spec, 1.55, 1.56

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31698

Modified Files:
	spamassassin.spec 
Added Files:
	spamassassin-3.0.4-4655-initrd-kill-ppid.patch 
Log Message:
#161785 ensure that service restart works


spamassassin-3.0.4-4655-initrd-kill-ppid.patch:
 redhat-rc-script.sh |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

--- NEW FILE spamassassin-3.0.4-4655-initrd-kill-ppid.patch ---
http://issues.apache.org/SpamAssassin/show_bug.cgi?id=4655
init.d spamassassin restart kills wrong process and fails

diff -urN Mail-SpamAssassin-3.0.4.orig/spamd/redhat-rc-script.sh Mail-SpamAssassin-3.0.4/spamd/redhat-rc-script.sh
--- Mail-SpamAssassin-3.0.4.orig/spamd/redhat-rc-script.sh	2005-06-05 21:31:24.000000000 -0400
+++ Mail-SpamAssassin-3.0.4/spamd/redhat-rc-script.sh	2005-10-30 22:18:14.000000000 -0500
@@ -19,6 +19,7 @@
 
 # Set default spamd configuration.
 SPAMDOPTIONS="-d -c -m5 -H"
+SPAMD_PID=/var/run/spamassassin/spamd.pid
 
 # Source spamd configuration.
 if [ -f /etc/sysconfig/spamassassin ] ; then
@@ -36,10 +37,13 @@
   start)
 	# Start daemon.
 	echo -n "Starting spamd: "
-	daemon $NICELEVEL spamd $SPAMDOPTIONS
+	daemon $NICELEVEL spamd $SPAMDOPTIONS -r $SPAMD_PID
 	RETVAL=$?
         echo
-        [ $RETVAL = 0 ] && touch /var/lock/subsys/spamassassin
+	if [ $RETVAL = 0 ]; then
+		[ -n "$SPAMD_PID" ] && ln -s $SPAMD_PID /var/run/spamd.pid
+		touch /var/lock/subsys/spamassassin
+	fi
         ;;
   stop)
         # Stop daemons.
@@ -47,7 +51,10 @@
         killproc spamd
         RETVAL=$?
         echo
-        [ $RETVAL = 0 ] && rm -f /var/lock/subsys/spamassassin
+	if [ $RETVAL = 0 ]; then
+		rm -f /var/lock/subsys/spamassassin
+		rm -f /var/run/spamd.pid
+	fi
         ;;
   restart)
         $0 stop


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- spamassassin.spec	14 Sep 2005 07:39:55 -0000	1.55
+++ spamassassin.spec	9 Nov 2005 17:27:16 -0000	1.56
@@ -6,7 +6,7 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.1.0
-Release: 1.fc5
+Release: 2.fc5
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -19,7 +19,7 @@
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-#Patch107: spamassassin-3.0.3-allow-disabling-subject-rewriting.patch
+Patch121: spamassassin-3.0.4-4655-initrd-kill-ppid.patch
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Buildroot: %{_tmppath}/%{name}-root
@@ -61,7 +61,7 @@
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-#%patch107 -p1
+%patch121 -p1
 # end of patches
 
 %build
@@ -148,6 +148,9 @@
 exit 0
 
 %changelog
+* Tue Nov 08 2005 Warren Togami <wtogami at redhat.com> - 3.1.0-2
+- #161785 ensure that service restart works
+
 * Tue Sep 13 2005 Warren Togami <wtogami at redhat.com> - 3.1.0-1
 - 3.1.0