From 4014d6f877473201795c7d95cf3a9a5917716466 Mon Sep 17 00:00:00 2001
From: Arjun Shankar <arjun.is@lostca.se>
Date: Tue, 23 May 2017 14:37:59 +0200
Subject: [PATCH] Auto-sync with upstream master

Upstream commit: 231a59ce2c5719d2d77752c21092960e28837b4a
---
 SUPPORTED                        |  1 +
 glibc-fedora-nptl-linklibc.patch |  4 ++--
 glibc.spec                       | 19 +++++++++++++++++--
 sources                          |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/SUPPORTED b/SUPPORTED
index bc6e6b5..ba9cdba 100644
--- a/SUPPORTED
+++ b/SUPPORTED
@@ -120,6 +120,7 @@ dv_MV/UTF-8 \
 dz_BT/UTF-8 \
 el_GR.UTF-8/UTF-8 \
 el_GR/ISO-8859-7 \
+el_GR@euro/ISO-8859-7 \
 el_CY.UTF-8/UTF-8 \
 el_CY/ISO-8859-7 \
 en_AG/UTF-8 \
diff --git a/glibc-fedora-nptl-linklibc.patch b/glibc-fedora-nptl-linklibc.patch
index 1a79477..fc87a4a 100644
--- a/glibc-fedora-nptl-linklibc.patch
+++ b/glibc-fedora-nptl-linklibc.patch
@@ -2,8 +2,8 @@ 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)libpthread.so \
+ 	$(objpfx)libpthread_nonshared.a
  $(objpfx)tst-unload: $(libdl)
 -# $(objpfx)../libc.so is used instead of $(common-objpfx)libc.so,
 +# $(objpfx)linklibc.so is used instead of $(common-objpfx)libc.so,
diff --git a/glibc.spec b/glibc.spec
index 3c26c2e..8756477 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.25-258-g25e39b4
+%define glibcsrcdir  glibc-2.25-362-g231a59c
 %define glibcversion 2.25.90
-%define glibcrelease 2%{?dist}
+%define glibcrelease 3%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -2268,6 +2268,21 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue May 23 2017 Arjun Shankar <arjun.is@lostca.se> - 2.25.90-3
+- Auto-sync with upstream master,
+  commit 231a59ce2c5719d2d77752c21092960e28837b4a.
+- Add el_GR@euro support (swbz#20686)
+- Set dl_platform and dl_hwcap from CPU features (swbz#21391)
+- Use __glibc_reserved convention in mcontext, sigcontext (swbz#21457)
+- Fix signal.h bsd_signal namespace (swbz#21445)
+- Fix network headers stdint.h namespace (swbz#21455)
+- resolv: Use RES_DFLRETRY consistently (swbz#21474)
+- Condition some sys/ucontext.h contents on __USE_MISC (swbz#21457)
+- Consolidate Linux read syscall (swbz#21428)
+- fork: Remove bogus parent PID assertions (swbz#21386)
+- Reduce value of LD_HWCAP_MASK for tst-env-setuid test case (swbz#21502)
+- libio: Avoid dup already opened file descriptor (swbz#21393)
+
 * Mon May 01 2017 Carlos O'Donell <carlos@systemhalted.org> - 2.25.90-2
 - Auto-sync with upstream master,
   commit 25e39b4229fb365a605dc4c8f5d6426a77bc08a6.
diff --git a/sources b/sources
index 911b3bf..a974c5c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.25-258-g25e39b4.tar.gz) = e7e310a3276098ff4481275c91a46a094974276727b52707bece2b5a91b4ef14a569c68f280e60919235eadd6977bfc543814a55d152244f3749a34a9b24dbe9
+SHA512 (glibc-2.25-362-g231a59c.tar.gz) = 79af83ccc469e4e10ab797200eb63829db38eab7cf36c00cee5c4e052540214c43e95af11f7ae5a9371d49e4beea8251357fa698e84dbee462e2347026cfef04