Fix tests check_set for bug #236160

Package-Manager: portage-2.1.4.4

4 files changed, 22 insertions, 4 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/Manifest b/net-im/bitlbee/Manifest
index a28dbe291bd6..241302deae39 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,4 +1,5 @@
 AUX bitlbee-1.0.3-xinetd.patch 504 RMD160 ceda3cb2ac112a8cd79565a4654c432747cf8821 SHA1 67cbfbcc411ec8846acb74398435daeb8bf0dddd SHA256 d1644765e413d2964997396f56ee7df915861f105a6238e926ac81d643c8d3ec
+AUX bitlbee-1.2.2-fix_tests_check_set.patch 452 RMD160 22544fc0acde62566a44ca97a63f5c1a23e29d07 SHA1 5874404077a692a3c8be6fc29b3bbc2ff7324b58 SHA256 1569026c1c9e5d784e6deddbc71f9bf63a58c28fd62325294c733e897a151271
 AUX bitlbee-gentoohack.patch 1015 RMD160 7149ceb9401a3f3986bd79b10a2ee16bd671e4a6 SHA1 612e35eb03253f30d476b883a93c89f3a131c564 SHA256 5d492cce483fd54f3abc7cdf7268e60efca9d0c70ad42ce37b58e21cce6d5745
 AUX bitlbee-xinetd.patch 519 RMD160 7594a98df26708e500c3f0c9e02e7974de19eff0 SHA1 cb9f28ed97dc2222b4b14423f8e82e65e8da1b45 SHA256 8a2c05060ab68f44dc296ccf5054e1dd29342b61b9801d9d90e05830b9edc20e
 AUX bitlbeed.confd 556 RMD160 775492d2db54e176b204cf45a3b1884d0fde363d SHA1 210f526e8924dd516b483f5710105fe531699943 SHA256 6a01b88182ac4e72499744e0c4909bb2529f2c908d1667dc8c104083c05998c0
@@ -18,7 +19,7 @@ EBUILD bitlbee-1.0.4.ebuild 4780 RMD160 7ec0ca612ed9be89b962d3b8135de1d242411c66
 EBUILD bitlbee-1.1-r1.ebuild 4525 RMD160 5db4e8fe9bbce32fcd893fe61fbea13c83e9a1e0 SHA1 3b6fd1383bf0bf9875f96f2cfb81a47d6a99926d SHA256 d6a509f1318f4c438915963792dd2ba84b97d883835cd16048b5848e2abaf4da
 EBUILD bitlbee-1.1.1.ebuild 4485 RMD160 7fadfde761bc4e8caf669c76b4d5e0f7277d9014 SHA1 1bfa40755c72c014bc3fc05b44dd28be086dbe42 SHA256 69cb6853f13059de983725bcb679db40f56312585879ed63bc90a046928d1074
 EBUILD bitlbee-1.2.1.ebuild 4746 RMD160 29cd751818c9f5c164a01d380f7a69d21e3a2353 SHA1 ac07153cad981e314b08341cd257bb975e9148ed SHA256 98e320c1896bd3b78c7b093dbae57d409db4dcd5e93a1f11e5d0192e8531b93e
-EBUILD bitlbee-1.2.2.ebuild 4746 RMD160 3300de7cb4bea066049c44fd62b4e7f09a6240d8 SHA1 9e41de15a04e74c9befd4ccd20e209cf9aa2628e SHA256 b3bbe0d2bbdd46d9d1dee743c05b649e14ab5be5ab4a34300e076425606992f4
+EBUILD bitlbee-1.2.2.ebuild 4800 RMD160 2c20b264c9aaee88f6f75f466733007991dc8554 SHA1 cac145a06438c351b8f15ec3c4932859dcfce6be SHA256 c02707ffe516c3f331a6d32df9bfffd0b45fa8cde07c5c9b8f9dd62b594127f5
 EBUILD bitlbee-1.2.ebuild 4763 RMD160 90fa46de3289ce1697bba3b96fce3613c4489b19 SHA1 18387f34c9b734c6ed73a52e4ecb058492938c26 SHA256 4999807a9d122bf839ce357cfadd14c19517f6f0db7d42e9ea609f63224985e6
-MISC ChangeLog 16435 RMD160 2bfee248546569bb2ea0e6ef80098dc020c7feb3 SHA1 c22e6086ac36c1cce51e47028b211115b020f9ea SHA256 4baf92e33a758dc16cf2e441efd5a868c74926b246eeaccaa5d918737b8b91b0
+MISC ChangeLog 16593 RMD160 5ffcc504c6ee1dbb3cd9fed07404b355fbd3ef2c SHA1 ada41365861f2503396a3d3ab855f9ad18c27dcd SHA256 d21475c5672965ae085fb3fe0ea1645d822649c33087ab378d655beb09f67f05
 MISC metadata.xml 526 RMD160 962ae22fcec98d00ffe7c399a5aafb53c9f2a0dd SHA1 80d98eaf4c9a652adb79cf3b0cd3d6c6c25e06c0 SHA256 487bd953ddfca7c67071caefb3ca22387a4845d1e8b3dd34d45b101b95aafd9b
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