From 57e29c27ff174d803512dc107caf6e4113388e4d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 1 Jul 2012 07:34:00 +0200 Subject: [PATCH] glibc: update to 2.16.0. --- ...ibc-2.12.1-static-shared-getpagesize.patch | 11 -- srcpkgs/glibc/patches/glibc-2.13-futex.patch | 33 ---- .../glibc-2.14-reexport-rpc-interface.patch | 26 --- ...glibc-2.14-reinstall-nis-rpc-headers.patch | 28 ---- .../glibc/patches/glibc-2.14.1-fixes-1.patch | 153 ------------------ srcpkgs/glibc/template | 10 +- 6 files changed, 5 insertions(+), 256 deletions(-) delete mode 100644 srcpkgs/glibc/patches/glibc-2.12.1-static-shared-getpagesize.patch delete mode 100644 srcpkgs/glibc/patches/glibc-2.13-futex.patch delete mode 100644 srcpkgs/glibc/patches/glibc-2.14-reexport-rpc-interface.patch delete mode 100644 srcpkgs/glibc/patches/glibc-2.14-reinstall-nis-rpc-headers.patch delete mode 100644 srcpkgs/glibc/patches/glibc-2.14.1-fixes-1.patch diff --git a/srcpkgs/glibc/patches/glibc-2.12.1-static-shared-getpagesize.patch b/srcpkgs/glibc/patches/glibc-2.12.1-static-shared-getpagesize.patch deleted file mode 100644 index 544ced89c8c..00000000000 --- a/srcpkgs/glibc/patches/glibc-2.12.1-static-shared-getpagesize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sysdeps/unix/sysv/linux/getpagesize.c -+++ sysdeps/unix/sysv/linux/getpagesize.c -@@ -28,7 +28,7 @@ - int - __getpagesize () - { --#ifdef __ASSUME_AT_PAGESIZE -+#if 0 && defined __ASSUME_AT_PAGESIZE - assert (GLRO(dl_pagesize) != 0); - return GLRO(dl_pagesize); - #else diff --git a/srcpkgs/glibc/patches/glibc-2.13-futex.patch b/srcpkgs/glibc/patches/glibc-2.13-futex.patch deleted file mode 100644 index a0ed937938c..00000000000 --- a/srcpkgs/glibc/patches/glibc-2.13-futex.patch +++ /dev/null @@ -1,33 +0,0 @@ -http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - ---- nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -+++ nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) ---- nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -+++ nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: - - 7: movq %rdx, %rax - --#ifndef __ASSUME_PRIVATE_FUTEX -+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME - addq $16, %rsp - cfi_adjust_cfa_offset(-16) - popq %r14 -@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) diff --git a/srcpkgs/glibc/patches/glibc-2.14-reexport-rpc-interface.patch b/srcpkgs/glibc/patches/glibc-2.14-reexport-rpc-interface.patch deleted file mode 100644 index 1fe90001d1f..00000000000 --- a/srcpkgs/glibc/patches/glibc-2.14-reexport-rpc-interface.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/libc-symbols.h b/include/libc-symbols.h -index 67e1ca2..5e7cca5 100644 ---- include/libc-symbols.h -+++ 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 ---- sunrpc/Makefile -+++ 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 diff --git a/srcpkgs/glibc/patches/glibc-2.14-reinstall-nis-rpc-headers.patch b/srcpkgs/glibc/patches/glibc-2.14-reinstall-nis-rpc-headers.patch deleted file mode 100644 index 12709543a15..00000000000 --- a/srcpkgs/glibc/patches/glibc-2.14-reinstall-nis-rpc-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -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 ---- nis/Makefile -+++ 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 - diff --git a/srcpkgs/glibc/patches/glibc-2.14.1-fixes-1.patch b/srcpkgs/glibc/patches/glibc-2.14.1-fixes-1.patch deleted file mode 100644 index f15973b6ab4..00000000000 --- a/srcpkgs/glibc/patches/glibc-2.14.1-fixes-1.patch +++ /dev/null @@ -1,153 +0,0 @@ -Submitted By: Matt Burgess -Date: 2011-10-07 -Initial Package Version: 2.14.1 -Upstream Status: From upstream -Origin: Matt Burgess -Description: Fixes Firefox crashes and a bug when programs link to - SDL. - ---- elf/dl-close.c 2011-10-07 09:48:55.000000000 +0000 -+++ elf/dl-close.c 2011-10-07 19:43:10.346411120 +0000 -@@ -119,17 +119,8 @@ - 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)) ---- elf/dl-deps.c 2011-10-07 09:48:55.000000000 +0000 -+++ elf/dl-deps.c 2011-10-07 19:43:10.348432639 +0000 -@@ -478,6 +478,7 @@ - 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. */ -@@ -678,6 +679,7 @@ - l_initfini[nlist] = NULL; - atomic_write_barrier (); - map->l_initfini = l_initfini; -+ map->l_free_initfini = 1; - if (l_reldeps != NULL) - { - atomic_write_barrier (); -@@ -686,7 +688,7 @@ - _dl_scope_free (old_l_reldeps); - } - if (old_l_initfini != NULL) -- map->l_orig_initfini = old_l_initfini; -+ _dl_scope_free (old_l_initfini); - - if (errno_reason) - _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, ---- elf/dl-libc.c 2011-10-07 09:48:55.000000000 +0000 -+++ elf/dl-libc.c 2011-10-07 19:43:10.352411141 +0000 -@@ -279,6 +279,10 @@ - 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 ---- elf/rtld.c 2011-10-07 09:48:55.000000000 +0000 -+++ elf/rtld.c 2011-10-07 19:43:10.355406263 +0000 -@@ -2263,6 +2263,7 @@ - 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, ---- include/link.h 2011-10-07 09:48:55.000000000 +0000 -+++ include/link.h 2011-10-07 19:43:10.357462703 +0000 -@@ -192,6 +192,9 @@ - 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 @@ - - /* 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 ---- resolv/res_query.c 2011-10-07 09:48:55.000000000 +0000 -+++ resolv/res_query.c 2011-10-07 19:43:10.361412711 +0000 -@@ -122,6 +122,7 @@ - int *resplen2) - { - HEADER *hp = (HEADER *) answer; -+ HEADER *hp2; - int n, use_malloc = 0; - u_int oflags = statp->_flags; - -@@ -239,26 +240,25 @@ - /* __libc_res_nsend might have reallocated the buffer. */ - hp = (HEADER *) *answerp; - -- /* We simplify the following tests by assigning HP to HP2. It -- is easy to verify that this is the same as ignoring all -- tests of HP2. */ -- HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp; -- -- if (n < (int) sizeof (HEADER) && answerp2 != NULL -- && *resplen2 > (int) sizeof (HEADER)) -+ /* We simplify the following tests by assigning HP to HP2 or -+ vice versa. It is easy to verify that this is the same as -+ ignoring all tests of HP or HP2. */ -+ if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER)) - { -- /* Special case of partial answer. */ -- assert (hp != hp2); -- hp = hp2; -+ hp2 = hp; - } -- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) -- && n > (int) sizeof (HEADER)) -+ else - { -- /* Special case of partial answer. */ -- assert (hp != hp2); -- hp2 = hp; -+ hp2 = (HEADER *) *answerp2; -+ if (n < (int) sizeof (HEADER)) -+ { -+ hp = hp2; -+ } - } - -+ /* Make sure both hp and hp2 are defined */ -+ assert((hp != NULL) && (hp2 != NULL)); -+ - if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0) - && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) { - #ifdef DEBUG diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 891ecb7a6eb..fb5465075a3 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,7 +1,7 @@ # Template file for 'glibc' pkgname=glibc -version=2.14.1 -revision=8 +version=2.16.0 +revision=1 short_desc="The GNU C library" maintainer="Juan RP " homepage="http://www.gnu.org/software/libc" @@ -13,8 +13,8 @@ depends="base-files libgcc glibc-locales" makedepends="bison perl" replaces="glibc>=0" softreplace=yes -distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2" -checksum=6e85a2fa3ebe6b28103361f09d27eeda37a021f24dab73f34064456d5a715b3b +distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.xz" +checksum=1edc36aa2a6cb7127971fce8e02eecffe9c7956297ad3ef10dd4c09f486d5924 long_desc=" The GNU C Library is the standard system C library for all GNU systems, and is an important part of what makes up a GNU system. It provides the @@ -36,7 +36,7 @@ do_configure() { fi ../configure ${CONFIGURE_SHARED_ARGS} --with-tls \ - --enable-add-ons=nptl,libidn \ + --enable-add-ons=nptl,libidn --enable-obsolete-rpc \ --enable-multi-arch --with-__thread \ --enable-bind-now --enable-kernel=2.6.27 \ --enable-stack-guard-randomization --disable-profile \