summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-im/bitlbee/ChangeLog6
-rw-r--r--net-im/bitlbee/bitlbee-1.2.2.ebuild4
-rw-r--r--net-im/bitlbee/files/bitlbee-1.2.2-fix_tests_check_set.patch11
3 files changed, 19 insertions, 2 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 8d4e8ac32bf5..f3ba3d9b1f43 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/bitlbee
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.104 2008/08/30 09:05:04 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.105 2008/08/30 16:00:52 cedk Exp $
+
+ 30 Aug 2008; Cédric Krier <cedk@gentoo.org>
+ +files/bitlbee-1.2.2-fix_tests_check_set.patch, bitlbee-1.2.2.ebuild:
+ Fix tests check_set for bug #236160
*bitlbee-1.2.2 (30 Aug 2008)
diff --git a/net-im/bitlbee/bitlbee-1.2.2.ebuild b/net-im/bitlbee/bitlbee-1.2.2.ebuild
index 14e5ed33915b..c7e129db1197 100644
--- a/net-im/bitlbee/bitlbee-1.2.2.ebuild
+++ b/net-im/bitlbee/bitlbee-1.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.2.ebuild,v 1.1 2008/08/30 09:05:04 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.2.2.ebuild,v 1.2 2008/08/30 16:00:52 cedk Exp $
EAPI="1"
inherit eutils toolchain-funcs confutils
@@ -78,6 +78,8 @@ src_unpack() {
sed -i \
-e "s@mozilla-nss@nss@g" \
configure || die "sed failed in configure"
+
+ epatch "${FILESDIR}/${P}-fix_tests_check_set.patch"
}
src_compile() {
diff --git a/net-im/bitlbee/files/bitlbee-1.2.2-fix_tests_check_set.patch b/net-im/bitlbee/files/bitlbee-1.2.2-fix_tests_check_set.patch
new file mode 100644
index 000000000000..839edd0869bf
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-1.2.2-fix_tests_check_set.patch
@@ -0,0 +1,11 @@
+diff -ru bitlbee-1.2.2~/tests/check_set.c bitlbee-1.2.2/tests/check_set.c
+--- bitlbee-1.2.2~/tests/check_set.c 2008-08-30 17:53:39.000000000 +0200
++++ bitlbee-1.2.2/tests/check_set.c 2008-08-30 17:53:58.000000000 +0200
+@@ -98,6 +98,7 @@
+ START_TEST(test_setstr_implicit)
+ void *data = "data";
+ set_t *s = NULL, *t;
++ t = set_add(&s, "name", "foo", NULL, data);
+ set_setstr(&s, "name", "bloe");
+ fail_unless(set_find(&s, "name") != NULL);
+ END_TEST