From b072c653daf233f57d2b20525a864d317788bf26 Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Sun, 9 Mar 2003 03:37:06 +0000 Subject: add patch to fix bug #16504. --- sys-libs/glibc/ChangeLog | 6 +++++- .../files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch | 20 ++++++++++++++++++++ sys-libs/glibc/glibc-2.3.1-r2.ebuild | 5 ++++- sys-libs/glibc/glibc-2.3.1-r3.ebuild | 5 ++++- 4 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 sys-libs/glibc/files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch (limited to 'sys-libs') diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 41362f388ad5..232d62b94522 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.46 2003/03/05 20:37:40 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.47 2003/03/09 03:37:06 azarah Exp $ + + 09 March 2003; Martin Schlemmer glibc-2.3.1*.ebuild : + Add patch glibc-2.3.1-typeo_dl-runtime_c.patch to fix issues with Oracle, + bug #16504, thanks to Tri D. Hoang for reporting. *glibc-2.3.2 (05 March 2003) diff --git a/sys-libs/glibc/files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch b/sys-libs/glibc/files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch new file mode 100644 index 000000000000..2cd7743a0003 --- /dev/null +++ b/sys-libs/glibc/files/2.3.1/glibc-2.3.1-typeo_dl-runtime_c.patch @@ -0,0 +1,20 @@ +--- glibc-2.3.1/elf/dl-runtime.c.orig 2003-03-09 05:26:32.000000000 +0200 ++++ glibc-2.3.1/elf/dl-runtime.c 2003-03-09 05:26:59.000000000 +0200 +@@ -84,7 +84,7 @@ + { + const ElfW(Half) *vernum = + (const void *) D_PTR (l, l_info[VERSYMIDX (DT_VERSYM)]); +- ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info) & 0x7fff]; ++ ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info)] & 0x7fff; + const struct r_found_version *version = &l->l_versions[ndx]; + + if (version->hash != 0) +@@ -179,7 +179,7 @@ + { + const ElfW(Half) *vernum = + (const void *) D_PTR (l,l_info[VERSYMIDX (DT_VERSYM)]); +- ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info) & 0x7fff]; ++ ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info)] & 0x7fff; + const struct r_found_version *version = &l->l_versions[ndx]; + + if (version->hash != 0) diff --git a/sys-libs/glibc/glibc-2.3.1-r2.ebuild b/sys-libs/glibc/glibc-2.3.1-r2.ebuild index 747f84df7d50..63385703c21e 100644 --- a/sys-libs/glibc/glibc-2.3.1-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r2.ebuild,v 1.18 2003/02/13 16:48:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r2.ebuild,v 1.19 2003/03/09 03:37:06 azarah Exp $ IUSE="nls pic build" @@ -122,6 +122,9 @@ src_unpack() { # for this fix, bug #13240. cd ${S}; epatch ${FILESDIR}/${PV}/${P}-locale.patch + # Fix problems with ORACLE, bug #16504 + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-typeo_dl-runtime_c.patch + # A few patches only for the MIPS platform. Descriptions of what they # do can be found in the patch headers. # thx (11 Jan 2003) diff --git a/sys-libs/glibc/glibc-2.3.1-r3.ebuild b/sys-libs/glibc/glibc-2.3.1-r3.ebuild index dea5f23d2aa7..2e1cb0bfba2e 100644 --- a/sys-libs/glibc/glibc-2.3.1-r3.ebuild +++ b/sys-libs/glibc/glibc-2.3.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r3.ebuild,v 1.6 2003/02/13 16:48:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r3.ebuild,v 1.7 2003/03/09 03:37:06 azarah Exp $ IUSE="nls pic build" @@ -122,6 +122,9 @@ src_unpack() { # for this fix, bug #13240. cd ${S}; epatch ${FILESDIR}/${PV}/${P}-locale.patch + # Fix problems with ORACLE, bug #16504 + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-typeo_dl-runtime_c.patch + # A few patches only for the MIPS platform. Descriptions of what they # do can be found in the patch headers. # thx (11 Jan 2003) -- cgit v1.2.3-65-gdbad