diff options
| author |   Dawid Węgliński <cla@gentoo.org> | 2010-09-29 11:54:36 +0000 |
|---|---|---|
| committer | Dawid Węgliński <cla@gentoo.org> | 2010-09-29 11:54:36 +0000 |
| commit | 5ea0d35c9b6f8b0e25c7dd6398cb327362c32c5e (patch) | |
| tree | 5acfd87f7586978822e0ce9e850213319ae89e49 /sys-cluster | |
| parent | Version bump with bugfixes and pass proper configure upnp option (bug #292076... (diff) | |
| download | gentoo-2-5ea0d35c9b6f8b0e25c7dd6398cb327362c32c5e.tar.gz gentoo-2-5ea0d35c9b6f8b0e25c7dd6398cb327362c32c5e.tar.bz2 gentoo-2-5ea0d35c9b6f8b0e25c7dd6398cb327362c32c5e.zip | |
Fix assert bug (bug #290579)
(Portage version: 2.2_rc78/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/heartbeat/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/heartbeat/files/heartbeat-2.0.8-crm-assert.patch | 11 | ||||
| -rw-r--r-- | sys-cluster/heartbeat/heartbeat-2.0.8.ebuild | 5 |
3 files changed, 19 insertions, 3 deletions
diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog index d8ec59526aeb..bf72def27312 100644 --- a/sys-cluster/heartbeat/ChangeLog +++ b/sys-cluster/heartbeat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/heartbeat # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.84 2010/09/11 14:21:31 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.85 2010/09/29 11:54:36 cla Exp $ + + 29 Sep 2010; Dawid Węgliński <cla@gentoo.org> heartbeat-2.0.8.ebuild, + +files/heartbeat-2.0.8-crm-assert.patch: + Fix assert bug (bug #290579) 11 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml: Drop useles maintainer line diff --git a/sys-cluster/heartbeat/files/heartbeat-2.0.8-crm-assert.patch b/sys-cluster/heartbeat/files/heartbeat-2.0.8-crm-assert.patch new file mode 100644 index 000000000000..9ac7d780c654 --- /dev/null +++ b/sys-cluster/heartbeat/files/heartbeat-2.0.8-crm-assert.patch @@ -0,0 +1,11 @@ +diff -Naur heartbeat-2.0.8.old/lib/crm/common/utils.c heartbeat-2.0.8/lib/crm/common/utils.c +--- heartbeat-2.0.8.old/lib/crm/common/utils.c 2010-09-29 13:40:09.000000000 +0200 ++++ heartbeat-2.0.8/lib/crm/common/utils.c 2010-09-29 13:41:45.000000000 +0200 +@@ -698,7 +698,6 @@ + crm_str_eq(const char *a, const char *b, gboolean use_case) + { + if(a == NULL || b == NULL) { +- CRM_ASSERT(a != b); + return FALSE; + + } else if(use_case && a[0] != b[0]) { diff --git a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild index 091673d64785..48e516279173 100644 --- a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild +++ b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.18 2010/06/30 10:58:41 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.19 2010/09/29 11:54:36 cla Exp $ inherit autotools flag-o-matic eutils @@ -52,7 +52,8 @@ src_unpack() { "${FILESDIR}"/${P}-delay.patch \ "${FILESDIR}"/${P}-glibc.patch \ "${FILESDIR}"/${P}-asneeded.patch \ - "${FILESDIR}"/${P}-install_fix.patch + "${FILESDIR}"/${P}-install_fix.patch \ + "${FILESDIR}"/${P}-crm-assert.patch sed -i \ -e 's:libgnutls-config:pkg-config gnutls:g' \ |