From 237f8d1302f1dd67acc3e197fd3733da07d3b3d1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mar 06 2008 01:11:43 +0000 Subject: Update to 2.1.3 Add management GUI Drop upstreamed patches Add patch for IPAddr (bz #434653) --- diff --git a/.cvsignore b/.cvsignore index a2894af..9442907 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -heartbeat-2.1.2.tar.gz +heartbeat-2.1.3.tar.gz diff --git a/IPaddr b/IPaddr new file mode 100644 index 0000000..154c00f --- /dev/null +++ b/IPaddr @@ -0,0 +1,20 @@ + +--- a/resources/OCF/IPaddr Thu Jul 26 19:26:13 2007 -0600 ++++ b/resources/OCF/IPaddr Tue Feb 19 20:46:11 2008 +0100 +@@ -247,9 +247,10 @@ lvs_restore_loopback() { + CMD="OCF_RESKEY_cidr_netmask=32 OCF_RESKEY_ip=$1 OCF_RESKEY_nic=$ifname $FINDIF" + if + NICINFO=`eval $CMD` ++ NICINFO=`echo $NICINFO | tr -s " "` + then +- netmask_text=`echo "$NICINFO" | cut -f2 -d " "` +- broadcast=`echo "$NICINFO" | cut -f3 -d " "` ++ netmask_text=`echo "$NICINFO" | cut -f3 -d " "` ++ broadcast=`echo "$NICINFO" | cut -f5 -d " "` + else + echo "ERROR: $CMD failed (rc=$rc)" + exit $OCF_ERR_GENERIC + + + + diff --git a/heartbeat-2.1.2-open.patch b/heartbeat-2.1.2-open.patch deleted file mode 100644 index a52de83..0000000 --- a/heartbeat-2.1.2-open.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur heartbeat-2.1.2.orig/heartbeat/heartbeat.c heartbeat-2.1.2/heartbeat/heartbeat.c ---- heartbeat-2.1.2.orig/heartbeat/heartbeat.c 2007-08-01 20:06:54.000000000 -0600 -+++ heartbeat-2.1.2/heartbeat/heartbeat.c 2007-08-14 22:21:46.000000000 -0600 -@@ -862,7 +862,7 @@ - - ourproc = procinfo->nprocs; - -- if (mp->vf->open(mp) != HA_OK){ -+ if ((mp->vf->open)(mp) != HA_OK){ - cl_log(LOG_ERR, "cannot open %s %s", - mp->type, - mp->name); -diff -Nur heartbeat-2.1.2.orig/lib/clplumbing/cl_msg.c heartbeat-2.1.2/lib/clplumbing/cl_msg.c ---- heartbeat-2.1.2.orig/lib/clplumbing/cl_msg.c 2007-08-01 20:06:54.000000000 -0600 -+++ heartbeat-2.1.2/lib/clplumbing/cl_msg.c 2007-08-14 21:36:14.000000000 -0600 -@@ -145,7 +145,7 @@ - return -1; - } - -- return open(filename, O_WRONLY|O_CREAT|O_APPEND); -+ return open(filename, O_WRONLY|O_CREAT|O_APPEND, 0755); - - } - diff --git a/heartbeat-fedora-chkconfig.patch b/heartbeat-fedora-chkconfig.patch deleted file mode 100644 index 4ae3445..0000000 --- a/heartbeat-fedora-chkconfig.patch +++ /dev/null @@ -1,63 +0,0 @@ -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. - # --# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ -+# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ - # description: Startup script high-availability services. - # processname: heartbeat - # pidfile: @localstatedir@/run/heartbeat.pid -@@ -391,12 +391,7 @@ - StartHA - RC=$? - Echo -- if -- [ $RC -eq 0 ] -- then -- [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR -- touch $LOCKDIR/$SUBSYS -- fi -+ [ $RC -eq 0 ] && touch /var/lock/subsys/heartbeat - RunStartStop post-start $RC - ;; - -@@ -413,11 +408,7 @@ - StopHA - RC=$? - Echo -- if -- [ $RC -eq 0 ] -- then -- rm -f $LOCKDIR/$SUBSYS -- fi -+ [ $RC -eq 0 ] && rm -f /var/lock/subsys/heartbeat - RunStartStop post-stop $RC - StopLogd - ;; -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 - # --# chkconfig: 2345 92 40 -+# chkconfig: - 92 40 - # description: Start and stop ldirectord on non-heartbeat systems - # Using the config file /etc/ha.d/ldirectord.cf - # -@@ -59,9 +59,11 @@ - case "$1" in - start) - action "Starting ldirectord" $DAEMON start -+ touch /var/lock/subsys/ldirectord - ;; - stop) - action "Stopping ldirectord" $DAEMON stop -+ rm -f /var/lock/subsys/ldirectord - ;; - restart) - action "Restarting ldirectord" $DAEMON restart diff --git a/heartbeat.spec b/heartbeat.spec index be9a5f4..a35806d 100644 --- a/heartbeat.spec +++ b/heartbeat.spec @@ -5,15 +5,14 @@ %define uname hacluster Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat -Version: 2.1.2 -Release: 2%{?dist} +Version: 2.1.3 +Release: 1%{?dist} License: GPLv2 and LGPLv2+ 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-2.1.2-open.patch +Patch1: http://hg.linux-ha.org/dev/raw-diff/806faf36d956/resources/OCF/IPaddr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel BuildRequires: iputils @@ -106,11 +105,20 @@ Requires: heartbeat = %{version}-%{release} %description devel Heartbeat development package +%package gui +Summary: Provides a gui interface to manage heartbeat clusters +Group: System Environment/Daemons +Requires: heartbeat = %{version}-%{release} +Requires: PyXML +Requires: pygtk2 >= 2.4 + +%description gui +GUI client for Heartbeat clusters + %prep %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness' @@ -206,7 +214,6 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || : %{_sysconfdir}/ha.d/rc.d %config(noreplace) %{_sysconfdir}/ha.d/README.config %{_libdir}/heartbeat -%{_libdir}/heartbeat-gui %{_libdir}/libapphb.so.* %{_libdir}/libccmclient.so.* %{_libdir}/libcib.so.* @@ -236,8 +243,8 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || : %dir %{_var}/run/heartbeat %attr (2755, hacluster, haclient) %{_bindir}/cl_status %{_bindir}/cl_respawn -%{_bindir}/hb_gui -%{_datadir}/heartbeat-gui/ +%{_sbindir}/ciblint +%{_sbindir}/hb_report %{_sbindir}/crmadmin %{_sbindir}/cibadmin %{_sbindir}/ccm_tool @@ -288,12 +295,10 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || : %doc ldirectord/ldirectord.cf %defattr(-,root,root,-) %{_sbindir}/ldirectord -%{_sbindir}/supervise-ldirectord-config %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord %{_sysconfdir}/init.d/ldirectord %{_sysconfdir}/ha.d/resource.d/ldirectord %{_mandir}/man8/ldirectord.8* -%{_mandir}/man8/supervise-ldirectord-config.8* %files -n stonith %doc doc/COPYING @@ -325,7 +330,19 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || : %{_includedir}/pils/ %{_libdir}/*.so +%files gui +%defattr(-,root,root) +%{_libdir}/heartbeat-gui +%{_datadir}/heartbeat-gui +%{_bindir}/hb_gui + %changelog +* Mon Feb 25 2008 Kevin Fenzi - 2.1.3-1 +- Update to 2.1.3 +- Add management GUI +- Drop upstreamed patches +- Add patch for IPAddr (bz #434653) + * Tue Aug 29 2007 Kevin Fenzi - 2.1.2-2 - Update sources diff --git a/sources b/sources index 64b10c3..188e349 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -56868ab82936b3f77deb777992c4a80d heartbeat-2.1.2.tar.gz +bca53530a3802f7677772323047405cd heartbeat-2.1.3.tar.gz