[gentoo-commits] gentoo-x86 commit in sys-cluster/heartbeat: ChangeLog heartbeat-2.0.8.ebuild

["Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>]

ssuominen    09/11/18 16:39:00

  Modified:             ChangeLog heartbeat-2.0.8.ebuild
  Log:
  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)

Revision  Changes    Path
1.80                 sys-cluster/heartbeat/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/heartbeat/ChangeLog?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/heartbeat/ChangeLog?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/heartbeat/ChangeLog?r1=1.79&r2=1.80

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog	27 Jul 2009 19:23:57 -0000	1.79
+++ ChangeLog	18 Nov 2009 16:38:59 -0000	1.80
@@ -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:



1.16                 sys-cluster/heartbeat/heartbeat-2.0.8.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild?r1=1.15&r2=1.16

Index: heartbeat-2.0.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- heartbeat-2.0.8.ebuild	27 Jul 2009 19:23:57 -0000	1.15
+++ heartbeat-2.0.8.ebuild	18 Nov 2009 16:38:59 -0000	1.16
@@ -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 @@
 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 \