This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 4fb11761280f5d845ae0003a0124ef5490c9d643 (commit) from 9507da1155fc38b123e29da356e41f630f6ebf29 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 4fb11761280f5d845ae0003a0124ef5490c9d643 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 17 14:12:35 2011 +0100

glibc: Update to 2.14.1.

Enable linking to nss.

-----------------------------------------------------------------------

Summary of changes: glibc/glibc.nm | 18 +- glibc/patches/glibc-fedora.patch | 1124 +++++++++++++++++--------------------- 2 files changed, 505 insertions(+), 637 deletions(-)

Difference in files: diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 88ceb39..a451dee 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,8 +4,8 @@ ###############################################################################

name = glibc -version = 2.14 -release = 5 +version = 2.14.1 +release = 1

maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Base @@ -41,6 +41,7 @@ build kernel-headers>=%{OPTIMIZED_KERNEL} libcap-devel libselinux-devel + nss-devel texinfo end

@@ -68,11 +69,6 @@ build # Apply the patches. %{MACRO_PATCHES}

- if [ "%{DISTRO_ARCH}" = "armv5tel" ]; then - sed -i configure \ - -e "s/libc_cv_gcc_static_libgcc=-static-libgcc/libc_cv_gcc_static_libgcc=/" - fi - # In the vi_VN.TCVN locale, bash enters an infinite loop at startup. It is # unknown whether this is a bash bug or a Glibc problem. Disable # installation of this locale in order to avoid the problem. @@ -149,7 +145,6 @@ build

configure_options = \ --build=%{DISTRO_BUILDTARGET} \ - --host=%{DISTRO_BUILDTARGET} \ --prefix=/usr \ --libexecdir=/usr/lib/glibc \ --disable-profile \ @@ -157,12 +152,9 @@ build --enable-kernel=%{OPTIMIZED_KERNEL} \ --with-selinux \ --disable-werror \ - --enable-bind-now \ - --enable-__thread \ - --enable-tls \ --enable-experimental-malloc \ - --with-gd \ - --with-nss-crypt + --enable-bind-now \ + --enable-nss-crypt

if "%{DISTRO_ARCH}" == "armv5tel" # Disable hardware FP for ARM. diff --git a/glibc/patches/glibc-fedora.patch b/glibc/patches/glibc-fedora.patch index ff7de11..ac1e0a5 100644 --- a/glibc/patches/glibc-fedora.patch +++ b/glibc/patches/glibc-fedora.patch @@ -1,27 +1,32 @@ ---- glibc-2.14/ChangeLog -+++ glibc-2.14-2/ChangeLog -@@ -1,3 +1,8 @@ -+2011-05-31 Andreas Schwab schwab@redhat.com +--- glibc-2.14.1/ChangeLog ++++ glibc-2.14.1-2/ChangeLog +@@ -200,6 +200,14 @@ + * malloc/memusage.sh: Fix quoting in message. + * debug/xtrace.sh: Likewise. + ++2011-06-28 Andreas Schwab schwab@redhat.com ++ ++ * iconvdata/gb18030.c: Update tables. ++ (BODY for FROM_LOOP): Handle non-BMP characters specially. + -+ * nscd/nscd_getserv_r.c (nscd_getserv_r): Don't free non-malloced -+ memory. Use alloca_account. Fix memory leak when retrying. ++ * sysdeps/posix/getaddrinfo.c (gaih_inet): Don't use gethostbyaddr ++ to determine canonical name. + - 2011-05-31 Ulrich Drepper drepper@gmail.com + 2011-06-27 Andreas Schwab schwab@redhat.com

- * version.h (RELEASE): Bump for 2.14 release. -@@ -10,11 +15,6 @@ - * po/Makefile (po-sed-cmd): Add ksh to extensions. - (libc.pot): Work around missing support for .ksh extension in xgettext. + * iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP +@@ -215,6 +223,10 @@ + * sysdeps/posix/getaddrinfo.c (gaih_inet): When looking up only IPv6 + addresses using gethostbyname4_r ignore IPv4 addresses.

-- [BZ #12684] -- * resolv/res_send.c (__libc_res_nsend): Only go to the next name server -- if both request failed. -- (send_dg): In case of server errors clear resplen or *resplen2. -- - [BZ #12454] - * elf/dl-deps.c (_dl_map_object_deps): Run initializer sorting only - when there are multiple maps. -@@ -400,6 +400,13 @@ ++2011-06-21 Andreas Schwab schwab@redhat.com ++ ++ * iconvdata/gb18030.c: Regenerate tables. ++ + 2011-06-15 Ulrich Drepper drepper@gmail.com + + * resolv/res_send.c (__libc_res_nsend): Fix typos in last patch. We +@@ -692,6 +704,13 @@ * libio/Makefile (tests): Add bug-fclose1. * libio/bug-fclose1.c: New file.

@@ -35,7 +40,21 @@ 2011-05-12 Ulrich Drepper drepper@gmail.com

[BZ #12511] -@@ -921,6 +928,31 @@ +@@ -969,13 +988,6 @@ + * stdlib/bug-getcontext.c: New file. + * stdlib/Makefile: Add rules to build and run bug-getcontext. + +-2011-04-13 Andreas Krebbel Andreas.Krebbel@de.ibm.com +- +- * sysdeps/s390/s390-64/utf16-utf32-z9.c: Wrap the z9-109 +- instructions into .machine "z9-109". +- * sysdeps/s390/s390-64/utf8-utf16-z9.c: Likewise. +- * sysdeps/s390/s390-64/utf8-utf32-z9.c: Likewise. +- + 2011-04-11 Andreas Krebbel Andreas.Krebbel@de.ibm.com + + * sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes +@@ -1213,6 +1225,31 @@ * sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime): Export.

@@ -67,7 +86,7 @@ 2011-03-22 Ulrich Drepper drepper@gmail.com

* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment -@@ -981,6 +1013,16 @@ +@@ -1273,6 +1310,16 @@ $LDFLAGS and -nostdlib -nostartfiles to linking step. Change main to _start.

@@ -84,7 +103,7 @@ 2011-03-06 Ulrich Drepper drepper@gmail.com

* elf/dl-load.c (_dl_map_object): If we are looking for the first -@@ -1035,12 +1077,6 @@ +@@ -1327,12 +1374,6 @@ * elf/noload.c: Include <memcheck.h>. (main): Call mtrace. Close all opened handles.

@@ -97,7 +116,7 @@ 2011-02-22 Samuel Thibault samuel.thibault@ens-lyon.org

Fix __if_freereq crash: Unlike the generic version which uses free, -@@ -1197,6 +1233,12 @@ +@@ -1489,6 +1530,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno.

@@ -110,7 +129,7 @@ 2011-01-19 Ulrich Drepper drepper@gmail.com

[BZ #11724] -@@ -1884,6 +1926,29 @@ +@@ -2176,6 +2223,26 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid.

@@ -134,13 +153,10 @@ + * nss/nss_files/files-XXX.c (internal_getent): Declare linebuflen + as size_t. + -+ * sysdeps/i386/i686/multiarch/strspn.S (ENTRY): Add missing -+ backslash. -+ 2010-09-24 Petr Baudis pasky@suse.cz

* debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -2676,6 +2741,32 @@ +@@ -2968,6 +3035,17 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.

@@ -151,21 +167,6 @@ + * sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def. + * resource/getrlimit.c: Likewise. + -+2010-06-28 Andreas Schwab schwab@redhat.com -+ -+ * allocatestack.c (setxid_mark_thread): Ensure that the exiting -+ thread is woken up. -+ -+ * elf/Makefile: Add rules to build and run unload8 test. -+ * elf/unload8.c: New file. -+ * elf/unload8mod1.c: New file. -+ * elf/unload8mod1x.c: New file. -+ * elf/unload8mod2.c: New file. -+ * elf/unload8mod3.c: New file. -+ -+ * elf/dl-close.c (_dl_close_worker): Reset private search list if -+ it wasn't used. -+ +2010-06-21 Andreas Schwab schwab@redhat.com + + * sysdeps/i386/i686/Makefile: Don't pass -mtune to assembler. @@ -173,7 +174,7 @@ 2010-06-07 Andreas Schwab schwab@redhat.com

* dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -2728,6 +2819,24 @@ +@@ -3020,6 +3098,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.

@@ -198,8 +199,8 @@ 2010-05-28 Luis Machado luisgpm@br.ibm.com

* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.14/ChangeLog.15 -+++ glibc-2.14-2/ChangeLog.15 +--- glibc-2.14.1/ChangeLog.15 ++++ glibc-2.14.1-2/ChangeLog.15 @@ -477,6 +477,14 @@

2004-11-26 Jakub Jelinek jakub@redhat.com @@ -265,8 +266,8 @@ 2004-08-30 Roland McGrath roland@frob.com

* scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.14/ChangeLog.16 -+++ glibc-2.14-2/ChangeLog.16 +--- glibc-2.14.1/ChangeLog.16 ++++ glibc-2.14.1-2/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -289,8 +290,8 @@ 2006-01-19 Thomas Schwinge tschwinge@gnu.org

* libio/genops.c: Include <stdbool.h>. ---- glibc-2.14/ChangeLog.17 -+++ glibc-2.14-2/ChangeLog.17 +--- glibc-2.14.1/ChangeLog.17 ++++ glibc-2.14.1-2/ChangeLog.17 @@ -256,6 +256,12 @@

* Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -369,8 +370,8 @@ 2006-12-09 Ulrich Drepper drepper@redhat.com

[BZ #3632] ---- glibc-2.14/Makeconfig -+++ glibc-2.14-2/Makeconfig +--- glibc-2.14.1/Makeconfig ++++ glibc-2.14.1-2/Makeconfig @@ -791,12 +791,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -387,16 +388,12 @@

ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.14/NEWS -+++ glibc-2.14-2/NEWS -@@ -16,19 +16,9 @@ Version 2.14 - 12393, 12420, 12432, 12445, 12449, 12453, 12454, 12460, 12469, 12489, - 12509, 12510, 12511, 12518, 12527, 12541, 12545, 12551, 12582, 12583, - 12587, 12597, 12601, 12611, 12625, 12626, 12631, 12650, 12653, 12655, -- 12660, 12671, 12681, 12684, 12685, 12711, 12713, 12714, 12717, 12723, -- 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, -- 12795, 12811, 12813, 12814 -- +--- glibc-2.14.1/NEWS ++++ glibc-2.14.1-2/NEWS +@@ -27,16 +27,6 @@ Version 2.14 + 12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, + 12795, 12811, 12813, 12814, 12841 + -* The RPC implementation in libc is obsoleted. Old programs keep working - but new programs cannot be linked with the routines in libc anymore. - Programs in need of RPC functionality must be linked against TI-RPC. @@ -406,14 +403,12 @@ - programs using RPC functions without referencing the TI-RPC library and the - removal of the RPC headers from the glibc headers. - Implemented by Ulrich Drepper. -+ 12660, 12671, 12681, 12685, 12711, 12713, 12714, 12717, 12723, 12724, -+ 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795, -+ 12811, 12813, 12814 - +- * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at, syncfs, setns, sendmmsg ---- glibc-2.14/config.h.in -+++ glibc-2.14-2/config.h.in + +--- glibc-2.14.1/config.h.in ++++ glibc-2.14.1-2/config.h.in @@ -204,6 +204,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS @@ -424,8 +419,8 @@ /*  */

---- glibc-2.14/configure -+++ glibc-2.14-2/configure +--- glibc-2.14.1/configure ++++ glibc-2.14.1-2/configure @@ -784,6 +784,7 @@ enable_all_warnings enable_multi_arch enable_experimental_malloc @@ -494,8 +489,8 @@ # The way shlib-versions is used to generate soversions.mk uses a # fairly simplistic model for name recognition that can't distinguish # i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os ---- glibc-2.14/configure.in -+++ glibc-2.14-2/configure.in +--- glibc-2.14.1/configure.in ++++ glibc-2.14.1-2/configure.in @@ -316,6 +316,29 @@ else fi AC_SUBST(libc_cv_nss_crypt) @@ -526,8 +521,8 @@ # The way shlib-versions is used to generate soversions.mk uses a # fairly simplistic model for name recognition that can't distinguish # i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os ---- glibc-2.14/csu/Makefile -+++ glibc-2.14-2/csu/Makefile +--- glibc-2.14.1/csu/Makefile ++++ glibc-2.14.1-2/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -538,8 +533,8 @@

vpath initfini.c $(sysdirs)

---- glibc-2.14/csu/elf-init.c -+++ glibc-2.14-2/csu/elf-init.c +--- glibc-2.14.1/csu/elf-init.c ++++ glibc-2.14.1-2/csu/elf-init.c @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -564,8 +559,8 @@

/* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.14/debug/tst-chk1.c -+++ glibc-2.14-2/debug/tst-chk1.c +--- glibc-2.14.1/debug/tst-chk1.c ++++ glibc-2.14.1-2/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -594,17 +589,9 @@ # define O 0 # else # define O 1 ---- glibc-2.14/elf/Makefile -+++ glibc-2.14-2/elf/Makefile -@@ -90,6 +90,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 \ -@@ -133,6 +134,7 @@ include ../Makeconfig +--- glibc-2.14.1/elf/Makefile ++++ glibc-2.14.1-2/elf/Makefile +@@ -135,6 +135,7 @@ include ../Makeconfig ifeq ($(unwind-find-fde),yes) routines += unwind-dw2-fde-glibc shared-only-routines += unwind-dw2-fde-glibc @@ -612,24 +599,7 @@ endif

before-compile = $(objpfx)trusted-dirs.h -@@ -221,7 +223,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 tst-unique3 tst-unique4 \ -@@ -279,6 +281,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 \ -@@ -500,7 +503,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ +@@ -504,7 +505,8 @@ CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS)

@@ -639,28 +609,8 @@

test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names)))) generated += $(addsuffix .so,$(strip $(modules-names))) -@@ -568,6 +572,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 -@@ -881,6 +888,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 ---- glibc-2.14/elf/dl-close.c -+++ glibc-2.14-2/elf/dl-close.c +--- glibc-2.14.1/elf/dl-close.c ++++ glibc-2.14.1-2/elf/dl-close.c @@ -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) @@ -681,22 +631,8 @@

/* There are still references to this object. Do nothing more. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) -@@ -430,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. */ ---- glibc-2.14/elf/dl-deps.c -+++ glibc-2.14-2/elf/dl-deps.c +--- glibc-2.14.1/elf/dl-deps.c ++++ glibc-2.14.1-2/elf/dl-deps.c @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); @@ -705,18 +641,7 @@ }

/* If we have no auxiliary objects just go on to the next map. */ -@@ -491,10 +492,6 @@ _dl_map_object_deps (struct link_map *map, - if (errno == 0 && errno_saved != 0) - __set_errno (errno_saved); - -- if (errno_reason) -- _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, -- NULL, errstring); -- - struct link_map **old_l_initfini = NULL; - if (map->l_initfini != NULL && map->l_type == lt_loaded) - { -@@ -681,6 +678,7 @@ Filters not supported with LD_TRACE_PRELINKING")); +@@ -678,6 +679,7 @@ Filters not supported with LD_TRACE_PRELINKING")); l_initfini[nlist] = NULL; atomic_write_barrier (); map->l_initfini = l_initfini; @@ -724,19 +649,17 @@ if (l_reldeps != NULL) { atomic_write_barrier (); -@@ -689,5 +687,9 @@ Filters not supported with LD_TRACE_PRELINKING")); +@@ -686,7 +688,7 @@ 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); -+ -+ if (errno_reason) -+ _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, -+ NULL, errstring); - } ---- glibc-2.14/elf/dl-init.c -+++ glibc-2.14-2/elf/dl-init.c + + if (errno_reason) + _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, +--- glibc-2.14.1/elf/dl-init.c ++++ glibc-2.14.1-2/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -759,8 +682,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.14/elf/dl-libc.c -+++ glibc-2.14-2/elf/dl-libc.c +--- glibc-2.14.1/elf/dl-libc.c ++++ glibc-2.14.1-2/elf/dl-libc.c @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)

for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -787,8 +710,8 @@ }

if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 ---- glibc-2.14/elf/dl-load.c -+++ glibc-2.14-2/elf/dl-load.c +--- glibc-2.14.1/elf/dl-load.c ++++ glibc-2.14.1-2/elf/dl-load.c @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len)

@@ -868,8 +791,8 @@ } else /* No DST we recognize. */ ---- glibc-2.14/elf/dl-support.c -+++ glibc-2.14-2/elf/dl-support.c +--- glibc-2.14.1/elf/dl-support.c ++++ glibc-2.14.1-2/elf/dl-support.c @@ -81,10 +81,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -881,8 +804,8 @@

/* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.14/elf/ldconfig.c -+++ glibc-2.14-2/elf/ldconfig.c +--- glibc-2.14.1/elf/ldconfig.c ++++ glibc-2.14.1-2/elf/ldconfig.c @@ -1034,17 +1034,19 @@ search_dirs (void)

@@ -964,8 +887,8 @@ }

const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.14/elf/ldd.bash.in -+++ glibc-2.14-2/elf/ldd.bash.in +--- glibc-2.14.1/elf/ldd.bash.in ++++ glibc-2.14.1-2/elf/ldd.bash.in @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "`$file'" >&2 fi done @@ -994,8 +917,8 @@ try_trace "$RTLD" "$file" || result=1 ;; *) ---- glibc-2.14/elf/rtld-Rules -+++ glibc-2.14-2/elf/rtld-Rules +--- glibc-2.14.1/elf/rtld-Rules ++++ glibc-2.14.1-2/elf/rtld-Rules @@ -1,7 +1,7 @@ # Subroutine makefile for compiling libc modules linked into dynamic linker.

@@ -1013,8 +936,8 @@ +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld

endif ---- glibc-2.14/elf/rtld.c -+++ glibc-2.14-2/elf/rtld.c +--- glibc-2.14.1/elf/rtld.c ++++ glibc-2.14.1-2/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -1058,114 +981,24 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.14/elf/unload8.c -+++ glibc-2.14-2/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; -+} ---- glibc-2.14/elf/unload8mod1.c -+++ glibc-2.14-2/elf/unload8mod1.c -@@ -0,0 +1,7 @@ -+extern void mod2 (void); -+ -+void -+mod1 (void) -+{ -+ mod2 (); -+} ---- glibc-2.14/elf/unload8mod1x.c -+++ glibc-2.14-2/elf/unload8mod1x.c -@@ -0,0 +1 @@ -+int mod1x; ---- glibc-2.14/elf/unload8mod2.c -+++ glibc-2.14-2/elf/unload8mod2.c -@@ -0,0 +1,7 @@ -+extern void mod3 (void); -+ -+void -+mod2 (void) -+{ -+ mod3 (); -+} ---- glibc-2.14/elf/unload8mod3.c -+++ glibc-2.14-2/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); -+} ---- glibc-2.14/extra-lib.mk -+++ glibc-2.14-2/extra-lib.mk +--- glibc-2.14.1/extra-lib.mk ++++ glibc-2.14.1-2/extra-lib.mk @@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left)) include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) endif

-CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 +CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib) ---- glibc-2.14/include/bits/stdlib-ldbl.h -+++ glibc-2.14-2/include/bits/stdlib-ldbl.h +--- glibc-2.14.1/include/bits/stdlib-ldbl.h ++++ glibc-2.14.1-2/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include <stdlib/bits/stdlib-ldbl.h> ---- glibc-2.14/include/bits/wchar-ldbl.h -+++ glibc-2.14-2/include/bits/wchar-ldbl.h +--- glibc-2.14.1/include/bits/wchar-ldbl.h ++++ glibc-2.14.1-2/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include <wcsmbs/bits/wchar-ldbl.h> ---- glibc-2.14/include/features.h -+++ glibc-2.14-2/include/features.h +--- glibc-2.14.1/include/features.h ++++ glibc-2.14.1-2/include/features.h @@ -310,8 +310,13 @@ #endif

@@ -1182,8 +1015,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.14/include/libc-symbols.h -+++ glibc-2.14-2/include/libc-symbols.h +--- glibc-2.14.1/include/libc-symbols.h ++++ glibc-2.14.1-2/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) @@ -1193,8 +1026,8 @@ # 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) ---- glibc-2.14/include/link.h -+++ glibc-2.14-2/include/link.h +--- glibc-2.14.1/include/link.h ++++ glibc-2.14.1-2/include/link.h @@ -1,6 +1,6 @@ /* Data structure for communication from the run-time dynamic linker for loaded ELF shared objects. @@ -1223,8 +1056,8 @@

/* List of the dependencies introduced through symbol binding. */ struct link_map_reldeps ---- glibc-2.14/include/stap-probe.h -+++ glibc-2.14-2/include/stap-probe.h +--- glibc-2.14.1/include/stap-probe.h ++++ glibc-2.14.1-2/include/stap-probe.h @@ -0,0 +1,140 @@ +/* Macros for defining Systemtap <sys/sdt.h> static probe points. + Copyright (C) 2011 Free Software Foundation, Inc. @@ -1366,16 +1199,16 @@ +#endif /* USE_STAP_PROBE. */ + +#endif /* stap-probe.h */ ---- glibc-2.14/include/sys/resource.h -+++ glibc-2.14-2/include/sys/resource.h +--- glibc-2.14.1/include/sys/resource.h ++++ glibc-2.14.1-2/include/sys/resource.h @@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)

extern int __setrlimit (enum __rlimit_resource __resource, const struct rlimit *__rlimits); +libc_hidden_proto (__getrlimit) #endif ---- glibc-2.14/inet/Makefile -+++ glibc-2.14-2/inet/Makefile +--- glibc-2.14.1/inet/Makefile ++++ glibc-2.14.1-2/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \

include ../Rules @@ -1385,8 +1218,8 @@ ifeq ($(have-thread-library),yes)

CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.14/intl/locale.alias -+++ glibc-2.14-2/intl/locale.alias +--- glibc-2.14.1/intl/locale.alias ++++ glibc-2.14.1-2/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -1396,8 +1229,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.14/libio/stdio.h -+++ glibc-2.14-2/libio/stdio.h +--- glibc-2.14.1/libio/stdio.h ++++ glibc-2.14.1-2/libio/stdio.h @@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -1411,8 +1244,8 @@

__BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.14/locale/iso-4217.def -+++ glibc-2.14-2/locale/iso-4217.def +--- glibc-2.14.1/locale/iso-4217.def ++++ glibc-2.14.1-2/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1504,8 +1337,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.14/locale/programs/locarchive.c -+++ glibc-2.14-2/locale/programs/locarchive.c +--- glibc-2.14.1/locale/programs/locarchive.c ++++ glibc-2.14.1-2/locale/programs/locarchive.c @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; @@ -1564,8 +1397,22 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.14/localedata/Makefile -+++ glibc-2.14-2/localedata/Makefile +--- glibc-2.14.1/localedata/ChangeLog ++++ glibc-2.14.1-2/localedata/ChangeLog +@@ -1,3 +1,11 @@ ++2011-06-28 Andreas Schwab schwab@redhat.com ++ ++ * charmaps/GB18030: Correct some entries. ++ ++2011-06-21 Andreas Schwab schwab@redhat.com ++ ++ * charmaps/GB18030: Readd lost characters. ++ + 2011-05-21 Ulrich Drepper drepper@gmail.com + + [BZ #12788] +--- glibc-2.14.1/localedata/Makefile ++++ glibc-2.14.1-2/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/([^.]*)[^@]*(.*)/\1\2/'`; \ @@ -1574,8 +1421,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.14/localedata/SUPPORTED -+++ glibc-2.14-2/localedata/SUPPORTED +--- glibc-2.14.1/localedata/SUPPORTED ++++ glibc-2.14.1-2/localedata/SUPPORTED @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1617,8 +1464,8 @@ sw_KE/UTF-8 \ sw_TZ/UTF-8 \ ta_IN/UTF-8 \ ---- glibc-2.14/localedata/locales/cy_GB -+++ glibc-2.14-2/localedata/locales/cy_GB +--- glibc-2.14.1/localedata/locales/cy_GB ++++ glibc-2.14.1-2/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061><U0077><U0072>";/ d_t_fmt "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>" @@ -1633,8 +1480,8 @@ END LC_TIME

LC_MESSAGES ---- glibc-2.14/localedata/locales/en_GB -+++ glibc-2.14-2/localedata/locales/en_GB +--- glibc-2.14.1/localedata/locales/en_GB ++++ glibc-2.14.1-2/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/ d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>" @@ -1646,8 +1493,8 @@ date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0025><U005A><U0020><U0025><U0059>" ---- glibc-2.14/localedata/locales/no_NO -+++ glibc-2.14-2/localedata/locales/no_NO +--- glibc-2.14.1/localedata/locales/no_NO ++++ glibc-2.14.1-2/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1718,8 +1565,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.14/localedata/locales/zh_TW -+++ glibc-2.14-2/localedata/locales/zh_TW +--- glibc-2.14.1/localedata/locales/zh_TW ++++ glibc-2.14.1-2/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1747,8 +1594,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.14/login/programs/pt_chown.c -+++ glibc-2.14-2/login/programs/pt_chown.c +--- glibc-2.14.1/login/programs/pt_chown.c ++++ glibc-2.14.1-2/login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include <string.h> #include <sys/stat.h> @@ -1790,8 +1637,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.14/malloc/mcheck.c -+++ glibc-2.14-2/malloc/mcheck.c +--- glibc-2.14.1/malloc/mcheck.c ++++ glibc-2.14.1-2/malloc/mcheck.c @@ -25,10 +25,26 @@ # include <mcheck.h> # include <stdint.h> @@ -1868,8 +1715,8 @@

old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.14/manual/libc.texinfo -+++ glibc-2.14-2/manual/libc.texinfo +--- glibc-2.14.1/manual/libc.texinfo ++++ glibc-2.14.1-2/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd

@@ -1879,8 +1726,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.14/misc/sys/cdefs.h -+++ glibc-2.14-2/misc/sys/cdefs.h +--- glibc-2.14.1/misc/sys/cdefs.h ++++ glibc-2.14.1-2/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1924,8 +1771,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.14/nis/Makefile -+++ glibc-2.14-2/nis/Makefile +--- glibc-2.14.1/nis/Makefile ++++ glibc-2.14.1-2/nis/Makefile @@ -23,9 +23,9 @@ subdir := nis

aux := nis_hash @@ -1947,8 +1794,8 @@

$(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.14/nis/nss -+++ glibc-2.14-2/nis/nss +--- glibc-2.14.1/nis/nss ++++ glibc-2.14.1-2/nis/nss @@ -25,7 +25,7 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get @@ -1958,9 +1805,9 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.14/nptl/ChangeLog -+++ glibc-2.14-2/nptl/ChangeLog -@@ -10,6 +10,51 @@ +--- glibc-2.14.1/nptl/ChangeLog ++++ glibc-2.14.1-2/nptl/ChangeLog +@@ -45,6 +45,51 @@ clearing memory. Patch partly by Robert Rex robert.rex@exasol.com.

@@ -2012,7 +1859,7 @@ 2011-01-19 Roland McGrath roland@redhat.com

* pthread_cond_wait.c (__pthread_cond_wait): Fix comment typo. -@@ -4739,6 +4784,11 @@ +@@ -4774,6 +4819,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld.

@@ -2024,7 +1871,7 @@ 2004-09-02 Ulrich Drepper drepper@redhat.com

* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6813,6 +6863,11 @@ +@@ -6848,6 +6898,11 @@

* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).

@@ -2036,8 +1883,8 @@ 2003-07-25 Jakub Jelinek jakub@redhat.com

* tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.14/nptl/DESIGN-systemtap-probes.txt -+++ glibc-2.14-2/nptl/DESIGN-systemtap-probes.txt +--- glibc-2.14.1/nptl/DESIGN-systemtap-probes.txt ++++ glibc-2.14.1-2/nptl/DESIGN-systemtap-probes.txt @@ -0,0 +1,89 @@ +Systemtap is a dynamic tracing/instrumenting tool available on Linux. Probes +that are not fired at run time have close to zero overhead. @@ -2128,8 +1975,8 @@ + arg1 = condition +cond_broadcast - probe for pthread_cond_broadcast + arg1 = condition ---- glibc-2.14/nptl/Makefile -+++ glibc-2.14-2/nptl/Makefile +--- glibc-2.14.1/nptl/Makefile ++++ glibc-2.14.1-2/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -2162,8 +2009,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.14/nptl/Versions -+++ glibc-2.14-2/nptl/Versions +--- glibc-2.14.1/nptl/Versions ++++ glibc-2.14.1-2/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -2172,29 +2019,9 @@ } }

---- glibc-2.14/nptl/allocatestack.c -+++ glibc-2.14-2/nptl/allocatestack.c -@@ -999,7 +999,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t) - - /* If the thread is exiting right now, ignore it. */ - if ((ch & EXITING_BITMASK) != 0) -- return; -+ { -+ /* Release the futex if there is no other setxid in -+ progress. */ -+ if ((ch & SETXID_BITMASK) == 0) -+ { -+ t->setxid_futex = 1; -+ lll_futex_wake (&t->setxid_futex, 1, LLL_PRIVATE); -+ } -+ return; -+ } - } - while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling, - ch | SETXID_BITMASK, ch)); ---- glibc-2.14/nptl/nptl-init.c -+++ glibc-2.14-2/nptl/nptl-init.c -@@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void) +--- glibc-2.14.1/nptl/nptl-init.c ++++ glibc-2.14.1-2/nptl/nptl-init.c +@@ -415,7 +415,7 @@ __pthread_initialize_minimal_internal (void) /* Determine the default allowed stack size. This is the size used in case the user does not specify one. */ struct rlimit limit; @@ -2203,8 +2030,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.14/nptl/pthread_cond_broadcast.c -+++ glibc-2.14-2/nptl/pthread_cond_broadcast.c +--- glibc-2.14.1/nptl/pthread_cond_broadcast.c ++++ glibc-2.14.1-2/nptl/pthread_cond_broadcast.c @@ -23,6 +23,7 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2222,8 +2049,8 @@ int pshared = (cond->__data.__mutex == (void *) ~0l) ? LLL_SHARED : LLL_PRIVATE; /* Make sure we are alone. */ ---- glibc-2.14/nptl/pthread_cond_destroy.c -+++ glibc-2.14-2/nptl/pthread_cond_destroy.c +--- glibc-2.14.1/nptl/pthread_cond_destroy.c ++++ glibc-2.14.1-2/nptl/pthread_cond_destroy.c @@ -20,6 +20,7 @@ #include <errno.h> #include <shlib-compat.h> @@ -2241,8 +2068,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared);

---- glibc-2.14/nptl/pthread_cond_init.c -+++ glibc-2.14-2/nptl/pthread_cond_init.c +--- glibc-2.14.1/nptl/pthread_cond_init.c ++++ glibc-2.14.1-2/nptl/pthread_cond_init.c @@ -20,6 +20,7 @@

#include <shlib-compat.h> @@ -2260,8 +2087,8 @@ return 0; } versioned_symbol (libpthread, __pthread_cond_init, ---- glibc-2.14/nptl/pthread_cond_signal.c -+++ glibc-2.14-2/nptl/pthread_cond_signal.c +--- glibc-2.14.1/nptl/pthread_cond_signal.c ++++ glibc-2.14.1-2/nptl/pthread_cond_signal.c @@ -26,6 +26,7 @@

#include <shlib-compat.h> @@ -2279,8 +2106,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared);

---- glibc-2.14/nptl/pthread_cond_wait.c -+++ glibc-2.14-2/nptl/pthread_cond_wait.c +--- glibc-2.14.1/nptl/pthread_cond_wait.c ++++ glibc-2.14.1-2/nptl/pthread_cond_wait.c @@ -25,6 +25,7 @@ #include <pthreadP.h>

@@ -2298,8 +2125,8 @@ /* Make sure we are alone. */ lll_lock (cond->__data.__lock, pshared);

---- glibc-2.14/nptl/pthread_create.c -+++ glibc-2.14-2/nptl/pthread_create.c +--- glibc-2.14.1/nptl/pthread_create.c ++++ glibc-2.14.1-2/nptl/pthread_create.c @@ -31,6 +31,8 @@

#include <shlib-compat.h> @@ -2327,8 +2154,8 @@ /* Start the thread. */ return create_thread (pd, iattr, STACK_VARIABLES_ARGS); } ---- glibc-2.14/nptl/pthread_join.c -+++ glibc-2.14-2/nptl/pthread_join.c +--- glibc-2.14.1/nptl/pthread_join.c ++++ glibc-2.14.1-2/nptl/pthread_join.c @@ -23,6 +23,8 @@ #include <atomic.h> #include "pthreadP.h" @@ -2355,8 +2182,8 @@ + return result; } ---- glibc-2.14/nptl/pthread_mutex_destroy.c -+++ glibc-2.14-2/nptl/pthread_mutex_destroy.c +--- glibc-2.14.1/nptl/pthread_mutex_destroy.c ++++ glibc-2.14.1-2/nptl/pthread_mutex_destroy.c @@ -20,11 +20,15 @@ #include <errno.h> #include "pthreadP.h" @@ -2373,8 +2200,8 @@ if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0 && mutex->__data.__nusers != 0) return EBUSY; ---- glibc-2.14/nptl/pthread_mutex_init.c -+++ glibc-2.14-2/nptl/pthread_mutex_init.c +--- glibc-2.14.1/nptl/pthread_mutex_init.c ++++ glibc-2.14.1-2/nptl/pthread_mutex_init.c @@ -24,6 +24,8 @@ #include <kernel-features.h> #include "pthreadP.h" @@ -2393,8 +2220,8 @@ return 0; } strong_alias (__pthread_mutex_init, pthread_mutex_init) ---- glibc-2.14/nptl/pthread_mutex_lock.c -+++ glibc-2.14-2/nptl/pthread_mutex_lock.c +--- glibc-2.14.1/nptl/pthread_mutex_lock.c ++++ glibc-2.14.1-2/nptl/pthread_mutex_lock.c @@ -24,6 +24,7 @@ #include <not-cancel.h> #include "pthreadP.h" @@ -2431,8 +2258,8 @@ return 0; } #ifndef __pthread_mutex_lock ---- glibc-2.14/nptl/pthread_mutex_timedlock.c -+++ glibc-2.14-2/nptl/pthread_mutex_timedlock.c +--- glibc-2.14.1/nptl/pthread_mutex_timedlock.c ++++ glibc-2.14.1-2/nptl/pthread_mutex_timedlock.c @@ -24,6 +24,8 @@ #include <lowlevellock.h> #include <not-cancel.h> @@ -2487,8 +2314,8 @@ }

out: ---- glibc-2.14/nptl/pthread_mutex_unlock.c -+++ glibc-2.14-2/nptl/pthread_mutex_unlock.c +--- glibc-2.14.1/nptl/pthread_mutex_unlock.c ++++ glibc-2.14.1-2/nptl/pthread_mutex_unlock.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include "pthreadP.h" @@ -2525,8 +2352,8 @@ return 0; }

---- glibc-2.14/nptl/pthread_rwlock_destroy.c -+++ glibc-2.14-2/nptl/pthread_rwlock_destroy.c +--- glibc-2.14.1/nptl/pthread_rwlock_destroy.c ++++ glibc-2.14.1-2/nptl/pthread_rwlock_destroy.c @@ -18,12 +18,15 @@ 02111-1307 USA. */

@@ -2543,8 +2370,8 @@ /* Nothing to be done. For now. */ return 0; } ---- glibc-2.14/nptl/pthread_rwlock_rdlock.c -+++ glibc-2.14-2/nptl/pthread_rwlock_rdlock.c +--- glibc-2.14.1/nptl/pthread_rwlock_rdlock.c ++++ glibc-2.14.1-2/nptl/pthread_rwlock_rdlock.c @@ -22,6 +22,7 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2571,8 +2398,8 @@

break; } ---- glibc-2.14/nptl/pthread_rwlock_unlock.c -+++ glibc-2.14-2/nptl/pthread_rwlock_unlock.c +--- glibc-2.14.1/nptl/pthread_rwlock_unlock.c ++++ glibc-2.14.1-2/nptl/pthread_rwlock_unlock.c @@ -22,11 +22,14 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2588,8 +2415,8 @@ lll_lock (rwlock->__data.__lock, rwlock->__data.__shared); if (rwlock->__data.__writer) rwlock->__data.__writer = 0; ---- glibc-2.14/nptl/pthread_rwlock_wrlock.c -+++ glibc-2.14-2/nptl/pthread_rwlock_wrlock.c +--- glibc-2.14.1/nptl/pthread_rwlock_wrlock.c ++++ glibc-2.14.1-2/nptl/pthread_rwlock_wrlock.c @@ -22,6 +22,7 @@ #include <lowlevellock.h> #include <pthread.h> @@ -2616,8 +2443,8 @@ break; }

---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -2626,8 +2453,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -2635,8 +2462,8 @@ + __uname; + } +} ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S @@ -22,6 +22,8 @@ #include <kernel-features.h> #include <lowlevellock.h> @@ -2656,8 +2483,8 @@ ENTER_KERNEL

2: movl %edx, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S @@ -24,6 +24,7 @@ #include <kernel-features.h> #include <pthread-pi-defines.h> @@ -2675,8 +2502,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S @@ -24,7 +24,7 @@ #include <kernel-features.h> #include <pthread-pi-defines.h> @@ -2695,8 +2522,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -24,7 +24,7 @@ #include <pthread-errnos.h> #include <pthread-pi-defines.h> @@ -2715,8 +2542,8 @@ cmpl $1000000000, 4(%ebp) movl $EINVAL, %eax jae 18f ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S @@ -25,6 +25,7 @@ #include <pthread-errnos.h> #include <pthread-pi-defines.h> @@ -2734,8 +2561,8 @@ /* Get internal lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S @@ -23,6 +23,7 @@ #include <pthread-errnos.h> #include <kernel-features.h> @@ -2753,8 +2580,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S @@ -23,6 +23,7 @@ #include <pthread-errnos.h> #include <kernel-features.h> @@ -2772,8 +2599,8 @@ /* Get the lock. */ movl $1, %edx xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2791,8 +2618,8 @@ __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ LLL_EBX_LOAD \ ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp;

@@ -2802,8 +2629,8 @@ cp = u.uts.version; else { ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next <kernel-features.h> + @@ -2811,8 +2638,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S @@ -22,6 +22,8 @@ #include <kernel-features.h> #include <lowlevellock.h> @@ -2842,8 +2669,8 @@ syscall

2: movl %edx, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h @@ -20,6 +20,8 @@ #ifndef _LOWLEVELLOCK_H #define _LOWLEVELLOCK_H 1 @@ -2861,8 +2688,8 @@ __asm __volatile ("syscall" \ : "=a" (__ignore) \ : "0" (SYS_futex), "D" (futex), \ ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S @@ -25,7 +25,7 @@ #include <kernel-features.h> #include <pthread-pi-defines.h> @@ -2881,8 +2708,8 @@ /* Get internal lock. */ movl $1, %esi xorl %eax, %eax ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S @@ -24,6 +24,7 @@ #include <pthread-pi-defines.h> #include <kernel-features.h> @@ -2900,8 +2727,8 @@ /* Get internal lock. */ movq %rdi, %r8 movl $1, %esi ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S @@ -23,6 +23,7 @@ #include <lowlevelcond.h> #include <pthread-pi-defines.h> @@ -2919,8 +2746,8 @@ cmpq $1000000000, 8(%rdx) movl $EINVAL, %eax jae 48f ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S @@ -23,6 +23,7 @@ #include <lowlevelcond.h> #include <tcb-offsets.h> @@ -2938,8 +2765,8 @@ cmpq $-1, dep_mutex(%rdi)

/* Prepare structure passed to cancellation handler. */ ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S @@ -22,7 +22,7 @@ #include <lowlevelrwlock.h> #include <pthread-errnos.h> @@ -2959,8 +2786,8 @@ xorq %r10, %r10

/* Get the lock. */ ---- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S -+++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S +--- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S ++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S @@ -22,7 +22,7 @@ #include <lowlevelrwlock.h> #include <pthread-errnos.h> @@ -2980,8 +2807,8 @@ xorq %r10, %r10

/* Get the lock. */ ---- glibc-2.14/nscd/nscd.conf -+++ glibc-2.14-2/nscd/nscd.conf +--- glibc-2.14.1/nscd/nscd.conf ++++ glibc-2.14.1-2/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -2991,8 +2818,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.14/nscd/nscd.init -+++ glibc-2.14-2/nscd/nscd.init +--- glibc-2.14.1/nscd/nscd.init ++++ glibc-2.14.1-2/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -3069,54 +2896,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.14/nscd/nscd_getserv_r.c -+++ glibc-2.14-2/nscd/nscd_getserv_r.c -@@ -124,6 +124,7 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto, - s_name = (char *) (&found->data[0].servdata + 1); - serv_resp = found->data[0].servdata; - s_proto = s_name + serv_resp.s_name_len; -+ alloca_aliases_len = 1; - aliases_len = (uint32_t *) (s_proto + serv_resp.s_proto_len); - aliases_list = ((char *) aliases_len - + serv_resp.s_aliases_cnt * sizeof (uint32_t)); -@@ -154,7 +155,9 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto, - + (serv_resp.s_aliases_cnt - * sizeof (uint32_t))); - if (alloca_aliases_len) -- tmp = __alloca (serv_resp.s_aliases_cnt * sizeof (uint32_t)); -+ tmp = alloca_account (serv_resp.s_aliases_cnt -+ * sizeof (uint32_t), -+ alloca_used); - else - { - tmp = malloc (serv_resp.s_aliases_cnt * sizeof (uint32_t)); -@@ -249,8 +252,9 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto, - + (serv_resp.s_aliases_cnt - * sizeof (uint32_t))); - if (alloca_aliases_len) -- aliases_len = alloca (serv_resp.s_aliases_cnt -- * sizeof (uint32_t)); -+ aliases_len = alloca_account (serv_resp.s_aliases_cnt -+ * sizeof (uint32_t), -+ alloca_used); - else - { - aliases_len = malloc (serv_resp.s_aliases_cnt -@@ -368,7 +372,11 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto, - } - - if (retval != -1) -- goto retry; -+ { -+ if (!alloca_aliases_len) -+ free (aliases_len); -+ goto retry; -+ } - } - - if (!alloca_aliases_len) ---- glibc-2.14/nss/Makefile -+++ glibc-2.14-2/nss/Makefile +--- glibc-2.14.1/nss/Makefile ++++ glibc-2.14.1-2/nss/Makefile @@ -75,6 +75,7 @@ endif

include ../Rules @@ -3125,8 +2906,8 @@

ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.14/nss/nss_files/files-XXX.c -+++ glibc-2.14-2/nss/nss_files/files-XXX.c +--- glibc-2.14.1/nss/nss_files/files-XXX.c ++++ glibc-2.14.1-2/nss/nss_files/files-XXX.c @@ -1,5 +1,5 @@ /* Common code for file-based databases in nss_files module. - Copyright (C) 1996-1999,2001,2002,2004,2007,2008 @@ -3143,8 +2924,8 @@ int parse_result;

if (buflen < sizeof *data + 2) ---- glibc-2.14/posix/Makefile -+++ glibc-2.14-2/posix/Makefile +--- glibc-2.14.1/posix/Makefile ++++ glibc-2.14.1-2/posix/Makefile @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -3162,11 +2943,11 @@ -endif +$(objpfx)getconf.speclist: getconf.speclist.h + $(CC) -E $(CFLAGS) $(CPPFLAGS) $< \ -+ | sed -n -e '/START_OF_STRINGS/,$${/(POSIX_V[67]|_XBS5)_/{s/^[^"]*"//;s/".*$$//;p}}' \ ++ | sed -n -e '/START_OF_STRINGS/,$${/(POSIX_V[67]|XBS5)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.14/posix/gai.conf -+++ glibc-2.14-2/posix/gai.conf +--- glibc-2.14.1/posix/gai.conf ++++ glibc-2.14.1-2/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence <mask> <value> @@ -3191,8 +2972,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.14/posix/getconf.speclist.h -+++ glibc-2.14-2/posix/getconf.speclist.h +--- glibc-2.14.1/posix/getconf.speclist.h ++++ glibc-2.14.1-2/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include <unistd.h> +const char *START_OF_STRINGS = @@ -3233,8 +3014,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.14/posix/regcomp.c -+++ glibc-2.14-2/posix/regcomp.c +--- glibc-2.14.1/posix/regcomp.c ++++ glibc-2.14.1-2/posix/regcomp.c @@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,

/* Local function for parse_bracket_exp used in _LIBC environement. @@ -3366,8 +3147,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.14/resolv/Makefile -+++ glibc-2.14-2/resolv/Makefile +--- glibc-2.14.1/resolv/Makefile ++++ glibc-2.14.1-2/resolv/Makefile @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ -Dgetnetbyaddr=res_getnetbyaddr

@@ -3376,53 +3157,8 @@

# The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.14/resolv/res_send.c -+++ glibc-2.14-2/resolv/res_send.c -@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or -@@ -1275,14 +1275,10 @@ send_dg(res_state statp, - (*thisresplenp > *thisanssizp) - ? *thisanssizp : *thisresplenp); - -- if (recvresp1 || (buf2 != NULL && recvresp2)) { -- *resplen2 = 0; -+ if (recvresp1 || (buf2 != NULL && recvresp2)) - return resplen; -- } - if (buf2 != NULL) - { -- /* No data from the first reply. */ -- resplen = 0; - /* We are waiting for a possible second reply. */ - if (hp->id == anhp->id) - recvresp1 = 1; -@@ -1348,7 +1344,7 @@ send_dg(res_state statp, - goto err_out; - } - else { -- /* poll should not have returned > 0 in this case. */ -+ /* poll should not have returned > 0 in this case. */ - abort (); - } - } ---- glibc-2.14/resource/getrlimit.c -+++ glibc-2.14-2/resource/getrlimit.c +--- glibc-2.14.1/resource/getrlimit.c ++++ glibc-2.14.1-2/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -3431,8 +3167,8 @@ weak_alias (__getrlimit, getrlimit)

stub_warning (getrlimit) ---- glibc-2.14/scripts/check-local-headers.sh -+++ glibc-2.14-2/scripts/check-local-headers.sh +--- glibc-2.14.1/scripts/check-local-headers.sh ++++ glibc-2.14.1-2/scripts/check-local-headers.sh @@ -31,6 +31,8 @@ fgrep -v "$includedir/asm" | fgrep -v "$includedir/linux" | fgrep -v "$includedir/selinux" | @@ -3442,8 +3178,8 @@ fgrep -v "$includedir/gd" | fgrep -v "$includedir/nss3"; then # If we found a match something is wrong. ---- glibc-2.14/stdio-common/vfprintf.c -+++ glibc-2.14-2/stdio-common/vfprintf.c +--- glibc-2.14.1/stdio-common/vfprintf.c ++++ glibc-2.14.1-2/stdio-common/vfprintf.c @@ -1161,41 +1161,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) else if (!is_long && spec != L_('S')) \ { \ @@ -3489,8 +3225,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.14/streams/Makefile -+++ glibc-2.14-2/streams/Makefile +--- glibc-2.14.1/streams/Makefile ++++ glibc-2.14.1-2/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -3500,8 +3236,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach

include ../Rules ---- glibc-2.14/sunrpc/Makefile -+++ glibc-2.14-2/sunrpc/Makefile +--- glibc-2.14.1/sunrpc/Makefile ++++ glibc-2.14.1-2/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) \ @@ -3522,8 +3258,8 @@ $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so ---- glibc-2.14/sysdeps/generic/dl-cache.h -+++ glibc-2.14-2/sysdeps/generic/dl-cache.h +--- glibc-2.14.1/sysdeps/generic/dl-cache.h ++++ glibc-2.14.1-2/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -3539,8 +3275,8 @@ #define CACHEMAGIC "ld.so-1.7.0"

/* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-2.14/sysdeps/i386/Makefile -+++ glibc-2.14-2/sysdeps/i386/Makefile +--- glibc-2.14.1/sysdeps/i386/Makefile ++++ glibc-2.14.1-2/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -3565,8 +3301,8 @@ endif

ifeq ($(subdir),elf) ---- glibc-2.14/sysdeps/i386/__longjmp.S -+++ glibc-2.14-2/sysdeps/i386/__longjmp.S +--- glibc-2.14.1/sysdeps/i386/__longjmp.S ++++ glibc-2.14.1-2/sysdeps/i386/__longjmp.S @@ -1,5 +1,5 @@ /* longjmp for i386. - Copyright (C) 1995-1998,2000,2002,2005,2006,2009 @@ -3613,8 +3349,8 @@ #endif /* Jump to saved PC. */ jmp *%edx ---- glibc-2.14/sysdeps/i386/bsd-_setjmp.S -+++ glibc-2.14-2/sysdeps/i386/bsd-_setjmp.S +--- glibc-2.14.1/sysdeps/i386/bsd-_setjmp.S ++++ glibc-2.14.1-2/sysdeps/i386/bsd-_setjmp.S @@ -1,5 +1,6 @@ /* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. i386 version. - Copyright (C) 1994-1997,2000-2002,2005, 2006 Free Software Foundation, Inc. @@ -3639,8 +3375,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14/sysdeps/i386/bsd-setjmp.S -+++ glibc-2.14-2/sysdeps/i386/bsd-setjmp.S +--- glibc-2.14.1/sysdeps/i386/bsd-setjmp.S ++++ glibc-2.14.1-2/sysdeps/i386/bsd-setjmp.S @@ -1,5 +1,6 @@ /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. i386 version. - Copyright (C) 1994-1997,2000,2001,2005, 2006 Free Software Foundation, Inc. @@ -3665,8 +3401,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14/sysdeps/i386/i686/Makefile -+++ glibc-2.14-2/sysdeps/i386/i686/Makefile +--- glibc-2.14.1/sysdeps/i386/i686/Makefile ++++ glibc-2.14.1-2/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -3687,21 +3423,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.14/sysdeps/i386/i686/multiarch/strspn.S -+++ glibc-2.14-2/sysdeps/i386/i686/multiarch/strspn.S -@@ -76,8 +76,8 @@ END(strspn) - # define ENTRY(name) \ - .type __strspn_ia32, @function; \ - .globl __strspn_ia32; \ -- .p2align 4 -- __strspn_ia32: cfi_startproc; \ -+ .p2align 4; \ -+__strspn_ia32: cfi_startproc; \ - CALL_MCOUNT - # undef END - # define END(name) \ ---- glibc-2.14/sysdeps/i386/setjmp.S -+++ glibc-2.14-2/sysdeps/i386/setjmp.S +--- glibc-2.14.1/sysdeps/i386/setjmp.S ++++ glibc-2.14.1-2/sysdeps/i386/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for i386. - Copyright (C) 1995,1996,1997,2000,2001,2005,2006 @@ -3725,8 +3448,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%ecx) #endif ---- glibc-2.14/sysdeps/ia64/Makefile -+++ glibc-2.14-2/sysdeps/ia64/Makefile +--- glibc-2.14.1/sysdeps/ia64/Makefile ++++ glibc-2.14.1-2/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing

ifeq (yes,$(build-shared)) @@ -3738,8 +3461,8 @@ endif endif

---- glibc-2.14/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.14-2/sysdeps/ia64/ia64libgcc.S +--- glibc-2.14.1/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.14.1-2/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -4091,8 +3814,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.14/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.14-2/sysdeps/ia64/libgcc-compat.c +--- glibc-2.14.1/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.14.1-2/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -4178,17 +3901,128 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.14/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.14-2/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.14.1/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.14.1-2/sysdeps/mach/hurd/getrlimit.c @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)

return 0; } +libc_hidden_def (__getrlimit) weak_alias (__getrlimit, getrlimit) ---- glibc-2.14/sysdeps/posix/getaddrinfo.c -+++ glibc-2.14-2/sysdeps/posix/getaddrinfo.c -@@ -1335,10 +1335,12 @@ static const struct scopeentry +--- glibc-2.14.1/sysdeps/posix/getaddrinfo.c ++++ glibc-2.14.1-2/sysdeps/posix/getaddrinfo.c +@@ -565,8 +565,8 @@ gaih_inet (const char *name, const struct gaih_service *service, + + /* If we do not have to look for IPv6 addresses, use + the simple, old functions, which do not support +- IPv6 scope ids. */ +- if (req->ai_family == AF_INET) ++ IPv6 scope ids, nor retrieving the canonical name. */ ++ if (req->ai_family == AF_INET && (req->ai_flags & AI_CANONNAME) == 0) + { + int family = req->ai_family; + size_t tmpbuflen = 512; +@@ -1115,68 +1115,10 @@ gaih_inet (const char *name, const struct gaih_service *service, + /* Only the first entry gets the canonical name. */ + if (at2 == at && (req->ai_flags & AI_CANONNAME) != 0) + { +- char *tmpbuf2 = NULL; +- bool malloc_tmpbuf2 = false; +- + if (canon == NULL) +- { +- struct hostent *h = NULL; +- int herrno; +- struct hostent th; +- size_t tmpbuf2len = 512; +- +- do +- { +- if (__libc_use_alloca (alloca_used + 2 * tmpbuf2len)) +- tmpbuf2 = extend_alloca_account (tmpbuf2, tmpbuf2len, +- tmpbuf2len * 2, +- alloca_used); +- else +- { +- char *newp = realloc (malloc_tmpbuf2 ? tmpbuf2 : NULL, +- 2 * tmpbuf2len); +- if (newp == NULL) +- { +- if (malloc_tmpbuf2) +- free (tmpbuf2); +- result = -EAI_MEMORY; +- goto free_and_return; +- } +- +- tmpbuf2 = newp; +- tmpbuf2len = 2 * tmpbuf2len; +- malloc_tmpbuf2 = true; +- } +- +- rc = __gethostbyaddr_r (at2->addr, +- ((at2->family == AF_INET6) +- ? sizeof (struct in6_addr) +- : sizeof (struct in_addr)), +- at2->family, &th, tmpbuf2, +- tmpbuf2len, &h, &herrno); +- } +- while (rc == ERANGE && herrno == NETDB_INTERNAL); +- +- if (rc != 0 && herrno == NETDB_INTERNAL) +- { +- if (malloc_tmpbuf2) +- free (tmpbuf2); +- +- __set_h_errno (herrno); +- result = -EAI_SYSTEM; +- goto free_and_return; +- } +- +- if (h != NULL) +- canon = h->h_name; +- else +- { +- assert (orig_name != NULL); +- /* If the canonical name cannot be determined, use +- the passed in string. */ +- canon = orig_name; +- } +- } ++ /* If the canonical name cannot be determined, use ++ the passed in string. */ ++ canon = orig_name; + + #ifdef HAVE_LIBIDN + if (req->ai_flags & AI_CANONIDN) +@@ -1191,9 +1133,6 @@ gaih_inet (const char *name, const struct gaih_service *service, + int rc = __idna_to_unicode_lzlz (canon, &out, idn_flags); + if (rc != IDNA_SUCCESS) + { +- if (malloc_tmpbuf2) +- free (tmpbuf2); +- + if (rc == IDNA_MALLOC_ERROR) + result = -EAI_MEMORY; + else if (rc == IDNA_DLOPEN_ERROR) +@@ -1223,17 +1162,11 @@ gaih_inet (const char *name, const struct gaih_service *service, + canon = strdup (canon); + if (canon == NULL) + { +- if (malloc_tmpbuf2) +- free (tmpbuf2); +- + result = -EAI_MEMORY; + goto free_and_return; + } + } + } +- +- if (malloc_tmpbuf2) +- free (tmpbuf2); + } + + family = at2->family; +@@ -1370,10 +1303,12 @@ static const struct scopeentry /* Link-local addresses: scope 2. */ { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 }, @@ -4201,8 +4035,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.14/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.14-2/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.14.1/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.14.1-2/sysdeps/powerpc/powerpc64/Makefile @@ -33,6 +33,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -4211,16 +4045,58 @@ endif

ifeq ($(subdir),elf) ---- glibc-2.14/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.14-2/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.14.1/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.14.1-2/sysdeps/powerpc/powerpc64/elf/Makefile @@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs) CFLAGS-rtld-memmove.os = $(no-special-regs) CFLAGS-rtld-memchr.os = $(no-special-regs) CFLAGS-rtld-strnlen.os = $(no-special-regs) + +CFLAGS-gmon-start.c = -fno-strict-aliasing ---- glibc-2.14/sysdeps/unix/nice.c -+++ glibc-2.14-2/sysdeps/unix/nice.c +--- glibc-2.14.1/sysdeps/s390/s390-64/utf16-utf32-z9.c ++++ glibc-2.14.1-2/sysdeps/s390/s390-64/utf16-utf32-z9.c +@@ -169,10 +169,7 @@ gconv_end (struct __gconv_step *data) + register unsigned long long outlen asm("11") = outend - outptr; \ + uint64_t cc = 0; \ + \ +- asm volatile (".machine push \n\t" \ +- ".machine "z9-109" \n\t" \ +- "0: " INSTRUCTION " \n\t" \ +- ".machine pop \n\t" \ ++ asm volatile ("0: " INSTRUCTION " \n\t" \ + " jo 0b \n\t" \ + " ipm %2 \n" \ + : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ +--- glibc-2.14.1/sysdeps/s390/s390-64/utf8-utf16-z9.c ++++ glibc-2.14.1-2/sysdeps/s390/s390-64/utf8-utf16-z9.c +@@ -151,10 +151,7 @@ gconv_end (struct __gconv_step *data) + register unsigned long long outlen asm("11") = outend - outptr; \ + uint64_t cc = 0; \ + \ +- asm volatile (".machine push \n\t" \ +- ".machine "z9-109" \n\t" \ +- "0: " INSTRUCTION " \n\t" \ +- ".machine pop \n\t" \ ++ asm volatile ("0: " INSTRUCTION " \n\t" \ + " jo 0b \n\t" \ + " ipm %2 \n" \ + : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ +--- glibc-2.14.1/sysdeps/s390/s390-64/utf8-utf32-z9.c ++++ glibc-2.14.1-2/sysdeps/s390/s390-64/utf8-utf32-z9.c +@@ -155,10 +155,7 @@ gconv_end (struct __gconv_step *data) + register unsigned long long outlen asm("11") = outend - outptr; \ + uint64_t cc = 0; \ + \ +- asm volatile (".machine push \n\t" \ +- ".machine "z9-109" \n\t" \ +- "0: " INSTRUCTION " \n\t" \ +- ".machine pop \n\t" \ ++ asm volatile ("0: " INSTRUCTION " \n\t" \ + " jo 0b \n\t" \ + " ipm %2 \n" \ + : "+a" (pOutput), "+a" (pInput), "+d" (cc), \ +--- glibc-2.14.1/sysdeps/unix/nice.c ++++ glibc-2.14.1-2/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -4235,8 +4111,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.14/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include <unistd.h> #include <sys/socket.h> @@ -4252,8 +4128,8 @@

#ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.14/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -4296,8 +4172,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.14/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/getpagesize.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int __getpagesize () @@ -4307,8 +4183,8 @@ assert (GLRO(dl_pagesize) != 0); return GLRO(dl_pagesize); #else ---- glibc-2.14/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S +--- glibc-2.14.1/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S @@ -1,4 +1,5 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2001,2004,2005,2006,2009,2011 @@ -4342,8 +4218,8 @@ + LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx) jmp *%edx END (____longjmp_chk) ---- glibc-2.14/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.14.1/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -4404,16 +4280,16 @@ + } while (0) + +#include_next <dl-cache.h> ---- glibc-2.14/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/i386/getrlimit.c @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) }

weak_alias (__new_getrlimit, __getrlimit); +libc_hidden_weak (__getrlimit) versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2); ---- glibc-2.14/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -4446,29 +4322,29 @@ + } while (0) + #include_next <dl-cache.h> ---- glibc-2.14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include <sysdeps/i386/dl-procinfo.c> +#else +#include <sysdeps/generic/dl-procinfo.c> +#endif ---- glibc-2.14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h> +#else +#include <sysdeps/generic/dl-procinfo.h> +#endif ---- glibc-2.14/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed @@ -1 +1 @@ -s_^(RTLDLIST=)([^ ]*)-ia64(.so.[0-9.]*)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^(RTLDLIST=)([^ ]*)-ia64(.so.[0-9.]*)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-2.14/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.14.1/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@

#include <kernel-features.h> @@ -4494,8 +4370,8 @@

struct netlink_res { ---- glibc-2.14/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.14.1/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -4505,8 +4381,8 @@ #define _PATH_WTMP "/var/log/wtmp"

/* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.14/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.14.1/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -4552,8 +4428,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.14/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S -+++ glibc-2.14-2/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S +--- glibc-2.14.1/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S ++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S @@ -19,6 +19,7 @@ #include <sysdep.h> #include <jmpbuf-offsets.h> @@ -4580,8 +4456,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (____longjmp_chk) ---- glibc-2.14/sysdeps/x86_64/__longjmp.S -+++ glibc-2.14-2/sysdeps/x86_64/__longjmp.S +--- glibc-2.14.1/sysdeps/x86_64/__longjmp.S ++++ glibc-2.14.1-2/sysdeps/x86_64/__longjmp.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc. +/* Copyright (C) 2001,2004,2005,2006,2009,2011 Free Software Foundation, Inc. @@ -4611,8 +4487,8 @@ + LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx) jmpq *%rdx END (__longjmp) ---- glibc-2.14/sysdeps/x86_64/setjmp.S -+++ glibc-2.14-2/sysdeps/x86_64/setjmp.S +--- glibc-2.14.1/sysdeps/x86_64/setjmp.S ++++ glibc-2.14.1-2/sysdeps/x86_64/setjmp.S @@ -1,5 +1,5 @@ /* setjmp for x86-64. - Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. @@ -4636,8 +4512,8 @@ #ifdef PTR_MANGLE PTR_MANGLE (%rax) #endif ---- glibc-2.14/timezone/zic.c -+++ glibc-2.14-2/timezone/zic.c +--- glibc-2.14.1/timezone/zic.c ++++ glibc-2.14.1-2/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return;

hooks/post-receive -- IPFire 3.x development tree