From bbd2a17ee82b260c16e78f123f385ac76d6cc85c Mon Sep 17 00:00:00 2001 From: Christian Zoffoli Date: Fri, 14 Jul 2006 17:41:48 +0000 Subject: op_list fix (Portage version: 2.1-r1) --- sys-cluster/heartbeat/ChangeLog | 6 +++++- sys-cluster/heartbeat/files/heartbeat-2.0.4-op_list.patch | 11 +++++++++++ sys-cluster/heartbeat/heartbeat-2.0.4.ebuild | 9 +++++++-- 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 sys-cluster/heartbeat/files/heartbeat-2.0.4-op_list.patch (limited to 'sys-cluster') diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog index a109496365e1..a3caf0533f19 100644 --- a/sys-cluster/heartbeat/ChangeLog +++ b/sys-cluster/heartbeat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/heartbeat # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.46 2006/07/13 13:07:20 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.47 2006/07/14 17:41:48 xmerlin Exp $ + + 14 Jul 2006; Christian Zoffoli + +files/heartbeat-2.0.4-op_list.patch, heartbeat-2.0.4.ebuild: + op_list fix, thanks to Federico Cuello . 13 Jul 2006; Christian Zoffoli heartbeat-2.0.4.ebuild, heartbeat-2.0.5.ebuild: diff --git a/sys-cluster/heartbeat/files/heartbeat-2.0.4-op_list.patch b/sys-cluster/heartbeat/files/heartbeat-2.0.4-op_list.patch new file mode 100644 index 000000000000..508be71d2ac3 --- /dev/null +++ b/sys-cluster/heartbeat/files/heartbeat-2.0.4-op_list.patch @@ -0,0 +1,11 @@ +--- heartbeat-2.0.4/lib/lrm/clientlib.c.orig 2006-07-14 20:27:35.000000000 +0200 ++++ heartbeat-2.0.4/lib/lrm/clientlib.c 2006-07-14 20:36:44.000000000 +0200 +@@ -1014,7 +1014,7 @@ + } + ha_msg_del(op_msg); + } +- g_list_sort(op_list, compare_call_id); ++ op_list = g_list_sort(op_list, compare_call_id); + return op_list; + } + diff --git a/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild index 717ad56c9a01..66458263d704 100644 --- a/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild +++ b/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild,v 1.4 2006/07/13 13:07:20 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild,v 1.5 2006/07/14 17:41:48 xmerlin Exp $ -inherit flag-o-matic +inherit flag-o-matic eutils DESCRIPTION="Heartbeat high availability cluster manager" HOMEPAGE="http://www.linux-ha.org" @@ -36,6 +36,11 @@ DEPEND=" dev-lang/swig " +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-op_list.patch || die +} src_compile() { append-ldflags $(bindnow-flags) -- cgit v1.2.3-65-gdbad