[glibc] Sync with upstream master

[Siddhesh Poyarekar]

commit 4d96e3246cdb6ea797fe104a79875268fa888532
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Mon Oct 21 15:06:43 2013 +0530

    Sync with upstream master

 glibc-fedora-gai-canonical.patch |  128 ----------------------------------
 glibc-localedef-arg.patch        |  140 --------------------------------------
 glibc.spec                       |   14 ++--
 sources                          |    2 +-
 4 files changed, 7 insertions(+), 277 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 7f43638..9a1b4ad 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.18-303-g1e14558
+%define glibcsrcdir  glibc-2.18-322-gd1f23d4
 %define glibcversion 2.18.90
-%define glibcrelease 11%{?dist}
+%define glibcrelease 12%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -151,7 +151,6 @@ Patch0012: %{name}-fedora-linux-tcsetattr.patch
 Patch0014: %{name}-fedora-nptl-linklibc.patch
 Patch0015: %{name}-fedora-localedef.patch
 Patch0016: %{name}-fedora-i386-tls-direct-seg-refs.patch
-Patch0017: %{name}-fedora-gai-canonical.patch
 Patch0019: %{name}-fedora-nis-rh188246.patch
 Patch0020: %{name}-fedora-manual-dircategory.patch
 Patch0024: %{name}-fedora-locarchive.patch
@@ -184,9 +183,6 @@ Patch0043: %{name}-rh1009623.patch
 #      binutils bug.
 Patch0044: %{name}-rh1009145.patch
 
-# Provide localedef with --list-archive FILE support.
-Patch0045: %{name}-localedef-arg.patch
-
 # Allow applications to call pthread_atfork without libpthread.so.
 Patch0046: %{name}-rh1013801.patch
 
@@ -520,7 +516,6 @@ package or when debugging this package.
 %patch0014 -p1
 %patch0015 -p1
 %patch0016 -p1
-%patch0017 -p1
 %patch0019 -p1
 %patch0020 -p1
 %patch2021 -p1
@@ -543,7 +538,6 @@ package or when debugging this package.
 %patch0042 -p1
 %patch0043 -p1
 %patch0044 -p1
-%patch0045 -p1
 %patch0046 -p1
 
 ##############################################################################
@@ -1630,6 +1624,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Oct 21 2013 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.18.90-12
+- Allow fill_archive to be called with NULL fname.
+- Sync with upstream master.
+
 * Tue Oct 15 2013 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.18.90-11
 - Sync with upstream master.
 
diff --git a/sources b/sources
index ca18a79..efbcfc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-60f9a7e0483ab7d38ea30f99826b7bff  glibc-2.18-303-g1e14558.tar.gz
+6e4469f47c53fb5f7513b45c0dd6ce58  glibc-2.18-322-gd1f23d4.tar.gz