2.11.3-1

2010-11-30 13:28:10 +01:00 · 2010-11-30 13:28:10 +01:00 · 38b061a210
commit 38b061a210
parent bca1dced06
4 changed files with 185 additions and 346 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-/glibc-2.11.2-5-g2158096-fedora.tar.bz2
-/glibc-2.11.2-5-g2158096.tar.bz2
+/glibc-2.11.3-fedora.tar.bz2
+/glibc-2.11.3.tar.bz2
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@ -1,21 +1,9 @@
--- glibc-2.11.2-5-g2158096/ChangeLog
-+++ glibc-2.11.2-2/ChangeLog
-@@ -1,3 +1,24 @@
-+2010-10-22  Andreas Schwab  <schwab@redhat.com>
-+
-+	* include/dlfcn.h (__RTLD_SECURE): Define.
-+	* elf/dl-load.c (_dl_map_object): Remove preloaded parameter.  Use
-+	mode & __RTLD_SECURE instead.
-+	(open_path): Remove preloaded parameter to secure.
-+	* sysdeps/generic/ldsodefs.h (_dl_map_object): Adjust declaration.
-+	* elf/dl-open.c (dl_open_worker): Adjust call to _dl_map_object.
-+	* elf/dl-deps.c (openaux): Likewise.
-+	* elf/rtld.c (struct map_args): Remove is_preloaded.
-+	(map_doit): Don't use it.
-+	(dl_main): Likewise.
-+	(do_preload): Use __RTLD_SECURE instead of is_preloaded.
-+	(dlmopen_doit): Add __RTLD_SECURE to mode bits.
-+
+--- glibc-2.11.3/ChangeLog
+++ glibc-2.11.3-3/ChangeLog
+@@ -300,6 +300,12 @@
+ 	* wcsmbs/wchar.h (swscanf, vswscanf): Likewise.
+ 	* posix/getopt.h (getopt): Likewise.
+ 
 +2010-10-18  Andreas Schwab  <schwab@redhat.com>
 +
 +	* elf/dl-load.c (is_dst): Remove last parameter.
@ -25,7 +13,7 @@
 2010-05-26  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #11640]
-@@ -303,6 +324,19 @@
+@@ -605,6 +611,19 @@
 	redundant and incorrect else block which overwrites current line
 	with the partial next line.
 
@ -45,7 +33,7 @@
 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #11127]
-@@ -1474,6 +1508,11 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
+@@ -1776,6 +1795,11 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
 	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
 	the unique symbol hash table should not be const.
 
@ -57,7 +45,7 @@
 2009-07-21  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -1739,6 +1778,11 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
+@@ -2041,6 +2065,11 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
 	out common code into new function get_common_indeces. Determine
 	extended family and model for Intel processors.
 
@ -69,7 +57,7 @@
 2009-06-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -10432,6 +10476,10 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
+@@ -10734,6 +10763,10 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
 	[BZ #4368]
 	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
 
@ -80,7 +68,7 @@
 2007-04-16  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #4364]
-@@ -11689,6 +11737,15 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
+@@ -11991,6 +12024,15 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
 	separators also if no non-zero digits found.
 	* stdlib/Makefile (tests): Add tst-strtod3.
 
@ -96,8 +84,8 @@
 2006-12-09  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #3632]
--- glibc-2.11.2-5-g2158096/ChangeLog.15
-+++ glibc-2.11.2-2/ChangeLog.15
+--- glibc-2.11.3/ChangeLog.15
+++ glibc-2.11.3-3/ChangeLog.15
@@ -477,6 +477,14 @@
 
 2004-11-26  Jakub Jelinek  <jakub@redhat.com>
@ -163,8 +151,8 @@
 2004-08-30  Roland McGrath  <roland@frob.com>
 
 	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
--- glibc-2.11.2-5-g2158096/ChangeLog.16
-+++ glibc-2.11.2-2/ChangeLog.16
+--- glibc-2.11.3/ChangeLog.16
+++ glibc-2.11.3-3/ChangeLog.16
@@ -2042,6 +2042,9 @@
 	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
 	followed by __THROW.
@ -218,8 +206,8 @@
 2005-07-28  Thomas Schwinge  <schwinge@nic-nac-project.de>
 
 	[BZ #1137]
--- glibc-2.11.2-5-g2158096/Makeconfig
-+++ glibc-2.11.2-2/Makeconfig
+--- glibc-2.11.3/Makeconfig
+++ glibc-2.11.3-3/Makeconfig
@@ -780,12 +780,12 @@ endif
 # The assembler can generate debug information too.
 ifndef ASFLAGS
@ -236,8 +224,8 @@
 
 ifndef BUILD_CC
 BUILD_CC = $(CC)
--- glibc-2.11.2-5-g2158096/csu/Makefile
-+++ glibc-2.11.2-2/csu/Makefile
+--- glibc-2.11.3/csu/Makefile
+++ glibc-2.11.3-3/csu/Makefile
@@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
 $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
 	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@ -248,8 +236,8 @@
 
 vpath initfini.c $(sysdirs)
 
--- glibc-2.11.2-5-g2158096/csu/elf-init.c
-+++ glibc-2.11.2-2/csu/elf-init.c
+--- glibc-2.11.3/csu/elf-init.c
+++ glibc-2.11.3-3/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;
@ -274,8 +262,8 @@
 
 /* These function symbols are provided for the .init/.fini section entry
    points automagically by the linker.  */
--- glibc-2.11.2-5-g2158096/debug/tst-chk1.c
-+++ glibc-2.11.2-2/debug/tst-chk1.c
+--- glibc-2.11.3/debug/tst-chk1.c
+++ glibc-2.11.3-3/debug/tst-chk1.c
@@ -17,6 +17,9 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
@ -304,19 +292,8 @@
 #  define O 0
 # else
 #  define O 1
--- glibc-2.11.2-5-g2158096/elf/dl-deps.c
-+++ glibc-2.11.2-2/elf/dl-deps.c
-@@ -62,7 +62,7 @@ openaux (void *a)
- {
-   struct openaux_args *args = (struct openaux_args *) a;
- 
-  args->aux = _dl_map_object (args->map, args->name, 0,
-+  args->aux = _dl_map_object (args->map, args->name,
- 			      (args->map->l_type == lt_executable
- 			       ? lt_library : args->map->l_type),
- 			      args->trace_mode, args->open_mode,
--- glibc-2.11.2-5-g2158096/elf/dl-load.c
-+++ glibc-2.11.2-2/elf/dl-load.c
+--- glibc-2.11.3/elf/dl-load.c
+++ glibc-2.11.3-3/elf/dl-load.c
@@ -169,8 +169,7 @@ local_strdup (const char *s)
 
 
@ -385,98 +362,8 @@
 	    repl = DL_DST_LIB;
 
 	  if (repl != NULL && repl != (const char *) -1)
-@@ -1802,7 +1798,7 @@ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader,
-    if MAY_FREE_DIRS is true.  */
- 
- static int
-open_path (const char *name, size_t namelen, int preloaded,
-+open_path (const char *name, size_t namelen, int secure,
- 	   struct r_search_path_struct *sps, char **realname,
- 	   struct filebuf *fbp, struct link_map *loader, int whatcode,
- 	   bool *found_other_class)
-@@ -1884,7 +1880,7 @@ open_path (const char *name, size_t namelen, int preloaded,
- 	  /* Remember whether we found any existing directory.  */
- 	  here_any |= this_dir->status[cnt] != nonexisting;
- 
-	  if (fd != -1 && __builtin_expect (preloaded, 0)
-+	  if (fd != -1 && __builtin_expect (secure, 0)
- 	      && INTUSE(__libc_enable_secure))
- 	    {
- 	      /* This is an extra security effort to make sure nobody can
-@@ -1953,7 +1949,7 @@ open_path (const char *name, size_t namelen, int preloaded,
- 
- struct link_map *
- internal_function
-_dl_map_object (struct link_map *loader, const char *name, int preloaded,
-+_dl_map_object (struct link_map *loader, const char *name,
- 		int type, int trace_mode, int mode, Lmid_t nsid)
- {
-   int fd;
-@@ -2057,7 +2053,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	  for (l = loader; l; l = l->l_loader)
- 	    if (cache_rpath (l, &l->l_rpath_dirs, DT_RPATH, "RPATH"))
- 	      {
-		fd = open_path (name, namelen, preloaded, &l->l_rpath_dirs,
-+		fd = open_path (name, namelen, mode & __RTLD_SECURE,
-+				&l->l_rpath_dirs,
- 				&realname, &fb, loader, LA_SER_RUNPATH,
- 				&found_other_class);
- 		if (fd != -1)
-@@ -2072,14 +2069,15 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	      && main_map != NULL && main_map->l_type != lt_loaded
- 	      && cache_rpath (main_map, &main_map->l_rpath_dirs, DT_RPATH,
- 			      "RPATH"))
-	    fd = open_path (name, namelen, preloaded, &main_map->l_rpath_dirs,
-+	    fd = open_path (name, namelen, mode & __RTLD_SECURE,
-+			    &main_map->l_rpath_dirs,
- 			    &realname, &fb, loader ?: main_map, LA_SER_RUNPATH,
- 			    &found_other_class);
- 	}
- 
-       /* Try the LD_LIBRARY_PATH environment variable.  */
-       if (fd == -1 && env_path_list.dirs != (void *) -1)
-	fd = open_path (name, namelen, preloaded, &env_path_list,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE, &env_path_list,
- 			&realname, &fb,
- 			loader ?: GL(dl_ns)[LM_ID_BASE]._ns_loaded,
- 			LA_SER_LIBPATH, &found_other_class);
-@@ -2088,12 +2086,12 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
-       if (fd == -1 && loader != NULL
- 	  && cache_rpath (loader, &loader->l_runpath_dirs,
- 			  DT_RUNPATH, "RUNPATH"))
-	fd = open_path (name, namelen, preloaded,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE,
- 			&loader->l_runpath_dirs, &realname, &fb, loader,
- 			LA_SER_RUNPATH, &found_other_class);
- 
-       if (fd == -1
-	  && (__builtin_expect (! preloaded, 1)
-+	  && (__builtin_expect (! (mode & __RTLD_SECURE), 1)
- 	      || ! INTUSE(__libc_enable_secure)))
- 	{
- 	  /* Check the list of libraries in the file /etc/ld.so.cache,
-@@ -2159,7 +2157,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
- 	  && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
- 	      || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
- 	  && rtld_search_dirs.dirs != (void *) -1)
-	fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
- 			&realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
- 
-       /* Add another newline when we are tracing the library loading.  */
--- glibc-2.11.2-5-g2158096/elf/dl-open.c
-+++ glibc-2.11.2-2/elf/dl-open.c
-@@ -251,7 +251,7 @@ dl_open_worker (void *a)
- 
-   /* Load the named object.  */
-   struct link_map *new;
-  args->map = new = _dl_map_object (call_map, file, 0, lt_loaded, 0,
-+  args->map = new = _dl_map_object (call_map, file, lt_loaded, 0,
- 				    mode | __RTLD_CALLMAP, args->nsid);
- 
-   /* If the pointer returned is NULL this means the RTLD_NOLOAD flag is
--- glibc-2.11.2-5-g2158096/elf/ldconfig.c
-+++ glibc-2.11.2-2/elf/ldconfig.c
+--- glibc-2.11.3/elf/ldconfig.c
+++ glibc-2.11.3-3/elf/ldconfig.c
@@ -1031,17 +1031,19 @@ search_dirs (void)
 
 
@ -558,67 +445,8 @@
     }
 
   const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
--- glibc-2.11.2-5-g2158096/elf/rtld.c
-+++ glibc-2.11.2-2/elf/rtld.c
-@@ -588,7 +588,6 @@ struct map_args
-   /* Argument to map_doit.  */
-   char *str;
-   struct link_map *loader;
-  int is_preloaded;
-   int mode;
-   /* Return value of map_doit.  */
-   struct link_map *map;
-@@ -626,16 +625,17 @@ static void
- map_doit (void *a)
- {
-   struct map_args *args = (struct map_args *) a;
-  args->map = _dl_map_object (args->loader, args->str,
-			      args->is_preloaded, lt_library, 0, args->mode,
-			      LM_ID_BASE);
-+  args->map = _dl_map_object (args->loader, args->str, lt_library, 0,
-+			      args->mode, LM_ID_BASE);
- }
- 
- static void
- dlmopen_doit (void *a)
- {
-   struct dlmopen_args *args = (struct dlmopen_args *) a;
-  args->map = _dl_open (args->fname, RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT,
-+  args->map = _dl_open (args->fname,
-+			(RTLD_LAZY | __RTLD_DLOPEN | __RTLD_AUDIT
-+			 | __RTLD_SECURE),
- 			dl_main, LM_ID_NEWLM, _dl_argc, INTUSE(_dl_argv),
- 			__environ);
- }
-@@ -805,8 +805,7 @@ do_preload (char *fname, struct link_map *main_map, const char *where)
- 
-   args.str = fname;
-   args.loader = main_map;
-  args.is_preloaded = 1;
-  args.mode = 0;
-+  args.mode = __RTLD_SECURE;
- 
-   unsigned int old_nloaded = GL(dl_ns)[LM_ID_BASE]._ns_nloaded;
- 
-@@ -1052,7 +1051,6 @@ of this helper program; chances are you did not intend to run this program.\n\
- 
- 	  args.str = rtld_progname;
- 	  args.loader = NULL;
-	  args.is_preloaded = 0;
- 	  args.mode = __RTLD_OPENEXEC;
- 	  (void) _dl_catch_error (&objname, &err_str, &malloced, map_doit,
- 				  &args);
-@@ -1064,7 +1062,7 @@ of this helper program; chances are you did not intend to run this program.\n\
-       else
- 	{
- 	  HP_TIMING_NOW (start);
-	  _dl_map_object (NULL, rtld_progname, 0, lt_library, 0,
-+	  _dl_map_object (NULL, rtld_progname, lt_library, 0,
- 			  __RTLD_OPENEXEC, LM_ID_BASE);
- 	  HP_TIMING_NOW (stop);
- 
--- glibc-2.11.2-5-g2158096/elf/tst-stackguard1.c
-+++ glibc-2.11.2-2/elf/tst-stackguard1.c
+--- glibc-2.11.3/elf/tst-stackguard1.c
+++ glibc-2.11.3-3/elf/tst-stackguard1.c
@@ -160,17 +160,21 @@ do_test (void)
      the 16 runs, something is very wrong.  */
   int ndifferences = 0;
@ -643,26 +471,16 @@
     {
       puts ("stack guard canaries are not randomized enough");
       puts ("nor equal to the default canary value");
--- glibc-2.11.2-5-g2158096/include/bits/stdlib-ldbl.h
-+++ glibc-2.11.2-2/include/bits/stdlib-ldbl.h
+--- glibc-2.11.3/include/bits/stdlib-ldbl.h
+++ glibc-2.11.3-3/include/bits/stdlib-ldbl.h
@@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
--- glibc-2.11.2-5-g2158096/include/bits/wchar-ldbl.h
-+++ glibc-2.11.2-2/include/bits/wchar-ldbl.h
+--- glibc-2.11.3/include/bits/wchar-ldbl.h
+++ glibc-2.11.3-3/include/bits/wchar-ldbl.h
@@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
--- glibc-2.11.2-5-g2158096/include/dlfcn.h
-+++ glibc-2.11.2-2/include/dlfcn.h
-@@ -9,6 +9,7 @@
- #define __RTLD_OPENEXEC	0x20000000
- #define __RTLD_CALLMAP	0x10000000
- #define __RTLD_AUDIT	0x08000000
-+#define __RTLD_SECURE	0x04000000 /* Apply additional security checks.  */
- 
- #define __LM_ID_CALLER	-2
- 
--- glibc-2.11.2-5-g2158096/include/features.h
-+++ glibc-2.11.2-2/include/features.h
+--- glibc-2.11.3/include/features.h
+++ glibc-2.11.3-3/include/features.h
@@ -299,8 +299,13 @@
 #endif
 
@ -679,8 +497,8 @@
 #  define __USE_FORTIFY_LEVEL 2
 # else
 #  define __USE_FORTIFY_LEVEL 1
--- glibc-2.11.2-5-g2158096/intl/locale.alias
-+++ glibc-2.11.2-2/intl/locale.alias
+--- glibc-2.11.3/intl/locale.alias
+++ glibc-2.11.3-3/intl/locale.alias
@@ -57,8 +57,6 @@ korean		ko_KR.eucKR
 korean.euc 	ko_KR.eucKR
 ko_KR		ko_KR.eucKR
@ -690,8 +508,8 @@
 norwegian       nb_NO.ISO-8859-1
 nynorsk		nn_NO.ISO-8859-1
 polish          pl_PL.ISO-8859-2
--- glibc-2.11.2-5-g2158096/libio/stdio.h
-+++ glibc-2.11.2-2/libio/stdio.h
+--- glibc-2.11.3/libio/stdio.h
+++ glibc-2.11.3-3/libio/stdio.h
@@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
 extern struct _IO_FILE *stdin;		/* Standard input stream.  */
 extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@ -705,8 +523,8 @@
 
 __BEGIN_NAMESPACE_STD
 /* Remove file FILENAME.  */
--- glibc-2.11.2-5-g2158096/locale/iso-4217.def
-+++ glibc-2.11.2-2/locale/iso-4217.def
+--- glibc-2.11.3/locale/iso-4217.def
+++ glibc-2.11.3-3/locale/iso-4217.def
@@ -8,6 +8,7 @@
  *
  * !!! The list has to be sorted !!!
@ -798,8 +616,8 @@
 DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
 DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
 DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
--- glibc-2.11.2-5-g2158096/locale/programs/locarchive.c
-+++ glibc-2.11.2-2/locale/programs/locarchive.c
+--- glibc-2.11.3/locale/programs/locarchive.c
+++ glibc-2.11.3-3/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;
@ -858,8 +676,8 @@
 add_alias (struct locarhandle *ah, const char *alias, bool replace,
 	   const char *oldname, uint32_t *locrec_offset_p)
 {
--- glibc-2.11.2-5-g2158096/localedata/Makefile
-+++ glibc-2.11.2-2/localedata/Makefile
+--- glibc-2.11.3/localedata/Makefile
+++ glibc-2.11.3-3/localedata/Makefile
@@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
 	echo -n '...'; \
 	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@ -868,8 +686,8 @@
 		     -i locales/$$input -c -f charmaps/$$charset \
 		     $(addprefix --prefix=,$(install_root)) $$locale; \
 	echo ' done'; \
--- glibc-2.11.2-5-g2158096/localedata/SUPPORTED
-+++ glibc-2.11.2-2/localedata/SUPPORTED
+--- glibc-2.11.3/localedata/SUPPORTED
+++ glibc-2.11.3-3/localedata/SUPPORTED
@@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
 cy_GB/ISO-8859-14 \
 da_DK.UTF-8/UTF-8 \
@ -911,8 +729,8 @@
 ta_IN/UTF-8 \
 te_IN/UTF-8 \
 tg_TJ.UTF-8/UTF-8 \
--- glibc-2.11.2-5-g2158096/localedata/locales/cy_GB
-+++ glibc-2.11.2-2/localedata/locales/cy_GB
+--- glibc-2.11.3/localedata/locales/cy_GB
+++ glibc-2.11.3-3/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>"
@ -927,8 +745,8 @@
 END LC_TIME
 
 LC_MESSAGES
--- glibc-2.11.2-5-g2158096/localedata/locales/en_GB
-+++ glibc-2.11.2-2/localedata/locales/en_GB
+--- glibc-2.11.3/localedata/locales/en_GB
+++ glibc-2.11.3-3/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>"
@ -940,8 +758,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.11.2-5-g2158096/localedata/locales/no_NO
-+++ glibc-2.11.2-2/localedata/locales/no_NO
+--- glibc-2.11.3/localedata/locales/no_NO
+++ glibc-2.11.3-3/localedata/locales/no_NO
@@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@ -1012,8 +830,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
--- glibc-2.11.2-5-g2158096/localedata/locales/zh_TW
-+++ glibc-2.11.2-2/localedata/locales/zh_TW
+--- glibc-2.11.3/localedata/locales/zh_TW
+++ glibc-2.11.3-3/localedata/locales/zh_TW
@@ -1,7 +1,7 @@
 comment_char %
 escape_char /
@ -1041,14 +859,15 @@
 revision   "0.2"
 date       "2000-08-02"
 %
--- glibc-2.11.2-5-g2158096/malloc/mcheck.c
-+++ glibc-2.11.2-2/malloc/mcheck.c
-@@ -24,9 +24,25 @@
+--- glibc-2.11.3/malloc/mcheck.c
+++ glibc-2.11.3-3/malloc/mcheck.c
+@@ -25,10 +25,26 @@
 # include <mcheck.h>
 # include <stdint.h>
 # include <stdio.h>
 +# include <stdlib.h>
 # include <libintl.h>
+ # include <errno.h>
 #endif
 
 +#ifdef _LIBC
@ -1069,7 +888,7 @@
 /* Old hook values.  */
 static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t);
 static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t);
-@@ -197,7 +213,7 @@ freehook (__ptr_t ptr, const __ptr_t caller)
+@@ -199,7 +215,7 @@ freehook (__ptr_t ptr, const __ptr_t caller)
   if (old_free_hook != NULL)
     (*old_free_hook) (ptr, caller);
   else
@ -1078,7 +897,7 @@
   __free_hook = freehook;
 }
 
-@@ -214,7 +230,7 @@ mallochook (__malloc_size_t size, const __ptr_t caller)
+@@ -222,7 +238,7 @@ mallochook (__malloc_size_t size, const __ptr_t caller)
     hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1,
 					     caller);
   else
@ -1087,7 +906,7 @@
   __malloc_hook = mallochook;
   if (hdr == NULL)
     return NULL;
-@@ -245,7 +261,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size,
+@@ -259,7 +275,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size,
   if (old_memalign_hook != NULL)
     block = (*old_memalign_hook) (alignment, slop + size + 1, caller);
   else
@ -1096,7 +915,7 @@
   __memalign_hook = memalignhook;
   if (block == NULL)
     return NULL;
-@@ -300,8 +316,8 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller)
+@@ -320,8 +336,8 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller)
 					      sizeof (struct hdr) + size + 1,
 					      caller);
   else
@ -1107,7 +926,7 @@
   __free_hook = freehook;
   __malloc_hook = mallochook;
   __memalign_hook = memalignhook;
-@@ -361,8 +377,8 @@ mcheck (func)
+@@ -381,8 +397,8 @@ mcheck (func)
   if (__malloc_initialized <= 0 && !mcheck_used)
     {
       /* We call malloc() once here to ensure it is initialized.  */
@ -1118,8 +937,8 @@
 
       old_free_hook = __free_hook;
       __free_hook = freehook;
--- glibc-2.11.2-5-g2158096/manual/libc.texinfo
-+++ glibc-2.11.2-2/manual/libc.texinfo
+--- glibc-2.11.3/manual/libc.texinfo
+++ glibc-2.11.3-3/manual/libc.texinfo
@@ -5,7 +5,7 @@
 @c setchapternewpage odd
 
@ -1129,8 +948,8 @@
 @direntry
 * Libc: (libc).                 C library.
 @end direntry
--- glibc-2.11.2-5-g2158096/misc/sys/cdefs.h
-+++ glibc-2.11.2-2/misc/sys/cdefs.h
+--- glibc-2.11.3/misc/sys/cdefs.h
+++ glibc-2.11.3-3/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)
@ -1174,17 +993,17 @@
 # define __va_arg_pack() __builtin_va_arg_pack ()
 # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
 #endif
--- glibc-2.11.2-5-g2158096/nis/nss
-+++ glibc-2.11.2-2/nis/nss
+--- glibc-2.11.3/nis/nss
+++ glibc-2.11.3-3/nis/nss
@@ -25,4 +25,4 @@
 #  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
--- glibc-2.11.2-5-g2158096/nptl/ChangeLog
-+++ glibc-2.11.2-2/nptl/ChangeLog
-@@ -3739,6 +3739,15 @@
+--- glibc-2.11.3/nptl/ChangeLog
+++ glibc-2.11.3-3/nptl/ChangeLog
+@@ -3759,6 +3759,15 @@
 	Use __sigfillset.  Document that sigfillset does the right thing wrt
 	to SIGSETXID.
 
@ -1200,7 +1019,7 @@
 2005-07-11  Jakub Jelinek  <jakub@redhat.com>
 
 	[BZ #1102]
-@@ -4475,6 +4484,11 @@
+@@ -4495,6 +4504,11 @@
 	Move definition inside libpthread, libc, librt check.  Provide
 	definition for rtld.
 
@ -1212,7 +1031,7 @@
 2004-09-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6549,6 +6563,11 @@
+@@ -6569,6 +6583,11 @@
 
 	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
 
@ -1224,8 +1043,8 @@
 2003-07-25  Jakub Jelinek  <jakub@redhat.com>
 
 	* tst-cancel17.c (do_test): Check if aio_cancel failed.
--- glibc-2.11.2-5-g2158096/nptl/Makefile
-+++ glibc-2.11.2-2/nptl/Makefile
+--- glibc-2.11.3/nptl/Makefile
+++ glibc-2.11.3-3/nptl/Makefile
@@ -339,7 +339,8 @@ endif
 extra-objs += $(crti-objs) $(crtn-objs)
 omit-deps += crti crtn
@ -1236,7 +1055,7 @@
 endif
 
 CFLAGS-flockfile.c = -D_IO_MTSAFE_IO
-@@ -525,15 +526,19 @@ $(addprefix $(objpfx), \
+@@ -526,15 +527,19 @@ $(addprefix $(objpfx), \
     $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
 				       $(objpfx)libpthread_nonshared.a
 $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so
@ -1258,8 +1077,8 @@
 else
 $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
 endif
--- glibc-2.11.2-5-g2158096/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.11.2-2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.11.3/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ glibc-2.11.3-3/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
@ -1268,8 +1087,8 @@
 +#define _XOPEN_STREAMS	-1
 +
 #endif /* bits/posix_opt.h */
--- glibc-2.11.2-5-g2158096/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.11.2-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.11.3/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ glibc-2.11.3-3/nptl/sysdeps/unix/sysv/linux/kernel-features.h
@@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@ -1277,8 +1096,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
--- glibc-2.11.2-5-g2158096/nptl/tst-stackguard1.c
-+++ glibc-2.11.2-2/nptl/tst-stackguard1.c
+--- glibc-2.11.3/nptl/tst-stackguard1.c
+++ glibc-2.11.3-3/nptl/tst-stackguard1.c
@@ -190,17 +190,21 @@ do_test (void)
      the 16 runs, something is very wrong.  */
   int ndifferences = 0;
@ -1303,8 +1122,8 @@
     {
       puts ("stack guard canaries are not randomized enough");
       puts ("nor equal to the default canary value");
--- glibc-2.11.2-5-g2158096/nscd/nscd.conf
-+++ glibc-2.11.2-2/nscd/nscd.conf
+--- glibc-2.11.3/nscd/nscd.conf
+++ glibc-2.11.3-3/nscd/nscd.conf
@@ -33,7 +33,7 @@
 #	logfile			/var/log/nscd.log
 #	threads			4
@ -1314,8 +1133,8 @@
 #	stat-user		somebody
 	debug-level		0
 #	reload-count		5
--- glibc-2.11.2-5-g2158096/nscd/nscd.init
-+++ glibc-2.11.2-2/nscd/nscd.init
+--- glibc-2.11.3/nscd/nscd.init
+++ glibc-2.11.3-3/nscd/nscd.init
@@ -9,6 +9,7 @@
 #		slow naming services like NIS, NIS+, LDAP, or hesiod.
 # processname: /usr/sbin/nscd
@ -1387,9 +1206,9 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
--- glibc-2.11.2-5-g2158096/posix/Makefile
-+++ glibc-2.11.2-2/posix/Makefile
-@@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
+--- glibc-2.11.3/posix/Makefile
+++ glibc-2.11.3-3/posix/Makefile
+@@ -315,15 +315,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
 	  mv -f $@/$$spec.new $@/$$spec; \
 	done < $(objpfx)getconf.speclist
 
@ -1409,8 +1228,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 	mv -f $@.new $@
--- glibc-2.11.2-5-g2158096/posix/getconf.speclist.h
-+++ glibc-2.11.2-2/posix/getconf.speclist.h
+--- glibc-2.11.3/posix/getconf.speclist.h
+++ glibc-2.11.3-3/posix/getconf.speclist.h
@@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@ -1451,8 +1270,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
--- glibc-2.11.2-5-g2158096/streams/Makefile
-+++ glibc-2.11.2-2/streams/Makefile
+--- glibc-2.11.3/streams/Makefile
+++ glibc-2.11.3-3/streams/Makefile
@@ -21,7 +21,7 @@
 #
 subdir	:= streams
@ -1462,8 +1281,8 @@
 routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
 
 include ../Rules
--- glibc-2.11.2-5-g2158096/sysdeps/generic/dl-cache.h
-+++ glibc-2.11.2-2/sysdeps/generic/dl-cache.h
+--- glibc-2.11.3/sysdeps/generic/dl-cache.h
+++ glibc-2.11.3-3/sysdeps/generic/dl-cache.h
@@ -36,6 +36,14 @@
 # define add_system_dir(dir) add_dir (dir)
 #endif
@ -1479,24 +1298,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.11.2-5-g2158096/sysdeps/generic/ldsodefs.h
-+++ glibc-2.11.2-2/sysdeps/generic/ldsodefs.h
-@@ -820,11 +820,9 @@ extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *),
- 
- /* Open the shared object NAME and map in its segments.
-    LOADER's DT_RPATH is used in searching for NAME.
-   If the object is already opened, returns its existing map.
-   For preloaded shared objects PRELOADED is set to a non-zero
-   value to allow additional security checks.  */
-+   If the object is already opened, returns its existing map.  */
- extern struct link_map *_dl_map_object (struct link_map *loader,
-					const char *name, int preloaded,
-+					const char *name,
- 					int type, int trace_mode, int mode,
- 					Lmid_t nsid)
-      internal_function attribute_hidden;
--- glibc-2.11.2-5-g2158096/sysdeps/i386/Makefile
-+++ glibc-2.11.2-2/sysdeps/i386/Makefile
+--- glibc-2.11.3/sysdeps/i386/Makefile
+++ glibc-2.11.3-3/sysdeps/i386/Makefile
@@ -2,6 +2,8 @@
 # Every i386 port in use uses gas syntax (I think).
 asm-CPPFLAGS += -DGAS_SYNTAX
@ -1521,8 +1324,8 @@
 endif
 
 ifeq ($(subdir),elf)
--- glibc-2.11.2-5-g2158096/sysdeps/ia64/Makefile
-+++ glibc-2.11.2-2/sysdeps/ia64/Makefile
+--- glibc-2.11.3/sysdeps/ia64/Makefile
+++ glibc-2.11.3-3/sysdeps/ia64/Makefile
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
 
 ifeq (yes,$(build-shared))
@ -1534,8 +1337,8 @@
 endif
 endif
 
--- glibc-2.11.2-5-g2158096/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.11.2-2/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.11.3/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.11.3-3/sysdeps/ia64/ia64libgcc.S
@@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@ -1887,8 +1690,8 @@
 -	.symver	___multi3, __multi3@GLIBC_2.2
 -
 -#endif
--- glibc-2.11.2-5-g2158096/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.11.2-2/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.11.3/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.11.3-3/sysdeps/ia64/libgcc-compat.c
@@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@ -1974,8 +1777,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
--- glibc-2.11.2-5-g2158096/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.11.2-2/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.11.3/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.11.3-3/sysdeps/powerpc/powerpc64/Makefile
@@ -30,6 +30,7 @@ ifneq ($(elf),no)
 # we use -fpic instead which is much better.
 CFLAGS-initfini.s += -fpic -O1
@ -1984,8 +1787,8 @@
 endif
 
 ifeq ($(subdir),elf)
--- glibc-2.11.2-5-g2158096/sysdeps/sparc/sparc64/dl-machine.h
-+++ glibc-2.11.2-2/sysdeps/sparc/sparc64/dl-machine.h
+--- glibc-2.11.3/sysdeps/sparc/sparc64/dl-machine.h
+++ glibc-2.11.3-3/sysdeps/sparc/sparc64/dl-machine.h
@@ -623,11 +623,13 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
 	  value = sym->st_value - sym_map->l_tls_offset
 	    + reloc->r_addend;
@ -2004,8 +1807,8 @@
 	}
       break;
 # endif
--- glibc-2.11.2-5-g2158096/sysdeps/unix/nice.c
-+++ glibc-2.11.2-2/sysdeps/unix/nice.c
+--- glibc-2.11.3/sysdeps/unix/nice.c
+++ glibc-2.11.3-3/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr)
 	__set_errno (save);
     }
@ -2020,8 +1823,8 @@
   if (result == -1)
     {
       if (errno == EACCES)
--- glibc-2.11.2-5-g2158096/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.11.3-3/sysdeps/unix/sysv/linux/check_pf.c
@@ -27,13 +27,10 @@
 #include <unistd.h>
 #include <sys/socket.h>
@ -2037,8 +1840,8 @@
 
 #ifndef IFA_F_HOMEADDRESS
 # define IFA_F_HOMEADDRESS 0
--- glibc-2.11.2-5-g2158096/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ glibc-2.11.3-3/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -17,10 +17,13 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
@ -2086,8 +1889,8 @@
     }
   else
 #endif
--- glibc-2.11.2-5-g2158096/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.11.3-3/sysdeps/unix/sysv/linux/futimesat.c
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
 {
   int result;
@ -2130,8 +1933,8 @@
     {
       size_t filelen = strlen (file);
       if (__builtin_expect (filelen == 0, 0))
--- glibc-2.11.2-5-g2158096/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/i386/clone.S
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/i386/clone.S
+++ glibc-2.11.3-3/sysdeps/unix/sysv/linux/i386/clone.S
@@ -120,9 +120,6 @@ L(pseudo_end):
 	ret
 
@ -2150,8 +1953,8 @@
 
 	cfi_startproc
 PSEUDO_END (BP_SYM (__clone))
--- glibc-2.11.2-5-g2158096/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ glibc-2.11.3-3/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.
@ -2212,8 +2015,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
--- glibc-2.11.2-5-g2158096/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ glibc-2.11.3-3/sysdeps/unix/sysv/linux/ia64/dl-cache.h
@@ -22,4 +22,31 @@
 #define _dl_cache_check_flags(flags) \
   ((flags) == _DL_CACHE_DEFAULT_ID)
@ -2246,29 +2049,29 @@
 +  } while (0)
 +
 #include_next <dl-cache.h>
--- glibc-2.11.2-5-g2158096/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ glibc-2.11.3-3/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.11.2-5-g2158096/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ glibc-2.11.3-3/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.11.2-5-g2158096/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ glibc-2.11.3-3/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.11.2-5-g2158096/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.11.3-3/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -25,6 +25,24 @@
 
 #include <kernel-features.h>
@ -2294,8 +2097,8 @@
 
 struct netlink_res
 {
--- glibc-2.11.2-5-g2158096/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.11.3-3/sysdeps/unix/sysv/linux/paths.h
@@ -62,7 +62,7 @@
 #define	_PATH_TTY	"/dev/tty"
 #define	_PATH_UNIX	"/boot/vmlinux"
@ -2305,8 +2108,8 @@
 #define _PATH_WTMP	"/var/log/wtmp"
 
 /* Provide trailing slash, since mostly used for building pathnames. */
--- glibc-2.11.2-5-g2158096/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c
+++ glibc-2.11.3-3/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c
@@ -0,0 +1,49 @@
 +/* Copyright (C) 2010 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@ -2357,8 +2160,8 @@
 +  return result;
 +}
 +weak_alias (__libc_msgrcv, msgrcv)
--- glibc-2.11.2-5-g2158096/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.11.3-3/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
 {
   struct __kernel_termios k_termios;
@ -2404,8 +2207,8 @@
 +  return retval;
 }
 libc_hidden_def (tcsetattr)
--- glibc-2.11.2-5-g2158096/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.11.2-2/sysdeps/unix/sysv/linux/x86_64/clone.S
+--- glibc-2.11.3/sysdeps/unix/sysv/linux/x86_64/clone.S
+++ glibc-2.11.3-3/sysdeps/unix/sysv/linux/x86_64/clone.S
@@ -89,9 +89,6 @@ L(pseudo_end):
 	ret
 
@ -2424,8 +2227,8 @@
 
 	cfi_startproc;
 PSEUDO_END (BP_SYM (__clone))
--- glibc-2.11.2-5-g2158096/timezone/zic.c
-+++ glibc-2.11.2-2/timezone/zic.c
+--- glibc-2.11.3/timezone/zic.c
+++ glibc-2.11.3-3/timezone/zic.c
@@ -1921,7 +1921,7 @@ const int			zonecount;
 		if (stdrp != NULL && stdrp->r_hiyear == 2037)
 			return;
--- a/glibc.spec
+++ b/glibc.spec
@ -1,5 +1,6 @@
-%define glibcsrcdir glibc-2.11.2-5-g2158096
-%define glibcversion 2.11.2
+%define glibcsrcdir glibc-2.11.3
+%define glibc_release_url http://ftp.gnu.org/gnu/glibc/
+%define glibcversion 2.11.3
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
 %define auxarches athlon sparcv9v sparc64v alphaev6
@ -28,7 +29,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 3
+Release: 1
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@ -36,7 +37,7 @@ Release: 3
 # libraries without restrictions.
 License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
 Group: System Environment/Libraries
-URL: http://sources.redhat.com/glibc/
+URL: http://www.gnu.org/software/glibc/
 Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.bz2
 Source1: %{glibcsrcdir}-fedora.tar.bz2
 Patch0: %{name}-fedora.patch
@ -1037,6 +1038,41 @@ rm -f *.filelist*
 %endif

 %changelog
+* Mon Nov 22 2010 Andreas Schwab <schwab@redhat.com> - 2.11.3-1
+- Update to 2.11.3 release
+  - Allow aux_cache_file open()ing to fail silently even in the chroot
+    mode (BZ#11149)
+  - Fix multiple nss_compat initgroups() bugs (BZ#10085)
+  - Properly convert f_fsid in statvfs (BZ#11611)
+  - Define MAP_HUGETLB and SWAP_FLAG_DISCARD
+  - Avoid too much stack use in fnmatch (BZ#11883)
+  - Fix comparison in sqrtl for IBM long double 128
+  - Fix warnings in __bswap_16 (BZ#12194)
+  - Properly quote output of locale (BZ#11904)
+  - Fix concurrency problem between dl_open and dl_iterate_phdr
+  - Fix perturbing in malloc on free (BZ#12140)
+  - Don't expand DST twice in dl_open
+  - Fix memory leak for some invalid regular expressions (BZ#12078)
+  - Linux getifaddrs might return entries with ->ifa_addr being NULL
+    (BZ#12093)
+  - Handle large malloc requests (BZ#12005)
+  - getdents64 fallback d_type support
+  - Fix _FORITY_SOURCE version of longjmp for Linux/x86-64 (BZ#11968)
+  - Fix array overflow in floating point parser (BZ#7066)
+  - Missing server address again leads to localhost being used (BZ#10851)
+  - Document M_PERTURB
+  - Fix vDSO synthetic hwcap handling so they are not masked out from
+    ld.so.cache matching
+  - 32bit memset-sse2.S fails with uneven cache size (BZ#12191)
+  - Verify in ttyname that the symlink is valid (BZ#12167)
+  - Fix x86-64 strchr propagation of search byte into all bytes of SSE
+    register (BZ#12159)
+  - Fix alignment of AVX safe area on x86-64 (BZ#12113, #643889)
+  - Fix strstr and memmem algorithm (BZ#12092)
+  - Fix handling of tail bytes of buffer in SSE2/SSSE3 x86-64 version
+    strn{,case}cmp (BZ#12077)
+  - Fix use of extend_alloca in NIS
+
 * Fri Oct 22 2010 Andreas Schwab <schwab@redhat.com> - 2.11.2-3
 - Require suid bit on audit objects in privileged programs (CVE-2010-3856)

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-2f3e435647d450bc2608577ad42361f9  glibc-2.11.2-5-g2158096-fedora.tar.bz2
-f4bbd2867792513caa2645787b5f9b2a  glibc-2.11.2-5-g2158096.tar.bz2
+b730f1a604bc7ffd41911ad62c8638dd  glibc-2.11.3-fedora.tar.bz2
+acfeba0d7c9e86726b6c975bf6e9fccb  glibc-2.11.3.tar.bz2