- Remove obsolete patches from glibc-fedora.patch. Explode

remaining patches into distinct patchfiles. Thanks to Dmitry V. Levin for identifying them! Drop ia64 specific patches and specfile fragments
2012-08-20 13:25:02 -06:00 · 2012-08-20 13:25:02 -06:00 · fb633eaa14
commit fb633eaa14
parent 8854fdfb25
39 changed files with 2013 additions and 2122 deletions
--- a/glibc-fedora-__libc_multiple_libcs.patch
+++ b/glibc-fedora-__libc_multiple_libcs.patch
@ -0,0 +1,83 @@
 From 16552c01a66633c9e412984d9d92616bd4e5303c Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Fri, 11 Jun 2010 11:04:11 +0200
 Subject: [PATCH] Properly set __libc_multiple_libcs
 * elf/rtld.c (_dl_starting_up): Always define.
 (dl_main): Always set _dl_starting_up.
 * elf/dl-support.c (_dl_starting_up): Always define.
 * elf/dl-init.c (_dl_init): Always clear _dl_starting_up.
 ---
 ChangeLog        |    7 +++++++
 elf/dl-init.c    |    4 ----
 elf/dl-support.c |    2 --
 elf/rtld.c       |    4 ----
 4 files changed, 7 insertions(+), 10 deletions(-)
 --- a/elf/dl-init.c
 +++ b/elf/dl-init.c
@@ -23,11 +23,9 @@
 /* Type of the initializer.  */
 typedef void (*init_t) (int, char **, char **);
 -#ifndef HAVE_INLINED_SYSCALLS
 /* Flag, nonzero during startup phase.  */
 extern int _dl_starting_up;
 extern int _dl_starting_up_internal attribute_hidden;
 -#endif
 static void
@@ -132,9 +130,7 @@ _dl_init (struct link_map *main_map, int argc, char **argv, char **env)
   while (i-- > 0)
     call_init (main_map->l_initfini[i], argc, argv, env);
 -#ifndef HAVE_INLINED_SYSCALLS
   /* Finished starting up.  */
   INTUSE(_dl_starting_up) = 0;
 -#endif
 }
 INTDEF (_dl_init)
 --- a/elf/dl-support.c
 +++ b/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;
 -#ifndef HAVE_INLINED_SYSCALLS
 /* Nonzero during startup.  */
 int _dl_starting_up = 1;
 -#endif
 /* Random data provided by the kernel.  */
 void *_dl_random;
 --- a/elf/rtld.c
 +++ b/elf/rtld.c
@@ -106,7 +106,6 @@ static struct audit_list
   struct audit_list *next;
 } *audit_list;
 -#ifndef HAVE_INLINED_SYSCALLS
 /* Set nonzero during loading and initialization of executable and
    libraries, cleared before the executable's entry point runs.  This
    must not be initialized to nonzero, because the unused dynamic
@@ -116,7 +115,6 @@ static struct audit_list
    never be called.  */
 int _dl_starting_up = 0;
 INTVARDEF(_dl_starting_up)
 -#endif
 /* This is the structure which defines all variables global to ld.so
    (except those which cannot be added for some reason).  */
@@ -929,10 +927,8 @@ dl_main (const ElfW(Phdr) *phdr,
   /* Process the environment variable which control the behaviour.  */
   process_envvars (&mode);
 -#ifndef HAVE_INLINED_SYSCALLS
   /* Set up a flag which tells we are just starting.  */
   INTUSE(_dl_starting_up) = 1;
 -#endif
   if (*user_entry == (ElfW(Addr)) ENTRY_POINT)
     {
--- a/glibc-fedora-cdefs-gnuc.patch
+++ b/glibc-fedora-cdefs-gnuc.patch
@ -0,0 +1,39 @@
 diff -Nrup a/misc/sys/cdefs.h b/misc/sys/cdefs.h
 --- a/misc/sys/cdefs.h	2012-06-05 07:42:49.000000000 -0600
 +++ b/misc/sys/cdefs.h	2012-06-07 12:15:21.808318708 -0600
@@ -142,7 +142,10 @@
 #define __bos0(ptr) __builtin_object_size (ptr, 0)
 #define __fortify_function __extern_always_inline __attribute_artificial__
 -#if __GNUC_PREREQ (4,3)
 +#if __GNUC_PREREQ (4,3) \
 +    || (defined __GNUC_RH_RELEASE__ && __GNUC__ == 4 \
 +	&& __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 2 \
 +	&& __GNUC_RH_RELEASE__ >= 31)
 # define __warndecl(name, msg) \
   extern void name (void) __attribute__((__warning__ (msg)))
 # define __warnattr(msg) __attribute__((__warning__ (msg)))
@@ -320,7 +323,10 @@
 /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
    inline semantics, unless -fgnu89-inline is used.  */
 -#if !defined __cplusplus || __GNUC_PREREQ (4,3)
 +#if !defined __cplusplus || __GNUC_PREREQ (4,3) \
 +    || (defined __GNUC_RH_RELEASE__ && __GNUC__ == 4 \
 +       && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 2 \
 +       && __GNUC_RH_RELEASE__ >= 31)
 # if defined __GNUC_STDC_INLINE__ || defined __cplusplus
 #  define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
 #  define __extern_always_inline \
@@ -333,7 +339,10 @@
 /* GCC 4.3 and above allow passing all anonymous arguments of an
    __extern_always_inline function to some other vararg function.  */
 -#if __GNUC_PREREQ (4,3)
 +#if __GNUC_PREREQ (4,3) \
 +    || (defined __GNUC_RH_RELEASE__ && __GNUC__ == 4 \
 +	&& __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 2 \
 +	&& __GNUC_RH_RELEASE__ >= 31)
 # define __va_arg_pack() __builtin_va_arg_pack ()
 # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
 #endif
--- a/glibc-fedora-elf-ORIGIN.patch
+++ b/glibc-fedora-elf-ORIGIN.patch
@ -0,0 +1,98 @@
 From 207e77fd3f0a94acdf0557608dd4f10ce0e0f22f Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Mon, 9 May 2011 10:55:58 +0200
 Subject: [PATCH] Never leave $ORIGIN unexpanded
 * elf/dl-load.c (is_dst): Remove parameter secure, all callers
 changed.  Move check for valid use of $ORIGIN ...
 (_dl_dst_substitute): ... here.  Reset check_for_trusted when a
 path element is skipped.
 ---
 ChangeLog     |    7 +++++++
 elf/dl-load.c |   34 ++++++++++++++++------------------
 2 files changed, 23 insertions(+), 18 deletions(-)
 diff --git a/elf/dl-load.c b/elf/dl-load.c
 index 18a83d2..6e16a9a 100644
 --- a/elf/dl-load.c
 +++ b/elf/dl-load.c
@@ -249,8 +249,7 @@ is_trusted_path_normalize (const char *path, size_t len)
 static size_t
 -is_dst (const char *start, const char *name, const char *str,
 -	int is_path, int secure)
 +is_dst (const char *start, const char *name, const char *str, int is_path)
 {
   size_t len;
   bool is_curly = false;
@@ -279,12 +278,6 @@ is_dst (const char *start, const char *name, const char *str,
 	   && (!is_path || name[len] != ':'))
     return 0;
 -  if (__builtin_expect (secure, 0)
 -      && ((name[len] != '\0' && name[len] != '/'
 -	   && (!is_path || name[len] != ':'))
 -	  || (name != start + 1 && (!is_path || name[-2] != ':'))))
 -    return 0;
 -
   return len;
 }
@@ -299,13 +292,10 @@ _dl_dst_count (const char *name, int is_path)
     {
       size_t len;
 -      /* $ORIGIN is not expanded for SUID/GUID programs (except if it
 -	 is $ORIGIN alone) and it must always appear first in path.  */
       ++name;
 -      if ((len = is_dst (start, name, "ORIGIN", is_path,
 -			 INTUSE(__libc_enable_secure))) != 0
 -	  || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0
 -	  || (len = is_dst (start, name, "LIB", is_path, 0)) != 0)
 +      if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0
 +	  || (len = is_dst (start, name, "PLATFORM", is_path)) != 0
 +	  || (len = is_dst (start, name, "LIB", is_path)) != 0)
 	++cnt;
       name = strchr (name + len, '$');
@@ -338,9 +328,16 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
 	  size_t len;
 	  ++name;
 -	  if ((len = is_dst (start, name, "ORIGIN", is_path,
 -			     INTUSE(__libc_enable_secure))) != 0)
 +	  if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0)
 	    {
 +	      /* For SUID/GUID programs $ORIGIN must always appear
 +		 first in a path element.  */
 +	      if (__builtin_expect (INTUSE(__libc_enable_secure), 0)
 +		  && ((name[len] != '\0' && name[len] != '/'
 +		       && (!is_path || name[len] != ':'))
 +		      || (name != start + 1 && (!is_path || name[-2] != ':'))))
 +		repl = (const char *) -1;
 +	      else
 #ifndef SHARED
 	      if (l == NULL)
 		repl = _dl_get_origin ();
@@ -351,9 +348,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
 	      check_for_trusted = (INTUSE(__libc_enable_secure)
 				   && l->l_type == lt_executable);
 	    }
 -	  else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0)
 +	  else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0)
 	    repl = GLRO(dl_platform);
 -	  else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0)
 +	  else if ((len = is_dst (start, name, "LIB", is_path)) != 0)
 	    repl = DL_DST_LIB;
 	  if (repl != NULL && repl != (const char *) -1)
@@ -373,6 +370,7 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
 		 element, but keep an empty element at the end.  */
 	      if (wp == result && is_path && *name == ':' && name[1] != '\0')
 		++name;
 +	      check_for_trusted = false;
 	    }
 	  else
 	    /* No DST we recognize.  */
--- a/glibc-fedora-elf-init-hidden_undef.patch
+++ b/glibc-fedora-elf-init-hidden_undef.patch
@ -0,0 +1,30 @@
 * Fri May 29 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-44
 - make __init_array_start etc. symbols in elf-init.oS hidden undefined
 diff -Nrup a/csu/elf-init.c b/csu/elf-init.c
 --- a/csu/elf-init.c	2012-06-05 07:42:49.000000000 -0600
 +++ b/csu/elf-init.c	2012-06-07 12:15:21.570319597 -0600
@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int,
 extern void (*__fini_array_start []) (void) attribute_hidden;
 extern void (*__fini_array_end []) (void) attribute_hidden;
 +#if defined HAVE_VISIBILITY_ATTRIBUTE \
 +    && (defined SHARED || defined LIBC_NONSHARED)
 +# define hidden_undef_2(x) #x
 +# define hidden_undef_1(x) hidden_undef_2 (x)
 +# define hidden_undef(x) \
 +  __asm (hidden_undef_1 (ASM_GLOBAL_DIRECTIVE) " " #x); \
 +  __asm (".hidden " #x);
 +#else
 +# define hidden_undef(x)
 +#endif
 +
 +hidden_undef (__preinit_array_start)
 +hidden_undef (__preinit_array_end)
 +hidden_undef (__init_array_start)
 +hidden_undef (__init_array_end)
 +hidden_undef (__fini_array_start)
 +hidden_undef (__fini_array_end)
 /* These function symbols are provided for the .init/.fini section entry
    points automagically by the linker.  */
--- a/glibc-fedora-elf-rh737223.patch
+++ b/glibc-fedora-elf-rh737223.patch
@ -0,0 +1,27 @@
 From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Fri, 7 Oct 2011 09:31:27 +0200
 Subject: [PATCH] Horrible workaround for horribly broken software
 * Tue Oct 11 2011 Andreas Schwab <schwab@redhat.com> - 2.14.90-11
 - Horrible workaround for horribly broken software (#737223)
 ---
 elf/rtld.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
 diff --git a/elf/rtld.c b/elf/rtld.c
 index 978c609..8422b9f 100644
 --- a/elf/rtld.c
 +++ b/elf/rtld.c
@@ -1404,7 +1404,9 @@ of this helper program; chances are you did not intend to run this program.\n\
 	      char *copy = malloc (len);
 	      if (copy == NULL)
 		_dl_fatal_printf ("out of memory\n");
 -	      l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
 +	      l->l_libname->name = memcpy (copy, dsoname, len);
 +	      if (GLRO(dl_debug_mask))
 +		l->l_name = copy;
 	    }
 	  /* Add the vDSO to the object list.  */
--- a/glibc-fedora-gai-canonical.patch
+++ b/glibc-fedora-gai-canonical.patch
@ -0,0 +1,128 @@
 From bf18f175afdb59cdcd1016995b351e2bbb1d6ba7 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Tue, 21 Jun 2011 17:28:57 +0200
 Subject: [PATCH] Don't use gethostbyaddr to determine canonical name
 * sysdeps/posix/getaddrinfo.c (gaih_inet): Don't use gethostbyaddr
 to determine canonical name.
 ---
 ChangeLog                   |    5 +++
 sysdeps/posix/getaddrinfo.c |   77 +++----------------------------------------
 2 files changed, 10 insertions(+), 72 deletions(-)
 --- a/sysdeps/posix/getaddrinfo.c
 +++ b/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)
 	    {
 	      /* Allocate additional room for struct host_data.  */
 	      size_t tmpbuflen = (512 + MAX_NR_ALIASES * sizeof(char*)
@@ -1107,70 +1107,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;
 -		/* Add room for struct host_data.  */
 -		size_t tmpbuf2len = (512 + (MAX_NR_ALIASES+MAX_NR_ADDRS+1)
 -				     * sizeof(char*) + 16 * sizeof(char));
 -
 -		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)
@@ -1185,9 +1125,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)
@@ -1217,17 +1154,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;
--- a/glibc-fedora-gai-rfc1918.patch
+++ b/glibc-fedora-gai-rfc1918.patch
@ -0,0 +1,54 @@
 From 1080954fbcf54814875eb988673004d25a1655cf Mon Sep 17 00:00:00 2001
 From: Ulrich Drepper <drepper@redhat.com>
 Date: Tue, 6 Apr 2010 12:27:58 +0200
 Subject: [PATCH] Assign global scope to RFC 1918 addresses
 * sysdeps/posix/getaddrinfo.c (default_scopes): Assign global
 scope to RFC 1918 addresses.
 * posix/gai.conf: Document difference from RFC 3484.
 ---
 ChangeLog                   |    6 ++++++
 posix/gai.conf              |    6 ++++--
 sysdeps/posix/getaddrinfo.c |    2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)
 diff --git a/posix/gai.conf b/posix/gai.conf
 index 195287e..bd40684 100644
 --- a/posix/gai.conf
 +++ b/posix/gai.conf
@@ -41,7 +41,7 @@
 #
 # precedence  <mask>   <value>
 #    Add another rule to the RFC 3484 precedence table.  See section 2.1
 -#    and 10.3 in RFC 3484.  The default is:
 +#    and 10.3 in RFC 3484.  The RFC requires:
 #
 #precedence  ::1/128       50
 #precedence  ::/0          40
@@ -58,7 +58,7 @@
 #    Add another rule to the RFC 3484 scope table for IPv4 addresses.
 #    By default the scope IDs described in section 3.2 in RFC 3484 are
 #    used.  Changing these defaults should hardly ever be necessary.
 -#    The defaults are equivalent to:
 +#    The definitions in RFC 1918 are equivalent to:
 #
 #scopev4 ::ffff:169.254.0.0/112  2
 #scopev4 ::ffff:127.0.0.0/104    2
 diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
 index 2e0c724..3eb5971 100644
 --- a/sysdeps/posix/getaddrinfo.c
 +++ b/sysdeps/posix/getaddrinfo.c
@@ -1099,10 +1099,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 },
 +#if 0
     /* Site-local addresses: scope 5.  */
     { { { 10, 0, 0, 0 } }, htonl_c (0xff000000), 5 },
     { { { 172, 16, 0, 0 } }, htonl_c (0xfff00000), 5 },
     { { { 192, 168, 0, 0 } }, htonl_c (0xffff0000), 5 },
 +#endif
     /* Default: scope 14.  */
     { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
   };
--- a/glibc-fedora-getconf.patch
+++ b/glibc-fedora-getconf.patch
@ -0,0 +1,74 @@
 2004-11-26  Jakub Jelinek  <jakub@redhat.com>
 	* posix/Makefile (generated: Add getconf.speclist.
 	($(inst_libexecdir)/getconf): Use getconf.speclist instead of
 	getconf output.
 	($(objpfx)getconf.speclist): New rule.
 	* posix/getconf.speclist.h: New file.
 diff -Nrup a/posix/Makefile b/posix/Makefile
 --- a/posix/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/posix/Makefile	2012-06-07 12:15:21.820318664 -0600
@@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
 	  mv -f $@/$$spec.new $@/$$spec; \
 	done < $(objpfx)getconf.speclist
 -$(objpfx)getconf.speclist: $(objpfx)getconf
 -ifeq (no,$(cross-compiling))
 -	LC_ALL=C GETCONF_DIR=/dev/null \
 -	$(run-program-prefix) $< _POSIX_V7_WIDTH_RESTRICTED_ENVS > $@.new
 -	LC_ALL=C GETCONF_DIR=/dev/null \
 -	$(run-program-prefix) $< _POSIX_V6_WIDTH_RESTRICTED_ENVS >> $@.new
 -	LC_ALL=C GETCONF_DIR=/dev/null \
 -	$(run-program-prefix) $< _XBS5_WIDTH_RESTRICTED_ENVS >> $@.new
 -else
 -	> $@.new
 -endif
 +$(objpfx)getconf.speclist: getconf.speclist.h
 +	$(CC) -E $(CFLAGS) $(CPPFLAGS) $< \
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 	mv -f $@.new $@
 diff -Nrup a/posix/getconf.speclist.h b/posix/getconf.speclist.h
 --- a/posix/getconf.speclist.h	1969-12-31 17:00:00.000000000 -0700
 +++ b/posix/getconf.speclist.h	2012-06-07 12:15:21.820318664 -0600
@@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
 +#if _POSIX_V7_ILP32_OFF32 == 1
 +"POSIX_V7_ILP32_OFF32"
 +#endif
 +#if _POSIX_V7_ILP32_OFFBIG == 1
 +"POSIX_V7_ILP32_OFFBIG"
 +#endif
 +#if _POSIX_V7_LP64_OFF64 == 1
 +"POSIX_V7_LP64_OFF64"
 +#endif
 +#if _POSIX_V7_LPBIG_OFFBIG == 1
 +"POSIX_V7_LPBIG_OFFBIG"
 +#endif
 +#if _POSIX_V6_ILP32_OFF32 == 1
 +"POSIX_V6_ILP32_OFF32"
 +#endif
 +#if _POSIX_V6_ILP32_OFFBIG == 1
 +"POSIX_V6_ILP32_OFFBIG"
 +#endif
 +#if _POSIX_V6_LP64_OFF64 == 1
 +"POSIX_V6_LP64_OFF64"
 +#endif
 +#if _POSIX_V6_LPBIG_OFFBIG == 1
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +#if _XBS5_ILP32_OFF32 == 1
 +"XBS5_ILP32_OFF32"
 +#endif
 +#if _XBS5_ILP32_OFFBIG == 1
 +"XBS5_ILP32_OFFBIG"
 +#endif
 +#if _XBS5_LP64_OFF64 == 1
 +"XBS5_LP64_OFF64"
 +#endif
 +#if _XBS5_LPBIG_OFFBIG == 1
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
--- a/glibc-fedora-getrlimit-PLT.patch
+++ b/glibc-fedora-getrlimit-PLT.patch
@ -0,0 +1,45 @@
 From 70d0a630700f602a457832383161d261fe222db5 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Thu, 1 Jul 2010 13:14:26 +0200
 Subject: [PATCH] Fix PLT reference
 * include/sys/resource.h (__getrlimit): Add hidden proto.
 * sysdeps/unix/sysv/linux/i386/getrlimit.c: Add libc_hidden_weak.
 * sysdeps/mach/hurd/getrlimit.c: Add libc_hidden_def.
 * resource/getrlimit.c: Likewise.
 ---
 ChangeLog                                |    7 +++++++
 include/sys/resource.h                   |    1 +
 resource/getrlimit.c                     |    1 +
 sysdeps/mach/hurd/getrlimit.c            |    1 +
 sysdeps/unix/sysv/linux/i386/getrlimit.c |    1 +
 5 files changed, 11 insertions(+), 0 deletions(-)
 --- a/include/sys/resource.h
 +++ b/include/sys/resource.h
@@ -14,5 +14,6 @@ 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
 #endif
 --- a/resource/getrlimit.c
 +++ b/resource/getrlimit.c
@@ -27,6 +27,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
   __set_errno (ENOSYS);
   return -1;
 }
 +libc_hidden_def (__getrlimit)
 weak_alias (__getrlimit, getrlimit)
 stub_warning (getrlimit)
 --- a/sysdeps/mach/hurd/getrlimit.c
 +++ b/sysdeps/mach/hurd/getrlimit.c
@@ -43,4 +43,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
   return 0;
 }
 +libc_hidden_def (__getrlimit)
 weak_alias (__getrlimit, getrlimit)
--- a/glibc-fedora-i386-tls-direct-seg-refs.patch
+++ b/glibc-fedora-i386-tls-direct-seg-refs.patch
@ -0,0 +1,18 @@
 diff -Nrup a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
 --- a/sysdeps/i386/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/sysdeps/i386/Makefile	2012-06-07 12:15:21.826318641 -0600
@@ -62,6 +64,14 @@ endif
 ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
 defines += -DNO_TLS_DIRECT_SEG_REFS
 +else
 +# .a libraries are not performance critical and so we
 +# build them without direct TLS segment references
 +# always.
 +CPPFLAGS-.o += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.o += -mno-tls-direct-seg-refs
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
 endif
 ifeq ($(subdir),elf)
--- a/glibc-fedora-i686-nopl.patch
+++ b/glibc-fedora-i686-nopl.patch
@ -0,0 +1,36 @@
 From b82207b25ed05d2e31563859382036ec385fc650 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Mon, 21 Jun 2010 16:54:50 +0200
 Subject: [PATCH] Workaround assembler bug sneaking in nopl
 * sysdeps/i386/i686/Makefile: Don't pass -mtune to assembler.
 ---
 ChangeLog                  |    4 ++++
 sysdeps/i386/i686/Makefile |   16 ----------------
 2 files changed, 4 insertions(+), 16 deletions(-)
 diff --git a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile
 index e6b2924..dbcf1c3 100644
 --- a/sysdeps/i386/i686/Makefile
 +++ b/sysdeps/i386/i686/Makefile
@@ -9,19 +9,3 @@ stack-align-test-flags += -msse
 ifeq ($(subdir),string)
 sysdep_routines += cacheinfo
 endif
 -
 -ifeq (yes,$(config-asflags-i686))
 -CFLAGS-.o += -Wa,-mtune=i686
 -CFLAGS-.os += -Wa,-mtune=i686
 -CFLAGS-.op += -Wa,-mtune=i686
 -CFLAGS-.og += -Wa,-mtune=i686
 -CFLAGS-.ob += -Wa,-mtune=i686
 -CFLAGS-.oS += -Wa,-mtune=i686
 -
 -ASFLAGS-.o += -Wa,-mtune=i686
 -ASFLAGS-.os += -Wa,-mtune=i686
 -ASFLAGS-.op += -Wa,-mtune=i686
 -ASFLAGS-.og += -Wa,-mtune=i686
 -ASFLAGS-.ob += -Wa,-mtune=i686
 -ASFLAGS-.oS += -Wa,-mtune=i686
 -endif
--- a/glibc-fedora-include-bits-ldbl.patch
+++ b/glibc-fedora-include-bits-ldbl.patch
@ -0,0 +1,30 @@
 From 5eb4509a6651d19c7a28c4506d6aa582c9ee095a Mon Sep 17 00:00:00 2001
 From: Jakub Jelinek <jakub@redhat.com>
 Date: Wed, 1 Feb 2006 09:30:43 +0000
 Subject: [PATCH] 128-bit long double fixes
 * include/bits/stdlib-ldbl.h: New file.
 * include/bits/wchar-ldbl.h: New file.
 ---
 ChangeLog                  |    5 +++++
 include/bits/stdlib-ldbl.h |    1 +
 include/bits/wchar-ldbl.h  |    1 +
 3 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100644 include/bits/stdlib-ldbl.h
 create mode 100644 include/bits/wchar-ldbl.h
 diff --git a/include/bits/stdlib-ldbl.h b/include/bits/stdlib-ldbl.h
 new file mode 100644
 index 0000000..6250949
 --- /dev/null
 +++ b/include/bits/stdlib-ldbl.h
@@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
 diff --git a/include/bits/wchar-ldbl.h b/include/bits/wchar-ldbl.h
 new file mode 100644
 index 0000000..29baa2f
 --- /dev/null
 +++ b/include/bits/wchar-ldbl.h
@@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
--- a/glibc-fedora-ldd.patch
+++ b/glibc-fedora-ldd.patch
@ -0,0 +1,42 @@
 From 83e5edd390eabe8f8e8e0d051f929b77a30c0767 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Fri, 18 Mar 2011 16:22:52 +0100
 Subject: [PATCH] ldd: never run file directly
 * elf/ldd.bash.in: Never run file directly.
 ---
 ChangeLog       |    4 ++++
 elf/ldd.bash.in |   14 +-------------
 2 files changed, 5 insertions(+), 13 deletions(-)
 --- a/elf/ldd.bash.in
 +++ b/elf/ldd.bash.in
@@ -166,18 +166,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
       fi
     done
     case $ret in
 -    0)
 -      # If the program exits with exit code 5, it means the process has been
 -      # invoked with __libc_enable_secure.  Fall back to running it through
 -      # the dynamic linker.
 -      try_trace "$file"
 -      rc=$?
 -      if [ $rc = 5 ]; then
 -	try_trace "$RTLD" "$file"
 -	rc=$?
 -      fi
 -      [ $rc = 0 ] || result=1
 -      ;;
     1)
       # This can be a non-ELF binary or no binary at all.
       nonelf "$file" || {
@@ -185,7 +173,7 @@ warning: you do not have execution permission for" "\`$file'" >&2
 	result=1
       }
       ;;
 -    2)
 +    0|2)
       try_trace "$RTLD" "$file" || result=1
       ;;
     *)
--- a/glibc-fedora-linux-tcsetattr.patch
+++ b/glibc-fedora-linux-tcsetattr.patch
@ -0,0 +1,48 @@
 diff -Nrup a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c
 --- a/sysdeps/unix/sysv/linux/tcsetattr.c	2012-06-05 07:42:49.000000000 -0600
 +++ b/sysdeps/unix/sysv/linux/tcsetattr.c	2012-06-07 12:15:21.831318623 -0600
@@ -48,6 +48,7 @@ tcsetattr (fd, optional_actions, termios
 {
   struct __kernel_termios k_termios;
   unsigned long int cmd;
 +  int retval;
   switch (optional_actions)
     {
@@ -79,6 +80,35 @@ tcsetattr (fd, optional_actions, termios
   memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
 	  __KERNEL_NCCS * sizeof (cc_t));
 -  return INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
 +  retval = INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
 +
 +  if (retval == 0 && cmd == TCSETS)
 +    {
 +      /* The Linux kernel has a bug which silently ignore the invalid
 +        c_cflag on pty. We have to check it here. */
 +      int save = errno;
 +      retval = INLINE_SYSCALL (ioctl, 3, fd, TCGETS, &k_termios);
 +      if (retval)
 +       {
 +         /* We cannot verify if the setting is ok. We don't return
 +            an error (?). */
 +         __set_errno (save);
 +         retval = 0;
 +       }
 +      else if ((termios_p->c_cflag & (PARENB | CREAD))
 +              != (k_termios.c_cflag & (PARENB | CREAD))
 +              || ((termios_p->c_cflag & CSIZE)
 +                  && ((termios_p->c_cflag & CSIZE)
 +                      != (k_termios.c_cflag & CSIZE))))
 +       {
 +         /* It looks like the Linux kernel silently changed the
 +            PARENB/CREAD/CSIZE bits in c_cflag. Report it as an
 +            error. */
 +         __set_errno (EINVAL);
 +         retval = -1;
 +       }
 +    }
 +
 +  return retval;
 }
 libc_hidden_def (tcsetattr)
--- a/glibc-fedora-locale-euro.patch
+++ b/glibc-fedora-locale-euro.patch
@ -0,0 +1,99 @@
 * Tue Mar 26 2002 Jakub Jelinek <jakub@redhat.com> 2.2.5-28
 - readd temporarily currencies which were superceeded by Euro
  into the list of accepted currencies by localedef to make
  standard conformance testsuites happy
 diff -Nrup a/locale/iso-4217.def b/locale/iso-4217.def
 --- a/locale/iso-4217.def	2012-06-05 07:42:49.000000000 -0600
 +++ b/locale/iso-4217.def	2012-06-07 12:15:21.584319544 -0600
@@ -8,6 +8,7 @@
  *
  * !!! The list has to be sorted !!!
  */
 +DEFINE_INT_CURR("ADP")		/* Andorran Peseta -> EUR  */
 DEFINE_INT_CURR("AED")		/* United Arab Emirates Dirham  */
 DEFINE_INT_CURR("AFN")		/* Afghanistan Afgani  */
 DEFINE_INT_CURR("ALL")		/* Albanian Lek  */
@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD")		/* Armenia Dram
 DEFINE_INT_CURR("ANG")		/* Netherlands Antilles  */
 DEFINE_INT_CURR("AOA")		/* Angolan Kwanza  */
 DEFINE_INT_CURR("ARS")		/* Argentine Peso  */
 +DEFINE_INT_CURR("ATS")		/* Austrian Schilling -> EUR  */
 DEFINE_INT_CURR("AUD")		/* Australian Dollar  */
 DEFINE_INT_CURR("AWG")		/* Aruba Guilder  */
 DEFINE_INT_CURR("AZM")		/* Azerbaijan Manat  */
 DEFINE_INT_CURR("BAM")		/* Bosnian and Herzegovina Convertible Mark  */
 DEFINE_INT_CURR("BBD")		/* Barbados Dollar  */
 DEFINE_INT_CURR("BDT")		/* Bangladesh Taka  */
 +DEFINE_INT_CURR("BEF")		/* Belgian Franc -> EUR  */
 DEFINE_INT_CURR("BGN")		/* Bulgarian Lev  */
 DEFINE_INT_CURR("BHD")		/* Bahraini Dinar  */
 DEFINE_INT_CURR("BIF")		/* Burundi Franc  */
@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP")		/* Cuban Peso  *
 DEFINE_INT_CURR("CVE")		/* Cape Verde Escudo  */
 DEFINE_INT_CURR("CYP")		/* Cypriot Pound  */
 DEFINE_INT_CURR("CZK")		/* Czech Koruna  */
 +DEFINE_INT_CURR("DEM")		/* German Mark -> EUR  */
 DEFINE_INT_CURR("DJF")		/* Djibouti Franc  */
 DEFINE_INT_CURR("DKK")		/* Danish Krone (Faroe Islands, Greenland)  */
 DEFINE_INT_CURR("DOP")		/* Dominican Republic  */
@@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD")		/* Algerian Dina
 DEFINE_INT_CURR("EEK")		/* Estonian Kroon  */
 DEFINE_INT_CURR("EGP")		/* Egyptian Pound  */
 DEFINE_INT_CURR("ERN")		/* Eritrean Nakfa  */
 +DEFINE_INT_CURR("ESP")		/* Spanish Peseta -> EUR  */
 DEFINE_INT_CURR("ETB")		/* Ethiopian Birr  */
 DEFINE_INT_CURR("EUR")		/* European Union Euro  */
 +DEFINE_INT_CURR("FIM")		/* Finnish Markka -> EUR  */
 DEFINE_INT_CURR("FJD")		/* Fiji Dollar  */
 DEFINE_INT_CURR("FKP")		/* Falkland Islands Pound (Malvinas)  */
 +DEFINE_INT_CURR("FRF")		/* French Franc -> EUR  */
 DEFINE_INT_CURR("GBP")		/* British Pound  */
 DEFINE_INT_CURR("GEL")		/* Georgia Lari  */
 DEFINE_INT_CURR("GHC")		/* Ghana Cedi  */
 DEFINE_INT_CURR("GIP")		/* Gibraltar Pound  */
 DEFINE_INT_CURR("GMD")		/* Gambian Dalasi  */
 DEFINE_INT_CURR("GNF")		/* Guinea Franc  */
 +DEFINE_INT_CURR("GRD")		/* Greek Drachma -> EUR  */
 DEFINE_INT_CURR("GTQ")		/* Guatemala Quetzal  */
 DEFINE_INT_CURR("GYD")		/* Guyana Dollar  */
 DEFINE_INT_CURR("HKD")		/* Hong Kong Dollar  */
@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK")		/* Croatia Kuna
 DEFINE_INT_CURR("HTG")		/* Haiti Gourde  */
 DEFINE_INT_CURR("HUF")		/* Hungarian Forint  */
 DEFINE_INT_CURR("IDR")		/* Indonesia Rupiah  */
 +DEFINE_INT_CURR("IEP")		/* Irish Pound -> EUR  */
 DEFINE_INT_CURR("ILS")		/* Israeli Shekel  */
 DEFINE_INT_CURR("IMP")		/* Isle of Man Pounds  */
 DEFINE_INT_CURR("INR")		/* Indian Rupee (Bhutan)  */
 DEFINE_INT_CURR("IQD")		/* Iraqi Dinar  */
 DEFINE_INT_CURR("IRR")		/* Iranian Rial  */
 DEFINE_INT_CURR("ISK")		/* Iceland Krona  */
 +DEFINE_INT_CURR("ITL")		/* Italian Lira -> EUR  */
 DEFINE_INT_CURR("JEP")		/* Jersey Pound  */
 DEFINE_INT_CURR("JMD")		/* Jamaican Dollar  */
 DEFINE_INT_CURR("JOD")		/* Jordanian Dinar  */
@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR")		/* Sri Lankan Ru
 DEFINE_INT_CURR("LRD")		/* Liberian Dollar  */
 DEFINE_INT_CURR("LSL")		/* Lesotho Maloti  */
 DEFINE_INT_CURR("LTL")		/* Lithuanian Litas  */
 +DEFINE_INT_CURR("LUF")		/* Luxembourg Franc -> EUR  */
 DEFINE_INT_CURR("LVL")		/* Latvia Lat  */
 DEFINE_INT_CURR("LYD")		/* Libyan Arab Jamahiriya Dinar  */
 DEFINE_INT_CURR("MAD")		/* Moroccan Dirham  */
@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM")		/* Mozambique Me
 DEFINE_INT_CURR("NAD")		/* Namibia Dollar  */
 DEFINE_INT_CURR("NGN")		/* Nigeria Naira  */
 DEFINE_INT_CURR("NIO")		/* Nicaragua Cordoba Oro  */
 +DEFINE_INT_CURR("NLG")		/* Netherlands Guilder -> EUR  */
 DEFINE_INT_CURR("NOK")		/* Norwegian Krone  */
 DEFINE_INT_CURR("NPR")		/* Nepalese Rupee  */
 DEFINE_INT_CURR("NZD")		/* New Zealand Dollar  */
@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK")		/* Papau New Gui
 DEFINE_INT_CURR("PHP")		/* Philippines Peso  */
 DEFINE_INT_CURR("PKR")		/* Pakistan Rupee  */
 DEFINE_INT_CURR("PLN")		/* Polish Zloty  */
 +DEFINE_INT_CURR("PTE")		/* Portugese Escudo -> EUR  */
 DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
 DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
 DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
--- a/glibc-fedora-localedata-locales-fixes.patch
+++ b/glibc-fedora-localedata-locales-fixes.patch
@ -0,0 +1,57 @@
 diff -Nrup a/localedata/locales/cy_GB b/localedata/locales/cy_GB
 --- a/localedata/locales/cy_GB	2012-06-05 07:42:49.000000000 -0600
 +++ b/localedata/locales/cy_GB	2012-06-07 12:15:21.805318719 -0600
@@ -248,9 +248,9 @@ mon         "<U0049><U006F><U006E><U0061
 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>"
 t_fmt       "<U0025><U0054>"
 -am_pm       "<U0061><U006D>";"<U0070><U006D>"
 +am_pm       "<U0041><U004D>";"<U0050><U004D>"
 t_fmt_ampm  "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
 -date_fmt    "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
 +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>"
 first_workday 2
 diff -Nrup a/localedata/locales/en_GB b/localedata/locales/en_GB
 --- a/localedata/locales/en_GB	2012-06-05 07:42:49.000000000 -0600
 +++ b/localedata/locales/en_GB	2012-06-07 12:15:21.806318715 -0600
@@ -116,7 +116,7 @@ mon         "<U004A><U0061><U006E><U0075
 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>"
 t_fmt       "<U0025><U0054>"
 -am_pm       "<U0061><U006D>";"<U0070><U006D>"
 +am_pm       "<U0041><U004D>";"<U0050><U004D>"
 t_fmt_ampm  "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"
 date_fmt    "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
 diff -Nrup a/localedata/locales/zh_TW b/localedata/locales/zh_TW
 --- a/localedata/locales/zh_TW	2012-06-05 07:42:49.000000000 -0600
 +++ b/localedata/locales/zh_TW	2012-06-07 12:15:21.807318711 -0600
@@ -1,7 +1,7 @@
 comment_char %
 escape_char /
 %
 -% Chinese language locale for Taiwan R.O.C.
 +% Chinese language locale for Taiwan
 % charmap: BIG5-CP950
 %
 % Original Author:
@@ -17,7 +17,7 @@ escape_char /
 % Reference:	http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
 LC_IDENTIFICATION
 -title      "Chinese locale for Taiwan R.O.C."
 +title      "Chinese locale for Taiwan"
 source     ""
 address    ""
 contact    ""
@@ -25,7 +25,7 @@ email      "bug-glibc-locales@gnu.org"
 tel        ""
 fax        ""
 language   "Chinese"
 -territory  "Taiwan R.O.C."
 +territory  "Taiwan"
 revision   "0.2"
 date       "2000-08-02"
 %
--- a/glibc-fedora-localedata-no_NO.patch
+++ b/glibc-fedora-localedata-no_NO.patch
@ -0,0 +1,102 @@
 * Mon Dec  1 2003 Jakub Jelinek <jakub@redhat.com> 2.3.3-1
 - for the time being, include both nb_NO* and no_NO* as locales
  so that the distribution can catch up with the no_NO->nb_NO
  transition
 diff -Nrup a/intl/locale.alias b/intl/locale.alias
 --- a/intl/locale.alias	2012-06-05 07:42:49.000000000 -0600
 +++ b/intl/locale.alias	2012-06-07 12:15:21.583319548 -0600
@@ -56,8 +56,6 @@ korean		ko_KR.eucKR
 korean.euc 	ko_KR.eucKR
 ko_KR		ko_KR.eucKR
 lithuanian      lt_LT.ISO-8859-13
 -no_NO		nb_NO.ISO-8859-1
 -no_NO.ISO-8859-1 nb_NO.ISO-8859-1
 norwegian       nb_NO.ISO-8859-1
 nynorsk		nn_NO.ISO-8859-1
 polish          pl_PL.ISO-8859-2
 diff -Nrup a/localedata/SUPPORTED b/localedata/SUPPORTED
 --- a/localedata/SUPPORTED	2012-06-05 07:42:49.000000000 -0600
 +++ b/localedata/SUPPORTED	2012-06-07 12:15:21.805318719 -0600
@@ -320,6 +320,8 @@ nl_NL/ISO-8859-1 \
 nl_NL@euro/ISO-8859-15 \
 nn_NO.UTF-8/UTF-8 \
 nn_NO/ISO-8859-1 \
 +no_NO.UTF-8/UTF-8 \
 +no_NO/ISO-8859-1 \
 nr_ZA/UTF-8 \
 nso_ZA/UTF-8 \
 oc_FR.UTF-8/UTF-8 \
 diff -Nrup a/localedata/locales/no_NO b/localedata/locales/no_NO
 --- a/localedata/locales/no_NO	1969-12-31 17:00:00.000000000 -0700
 +++ b/localedata/locales/no_NO	2012-06-07 12:15:21.806318715 -0600
@@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
 +
 +% Norwegian language locale for Norway
 +% Source: Norsk Standardiseringsforbund
 +% Address: University Library,
 +%   Drammensveien 41, N-9242 Oslo, Norge
 +% Contact: Kolbjoern Aamboe
 +% Tel: +47 - 22859109
 +% Fax: +47 - 22434497
 +% Email: kolbjorn.aambo@usit.uio.no
 +% Language: no
 +% Territory: NO
 +% Revision: 4.3
 +% Date: 1996-10-15
 +% Application: general
 +% Users: general
 +% Repertoiremap: mnemonic.ds
 +% Charset: ISO-8859-1
 +% Distribution and use is free, also
 +% for commercial purposes.
 +
 +LC_IDENTIFICATION
 +copy "nb_NO"
 +END LC_IDENTIFICATION
 +
 +LC_COLLATE
 +copy "nb_NO"
 +END LC_COLLATE
 +
 +LC_CTYPE
 +copy "nb_NO"
 +END LC_CTYPE
 +
 +LC_MONETARY
 +copy "nb_NO"
 +END LC_MONETARY
 +
 +LC_NUMERIC
 +copy "nb_NO"
 +END LC_NUMERIC
 +
 +LC_TIME
 +copy "nb_NO"
 +END LC_TIME
 +
 +LC_MESSAGES
 +copy "nb_NO"
 +END LC_MESSAGES
 +
 +LC_PAPER
 +copy "nb_NO"
 +END LC_PAPER
 +
 +LC_TELEPHONE
 +copy "nb_NO"
 +END LC_TELEPHONE
 +
 +LC_MEASUREMENT
 +copy "nb_NO"
 +END LC_MEASUREMENT
 +
 +LC_NAME
 +copy "nb_NO"
 +END LC_NAME
 +
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
--- a/glibc-fedora-localedata-rh61908.patch
+++ b/glibc-fedora-localedata-rh61908.patch
@ -0,0 +1,38 @@
 * Tue Mar 26 2002 Jakub Jelinek <jakub@redhat.com> 2.2.5-28
 - add a couple of .ISO-8859-15 locales (#61908)
 diff -Nrup a/localedata/SUPPORTED b/localedata/SUPPORTED
 --- a/localedata/SUPPORTED	2012-06-05 07:42:49.000000000 -0600
 +++ b/localedata/SUPPORTED	2012-06-07 12:15:21.805318719 -0600
@@ -88,6 +88,7 @@ cy_GB.UTF-8/UTF-8 \
 cy_GB/ISO-8859-14 \
 da_DK.UTF-8/UTF-8 \
 da_DK/ISO-8859-1 \
 +da_DK.ISO-8859-15/ISO-8859-15 \
 de_AT.UTF-8/UTF-8 \
 de_AT/ISO-8859-1 \
 de_AT@euro/ISO-8859-15 \
@@ -119,6 +120,7 @@ en_DK.UTF-8/UTF-8 \
 en_DK/ISO-8859-1 \
 en_GB.UTF-8/UTF-8 \
 en_GB/ISO-8859-1 \
 +en_GB.ISO-8859-15/ISO-8859-15 \
 en_HK.UTF-8/UTF-8 \
 en_HK/ISO-8859-1 \
 en_IE.UTF-8/UTF-8 \
@@ -134,6 +136,7 @@ en_SG.UTF-8/UTF-8 \
 en_SG/ISO-8859-1 \
 en_US.UTF-8/UTF-8 \
 en_US/ISO-8859-1 \
 +en_US.ISO-8859-15/ISO-8859-15 \
 en_ZA.UTF-8/UTF-8 \
 en_ZA/ISO-8859-1 \
 en_ZM/UTF-8 \
@@ -378,6 +381,7 @@ sv_FI/ISO-8859-1 \
 sv_FI@euro/ISO-8859-15 \
 sv_SE.UTF-8/UTF-8 \
 sv_SE/ISO-8859-1 \
 +sv_SE.ISO-8859-15/ISO-8859-15 \
 sw_KE/UTF-8 \
 sw_TZ/UTF-8 \
 ta_IN/UTF-8 \
--- a/glibc-fedora-localedef.patch
+++ b/glibc-fedora-localedef.patch
@ -0,0 +1,11 @@
 diff -Nrup a/localedata/Makefile b/localedata/Makefile
 --- a/localedata/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/localedata/Makefile	2012-06-07 12:15:21.776318827 -0600
@@ -211,6 +211,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
 	echo -n '...'; \
 	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
 	$(LOCALEDEF) --alias-file=../intl/locale.alias \
 +		     --no-archive \
 		     -i locales/$$input -c -f charmaps/$$charset \
 		     $(addprefix --prefix=,$(install_root)) $$locale; \
 	echo ' done'; \
--- a/glibc-fedora-locarchive.patch
+++ b/glibc-fedora-locarchive.patch
@ -0,0 +1,51 @@
 This is a part of commit glibc-2.3.3-1492-ga891c7b,
 needed for fedora/build-locale-archive.c only.
 diff -Nrup a/ChangeLog.17 b/ChangeLog.17
 --- a/ChangeLog.17	2012-06-05 07:42:49.000000000 -0600
 +++ b/ChangeLog.17	2012-06-07 12:15:21.564319619 -0600
@@ -11818,6 +11829,10 @@ d2009-10-30  Ulrich Drepper  <drepper@re
 	[BZ #4368]
 	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
 +2007-04-16  Jakub Jelinek  <jakub@redhat.com>
 +
 +	* locale/programs/locarchive.c (add_alias, insert_name): Remove static.
 +
 2007-04-16  Ulrich Drepper  <drepper@redhat.com>
 	[BZ #4364]
 diff -Nrup a/locale/programs/locarchive.c b/locale/programs/locarchive.c
 --- a/locale/programs/locarchive.c	2012-06-05 07:42:49.000000000 -0600
 +++ b/locale/programs/locarchive.c	2012-06-07 12:15:21.585319540 -0600
@@ -252,9 +252,9 @@ oldlocrecentcmp (const void *a, const vo
 /* forward decls for below */
 static uint32_t add_locale (struct locarhandle *ah, const char *name,
 			    locale_data_t data, bool replace);
 -static void add_alias (struct locarhandle *ah, const char *alias,
 -		       bool replace, const char *oldname,
 -		       uint32_t *locrec_offset_p);
 +void add_alias (struct locarhandle *ah, const char *alias,
 +		bool replace, const char *oldname,
 +		uint32_t *locrec_offset_p);
 static bool
@@ -635,7 +635,7 @@ close_archive (struct locarhandle *ah)
 #include "../../intl/explodename.c"
 #include "../../intl/l10nflist.c"
 -static struct namehashent *
 +struct namehashent *
 insert_name (struct locarhandle *ah,
 	     const char *name, size_t name_len, bool replace)
 {
@@ -693,7 +693,7 @@ insert_name (struct locarhandle *ah,
   return &namehashtab[idx];
 }
 -static void
 +void
 add_alias (struct locarhandle *ah, const char *alias, bool replace,
 	   const char *oldname, uint32_t *locrec_offset_p)
 {
--- a/glibc-fedora-manual-dircategory.patch
+++ b/glibc-fedora-manual-dircategory.patch
@ -0,0 +1,20 @@
 From 4820b9175535e13df79ce816106016040014916e Mon Sep 17 00:00:00 2001
 From: Jakub Jelinek <jakub@redhat.com>
 Date: Fri, 3 Nov 2006 16:31:21 +0000
 Subject: [PATCH] Change @dircategory.
 ---
 manual/libc.texinfo |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
 --- a/manual/libc.texinfo
 +++ b/manual/libc.texinfo
@@ -7,7 +7,7 @@
 @include macros.texi
 @comment Tell install-info what to do.
 -@dircategory Software libraries
 +@dircategory Libraries
 @direntry
 * Libc: (libc).                 C library.
 @end direntry
--- a/glibc-fedora-nis-rh188246.patch
+++ b/glibc-fedora-nis-rh188246.patch
@ -0,0 +1,21 @@
 From baba5d9461d4e8a581ac26fe4412ad783ffc73e7 Mon Sep 17 00:00:00 2001
 From: Jakub Jelinek <jakub@redhat.com>
 Date: Mon, 1 May 2006 08:02:53 +0000
 Subject: [PATCH] Enable SETENT_BATCH_READ nis/nss option by default
 * Mon May  1 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-4
 - SETENT_BATCH_READ /etc/default/nss option for speeding up
  some usages of NIS+ (#188246)
 diff --git a/nis/nss b/nis/nss
 --- a/nis/nss
 +++ b/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
 #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
 #
 # ADJUNCT_AS_SHADOW
 #  If set to TRUE, the passwd routines in the NIS NSS module will not
--- a/glibc-fedora-nptl-linklibc.patch
+++ b/glibc-fedora-nptl-linklibc.patch
@ -0,0 +1,25 @@
 diff -Nrup a/nptl/Makefile b/nptl/Makefile
 --- a/nptl/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/nptl/Makefile	2012-06-07 12:15:21.816318678 -0600
@@ -529,15 +529,19 @@ $(addprefix $(objpfx), \
     $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
 				       $(objpfx)libpthread_nonshared.a
 $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so
 -# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
 +# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,
 # since otherwise libpthread.so comes before libc.so when linking.
 $(addprefix $(objpfx), $(tests-reverse)): \
 -  $(objpfx)../libc.so $(objpfx)libpthread.so \
 +  $(objpfx)linklibc.so $(objpfx)libpthread.so \
   $(objpfx)libpthread_nonshared.a
 $(objpfx)../libc.so: $(common-objpfx)libc.so ;
 $(addprefix $(objpfx),$(tests-static) $(xtests-static)): $(objpfx)libpthread.a
 $(objpfx)tst-atfork2.out: $(objpfx)tst-atfork2mod.so
 +
 +$(objpfx)linklibc.so: $(common-objpfx)libc.so
 +	ln -s ../libc.so $@
 +generated += libclink.so
 else
 $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
 endif
--- a/glibc-fedora-nscd.patch
+++ b/glibc-fedora-nscd.patch
@ -0,0 +1,91 @@
 diff -Nrup a/nscd/nscd.conf b/nscd/nscd.conf
 --- a/nscd/nscd.conf	2012-06-05 07:42:49.000000000 -0600
 +++ b/nscd/nscd.conf	2012-06-07 12:15:21.818318670 -0600
@@ -33,7 +33,7 @@
 #	logfile			/var/log/nscd.log
 #	threads			4
 #	max-threads		32
 -#	server-user		nobody
 +	server-user		nscd
 #	stat-user		somebody
 	debug-level		0
 #	reload-count		5
 diff -Nrup a/nscd/nscd.init b/nscd/nscd.init
 --- a/nscd/nscd.init	2012-06-05 07:42:49.000000000 -0600
 +++ b/nscd/nscd.init	2012-06-07 12:15:21.818318670 -0600
@@ -9,6 +9,7 @@
 #		slow naming services like NIS, NIS+, LDAP, or hesiod.
 # processname: /usr/sbin/nscd
 # config: /etc/nscd.conf
 +# config: /etc/sysconfig/nscd
 #
 ### BEGIN INIT INFO
 # Provides: nscd
@@ -28,20 +29,8 @@
 # Source function library.
 . /etc/init.d/functions
 -# nscd does not run on any kernel lower than 2.2.0 because of threading
 -# problems, so we require that in first place.
 -case $(uname -r) in
 -    2.[2-9].*)
 -	# this is okay
 -	;;
 -    [3-9]*)
 -	# these are of course also okay
 -	;;
 -    *)
 -	#this is not
 -	exit 1
 -	;;
 -esac
 +# Source an auxiliary options file if we have one, and pick up NSCD_OPTIONS.
 +[ -r /etc/sysconfig/nscd ] && . /etc/sysconfig/nscd
 RETVAL=0
 prog=nscd
@@ -50,7 +39,7 @@ start () {
     [ -d /var/run/nscd ] || mkdir /var/run/nscd
     [ -d /var/db/nscd ] || mkdir /var/db/nscd
     echo -n $"Starting $prog: "
 -    daemon /usr/sbin/nscd
 +    daemon /usr/sbin/nscd $NSCD_OPTIONS
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
@@ -83,11 +72,11 @@ restart() {
 # See how we were called.
 case "$1" in
     start)
 -	start
 +	[ -e /var/lock/subsys/nscd ] || start
 	RETVAL=$?
 	;;
     stop)
 -	stop
 +	[ ! -e /var/lock/subsys/nscd ] || stop
 	RETVAL=$?
 	;;
     status)
@@ -99,14 +88,17 @@ case "$1" in
 	RETVAL=$?
 	;;
     try-restart | condrestart)
 -	[ -e /var/lock/subsys/nscd ] && restart
 +	[ ! -e /var/lock/subsys/nscd ] || restart
 	RETVAL=$?
 	;;
     force-reload | reload)
     	echo -n $"Reloading $prog: "
 -	killproc /usr/sbin/nscd -HUP
 -	RETVAL=$?
 -	echo
 +    	RETVAL=0
 +    	/usr/sbin/nscd -i passwd || RETVAL=$?
 +    	/usr/sbin/nscd -i group || RETVAL=$?
 +    	/usr/sbin/nscd -i hosts || RETVAL=$?
 +    	/usr/sbin/nscd -i services || RETVAL=$?
 +    	echo
 	;;
     *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
--- a/glibc-fedora-nss-files-overflow-fix.patch
+++ b/glibc-fedora-nss-files-overflow-fix.patch
@ -0,0 +1,25 @@
 From f7001472d8d6ee9c5f83170c850a8a3b3ca0635f Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Fri, 20 Aug 2010 17:04:03 +0200
 Subject: [PATCH] Fix overflow in nss files parser
 * nss/nss_files/files-XXX.c (internal_getent): Declare linebuflen
 as size_t.
 ---
 ChangeLog                 |    3 +++
 nss/nss_files/files-XXX.c |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
 --- a/nss/nss_files/files-XXX.c
 +++ b/nss/nss_files/files-XXX.c
@@ -189,7 +189,7 @@ internal_getent (struct STRUCTURE *result,
 {
   char *p;
   struct parser_data *data = (void *) buffer;
 -  int linebuflen = buffer + buflen - data->linebuffer;
 +  size_t linebuflen = buffer + buflen - data->linebuffer;
   int parse_result;
   if (buflen < sizeof *data + 2)
--- a/glibc-fedora-path-vi.patch
+++ b/glibc-fedora-path-vi.patch
@ -0,0 +1,12 @@
 diff -Nrup a/sysdeps/unix/sysv/linux/paths.h b/sysdeps/unix/sysv/linux/paths.h
 --- a/sysdeps/unix/sysv/linux/paths.h	2012-06-05 07:42:49.000000000 -0600
 +++ b/sysdeps/unix/sysv/linux/paths.h	2012-06-07 12:15:21.831318623 -0600
@@ -62,7 +62,7 @@
 #define	_PATH_TTY	"/dev/tty"
 #define	_PATH_UNIX	"/boot/vmlinux"
 #define _PATH_UTMP	"/var/run/utmp"
 -#define	_PATH_VI	"/usr/bin/vi"
 +#define	_PATH_VI	"/bin/vi"
 #define _PATH_WTMP	"/var/log/wtmp"
 /* Provide trailing slash, since mostly used for building pathnames. */
--- a/glibc-fedora-ppc-unwind.patch
+++ b/glibc-fedora-ppc-unwind.patch
@ -0,0 +1,20 @@
 glibc-2.3.3-1478-g37582bc
 * Thu Nov 30 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-9
 - on ppc64 build __libc_start_main without unwind info,
  as it breaks MD_FROB_UPDATE_CONTEXT (#217729, #217775; in the
  future that could be fixable just by providing .cfi_undefined r2
  in __libc_start_main instead)
 diff -Nrup a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile
 --- a/sysdeps/powerpc/powerpc64/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/sysdeps/powerpc/powerpc64/Makefile	2012-06-07 12:15:21.828318633 -0600
@@ -35,6 +35,8 @@ CFLAGS-rtld-memmove.os = $(no-special-re
 CFLAGS-rtld-memchr.os = $(no-special-regs)
 CFLAGS-rtld-strnlen.os = $(no-special-regs)
 +CFLAGS-libc-start.c += -fno-asynchronous-unwind-tables
 +
 ifeq ($(subdir),csu)
 sysdep_routines += hp-timing
 elide-routines.os += hp-timing
--- a/glibc-fedora-pt_chown.patch
+++ b/glibc-fedora-pt_chown.patch
@ -0,0 +1,57 @@
 From ee3d4021aaaeacff7cf2addcdaa48859fffba2aa Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Thu, 3 Feb 2011 15:45:02 +0100
 Subject: [PATCH] Replace setuid by file capabilities
 * login/programs/pt_chown.c (main): Check for valid file
 descriptor instead of privileges.  Be careful to drop all
 capabilities when not needed.
 ---
 ChangeLog                 |    6 ++++++
 login/programs/pt_chown.c |   14 +++++++++-----
 3 files changed, 16 insertions(+), 6 deletions(-)
 --- a/login/programs/pt_chown.c
 +++ b/login/programs/pt_chown.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 +#include <fcntl.h>
 #ifdef HAVE_LIBCAP
 # include <sys/capability.h>
 # include <sys/prctl.h>
@@ -142,7 +143,7 @@ main (int argc, char *argv[])
   uid_t uid = getuid ();
   int remaining;
 -  if (argc == 1 && euid == 0)
 +  if (argc == 1 && fcntl (PTY_FILENO, F_GETFD) == 0)
     {
 #ifdef HAVE_LIBCAP
   /* Drop privileges.  */
@@ -175,6 +176,13 @@ main (int argc, char *argv[])
   /* We aren't going to be using privileges, so drop them right now. */
   setuid (uid);
 +#ifdef HAVE_LIBCAP
 +  cap_t caps = cap_init ();
 +  if (caps == NULL)
 +    error (1, errno, "cap_init");
 +  cap_set_proc (caps);
 +  cap_free (caps);
 +#endif
   /* Set locale via LC_ALL.  */
   setlocale (LC_ALL, "");
@@ -194,9 +202,5 @@ main (int argc, char *argv[])
       return EXIT_FAILURE;
     }
 -  /* Check if we are properly installed.  */
 -  if (euid != 0)
 -    error (FAIL_EXEC, 0, gettext ("needs to be installed setuid `root'"));
 -
   return EXIT_SUCCESS;
 }
--- a/glibc-fedora-regcomp-sw11561.patch
+++ b/glibc-fedora-regcomp-sw11561.patch
@ -0,0 +1,147 @@
 From c1b97d6d896b1f22fdf5d28471ef7859ec840a57 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Wed, 1 Sep 2010 17:26:15 +0200
 Subject: [PATCH] Fix handling of collating symbols in regexps
 [BZ #11561]
 * posix/regcomp.c (parse_bracket_exp): When looking up collating
 elements compare against the byte sequence of it, not its name.
 ---
 ChangeLog       |    4 +++
 posix/regcomp.c |   72 ++++++++++++++++++++----------------------------------
 2 files changed, 31 insertions(+), 45 deletions(-)
 --- a/posix/regcomp.c
 +++ b/posix/regcomp.c
@@ -2772,40 +2772,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.
      Seek the collating symbol entry correspondings to NAME.
 -     Return the index of the symbol in the SYMB_TABLE.  */
 +     Return the index of the symbol in the SYMB_TABLE,
 +     or -1 if not found.  */
   auto inline int32_t
   __attribute ((always_inline))
 -  seek_collating_symbol_entry (name, name_len)
 -	 const unsigned char *name;
 -	 size_t name_len;
 +  seek_collating_symbol_entry (const unsigned char *name, size_t name_len)
     {
 -      int32_t hash = elem_hash ((const char *) name, name_len);
 -      int32_t elem = hash % table_size;
 -      if (symb_table[2 * elem] != 0)
 -	{
 -	  int32_t second = hash % (table_size - 2) + 1;
 -
 -	  do
 -	    {
 -	      /* First compare the hashing value.  */
 -	      if (symb_table[2 * elem] == hash
 -		  /* Compare the length of the name.  */
 -		  && name_len == extra[symb_table[2 * elem + 1]]
 -		  /* Compare the name.  */
 -		  && memcmp (name, &extra[symb_table[2 * elem + 1] + 1],
 -			     name_len) == 0)
 -		{
 -		  /* Yep, this is the entry.  */
 -		  break;
 -		}
 +      int32_t elem;
 -	      /* Next entry.  */
 -	      elem += second;
 -	    }
 -	  while (symb_table[2 * elem] != 0);
 -	}
 -      return elem;
 +      for (elem = 0; elem < table_size; elem++)
 +	if (symb_table[2 * elem] != 0)
 +	  {
 +	    int32_t idx = symb_table[2 * elem + 1];
 +	    /* Skip the name of collating element name.  */
 +	    idx += 1 + extra[idx];
 +	    if (/* Compare the length of the name.  */
 +		name_len == extra[idx]
 +		/* Compare the name.  */
 +		&& memcmp (name, &extra[idx + 1], name_len) == 0)
 +	      /* Yep, this is the entry.  */
 +	      return elem;
 +	  }
 +      return -1;
     }
   /* Local function for parse_bracket_exp used in _LIBC environment.
@@ -2814,8 +2803,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
   auto inline unsigned int
   __attribute ((always_inline))
 -  lookup_collation_sequence_value (br_elem)
 -	 bracket_elem_t *br_elem;
 +  lookup_collation_sequence_value (bracket_elem_t *br_elem)
     {
       if (br_elem->type == SB_CHAR)
 	{
@@ -2843,7 +2831,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 	      int32_t elem, idx;
 	      elem = seek_collating_symbol_entry (br_elem->opr.name,
 						  sym_name_len);
 -	      if (symb_table[2 * elem] != 0)
 +	      if (elem != -1)
 		{
 		  /* We found the entry.  */
 		  idx = symb_table[2 * elem + 1];
@@ -2861,7 +2849,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 		  /* Return the collation sequence value.  */
 		  return *(unsigned int *) (extra + idx);
 		}
 -	      else if (symb_table[2 * elem] == 0 && sym_name_len == 1)
 +	      else if (sym_name_len == 1)
 		{
 		  /* No valid character.  Match it as a single byte
 		     character.  */
@@ -2883,11 +2871,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
   auto inline reg_errcode_t
   __attribute ((always_inline))
 -  build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
 -	 re_charset_t *mbcset;
 -	 int *range_alloc;
 -	 bitset_t sbcset;
 -	 bracket_elem_t *start_elem, *end_elem;
 +  build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc,
 +		   bracket_elem_t *start_elem, bracket_elem_t *end_elem)
     {
       unsigned int ch;
       uint32_t start_collseq;
@@ -2966,25 +2951,22 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
   auto inline reg_errcode_t
   __attribute ((always_inline))
 -  build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
 -	 re_charset_t *mbcset;
 -	 int *coll_sym_alloc;
 -	 bitset_t sbcset;
 -	 const unsigned char *name;
 +  build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
 +			  int *coll_sym_alloc, const unsigned char *name)
     {
       int32_t elem, idx;
       size_t name_len = strlen ((const char *) name);
       if (nrules != 0)
 	{
 	  elem = seek_collating_symbol_entry (name, name_len);
 -	  if (symb_table[2 * elem] != 0)
 +	  if (elem != -1)
 	    {
 	      /* We found the entry.  */
 	      idx = symb_table[2 * elem + 1];
 	      /* Skip the name of collating element name.  */
 	      idx += 1 + extra[idx];
 	    }
 -	  else if (symb_table[2 * elem] == 0 && name_len == 1)
 +	  else if (name_len == 1)
 	    {
 	      /* No valid character, treat it as a normal
 		 character.  */
--- a/glibc-fedora-s390-rh711330.patch
+++ b/glibc-fedora-s390-rh711330.patch
@ -0,0 +1,80 @@
 From 5a0546afb448a71cf045b980eb27c13bf5783920 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Thu, 9 Jun 2011 15:36:02 +0200
 Subject: [PATCH] Revert "Use .machine to prevent AS from complaining about
 z9-109 instructions in iconv modules"
 This reverts commit 2739047682590b1df473401b4febf424f857fccf.
 ---
 ChangeLog                             |    7 -------
 sysdeps/s390/s390-64/utf16-utf32-z9.c |    5 +----
 sysdeps/s390/s390-64/utf8-utf16-z9.c  |    5 +----
 sysdeps/s390/s390-64/utf8-utf32-z9.c  |    5 +----
 4 files changed, 3 insertions(+), 19 deletions(-)
 diff --git a/ChangeLog b/ChangeLog
 index 3ed77d0..90590d9 100644
 --- a/ChangeLog
 +++ b/ChangeLog
@@ -684,13 +684,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
 diff --git a/sysdeps/s390/s390-64/utf16-utf32-z9.c b/sysdeps/s390/s390-64/utf16-utf32-z9.c
 index 5bcaaae..14daf21 100644
 --- a/sysdeps/s390/s390-64/utf16-utf32-z9.c
 +++ b/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),		\
 diff --git a/sysdeps/s390/s390-64/utf8-utf16-z9.c b/sysdeps/s390/s390-64/utf8-utf16-z9.c
 index 812a42f..5f73f3c 100644
 --- a/sysdeps/s390/s390-64/utf8-utf16-z9.c
 +++ b/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),		\
 diff --git a/sysdeps/s390/s390-64/utf8-utf32-z9.c b/sysdeps/s390/s390-64/utf8-utf32-z9.c
 index 0ffd848..17ef8bc 100644
 --- a/sysdeps/s390/s390-64/utf8-utf32-z9.c
 +++ b/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),		\
--- a/glibc-fedora-streams-rh436349.patch
+++ b/glibc-fedora-streams-rh436349.patch
@ -0,0 +1,28 @@
 This is part of commit glibc-2.3.3-1564-gd0b6ac6
 * Fri Mar 14 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-11
 - remove <stropts.h>, define _XOPEN_STREAMS -1 (#436349)
 diff -Nrup a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 --- a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	2012-06-05 07:42:49.000000000 -0600
 +++ b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	2012-06-07 12:15:21.817318674 -0600
@@ -188,4 +188,7 @@
 /* Typed memory objects are not available.  */
 #define _POSIX_TYPED_MEMORY_OBJECTS	-1
 +/* Streams are not available.  */
 +#define _XOPEN_STREAMS	-1
 +
 #endif /* bits/posix_opt.h */
 diff -Nrup a/streams/Makefile b/streams/Makefile
 --- a/streams/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/streams/Makefile	2012-06-07 12:15:21.824318649 -0600
@@ -20,7 +20,7 @@
 #
 subdir	:= streams
 -headers		= stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h
 +#headers		= stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h
 routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
 include ../Rules
--- a/glibc-fedora-strict-aliasing.patch
+++ b/glibc-fedora-strict-aliasing.patch
@ -0,0 +1,91 @@
 From 96aefb90e843648812d1832789f4a88ea5350605 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Tue, 25 May 2010 15:09:20 +0200
 Subject: [PATCH] Avoid strict-aliasing issues
 ---
 elf/Makefile                           |    1 +
 inet/Makefile                          |    2 ++
 nis/Makefile                           |    2 ++
 nss/Makefile                           |    1 +
 resolv/Makefile                        |    1 +
 sunrpc/Makefile                        |    4 ++++
 sysdeps/powerpc/powerpc64/elf/Makefile |    2 ++
 7 files changed, 13 insertions(+), 0 deletions(-)
 --- a/elf/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/elf/Makefile	2012-06-07 12:15:21.572319589 -0600
@@ -50,6 +50,7 @@ include ../Makeconfig
 ifeq ($(unwind-find-fde),yes)
 routines += unwind-dw2-fde-glibc
 shared-only-routines += unwind-dw2-fde-glibc
 +CFLAGS-unwind-dw2-fde-glibc.c += -fno-strict-aliasing
 endif
 before-compile  = $(objpfx)trusted-dirs.h
 --- a/inet/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/inet/Makefile	2012-06-07 12:15:21.582319552 -0600
@@ -54,6 +54,8 @@ tests := htontest test_ifindex tst-ntoa
 include ../Rules
 +CFLAGS-tst-inet6_rth.c += -fno-strict-aliasing
 +
 ifeq ($(have-thread-library),yes)
 CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
 --- a/nis/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/nis/Makefile	2012-06-07 12:15:21.810318702 -0600
@@ -71,6 +71,8 @@ libnss_nisplus-inhibit-o = $(filter-out
 include ../Rules
 +CFLAGS-nis_findserv.c += -fno-strict-aliasing
 +CFLAGS-ypclnt.c += -fno-strict-aliasing
 $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
 $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
 --- a/nss/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/nss/Makefile	2012-06-07 12:15:21.819318667 -0600
@@ -101,6 +101,7 @@ $(libnss_db-dbs:%=$(objpfx)%.c): $(objpf
 	 echo '#include "$<"') > $@.new
 	mv -f $@.new $@
 +CFLAGS-files-hosts.c += -fno-strict-aliasing
 $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o)
 --- a/resolv/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/resolv/Makefile	2012-06-07 12:15:21.822318657 -0600
@@ -80,6 +80,7 @@ ifeq (yes,$(have-ssp))
 CFLAGS-libresolv += -fstack-protector
 endif
 CFLAGS-res_hconf.c = -fexceptions
 +CFLAGS-res_send.c += -fno-strict-aliasing
 # The BIND code elicits some harmless warnings.
 +cflags += -Wno-strict-prototypes -Wno-write-strings
 --- a/sunrpc/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/sunrpc/Makefile	2012-06-07 12:15:21.825318645 -0600
@@ -150,6 +150,10 @@ sunrpc-CPPFLAGS = -D_RPC_THREAD_SAFE_
 CPPFLAGS += $(sunrpc-CPPFLAGS)
 BUILD_CPPFLAGS += $(sunrpc-CPPFLAGS)
 +CFLAGS-clnt_tcp.c += -fno-strict-aliasing
 +CFLAGS-clnt_udp.c += -fno-strict-aliasing
 +CFLAGS-clnt_unix.c += -fno-strict-aliasing
 +
 $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so
 $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
 $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so
 --- a/sysdeps/powerpc/powerpc64/Makefile	2012-06-05 07:42:49.000000000 -0600
 +++ b/sysdeps/powerpc/powerpc64/Makefile	2012-06-07 12:15:21.828318633 -0600
@@ -35,6 +35,8 @@ CFLAGS-rtld-memmove.os = $(no-special-re
 CFLAGS-rtld-memchr.os = $(no-special-regs)
 CFLAGS-rtld-strnlen.os = $(no-special-regs)
 +CFLAGS-gmon-start.c += -fno-strict-aliasing
 +
 ifeq ($(subdir),csu)
 sysdep_routines += hp-timing
 elide-routines.os += hp-timing
--- a/glibc-fedora-test-debug-gnuc-compat.patch
+++ b/glibc-fedora-test-debug-gnuc-compat.patch
@ -0,0 +1,31 @@
 From 8c508c82e7ded8bb87e2784e25be9d9f8871d6b9 Mon Sep 17 00:00:00 2001
 From: Jakub Jelinek <jakub@redhat.com>
 Date: Mon, 15 Nov 2004 13:15:02 +0000
 Subject: [PATCH] Restore change unintentionally killed during merge.
 ---
 debug/tst-chk1.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c
 index 37320c3..0e5ba88 100644
 --- a/debug/tst-chk1.c
 +++ b/debug/tst-chk1.c
@@ -244,7 +244,7 @@ do_test (void)
   if (memcmp (a.buf1, "aabcdabcjj", 10))
     FAIL ();
 -#if __USE_FORTIFY_LEVEL < 2
 +#if __USE_FORTIFY_LEVEL < 2 || !__GNUC_PREREQ (4, 0)
   /* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2
      and sufficient GCC support, as the string operations overflow
      from a.buf1 into a.buf2.  */
@@ -359,7 +359,7 @@ do_test (void)
   memset (a.buf1 + 9, 'j', l0 + 2);
   CHK_FAIL_END
 -# if __USE_FORTIFY_LEVEL >= 2
 +# if __USE_FORTIFY_LEVEL >= 2 && __GNUC_PREREQ (4, 0)
 #  define O 0
 # else
 #  define O 1
--- a/glibc-fedora-test-debug-gnuc-hack.patch
+++ b/glibc-fedora-test-debug-gnuc-hack.patch
@ -0,0 +1,22 @@
 From e818d7d5034bd33373aebf570402abdb8e434f6e Mon Sep 17 00:00:00 2001
 From: Jakub Jelinek <jakub@redhat.com>
 Date: Sat, 19 Mar 2005 20:18:00 +0000
 Subject: [PATCH] Updated to fedora-glibc-20050319T1907
 ---
 debug/tst-chk1.c |  234 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 229 insertions(+), 5 deletions(-)
 diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c
 --- a/debug/tst-chk1.c
 +++ b/debug/tst-chk1.c
@@ -16,6 +16,9 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 +/* Hack: make sure GCC doesn't know __chk_fail () will not return.  */
 +#define __noreturn__
 +
 #include <assert.h>
 #include <fcntl.h>
 #include <locale.h>
--- a/glibc-fedora-tls-offset-rh731228.patch
+++ b/glibc-fedora-tls-offset-rh731228.patch
@ -0,0 +1,24 @@
 From a45bd0d9682db986191b075e64bcacd038af5993 Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Thu, 1 Sep 2011 10:45:00 +0200
 Subject: [PATCH] Don't treat tls_offset == 1 as forced dynamic
 * include/link.h (FORCED_DYNAMIC_TLS_OFFSET) [NO_TLS_OFFSET == 0]:
 Change to -1.
 ---
 ChangeLog      |    5 +++++
 include/link.h |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)
 --- a/include/link.h
 +++ b/include/link.h
@@ -289,7 +289,7 @@ struct link_map
 #endif
 #ifndef FORCED_DYNAMIC_TLS_OFFSET
 # if NO_TLS_OFFSET == 0
 -#  define FORCED_DYNAMIC_TLS_OFFSET 1
 +#  define FORCED_DYNAMIC_TLS_OFFSET -1
 # elif NO_TLS_OFFSET == -1
 #  define FORCED_DYNAMIC_TLS_OFFSET -2
 # else
--- a/glibc-fedora-uname-getrlimit.patch
+++ b/glibc-fedora-uname-getrlimit.patch
@ -0,0 +1,61 @@
 From cde99cd2b7b16a6113acb054e89d490047932a9f Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Thu, 8 Apr 2010 11:18:26 +0200
 Subject: [PATCH] Don't call uname or getrlimit in libpthread init function
 * sysdeps/unix/sysv/linux/i386/Versions: Export __uname under
 GLIBC_PRIVATE.
 * nptl/Versions: Export __getrlimit under GLIBC_PRIVATE.
 * sysdeps/unix/sysv/linux/i386/smp.h: Call __uname instead of uname.
 * nptl/nptl-init.c: Call __getrlimit instead of getrlimit.
 ---
 ChangeLog                                  |    8 ++++++++
 nptl/Versions                              |    1 +
 nptl/nptl-init.c                           |    2 +-
 nptl/sysdeps/unix/sysv/linux/i386/Versions |    6 ++++++
 nptl/sysdeps/unix/sysv/linux/i386/smp.h    |    2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 nptl/sysdeps/unix/sysv/linux/i386/Versions
 --- a/nptl/Version
 +++ b/nptl/Versions
@@ -30,6 +30,7 @@ libc {
     __libc_alloca_cutoff;
     # Internal libc interface to libpthread
     __libc_dl_error_tsd;
 +    __getrlimit;
   }
 }
 --- a/nptl/nptl-init.c
 +++ b/nptl/nptl-init.c
@@ -414,7 +414,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;
 -  if (getrlimit (RLIMIT_STACK, &limit) != 0
 +  if (__getrlimit (RLIMIT_STACK, &limit) != 0
       || limit.rlim_cur == RLIM_INFINITY)
     /* The system limit is not usable.  Use an architecture-specific
        default.  */
 --- a/nptl/sysdeps/unix/sysv/linux/i386/Versions
 +++ b/nptl/sysdeps/unix/sysv/linux/i386/Versions
@@ -0,0 +1,6 @@
 +libc {
 +  GLIBC_PRIVATE {
 +    # Internal libc interface to libpthread
 +    __uname;
 +  }
 +}
 --- a/nptl/sysdeps/unix/sysv/linux/i386/smp.h
 +++ b/nptl/sysdeps/unix/sysv/linux/i386/smp.h
@@ -36,7 +36,7 @@ is_smp_system (void)
   char *cp;
   /* Try reading the number using `sysctl' first.  */
 -  if (uname (&u.uts) == 0)
 +  if (__uname (&u.uts) == 0)
     cp = u.uts.version;
   else
     {
--- a/glibc-fedora-vfprintf-sw6530.patch
+++ b/glibc-fedora-vfprintf-sw6530.patch
@ -0,0 +1,62 @@
 From 8a34866d978e4281d69104372056ba0211d1373a Mon Sep 17 00:00:00 2001
 From: Andreas Schwab <schwab@redhat.com>
 Date: Tue, 31 Aug 2010 12:20:05 +0200
 Subject: [PATCH] Don't parse %s format argument as multibyte string
 [BZ #6530]
 * stdio-common/vfprintf.c (process_string_arg): Revert 2000-07-22
 change.
 ---
 ChangeLog               |    4 ++++
 stdio-common/vfprintf.c |   40 ++++------------------------------------
 2 files changed, 8 insertions(+), 36 deletions(-)
 --- a/stdio-common/vfprintf.c
 +++ b/stdio-common/vfprintf.c
@@ -1168,42 +1168,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
 	else if (!is_long && spec != L_('S'))				      \
 	  {								      \
 	    if (prec != -1)						      \
 -	      {								      \
 -		/* Search for the end of the string, but don't search past    \
 -		   the length (in bytes) specified by the precision.  Also    \
 -		   don't use incomplete characters.  */			      \
 -		if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX) == 1)   \
 -		  len = __strnlen (string, prec);			      \
 -		else							      \
 -		  {							      \
 -		    /* In case we have a multibyte character set the	      \
 -		       situation is more complicated.  We must not copy	      \
 -		       bytes at the end which form an incomplete character. */\
 -		    size_t ignore_size = (unsigned) prec > 1024 ? 1024 : prec;\
 -		    wchar_t ignore[ignore_size];			      \
 -		    const char *str2 = string;				      \
 -		    const char *strend = string + prec;			      \
 -		    if (strend < string)				      \
 -		      strend = (const char *) UINTPTR_MAX;		      \
 -									      \
 -		    mbstate_t ps;					      \
 -		    memset (&ps, '\0', sizeof (ps));			      \
 -									      \
 -		    while (str2 != NULL && str2 < strend)		      \
 -		      if (__mbsnrtowcs (ignore, &str2, strend - str2,	      \
 -					ignore_size, &ps) == (size_t) -1)     \
 -			{						      \
 -			  /* Conversion function has set errno.  */	      \
 -			  done = -1;					      \
 -			  goto all_done;				      \
 -			}						      \
 -									      \
 -		    if (str2 == NULL)					      \
 -		      len = strlen (string);				      \
 -		    else						      \
 -		      len = str2 - string - (ps.__count & 7);		      \
 -		  }							      \
 -	      }								      \
 +	      /* Search for the end of the string, but don't search past      \
 +		 the length (in bytes) specified by the precision.  */	      \
 +	      len = __strnlen (string, prec);				      \
 	    else							      \
 	      len = strlen (string);					      \
 	  }								      \
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
--- a/glibc.spec
+++ b/glibc.spec
@ -16,7 +16,7 @@
 %else
 %define buildpower6 0
 %endif
-%define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x
+%define rtkaioarches %{ix86} x86_64 ppc ppc64 s390 s390x
 %define biarcharches %{ix86} x86_64 ppc ppc64 s390 s390x
 %define debuginfocommonarches %{biarcharches} alpha alphaev6
 %define multiarcharches ppc ppc64 %{ix86} x86_64 %{sparc}
@ -58,9 +58,6 @@ Source1: %{glibcsrcdir}-fedora.tar.gz
 #
 # Patches that are highly unlikely to ever be accepated upstream.
 #
 # Still needs to be broken down into individual patches
 Patch0000: %{name}-fedora.patch
 # Is this still necessary, if so, it needs to go upstream
 Patch0001: %{name}-stap.patch
@ -98,6 +95,49 @@ Patch0010: %{name}-stap-libm.patch
 # Needs to be sent upstream
 Patch0029: %{name}-rh841318.patch
 # All these were from the glibc-fedora.patch mega-patch and need another
 # round of reviewing.  Ideally they'll either be submitted upstream or
 # dropped.
 Patch0031: %{name}-fedora-__libc_multiple_libcs.patch
 Patch0032: %{name}-fedora-cdefs-gnuc.patch
 Patch0033: %{name}-fedora-elf-ORIGIN.patch
 Patch0034: %{name}-fedora-elf-init-hidden_undef.patch
 Patch0035: %{name}-fedora-elf-rh737223.patch
 Patch0036: %{name}-fedora-gai-canonical.patch
 Patch0037: %{name}-fedora-gai-rfc1918.patch
 Patch0038: %{name}-fedora-getconf.patch
 Patch0039: %{name}-fedora-getrlimit-PLT.patch
 Patch0040: %{name}-fedora-i386-tls-direct-seg-refs.patch
 Patch0041: %{name}-fedora-i686-nopl.patch
 Patch0042: %{name}-fedora-include-bits-ldbl.patch
 Patch0043: %{name}-fedora-ldd.patch
 Patch0044: %{name}-fedora-linux-tcsetattr.patch
 Patch0045: %{name}-fedora-locale-euro.patch
 Patch0046: %{name}-fedora-localedata-locales-fixes.patch
 Patch0047: %{name}-fedora-localedata-no_NO.patch
 Patch0048: %{name}-fedora-localedata-rh61908.patch
 Patch0049: %{name}-fedora-localedef.patch
 Patch0050: %{name}-fedora-locarchive.patch
 Patch0051: %{name}-fedora-manual-dircategory.patch
 Patch0052: %{name}-fedora-nis-rh188246.patch
 Patch0053: %{name}-fedora-nptl-linklibc.patch
 Patch0054: %{name}-fedora-nscd.patch
 Patch0055: %{name}-fedora-nss-files-overflow-fix.patch
 Patch0056: %{name}-fedora-path-vi.patch
 Patch0057: %{name}-fedora-ppc-unwind.patch
 Patch0058: %{name}-fedora-pt_chown.patch
 Patch0059: %{name}-fedora-regcomp-sw11561.patch
 Patch0060: %{name}-fedora-s390-rh711330.patch
 Patch0061: %{name}-fedora-streams-rh436349.patch
 Patch0062: %{name}-fedora-strict-aliasing.patch
 Patch0063: %{name}-fedora-test-debug-gnuc-compat.patch
 Patch0064: %{name}-fedora-test-debug-gnuc-hack.patch
 Patch0065: %{name}-fedora-tls-offset-rh731228.patch
 Patch0066: %{name}-fedora-uname-getrlimit.patch
 Patch0067: %{name}-fedora-vfprintf-sw6530.patch
 #
 # Patches from upstream
 #
@ -132,7 +172,7 @@ Patch2020: %{name}-rh791161.patch
 # Upstream BZ 9954
 Patch2021: %{name}-rh739743.patch
-#Upstream BZ 13818
+# Upstream BZ 13818
 Patch2022: %{name}-rh800224.patch
 # Upstream BZ 14247
@ -153,7 +193,7 @@ Patch2027: %{name}-rh819430.patch
 # See http://sourceware.org/ml/libc-alpha/2012-06/msg00074.html
 Patch2028: %{name}-rh767693-2.patch
-# Upstrem BZ 14459
+# Upstream BZ 14459
 Patch2030: %{name}-rh847718.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -376,7 +416,6 @@ package or when debugging this package.
 %prep
 %setup -q -n %{glibcsrcdir} -b1
 %patch0000 -E -p1
 %patch0001 -E -p1
 %patch0002 -p1
 %patch0003 -p1
@ -407,6 +446,43 @@ package or when debugging this package.
 %patch2028 -p1
 %patch0029 -p1
 %patch2030 -p1
 %patch0031 -p1
 %patch0032 -p1
 %patch0033 -p1
 %patch0034 -p1
 %patch0035 -p1
 %patch0036 -p1
 %patch0037 -p1
 %patch0038 -p1
 %patch0039 -p1
 %patch0040 -p1
 %patch0041 -p1
 %patch0042 -p1
 %patch0043 -p1
 %patch0044 -p1
 %patch0045 -p1
 %patch0046 -p1
 %patch0047 -p1
 %patch0048 -p1
 %patch0049 -p1
 %patch0050 -p1
 %patch0051 -p1
 %patch0052 -p1
 %patch0053 -p1
 %patch0054 -p1
 %patch0055 -p1
 %patch0056 -p1
 %patch0057 -p1
 %patch0058 -p1
 %patch0059 -p1
 %patch0060 -p1
 %patch0061 -p1
 %patch0062 -p1
 %patch0063 -p1
 %patch0064 -p1
 %patch0065 -p1
 %patch0066 -p1
 %patch0067 -p1
 # On powerpc32, hp timing is only available in power4/power6
 # libs, not in base, so pre-power4 dynamic linker is incompatible
@ -863,13 +939,6 @@ cp posix/gai.conf documentation/
 mkdir -p $RPM_BUILD_ROOT/lib
 ln -sf /%{_lib}/ld64.so.1 $RPM_BUILD_ROOT/lib/ld64.so.1
 %endif
 %ifarch ia64
 %if "%{_lib}" == "lib64"
 # Compatibility symlink
 mkdir -p $RPM_BUILD_ROOT/lib
 ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2
 %endif
 %endif
 # Leave a compatibility symlink for the dynamic loader on armhfp targets,
 # at least until the world gets rebuilt
@ -1206,11 +1275,6 @@ rm -f *.filelist*
 %ifarch s390x
 /lib/ld64.so.1
 %endif
 %ifarch ia64
 %if "%{_lib}" == "lib64"
 /lib/ld-linux-ia64.so.2
 %endif
 %endif
 %ifarch armv7hl armv7hnl 
 /lib/ld-linux.so.3
 %endif
@ -1292,8 +1356,10 @@ rm -f *.filelist*
 %changelog
 * Mon Aug 20 2012 Jeff Law <law@redhat.com> - 2.16.90-3
-  - Remove obsolete patches from glibc-fedora.patch.  Thanks to
+  - Remove obsolete patches from glibc-fedora.patch.  Explode
    remaining patches into distinct patchfiles.  Thanks to
    Dmitry V. Levin for identifying them!
    Drop ia64 specific patches and specfile fragments
 * Wed Aug 15 2012 Jeff Law <law@redhat.com> - 2.16.90-2
  - Fix integer overflow leading to buffer overflow in strto* (#847718)