mirror of
https://gitdl.cn/https://github.com/chakralinux/lib32.git
synced 2025-01-23 17:33:34 +08:00
updated lib32-glibc to version 2.14
This commit is contained in:
Giuseppe
parent
c22a5faefd
commit
0f89520739
@ -6,35 +6,44 @@
|
||||
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
|
||||
# NOTE: valgrind requires rebuild with each new glibc version
|
||||
|
||||
_pkgbasename=glibc
|
||||
pkgname=lib32-$_pkgbasename
|
||||
pkgver=2.13
|
||||
pkgrel=3
|
||||
_glibcdate=20110117
|
||||
_pkgname=glibc
|
||||
pkgname=lib32-$_pkgname
|
||||
pkgver=2.14
|
||||
pkgrel=1
|
||||
_glibcdate=20110908
|
||||
pkgdesc="GNU C Library for multilib"
|
||||
arch=('x86_64')
|
||||
url="http://www.gnu.org/software/libc"
|
||||
license=('GPL' 'LGPL')
|
||||
depends=("glibc>=$pkgver")
|
||||
makedepends=('gcc-multilib>=4.4')
|
||||
#makedepends=('gcc-multilib>=4.6')
|
||||
makedepends=('gcc-multilib')
|
||||
options=('!strip' '!emptydirs')
|
||||
source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz
|
||||
source=(http://chakra-project.org/sources/${_pkgename}/${_pkgname}-${pkgver}_${_glibcdate}.tar.xz
|
||||
glibc-2.10-dont-build-timezone.patch
|
||||
glibc-2.10-bz4781.patch
|
||||
glibc-__i686.patch
|
||||
glibc-2.12.1-static-shared-getpagesize.patch
|
||||
glibc-2.12.2-ignore-origin-of-privileged-program.patch
|
||||
glibc-2.13-prelink.patch
|
||||
glibc-2.13-futex.patch
|
||||
glibc-2.13-dlclose-search-reset.patch
|
||||
glibc-2.14-libdl-crash.patch
|
||||
glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
|
||||
glibc-2.14-reexport-rpc-interface.patch
|
||||
glibc-2.14-reinstall-nis-rpc-headers.patch
|
||||
lib32-glibc.conf)
|
||||
md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190'
|
||||
md5sums=('069069eb9100cc7affd7ad884cb3c3e9'
|
||||
'4dadb9203b69a3210d53514bb46f41c3'
|
||||
'0c5540efc51c0b93996c51b57a8540ae'
|
||||
'40cd342e21f71f5e49e32622b25acc52'
|
||||
'a3ac6f318d680347bb6e2805d42b73b2'
|
||||
'b042647ea7d6f22ad319e12e796bd13e'
|
||||
'24dfab6fd244f3773523412588ecc52c'
|
||||
'7d0154b7e17ea218c9fa953599d24cc4'
|
||||
'22d09c58718fb3d1d31c3a6c14ca6886'
|
||||
'cea62cc6b903d222c5f26e05a3c0e0e6'
|
||||
'13728807283f111e5d9d38cf38e0a461'
|
||||
'c5de2a946215d647c8af5432ec4b0da0'
|
||||
'55febbb72139ac7b65757df085024b83'
|
||||
'6e052f1cb693d5d3203f50f9d4e8c33b')
|
||||
|
||||
build() {
|
||||
@ -58,23 +67,41 @@ build() {
|
||||
# http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
|
||||
patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
|
||||
|
||||
# http://sourceware.org/bugzilla/show_bug.cgi?id=12489
|
||||
# http://sourceware.org/git/?p=glibc.git;a=commit;h=25b3aada (only fedora branch...)
|
||||
patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch
|
||||
|
||||
# http://sourceware.org/bugzilla/show_bug.cgi?id=12403
|
||||
patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=593675
|
||||
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only fedora branch...)
|
||||
patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.patch
|
||||
|
||||
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
|
||||
# http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
|
||||
patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
|
||||
|
||||
# http://sourceware.org/bugzilla/show_bug.cgi?id=13013
|
||||
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
|
||||
patch -Np1 -i ${srcdir}/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
|
||||
|
||||
# re-export RPC interface until libtirpc is ready as a replacement
|
||||
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
|
||||
patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
|
||||
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
|
||||
patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
|
||||
|
||||
cd ${srcdir}
|
||||
mkdir glibc-build
|
||||
cd glibc-build
|
||||
|
||||
export CC="gcc -m32"
|
||||
|
||||
# Hack to fix NPTL issues with Xen, only required on 32bit platforms
|
||||
export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
|
||||
|
||||
echo "slibdir=/usr/lib32" >> configparms
|
||||
|
||||
export CC="gcc -m32"
|
||||
# remove hardening options from CFLAGS for building libraries
|
||||
CFLAGS=${CFLAGS/-fstack-protector/}
|
||||
CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
|
||||
|
||||
${srcdir}/glibc/configure --prefix=/usr \
|
||||
--libdir=/usr/lib32 --libexecdir=/usr/lib32 \
|
||||
@ -86,7 +113,22 @@ build() {
|
||||
--without-cvs --disable-profile \
|
||||
--disable-multi-arch i686-unknown-linux-gnu
|
||||
|
||||
# build libraries with hardening disabled
|
||||
echo "build-programs=no" >> configparms
|
||||
make
|
||||
|
||||
# re-enable hardening for programs
|
||||
sed -i "s#=no#=yes#" configparms
|
||||
echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
|
||||
echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
|
||||
make
|
||||
|
||||
# remove harding in preparation to run test-suite
|
||||
sed -i '2,4d' configparms
|
||||
}
|
||||
|
||||
check() {
|
||||
cd ${srcdir}/glibc-build
|
||||
|
||||
# some errors are expected - manually check log files
|
||||
make -k check || true
|
||||
@ -115,7 +157,7 @@ package() {
|
||||
usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
|
||||
usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
|
||||
usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
|
||||
usr/lib32/{pt_chown,gconv/*.so}
|
||||
usr/lib32/{pt_chown,{audit,gconv}/*.so}
|
||||
|
||||
# Dynamic linker
|
||||
install -d -m755 ${pkgdir}/lib
|
||||
@ -127,4 +169,3 @@ package() {
|
||||
# Symlink /usr/lib32/locale to /usr/lib/locale
|
||||
ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
|
||||
}
|
||||
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
|
||||
--- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000
|
||||
+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000
|
||||
@@ -120,9 +120,6 @@
|
||||
ret
|
||||
|
||||
L(thread_start):
|
||||
- cfi_startproc;
|
||||
- /* Clearing frame pointer is insufficient, use CFI. */
|
||||
- cfi_undefined (eip);
|
||||
/* Note: %esi is zero. */
|
||||
movl %esi,%ebp /* terminate the stack frame */
|
||||
#ifdef RESET_PID
|
||||
@@ -155,7 +152,6 @@
|
||||
jmp L(haspid)
|
||||
.previous
|
||||
#endif
|
||||
- cfi_endproc;
|
||||
|
||||
cfi_startproc
|
||||
PSEUDO_END (BP_SYM (__clone))
|
||||
diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
|
||||
--- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000
|
||||
+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000
|
||||
@@ -89,9 +89,6 @@
|
||||
ret
|
||||
|
||||
L(thread_start):
|
||||
- cfi_startproc;
|
||||
- /* Clearing frame pointer is insufficient, use CFI. */
|
||||
- cfi_undefined (rip);
|
||||
/* Clear the frame pointer. The ABI suggests this be done, to mark
|
||||
the outermost frame obviously. */
|
||||
xorl %ebp, %ebp
|
||||
@@ -116,7 +113,6 @@
|
||||
/* Call exit with return value from function call. */
|
||||
movq %rax, %rdi
|
||||
call HIDDEN_JUMPTARGET (_exit)
|
||||
- cfi_endproc;
|
||||
|
||||
cfi_startproc;
|
||||
PSEUDO_END (BP_SYM (__clone))
|
||||
@ -1,13 +0,0 @@
|
||||
timezone data has been split into the package sys-libs/timezone-data
|
||||
|
||||
--- glibc-2.4/Makeconfig
|
||||
+++ glibc-2.4/Makeconfig
|
||||
@@ -931,7 +931,7 @@
|
||||
stdlib stdio-common libio malloc string wcsmbs time dirent \
|
||||
grp pwd posix io termios resource misc socket sysvipc gmon \
|
||||
gnulib iconv iconvdata wctype manual shadow gshadow po argp \
|
||||
- crypt nss localedata timezone rt conform debug \
|
||||
+ crypt nss localedata rt conform debug \
|
||||
$(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
|
||||
|
||||
ifndef avoid-generated
|
||||
196
lib32-glibc/glibc-2.13-dlclose-search-reset.patch
Normal file
196
lib32-glibc/glibc-2.13-dlclose-search-reset.patch
Normal file
@ -0,0 +1,196 @@
|
||||
From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schwab <schwab@redhat.com>
|
||||
Date: Wed, 26 May 2010 18:28:59 +0200
|
||||
Subject: [PATCH] Fix scope handling during dl_close
|
||||
|
||||
---
|
||||
ChangeLog | 12 ++++++++++++
|
||||
elf/Makefile | 10 +++++++++-
|
||||
elf/dl-close.c | 7 +++++++
|
||||
elf/unload8.c | 33 +++++++++++++++++++++++++++++++++
|
||||
elf/unload8mod1.c | 7 +++++++
|
||||
elf/unload8mod1x.c | 1 +
|
||||
elf/unload8mod2.c | 7 +++++++
|
||||
elf/unload8mod3.c | 27 +++++++++++++++++++++++++++
|
||||
8 files changed, 103 insertions(+), 1 deletions(-)
|
||||
create mode 100644 elf/unload8.c
|
||||
create mode 100644 elf/unload8mod1.c
|
||||
create mode 100644 elf/unload8mod1x.c
|
||||
create mode 100644 elf/unload8mod2.c
|
||||
create mode 100644 elf/unload8mod3.c
|
||||
|
||||
diff --git a/elf/Makefile b/elf/Makefile
|
||||
index 59e835f..65b6deb 100644
|
||||
--- a/elf/Makefile
|
||||
+++ b/elf/Makefile
|
||||
@@ -89,6 +89,7 @@ distribute := rtld-Rules \
|
||||
unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
|
||||
unload6mod1.c unload6mod2.c unload6mod3.c \
|
||||
unload7mod1.c unload7mod2.c \
|
||||
+ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \
|
||||
tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \
|
||||
tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \
|
||||
tst-auditmod4a.c tst-auditmod4b.c \
|
||||
@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
|
||||
tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \
|
||||
tst-dlmodcount tst-dlopenrpath tst-deep1 \
|
||||
tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \
|
||||
- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \
|
||||
+ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \
|
||||
tst-audit1 tst-audit2 \
|
||||
tst-stackguard1 tst-addr1 tst-thrlock \
|
||||
tst-unique1 tst-unique2
|
||||
@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
|
||||
unload4mod1 unload4mod2 unload4mod3 unload4mod4 \
|
||||
unload6mod1 unload6mod2 unload6mod3 \
|
||||
unload7mod1 unload7mod2 \
|
||||
+ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \
|
||||
order2mod1 order2mod2 order2mod3 order2mod4 \
|
||||
tst-unique1mod1 tst-unique1mod2 \
|
||||
tst-unique2mod1 tst-unique2mod2
|
||||
@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl)
|
||||
$(objpfx)unload6mod3.so: $(libdl)
|
||||
$(objpfx)unload7mod1.so: $(libdl)
|
||||
$(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so
|
||||
+$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so
|
||||
+$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so
|
||||
+$(objpfx)unload8mod3.so: $(libdl)
|
||||
$(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so
|
||||
$(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so
|
||||
$(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so
|
||||
@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl)
|
||||
$(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so
|
||||
unload7-ENV = MALLOC_PERTURB_=85
|
||||
|
||||
+$(objpfx)unload8: $(libdl)
|
||||
+$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so
|
||||
+
|
||||
ifdef libdl
|
||||
$(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
|
||||
$(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
|
||||
diff --git a/elf/dl-close.c b/elf/dl-close.c
|
||||
index 700e765..f47d5f8 100644
|
||||
--- a/elf/dl-close.c
|
||||
+++ b/elf/dl-close.c
|
||||
@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map)
|
||||
|
||||
imap->l_scope_max = new_size;
|
||||
}
|
||||
+ else if (new_list != NULL)
|
||||
+ {
|
||||
+ /* We didn't change the scope array, so reset the search
|
||||
+ list. */
|
||||
+ imap->l_searchlist.r_list = NULL;
|
||||
+ imap->l_searchlist.r_nlist = 0;
|
||||
+ }
|
||||
|
||||
/* The loader is gone, so mark the object as not having one.
|
||||
Note: l_idx != IDX_STILL_USED -> object will be removed. */
|
||||
diff --git a/elf/unload8.c b/elf/unload8.c
|
||||
new file mode 100644
|
||||
index 0000000..f984a38
|
||||
--- /dev/null
|
||||
+++ b/elf/unload8.c
|
||||
@@ -0,0 +1,33 @@
|
||||
+#include <dlfcn.h>
|
||||
+#include <stdio.h>
|
||||
+
|
||||
+int
|
||||
+main (void)
|
||||
+{
|
||||
+ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY);
|
||||
+ if (h == NULL)
|
||||
+ {
|
||||
+ puts ("dlopen unload8mod1.so failed");
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY);
|
||||
+ if (h2 == NULL)
|
||||
+ {
|
||||
+ puts ("dlopen unload8mod1x.so failed");
|
||||
+ return 1;
|
||||
+ }
|
||||
+ dlclose (h2);
|
||||
+
|
||||
+ int (*mod1) (void) = dlsym (h, "mod1");
|
||||
+ if (mod1 == NULL)
|
||||
+ {
|
||||
+ puts ("dlsym failed");
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ mod1 ();
|
||||
+ dlclose (h);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c
|
||||
new file mode 100644
|
||||
index 0000000..fe7e81c
|
||||
--- /dev/null
|
||||
+++ b/elf/unload8mod1.c
|
||||
@@ -0,0 +1,7 @@
|
||||
+extern void mod2 (void);
|
||||
+
|
||||
+void
|
||||
+mod1 (void)
|
||||
+{
|
||||
+ mod2 ();
|
||||
+}
|
||||
diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c
|
||||
new file mode 100644
|
||||
index 0000000..835b634
|
||||
--- /dev/null
|
||||
+++ b/elf/unload8mod1x.c
|
||||
@@ -0,0 +1 @@
|
||||
+int mod1x;
|
||||
diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c
|
||||
new file mode 100644
|
||||
index 0000000..2fd8b67
|
||||
--- /dev/null
|
||||
+++ b/elf/unload8mod2.c
|
||||
@@ -0,0 +1,7 @@
|
||||
+extern void mod3 (void);
|
||||
+
|
||||
+void
|
||||
+mod2 (void)
|
||||
+{
|
||||
+ mod3 ();
|
||||
+}
|
||||
diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c
|
||||
new file mode 100644
|
||||
index 0000000..d49e22b
|
||||
--- /dev/null
|
||||
+++ b/elf/unload8mod3.c
|
||||
@@ -0,0 +1,27 @@
|
||||
+#include <dlfcn.h>
|
||||
+#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
+void
|
||||
+mod3_fini2 (void)
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+mod3_fini (void)
|
||||
+{
|
||||
+ mod3_fini2 ();
|
||||
+}
|
||||
+
|
||||
+void
|
||||
+mod3 (void)
|
||||
+{
|
||||
+ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY);
|
||||
+ if (h == NULL)
|
||||
+ {
|
||||
+ puts ("dlopen unload8mod2.so failed");
|
||||
+ exit (1);
|
||||
+ }
|
||||
+
|
||||
+ atexit (mod3_fini);
|
||||
+}
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
diff --git a/elf/rtld.c b/elf/rtld.c
|
||||
index 9a560b3..201c9cf 100644
|
||||
--- a/elf/rtld.c
|
||||
+++ b/elf/rtld.c
|
||||
@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
||||
we need it in the memory handling later. */
|
||||
GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
|
||||
|
||||
+ /* Remember the last search directory added at startup, now that
|
||||
+ malloc will no longer be the one from dl-minimal.c. */
|
||||
+ GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
|
||||
+
|
||||
if (prelinked)
|
||||
{
|
||||
if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
|
||||
@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
||||
lossage);
|
||||
}
|
||||
|
||||
- /* Remember the last search directory added at startup, now that
|
||||
- malloc will no longer be the one from dl-minimal.c. */
|
||||
- GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
|
||||
-
|
||||
if (! prelinked && rtld_multiple_ref)
|
||||
{
|
||||
/* There was an explicit ref to the dynamic linker as a shared lib.
|
||||
@ -0,0 +1,26 @@
|
||||
From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schwab <schwab@redhat.com>
|
||||
Date: Thu, 1 Sep 2011 10:46:14 +0200
|
||||
Subject: [PATCH] Avoid assertion failure when first DNS answer was empty
|
||||
|
||||
---
|
||||
ChangeLog | 4 ++++
|
||||
resolv/res_query.c | 2 +-
|
||||
2 files changed, 5 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/resolv/res_query.c b/resolv/res_query.c
|
||||
index 2f7cfaa..2ded9fb 100644
|
||||
--- a/resolv/res_query.c
|
||||
+++ b/resolv/res_query.c
|
||||
@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp,
|
||||
&& *resplen2 > (int) sizeof (HEADER))
|
||||
{
|
||||
/* Special case of partial answer. */
|
||||
- assert (hp != hp2);
|
||||
+ assert (n == 0 || hp != hp2);
|
||||
hp = hp2;
|
||||
}
|
||||
else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
132
lib32-glibc/glibc-2.14-libdl-crash.patch
Normal file
132
lib32-glibc/glibc-2.14-libdl-crash.patch
Normal file
@ -0,0 +1,132 @@
|
||||
diff --git a/elf/dl-close.c b/elf/dl-close.c
|
||||
index 73b2a2f..9bd91e3 100644
|
||||
--- a/elf/dl-close.c
|
||||
+++ b/elf/dl-close.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/* Close a shared object opened by `_dl_open'.
|
||||
- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
|
||||
if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
|
||||
|| dl_close_state != not_pending)
|
||||
{
|
||||
- if (map->l_direct_opencount == 0)
|
||||
- {
|
||||
- if (map->l_type == lt_loaded)
|
||||
- dl_close_state = rerun;
|
||||
- else if (map->l_type == lt_library)
|
||||
- {
|
||||
- struct link_map **oldp = map->l_initfini;
|
||||
- map->l_initfini = map->l_orig_initfini;
|
||||
- _dl_scope_free (oldp);
|
||||
- }
|
||||
- }
|
||||
+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
|
||||
+ dl_close_state = rerun;
|
||||
|
||||
/* There are still references to this object. Do nothing more. */
|
||||
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
|
||||
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
|
||||
index 9e30594..3890d00 100644
|
||||
--- a/elf/dl-deps.c
|
||||
+++ b/elf/dl-deps.c
|
||||
@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
|
||||
nneeded * sizeof needed[0]);
|
||||
atomic_write_barrier ();
|
||||
l->l_initfini = l_initfini;
|
||||
+ l->l_free_initfini = 1;
|
||||
}
|
||||
|
||||
/* If we have no auxiliary objects just go on to the next map. */
|
||||
@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
|
||||
l_initfini[nlist] = NULL;
|
||||
atomic_write_barrier ();
|
||||
map->l_initfini = l_initfini;
|
||||
+ map->l_free_initfini = 1;
|
||||
if (l_reldeps != NULL)
|
||||
{
|
||||
atomic_write_barrier ();
|
||||
@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
|
||||
_dl_scope_free (old_l_reldeps);
|
||||
}
|
||||
if (old_l_initfini != NULL)
|
||||
- map->l_orig_initfini = old_l_initfini;
|
||||
+ _dl_scope_free (old_l_initfini);
|
||||
}
|
||||
diff --git a/elf/dl-libc.c b/elf/dl-libc.c
|
||||
index 7be9483..a13fce3 100644
|
||||
--- a/elf/dl-libc.c
|
||||
+++ b/elf/dl-libc.c
|
||||
@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
|
||||
|
||||
for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
|
||||
{
|
||||
- /* Remove all additional names added to the objects. */
|
||||
for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
|
||||
{
|
||||
struct libname_list *lnp = l->l_libname->next;
|
||||
|
||||
l->l_libname->next = NULL;
|
||||
|
||||
+ /* Remove all additional names added to the objects. */
|
||||
while (lnp != NULL)
|
||||
{
|
||||
struct libname_list *old = lnp;
|
||||
@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
|
||||
if (! old->dont_free)
|
||||
free (old);
|
||||
}
|
||||
+
|
||||
+ /* Free the initfini dependency list. */
|
||||
+ if (l->l_free_initfini)
|
||||
+ free (l->l_initfini);
|
||||
}
|
||||
|
||||
if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
|
||||
diff --git a/elf/rtld.c b/elf/rtld.c
|
||||
index 4a9109e..617e30e 100644
|
||||
--- a/elf/rtld.c
|
||||
+++ b/elf/rtld.c
|
||||
@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
|
||||
lnp->dont_free = 1;
|
||||
lnp = lnp->next;
|
||||
}
|
||||
+ l->l_free_initfini = 0;
|
||||
|
||||
if (l != &GL(dl_rtld_map))
|
||||
_dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
|
||||
diff --git a/include/link.h b/include/link.h
|
||||
index e877104..051b99a 100644
|
||||
--- a/include/link.h
|
||||
+++ b/include/link.h
|
||||
@@ -1,6 +1,6 @@
|
||||
/* Data structure for communication from the run-time dynamic linker for
|
||||
loaded ELF shared objects.
|
||||
- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
@@ -192,6 +192,9 @@ struct link_map
|
||||
during LD_TRACE_PRELINKING=1
|
||||
contains any DT_SYMBOLIC
|
||||
libraries. */
|
||||
+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
|
||||
+ freed, ie. not allocated with
|
||||
+ the dummy malloc in ld.so. */
|
||||
|
||||
/* Collected information about own RPATH directories. */
|
||||
struct r_search_path_struct l_rpath_dirs;
|
||||
@@ -240,9 +243,6 @@ struct link_map
|
||||
|
||||
/* List of object in order of the init and fini calls. */
|
||||
struct link_map **l_initfini;
|
||||
- /* The init and fini list generated at startup, saved when the
|
||||
- object is also loaded dynamically. */
|
||||
- struct link_map **l_orig_initfini;
|
||||
|
||||
/* List of the dependencies introduced through symbol binding. */
|
||||
struct link_map_reldeps
|
||||
26
lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
Normal file
26
lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/include/libc-symbols.h b/include/libc-symbols.h
|
||||
index 67e1ca2..5e7cca5 100644
|
||||
--- a/include/libc-symbols.h
|
||||
+++ b/include/libc-symbols.h
|
||||
@@ -635,7 +635,7 @@ for linking")
|
||||
# define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
|
||||
# define libc_hidden_def(name) hidden_def (name)
|
||||
# define libc_hidden_weak(name) hidden_weak (name)
|
||||
-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
|
||||
+# define libc_hidden_nolink(name, version) hidden_def (name)
|
||||
# define libc_hidden_ver(local, name) hidden_ver (local, name)
|
||||
# define libc_hidden_data_def(name) hidden_data_def (name)
|
||||
# define libc_hidden_data_weak(name) hidden_data_weak (name)
|
||||
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
|
||||
index 5134ce9..40c73d1 100644
|
||||
--- a/sunrpc/Makefile
|
||||
+++ b/sunrpc/Makefile
|
||||
@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
|
||||
des_crypt.h)
|
||||
headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
|
||||
$(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
|
||||
-headers = rpc/netdb.h
|
||||
+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
|
||||
install-others = $(inst_sysconfdir)/rpc
|
||||
generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
|
||||
$(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
|
||||
28
lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
Normal file
28
lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schwab <schwab@redhat.com>
|
||||
Date: Tue, 17 May 2011 17:42:30 +0200
|
||||
Subject: [PATCH] Reinstall NIS RPC headers
|
||||
|
||||
---
|
||||
nis/Makefile | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/nis/Makefile b/nis/Makefile
|
||||
index b5c9609..d2934d9 100644
|
||||
--- a/nis/Makefile
|
||||
+++ b/nis/Makefile
|
||||
@@ -23,9 +23,9 @@ subdir := nis
|
||||
|
||||
aux := nis_hash
|
||||
|
||||
+headers := $(wildcard rpcsvc/*.[hx])
|
||||
distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
|
||||
- nisplus-parser.h nis_xdr.h nss \
|
||||
- $(wildcard rpcsvc/*.[hx])
|
||||
+ nisplus-parser.h nis_xdr.h nss
|
||||
|
||||
# These are the databases available for the nis (and perhaps later nisplus)
|
||||
# service. This must be a superset of the services in nss.
|
||||
--
|
||||
1.7.5.4
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
|
||||
--- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000
|
||||
+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000
|
||||
@@ -1,6 +1,7 @@
|
||||
# The mpn functions need a #define for asm syntax flavor.
|
||||
-# Every i386 port in use uses gas syntax (I think).
|
||||
-asm-CPPFLAGS += -DGAS_SYNTAX
|
||||
+# Every i386 port in use uses gas syntax (I think). Don't replace
|
||||
+# __i686 in __i686.get_pc_thunk.bx.
|
||||
+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686
|
||||
|
||||
# The i386 `long double' is a distinct type we support.
|
||||
long-double-fcts = yes
|
||||
@ -1 +0,0 @@
|
||||
/usr/lib32
|
||||
@ -1,11 +0,0 @@
|
||||
post_install() {
|
||||
sbin/ldconfig -r .
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
post_install
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user