diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2006-11-18 20:48:16 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2006-11-18 20:48:16 +0000 |
| commit | 38752c5a465e9bef79b7f0e0f9390c21781cab46 (patch) | |
| tree | 64421a1eafb78eee334149d49d74e5d5c5212062 /sys-devel | |
| parent | New upstream version (diff) | |
| download | gentoo-2-38752c5a465e9bef79b7f0e0f9390c21781cab46.tar.gz gentoo-2-38752c5a465e9bef79b7f0e0f9390c21781cab46.tar.bz2 gentoo-2-38752c5a465e9bef79b7f0e0f9390c21781cab46.zip | |
Added upstream patch fixing segfault during automated run. (bug #143753)
(Portage version: 2.1.2_rc2)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/prelink/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/prelink/files/prelink-20060712-cache-segfault.patch | 19 | ||||
| -rw-r--r-- | sys-devel/prelink/prelink-20060712.ebuild | 3 |
3 files changed, 26 insertions, 2 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/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 |