Added upstream patch fixing segfault during automated run. (bug #143753)

Package-Manager: portage-2.1.2_rc2

4 files changed, 38 insertions, 20 deletions

diff --git a/sys-devel/prelink/ChangeLog b/sys-devel/prelink/ChangeLog
index 49a18ce3f53b..b90bb88c3e5c 100644
--- a/sys-devel/prelink/ChangeLog
+++ b/sys-devel/prelink/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/prelink
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.45 2006/07/25 11:57:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/ChangeLog,v 1.46 2006/11/18 20:48:16 dirtyepic Exp $
+
+  18 Nov 2006; <dirtyepic@gentoo.org>
+  +files/prelink-20060712-cache-segfault.patch, prelink-20060712.ebuild:
+  Added upstream patch fixing segfault during automated run. (bug #143753)
 
 *prelink-20060712 (25 Jul 2006)
 
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index 8951d85d8db2..b5d6f6c7f07c 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX prelink-20040707-init.patch 1471 RMD160 8dfdcffde6d66d874e960b60310ef495df0e97f1 SHA1 f4a05aad25a3490018a1cdcd7a7f79b83f293733 SHA256 ee745a928fe46d832a0a8af010de43592a5a673cccc870d4d3f2e5d2ad458ad4
 MD5 23dd82792b9637171b3f2fffc51eeea9 files/prelink-20040707-init.patch 1471
 RMD160 8dfdcffde6d66d874e960b60310ef495df0e97f1 files/prelink-20040707-init.patch 1471
@@ -13,6 +10,10 @@ AUX prelink-20060213-symloop.patch 412 RMD160 4b8a1a6c82d34dbd09dad51d529927a583
 MD5 421b7cb118be678afb601e96150d990c files/prelink-20060213-symloop.patch 412
 RMD160 4b8a1a6c82d34dbd09dad51d529927a5830aa311 files/prelink-20060213-symloop.patch 412
 SHA256 e4c7c11b7bf56ebb832ca1e399f734d697480d0af2e14b7f76d19be749ab8ef5 files/prelink-20060213-symloop.patch 412
+AUX prelink-20060712-cache-segfault.patch 629 RMD160 a115f0141c74f1dac1eec884649a2fe927b45898 SHA1 a6e7c9bc627f63e6ccce6539b1f21a6f20adca9a SHA256 cdaf9da433ccdd3932baa1960f650e27f40d5142706bada3dc13f3624cc53a84
+MD5 9f1c5a211bd4d8afa35f4601a0a8e0e0 files/prelink-20060712-cache-segfault.patch 629
+RMD160 a115f0141c74f1dac1eec884649a2fe927b45898 files/prelink-20060712-cache-segfault.patch 629
+SHA256 cdaf9da433ccdd3932baa1960f650e27f40d5142706bada3dc13f3624cc53a84 files/prelink-20060712-cache-segfault.patch 629
 AUX prelink.confd 1454 RMD160 0eae2b85fe68c19dd1c843834b45f1a9c16b49b7 SHA1 9e673a6195c97f26a2d3d7c458623cbd83145227 SHA256 0e4345269f90b34f8dc0253e15c62696d371c4ba7faf5ca3ac81fe559adbc13a
 MD5 3bdd06eb10f032f3c219dc8e73f7f2b7 files/prelink.confd 1454
 RMD160 0eae2b85fe68c19dd1c843834b45f1a9c16b49b7 files/prelink.confd 1454
@@ -42,14 +43,14 @@ EBUILD prelink-20060213.ebuild 2307 RMD160 ae137772849a0d1175f15404a63642f4977ec
 MD5 a67c5d3ddb1f24d35c91675193cdd717 prelink-20060213.ebuild 2307
 RMD160 ae137772849a0d1175f15404a63642f4977ecad8 prelink-20060213.ebuild 2307
 SHA256 14e068374a3243b44ffe81c8744c4d223e55d593f321acb1090fd232ca8cff28 prelink-20060213.ebuild 2307
-EBUILD prelink-20060712.ebuild 2307 RMD160 ae0078b3186ca19e336f2ab79b0b784b6fd25a51 SHA1 6f12d3a0833bb77ca48f740380a432a96c183e45 SHA256 7acfc8eee3cfc67e4cd22741e2db1ae5e6786990a0e4519c59efc59803ac9fbd
-MD5 0c8b877bf2aad54657b4fbf5e6a11a2b prelink-20060712.ebuild 2307
-RMD160 ae0078b3186ca19e336f2ab79b0b784b6fd25a51 prelink-20060712.ebuild 2307
-SHA256 7acfc8eee3cfc67e4cd22741e2db1ae5e6786990a0e4519c59efc59803ac9fbd prelink-20060712.ebuild 2307
-MISC ChangeLog 5064 RMD160 3d1c95fff77ddbdf8d67702134ff25c3cb771226 SHA1 6f323406c481ab6f30311b3e2eaf2bdc59e4c41e SHA256 e745292912cfe2cbb9167f67721158e34dacb93ae44b90316af53242f3b5f0ee
-MD5 634df72ca9bf951016531e760bb59e2c ChangeLog 5064
-RMD160 3d1c95fff77ddbdf8d67702134ff25c3cb771226 ChangeLog 5064
-SHA256 e745292912cfe2cbb9167f67721158e34dacb93ae44b90316af53242f3b5f0ee ChangeLog 5064
+EBUILD prelink-20060712.ebuild 2366 RMD160 a51ec5dcb43b11349dbfd27425883e6552f9eac3 SHA1 d8b6c8e70379381df43de1e437058793c4af8c2d SHA256 e3ea795d7b98b44a4ae52b2dfc3bda2348ba9d445270384b0995dbab68fe6259
+MD5 3c23d535eb009091a70ef2cbd754ad26 prelink-20060712.ebuild 2366
+RMD160 a51ec5dcb43b11349dbfd27425883e6552f9eac3 prelink-20060712.ebuild 2366
+SHA256 e3ea795d7b98b44a4ae52b2dfc3bda2348ba9d445270384b0995dbab68fe6259 prelink-20060712.ebuild 2366
+MISC ChangeLog 5254 RMD160 a12dc8334d5e6e602b0c9c4958fa62af5f272a1b SHA1 6b727fd0e9f3a3ba669651558cf1079cce5d5449 SHA256 40e15379c08e8d1ac461bfef36a5b9cf22bd76db0485975f7e5bd1914de9d933
+MD5 db3ba7f0f21cd65be502cf56db2bae6a ChangeLog 5254
+RMD160 a12dc8334d5e6e602b0c9c4958fa62af5f272a1b ChangeLog 5254
+SHA256 40e15379c08e8d1ac461bfef36a5b9cf22bd76db0485975f7e5bd1914de9d933 ChangeLog 5254
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -69,10 +70,3 @@ SHA256 5a088be112fce2bb2d0afe8915be8d31b9d89289c0576135fa80f085aeed37ef files/di
 MD5 068c2de215f3cb89ad14659bf07ee2b0 files/digest-prelink-20060712 253
 RMD160 203e70a3b65ed3f1a4fdb8b2000a97f853b0e475 files/digest-prelink-20060712 253
 SHA256 efd7276b88d104bff03edc3a4a1ab6711d4af9c91e1297c236e78d8ed5aeba99 files/digest-prelink-20060712 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD4DBQFExgfZ1ZcsMnZjRyIRAusUAJiLZIzX5pXL+Yv3IAG6uC6pF2sIAJwKDkNc
-YYn2a3P3XjLuigx0b77SIA==
-=CPLb
------END PGP SIGNATURE-----
diff --git a/sys-devel/prelink/files/prelink-20060712-cache-segfault.patch b/sys-devel/prelink/files/prelink-20060712-cache-segfault.patch
new file mode 100644
index 000000000000..d73b9d418645
--- /dev/null
+++ b/sys-devel/prelink/files/prelink-20060712-cache-segfault.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/show_bug.cgi?id=143753
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=197451
+
+diff -urN prelink-0.0.20060712.orig/src/cache.c prelink-0.0.20060712/src/cache.c
+--- prelink-0.0.20060712.orig/src/cache.c       2006-08-15 23:36:13.000000000 +0000
++++ prelink-0.0.20060712/src/cache.c    2006-08-15 23:36:34.000000000 +0000
+@@ -336,8 +336,8 @@
+   struct prelink_entry *a = * (struct prelink_entry **) A;
+   struct prelink_entry *b = * (struct prelink_entry **) B;
+
+-  if (a == NULL && b != NULL)
+-    return 1;
++  if (a == NULL)
++    return (b != NULL);
+   if (a != NULL && b == NULL)
+     return -1;
+
+
+
diff --git a/sys-devel/prelink/prelink-20060712.ebuild b/sys-devel/prelink/prelink-20060712.ebuild
index 33877ac4175e..1fac42d080bc 100644
--- a/sys-devel/prelink/prelink-20060712.ebuild
+++ b/sys-devel/prelink/prelink-20060712.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20060712.ebuild,v 1.1 2006/07/25 11:57:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/prelink/prelink-20060712.ebuild,v 1.2 2006/11/18 20:48:16 dirtyepic Exp $
 
 inherit eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-20040707-init.patch
 	epatch ${FILESDIR}/${PN}-20060213-symloop.patch
+	epatch ${FILESDIR}/${PN}-20060712-cache-segfault.patch
 
 	# Build our /etc/env.d/60prelink
 	cat > "${S}/60prelink" <<-EOF