Author: jsoeterb
Update of /cvs/extras/rpms/heartbeat/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22949/FC-4
Modified Files:
.cvsignore heartbeat-fedora-chkconfig.patch
heartbeat-fedora-pam.patch heartbeat.spec sources
Log Message:
* Thu Apr 27 2006 Joost Soeterbroek <fedora(a)soeterbroek.com> - 2.0.5-1
- upstream version 2.0.5
- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
set in cts/CM_LinuxHAv2.py.in
+ Version 2.0.5 - significant bug fixes and a few feature deficits fixed
+ various portability fixes
+ enable GUI to run with pygtk 2.4
+ significant GUI improvements and speedups
+ numerous logging improvements (generally much quieter)
+ speed up CIB processing by writing it to disk asynchronously
+ add CIB on-disk checksums
+ removed dependency on openssl
+ added "failure stickiness" to the CIB/CRM
+ Several fixes to the membership code
+ We now log all output from resource agents
+ fixed STONITHd memory leaks.
+ Added an OCF RA for Xen guests
+ Added email alerts to ldirectord
+ Improvements to the haresources2cib upgrade tool
+ Several fixes to cibadmin
+ Fix some autoadd-related bugs
+ Added Chinese support to the GUI
+ Added a daemon to replace and generalize ipfail
+ Limited testing only
+ Significant improvements to CIM model, including modifying things
+ Extensive Master/slave testing and fixes
+ Use a digest of the parameters used in an action (smaller CIB)
+ Improved detection of "old" events that should be ignored by the PE
(ensures resource monitoring is active when required)
+ Better detection of required and/or optimal behaviour in mixed
(and formerly mixed) clusters
+ LRM now supports multiple concurrent monitor operations
+ Optional startup & runtime enforcement of DTD validation
(Invalid changes are rejected)
+ cibadmin tool overhauled and verified to function correctly
+ Some deprecated CIB features now unsupported
+ Placing nvpair objects in crm_config (must now use
cluster_property_set)
+ on_stopfail removed in favor of setting on_fail in the resource's
stop operation
+ start_prereq removed in favor of setting prereq in the resource's
start operation
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 30 Mar 2006 17:41:38 -0000 1.3
+++ .cvsignore 30 Apr 2006 09:27:59 -0000 1.4
@@ -1 +1 @@
-heartbeat-2.0.4.tar.gz
+heartbeat-2.0.5.tar.gz
heartbeat-fedora-chkconfig.patch:
Index: heartbeat-fedora-chkconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat-fedora-chkconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-chkconfig.patch 30 Mar 2006 17:41:38 -0000 1.1
+++ heartbeat-fedora-chkconfig.patch 30 Apr 2006 09:27:59 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in
heartbeat-2.0.4/heartbeat/init.d/heartbeat.in
---- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in 2005-09-10 23:46:23.000000000
+0200
-+++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in 2006-03-27 19:55:19.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in
heartbeat-2.0.5/heartbeat/init.d/heartbeat.in
+--- heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in 2006-04-14 21:25:33.000000000
+0200
++++ heartbeat-2.0.5/heartbeat/init.d/heartbeat.in 2006-04-27 20:32:29.000000000 +0200
@@ -13,7 +13,7 @@
# We don't hate anyone, and like for everyone to use
# our software, no matter what OS or distribution you're using.
@@ -10,26 +10,7 @@
# description: Startup script high-availability services.
# processname: heartbeat
# pidfile: @localstatedir(a)/run/heartbeat.pid
-@@ -51,18 +51,6 @@
- RUNDIR=@localstatedir@/run
-
- if
-- [ -r /etc/SuSE-release ]
--then
-- # rc.status is new since SuSE 7.0
-- [ -r /etc/rc.status ] && . /etc/rc.status
-- [ -r /etc/rc.config ] && . /etc/rc.config
--
-- # Determine the base and follow a runlevel link name.
-- base=${0##*/}
-- link=${base#*[SK][0-9][0-9]}
--
--fi
--if
- [ -z "$rc_done" ]
- then
- rc_done="Done."
-@@ -391,12 +379,7 @@
+@@ -391,12 +391,7 @@
StartHA
RC=$?
Echo
@@ -43,7 +24,7 @@
RunStartStop post-start $RC
;;
-@@ -413,11 +396,7 @@
+@@ -413,11 +408,7 @@
StopHA
RC=$?
Echo
@@ -56,9 +37,9 @@
RunStartStop post-stop $RC
StopLogd
;;
-diff -Nur heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord
heartbeat-2.0.4/ldirectord/init.d/ldirectord
---- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord 2005-10-17 14:49:21.000000000
+0200
-+++ heartbeat-2.0.4/ldirectord/init.d/ldirectord 2006-03-27 19:56:40.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord
heartbeat-2.0.5/ldirectord/init.d/ldirectord
+--- heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord 2005-10-17 14:49:21.000000000
+0200
++++ heartbeat-2.0.5/ldirectord/init.d/ldirectord 2006-04-27 20:33:35.000000000 +0200
@@ -2,7 +2,7 @@
#
# ldirectord Linux Director Daemon
heartbeat-fedora-pam.patch:
Index: heartbeat-fedora-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat-fedora-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-pam.patch 30 Mar 2006 17:41:38 -0000 1.1
+++ heartbeat-fedora-pam.patch 30 Apr 2006 09:27:59 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam
heartbeat-2.0.4/mgmt/daemon/mgmtd.pam
---- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam 2005-12-30 09:35:27.000000000 +0100
-+++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam 2006-03-27 19:59:12.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam
heartbeat-2.0.5/mgmt/daemon/mgmtd.pam
+--- heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam 2005-12-30 09:35:27.000000000 +0100
++++ heartbeat-2.0.5/mgmt/daemon/mgmtd.pam 2006-04-27 20:36:29.000000000 +0200
@@ -1,3 +1,8 @@
-auth required pam_unix.so
-account required pam_unix.so
Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- heartbeat.spec 30 Mar 2006 17:41:38 -0000 1.2
+++ heartbeat.spec 30 Apr 2006 09:27:59 -0000 1.3
@@ -5,19 +5,19 @@
%define uname hacluster
Summary: Heartbeat subsystem for High-Availability Linux
Name: heartbeat
-Version: 2.0.4
-Release: 2%{?dist}
+Version: 2.0.5
+Release: 1%{?dist}
License: GPL/LGPL
URL:
http://linux-ha.org/
Group: System Environment/Daemons
Source0:
http://linux-ha.org/download/%{name}-%{version}.tar.gz
Patch0: heartbeat-fedora-pam.patch
Patch1: heartbeat-fedora-chkconfig.patch
-Patch2: heartbeat-fedora-ccmuser.patch
+#Patch2: heartbeat-fedora-ccmuser.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel
BuildRequires: iputils
-BuildRequires: openssl-devel
+#BuildRequires: openssl-devel
BuildRequires: libnet-devel
BuildRequires: libtool-ltdl-devel
BuildRequires: net-snmp-devel
@@ -108,7 +108,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
%build
# disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in
signedness'
@@ -139,7 +139,6 @@
sed -i -e '1i# -*-Shell-script-*-'
$RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
sed -i -e '1i# -*-Shell-script-*-'
$RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crmtest/helper.sh
chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/pymgmt.py
@@ -191,6 +190,7 @@
%{_libdir}/libcib.so.*
%{_libdir}/libclm.so.*
%{_libdir}/libcrmcommon.so.*
+%{_libdir}/libtransitioner.so.*
%{_libdir}/libhbclient.so.*
%{_libdir}/liblrm.so.*
%{_libdir}/libpengine.so.*
@@ -223,9 +223,13 @@
%{_sbindir}/crm_attribute
%{_sbindir}/crm_resource
%{_sbindir}/crm_verify
+%{_sbindir}/attrd_updater
+%{_sbindir}/crm_failcount
+%{_sbindir}/crm_primitive.*
%dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm
%dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm
%dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm
+%dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/pengine
%{_mandir}/man1/cl_status.1*
%{_mandir}/man1/ha_logger.1*
%{_mandir}/man1/hb_standby.1*
@@ -244,7 +248,7 @@
%{_libdir}/libhbmgmtcommon.so.*
%{_libdir}/libhbmgmttls.so.*
%config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd
-%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
+%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo
%endif
%files -n ldirectord
@@ -276,6 +280,8 @@
%doc doc/COPYING
%doc doc/README
%defattr(-,root,root)
+/usr/include/pils
+%{_libdir}/libpils.*
%{_libdir}/pils/
%files devel
@@ -290,6 +296,49 @@
%{_libdir}/*.so
%changelog
+* Thu Apr 27 2006 Joost Soeterbroek <fedora(a)soeterbroek.com> - 2.0.5-1
+- upstream version 2.0.5
+- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
+ set in cts/CM_LinuxHAv2.py.in
+ + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
+ + various portability fixes
+ + enable GUI to run with pygtk 2.4
+ + significant GUI improvements and speedups
+ + numerous logging improvements (generally much quieter)
+ + speed up CIB processing by writing it to disk asynchronously
+ + add CIB on-disk checksums
+ + removed dependency on openssl
+ + added "failure stickiness" to the CIB/CRM
+ + Several fixes to the membership code
+ + We now log all output from resource agents
+ + fixed STONITHd memory leaks.
+ + Added an OCF RA for Xen guests
+ + Added email alerts to ldirectord
+ + Improvements to the haresources2cib upgrade tool
+ + Several fixes to cibadmin
+ + Fix some autoadd-related bugs
+ + Added Chinese support to the GUI
+ + Added a daemon to replace and generalize ipfail
+ + Limited testing only
+ + Significant improvements to CIM model, including modifying things
+ + Extensive Master/slave testing and fixes
+ + Use a digest of the parameters used in an action (smaller CIB)
+ + Improved detection of "old" events that should be ignored by the PE
+ (ensures resource monitoring is active when required)
+ + Better detection of required and/or optimal behaviour in mixed
+ (and formerly mixed) clusters
+ + LRM now supports multiple concurrent monitor operations
+ + Optional startup & runtime enforcement of DTD validation
+ (Invalid changes are rejected)
+ + cibadmin tool overhauled and verified to function correctly
+ + Some deprecated CIB features now unsupported
+ + Placing nvpair objects in crm_config (must now use
+ cluster_property_set)
+ + on_stopfail removed in favor of setting on_fail in the resource's
+ stop operation
+ + start_prereq removed in favor of setting prereq in the resource's
+ start operation
+
* Wed Mar 29 2006 Joost Soeterbroek <fedora(a)soeterbroek.com> - 2.0.4-2
- Version 2.0.4
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 30 Mar 2006 17:41:38 -0000 1.3
+++ sources 30 Apr 2006 09:27:59 -0000 1.4
@@ -1 +1 @@
-659aae2365daea3a17e5a4a4ae0b0a3e heartbeat-2.0.4.tar.gz
+209228b2948cfa4762a3a66454c6cc35 heartbeat-2.0.5.tar.gz