Non-maintainer commit. Fix building with _FORTIFY_SOURCE=2 and recent gnutls wrt #285305. The bug has also -Wl,--as-needed patch which should be applied to Makefile.am instead of Makefile.in, so leaving it out, instead using append-ldflags $(no-as-needed) so that we have something that actually compiles.

(Portage version: 2.2_rc49/cvs/Linux x86_64)

3 files changed, 40 insertions, 6 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index 04e29449b143..2595f1484091 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.79 2009/07/27 19:23:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.80 2009/11/18 16:38:59 ssuominen Exp $
+
+  18 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  heartbeat-2.0.8.ebuild, +files/heartbeat-2.0.8-glibc.patch:
+  Non-maintainer commit. Fix building with _FORTIFY_SOURCE=2 and recent
+  gnutls wrt #285305. The bug has also -Wl,--as-needed patch which should be
+  applied to Makefile.am instead of Makefile.in, so leaving it out, instead
+  using append-ldflags $(no-as-needed) so that we have something that
+  actually compiles.
 
   27 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   heartbeat-2.0.8.ebuild:
diff --git a/sys-cluster/heartbeat/files/heartbeat-2.0.8-glibc.patch b/sys-cluster/heartbeat/files/heartbeat-2.0.8-glibc.patch
new file mode 100644
index 000000000000..9e226de533c9
--- /dev/null
+++ b/sys-cluster/heartbeat/files/heartbeat-2.0.8-glibc.patch
@@ -0,0 +1,14 @@
+diff -ur heartbeat-2.0.8.orig/lib/clplumbing/cl_msg.c heartbeat-2.0.8/lib/clplumbing/cl_msg.c
+--- heartbeat-2.0.8.orig/lib/clplumbing/cl_msg.c	2007-01-12 04:57:07.000000000 +0200
++++ heartbeat-2.0.8/lib/clplumbing/cl_msg.c	2009-11-18 18:21:18.000000000 +0200
+@@ -145,8 +145,8 @@
+ 		cl_log(LOG_ERR, "%s: filename is NULL", __FUNCTION__);
+ 		return -1;
+ 	}
+-	
+-	return open(filename, O_WRONLY|O_CREAT|O_APPEND);
++	// see http://hg.linux-ha.org/lha-2.1/rev/148fb2e06d1c
++	return open(filename, O_WRONLY|O_CREAT|O_APPEND, 0644);
+ 
+ }
+ 
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
index ad4f3acfcda6..15be1ef9a2ec 100644
--- a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.15 2009/07/27 19:23:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.16 2009/11/18 16:38:59 ssuominen Exp $
 
-inherit flag-o-matic eutils
+inherit autotools flag-o-matic eutils
 
 DESCRIPTION="Heartbeat high availability cluster manager"
 HOMEPAGE="http://www.linux-ha.org"
@@ -47,12 +47,24 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	#epatch "${FILESDIR}"/${P}-update-resources-failcount.patch || die
-	epatch "${FILESDIR}"/${P}-crm-leaks.patch || die
-	epatch "${FILESDIR}"/${P}-delay.patch || die
+	#epatch "${FILESDIR}"/${P}-update-resources-failcount.patch
+	epatch "${FILESDIR}"/${P}-crm-leaks.patch
+	epatch "${FILESDIR}"/${P}-delay.patch
+	epatch "${FILESDIR}"/${P}-glibc.patch
+	sed -i \
+		-e 's:libgnutls-config:pkg-config gnutls:g' \
+		lib/mgmt/Makefile.am \
+		lib/plugins/quorumd/Makefile.am \
+		lib/plugins/quorum/Makefile.am \
+		membership/quorumd/Makefile.am \
+		mgmt/client/Makefile.am \
+		mgmt/daemon/Makefile.am
+	eautoreconf
 }
 
 src_compile() {
+	# FIXME. See bug 285305.
+	append-ldflags $(no-as-needed)
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \