From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 25 Apr 2007 18:08:43 -0000
Subject: [Cluster-devel] conga clustermon.spec.in.in conga.spec.in.in
Message-ID: <20070425180843.18702.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-04-25 19:08:43

Modified files:
	.              : clustermon.spec.in.in conga.spec.in.in 

Log message:
	Fix 237838: modcluster and ricci scriptlets fail during install

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.25.2.3&r2=1.25.2.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.7&r2=1.67.2.8

--- conga/clustermon.spec.in.in	2007/03/20 20:52:52	1.25.2.3
+++ conga/clustermon.spec.in.in	2007/04/25 18:08:42	1.25.2.4
@@ -88,10 +88,10 @@
 
 
 %post -n modcluster
-/sbin/chkconfig --add modclusterd
 DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
 /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
 /sbin/service oddjobd reload > /dev/null 2>&1
+/sbin/chkconfig --add modclusterd
 
 %preun -n modcluster
 if [ "$1" == "0" ]; then
@@ -138,6 +138,7 @@
 
 %post -n cluster-snmp
 /sbin/service snmpd condrestart > /dev/null 2>&1
+exit 0
 
 %postun -n cluster-snmp
 # don't restart snmpd twice on upgrades
@@ -194,6 +195,9 @@
 
 
 %changelog
+* Wed Apr 25 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.1-7
+- Fixed bz237838 (modcluster and ricci scriptlets fail during install)
+- Resolves: bz237838
 
 * Tue Mar 20 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-6
 - Do not fail on i18n machines
--- conga/conga.spec.in.in	2007/03/27 17:14:45	1.67.2.7
+++ conga/conga.spec.in.in	2007/04/25 18:08:42	1.67.2.8
@@ -257,10 +257,10 @@
 fi
 
 %post -n ricci
-/sbin/chkconfig --add ricci
 DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null`
 /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1
 /sbin/service oddjobd reload >/dev/null 2>&1
+/sbin/chkconfig --add ricci
 
 %preun -n ricci
 if [ "$1" == "0" ]; then
@@ -289,8 +289,10 @@
 
 %changelog
 
-* Tue Mar 27 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-7
+* Wed Apr 25 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.1-7
 - Fixed bz234196 (CVE-2007-0240 Conga includes version of Zope that is vulnerable to a XSS attack)
+- Fixed bz237838 (modcluster and ricci scriptlets fail during install)
+- Related: bz237838
 - Resolves: bz234196
 
 * Tue Mar 20 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-6