From c8064eb721d630b5af74d18f04848d907f0130ff Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Jun 12 2016 20:41:55 +0000
Subject: Auto-sync with upstream master


Resolves: #1344480
  (Crash in the nss_db NSS service module during iteration.)
Add the eo locale as a first-class citizen.

---

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 41f0e53..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/glibc-2.23-447-g2df1b98.tar.gz
diff --git a/SUPPORTED b/SUPPORTED
index 4ea4f60..3d03099 100644
--- a/SUPPORTED
+++ b/SUPPORTED
@@ -155,6 +155,7 @@ en_ZA/ISO-8859-1 \
 en_ZM/UTF-8 \
 en_ZW.UTF-8/UTF-8 \
 en_ZW/ISO-8859-1 \
+eo/UTF-8 \
 es_AR.UTF-8/UTF-8 \
 es_AR/ISO-8859-1 \
 es_BO.UTF-8/UTF-8 \
diff --git a/glibc.spec b/glibc.spec
index 6d937c3..1356205 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.23-447-g2df1b98
+%define glibcsrcdir  glibc-2.23-465-g31d0a4f
 %define glibcversion 2.23.90
-%define glibcrelease 20%{?dist}
+%define glibcrelease 21%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -1205,7 +1205,7 @@ $olddir/build-%{target}/elf/ld.so \
 # Setup the locale-archive template for use by glibc-all-langpacks.
 mv locale-archive{,.tmpl}
 # Create the file lists for the language specific sub-packages:
-for i in *_*
+for i in eo *_*
 do
     lang=${i%%_*}
     if [ ! -e langpack-${lang}.filelist ]; then
@@ -2069,6 +2069,13 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Sat Jun 11 2016 Florian Weimer <fweimer@redhat.com> - 2.23.90-21
+- Auto-sync with upstream master
+  (commit 31d0a4fa646db8b8c97ce24e0ec0a7b73de4fca1),
+  fixing the following bugs:
+- Add eo locale
+- Crash in the nss_db NSS service module during iteration (#1344480)
+
 * Thu Jun 09 2016 Florian Weimer <fweimer@redhat.com> - 2.23.90-20
 - Auto-sync with upstream master, fixing this bug:
 - Emacs crashes on startup (#1342976)
diff --git a/sources b/sources
index 1994310..54e2c7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-920d53af61e670ec740fb988fd07e4c9  glibc-2.23-447-g2df1b98.tar.gz
+4dbf0d43dc3b233af3ea68a23f016137  glibc-2.23-465-g31d0a4f.tar.gz