Added a patch, added missing dependency. Closes #46281.

6 files changed, 27 insertions, 4 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index b88bf9e18c8b..60e5e950cb6b 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.18 2004/03/25 12:54:09 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.19 2004/03/31 13:02:24 tantive Exp $
+
+*heartbeat-1.2.0-r2 (31 Mar 2004)
+
+  31 Mar 2004; Michael Imhof <tantive@gentoo.org> heartbeat-1.1.5.ebuild,
+  heartbeat-1.2.0-r1.ebuild, heartbeat-1.2.0-r2.ebuild,
+  files/heartbeat-1.2.0-failbackfix.patch:
+  Added a patch, added missing dependency. Closes #46281.
 
 *heartbeat-1.2.0-r1 (25 Mar 2004)
 
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index e906408396c4..11ecc221d7d1 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -3,7 +3,10 @@ MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
 MD5 f930adbf2f878e9bf6e3bca3efad436f ChangeLog 3260
 MD5 69048ef629f87413429e4c74dd4ee9c9 heartbeat-1.0.4.ebuild 1656
 MD5 7ff1d6208f10e354c8f0c36a946b7cb4 heartbeat-1.2.0-r1.ebuild 2158
+MD5 5edcda16a0458c818806079c7d422082 heartbeat-1.2.0-r2.ebuild 1977
 MD5 d940c2eea866c93bb48facd1ae54f5f6 files/digest-heartbeat-1.1.5 68
 MD5 d0464cdef2467f7458b0a36c33ffc226 files/heartbeat-init 828
 MD5 5a2e512ad67f6469362d57745be05d42 files/digest-heartbeat-1.2.0-r1 68
+MD5 9fc3b9c04b508118400377fabd75be92 files/heartbeat-1.2.0-failbackfix.patch 486
 MD5 42f0e631ebd916d234c0a3a807d4a671 files/digest-heartbeat-1.0.4 68
+MD5 5a2e512ad67f6469362d57745be05d42 files/digest-heartbeat-1.2.0-r2 68
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.0-r1 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.0-r2
index 46bc5b362cbe..46bc5b362cbe 100644
--- a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.0-r1
+++ b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.0-r2
diff --git a/sys-cluster/heartbeat/files/heartbeat-1.2.0-failbackfix.patch b/sys-cluster/heartbeat/files/heartbeat-1.2.0-failbackfix.patch
new file mode 100644
index 000000000000..127bf56cbc30
--- /dev/null
+++ b/sys-cluster/heartbeat/files/heartbeat-1.2.0-failbackfix.patch
@@ -0,0 +1,11 @@
+diff -ur heartbeat-1.2.0/heartbeat/hb_resource.c heartbeat-1.2.0.new/heartbeat/hb_resource.c
+--- heartbeat-1.2.0/heartbeat/hb_resource.c	2004-02-13 18:57:31.000000000 +0100
++++ heartbeat-1.2.0.new/heartbeat/hb_resource.c	2004-03-26 08:22:00.000000000 +0100
+@@ -825,6 +825,7 @@
+ 					/* FYI: This also got noted earlier */
+ 					procinfo->i_hold_resources
+ 					|=	HB_FOREIGN_RSC;
++					rsc_needs_failback = TRUE;
+ 					other_is_stable = 1;
+ 					if (ANYDEBUG) {
+ 						ha_log(LOG_DEBUG
diff --git a/sys-cluster/heartbeat/heartbeat-1.1.5.ebuild b/sys-cluster/heartbeat/heartbeat-1.1.5.ebuild
index a1ea652bab72..85e2b3a5912a 100644
--- a/sys-cluster/heartbeat/heartbeat-1.1.5.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.1.5.ebuild,v 1.2 2004/02/11 07:39:31 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.1.5.ebuild,v 1.3 2004/03/31 13:02:25 tantive Exp $
 
 DESCRIPTION="Heartbeat high availability cluster manager"
 HOMEPAGE="http://www.linux-ha.org"
@@ -17,7 +17,8 @@ DEPEND="dev-libs/popt
 	ldirectord? (	sys-cluster/ipvsadm
 			dev-perl/libwww-perl
 			dev-perl/perl-ldap
-			dev-perl/libnet )"
+			dev-perl/libnet )
+	>=sys-devel/libtool-1.5.2-r5"
 
 # need to add dev-perl/Mail-IMAPClient inside ldirectord above
 
diff --git a/sys-cluster/heartbeat/heartbeat-1.2.0-r1.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.0-r2.ebuild
index 5759c67250d7..03a4f1f15bf4 100644
--- a/sys-cluster/heartbeat/heartbeat-1.2.0-r1.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.0-r1.ebuild,v 1.1 2004/03/25 12:54:09 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.0-r2.ebuild,v 1.1 2004/03/31 13:02:25 tantive Exp $
 
 DESCRIPTION="Heartbeat high availability cluster manager"
 HOMEPAGE="http://www.linux-ha.org"
@@ -38,6 +38,7 @@ src_unpack() {
 	mv ltmain.sh ltmain.orig
 	echo "export _POSIX2_VERSION=199209" > ltmain.sh
 	cat ltmain.orig >> ltmain.sh
+	epatch ${FILESDIR}/${P}-failbackfix.patch
 	fix_makefiles
 }