[glibc] Sync with upstream master

[Siddhesh Poyarekar]

commit f03231b0696735487c97752ed710aade46e6b78c
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Tue Oct 15 11:09:58 2013 +0530

    Sync with upstream master

 glibc-rh1007590.patch |   46 -------------------------------
 glibc-rh841787.patch  |    9 ------
 glibc-stap-libm.patch |   73 -------------------------------------------------
 glibc.spec            |   16 ++++-------
 sources               |    2 +-
 5 files changed, 7 insertions(+), 139 deletions(-)
---
diff --git a/glibc-rh841787.patch b/glibc-rh841787.patch
index 3cec783..76f85bf 100644
--- a/glibc-rh841787.patch
+++ b/glibc-rh841787.patch
@@ -31,12 +31,3 @@ diff -rup a/resolv/res_send.c b/resolv/res_send.c
  				while (ns < MAXNS
  				       && EXT(statp).nsmap[ns] != MAXNS)
  					ns++;
-@@ -441,7 +441,7 @@ __libc_res_nsend(res_state statp, const
- 				    malloc(sizeof (struct sockaddr_in6));
- 			if (EXT(statp).nsaddrs[n] != NULL) {
- 				memset (mempcpy(EXT(statp).nsaddrs[n],
--						&statp->nsaddr_list[n],
-+						&statp->nsaddr_list[ns],
- 						sizeof (struct sockaddr_in)),
- 					'\0',
- 					sizeof (struct sockaddr_in6)
diff --git a/glibc.spec b/glibc.spec
index 4ba39de..7f43638 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.18-186-gfd96752
+%define glibcsrcdir  glibc-2.18-303-g1e14558
 %define glibcversion 2.18.90
-%define glibcrelease 10%{?dist}
+%define glibcrelease 11%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -141,9 +141,6 @@ Patch0006: %{name}-arm-hardfloat-3.patch
 Patch0008: %{name}-fedora-getrlimit-PLT.patch
 Patch0009: %{name}-fedora-include-bits-ldbl.patch
 
-# stap, needs to be sent upstream
-Patch0010: %{name}-stap-libm.patch
-
 # Needs to be sent upstream
 Patch0029: %{name}-rh841318.patch
 
@@ -221,8 +218,6 @@ Patch2026: %{name}-rh841787.patch
 # Upstream BZ 14185
 Patch2027: %{name}-rh819430.patch
 
-Patch2028: %{name}-rh1007590.patch
-
 ##############################################################################
 # End of glibc patches.
 ##############################################################################
@@ -519,7 +514,6 @@ package or when debugging this package.
 %patch2007 -p1
 %patch0008 -p1
 %patch0009 -p1
-%patch0010 -p1
 %patch2011 -p1
 %patch0012 -p1
 %patch2013 -p1
@@ -548,7 +542,6 @@ package or when debugging this package.
 %patch0041 -p1
 %patch0042 -p1
 %patch0043 -p1
-%patch2028 -p1
 %patch0044 -p1
 %patch0045 -p1
 %patch0046 -p1
@@ -1637,7 +1630,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
-* Thu Oct  3 2013 Carlos O'Donell <carlos at redhat.com> - 2.18.90-9
+* Tue Oct 15 2013 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.18.90-11
+- Sync with upstream master.
+
+* Thu Oct  3 2013 Carlos O'Donell <carlos at redhat.com> - 2.18.90-10
 - Allow applications to use pthread_atfork without explicitly
   requiring libpthread.so. (#1013801)
 - Support `--list-archive FILE' in localedef utility.
diff --git a/sources b/sources
index b85122a..ca18a79 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c667b38ec4bf60aff4a83d756e14e7aa  glibc-2.18-186-gfd96752.tar.gz
+60f9a7e0483ab7d38ea30f99826b7bff  glibc-2.18-303-g1e14558.tar.gz