From 419878ed02cd9d191b9b7deb2f2523f5950cf30a Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 12 Jul 2017 14:00:32 +0200
Subject: [PATCH] Auto-sync with upstream master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream commit: 30200427a99e5ddac9bad08599418d44d54aa9aa

- Add per-thread cache to malloc
- Add Samoan language locale for Samoa
- Add Awajún / Aguaruna locale for Peru
- CVE-2010-3192: Avoid backtrace from __stack_chk_fail (swbz#12189)
- Add preadv2, writev2 RWF_NOWAIT flag (swbz#21738)
- Fix abday strings for ar_JO/ar_LB/ar_SY locales (swbz#21749)
- Fix abday strings for ar_SA locale (swbz#21748, swbz#19066)
- Set data_fmt for da_DK locale (swbz#17297)
- Add yesstr and nostr for the zh_HK locale (swbz#21733)
- Fix abday strings for the ksIN@devanagari locale (swbz#21743)
- Do not include _dl_resolv_conflicts in libc.a (swbz#21742)
- Test __memmove_chk, __memset_chk only in libc.so (swbz#21741)
- Add iI and eE to  yesexpr and noexpr respectively for ts_ZA locale
- Add yesstr/nostr for kw_GB locale (swbz#21734)
- Add yesstr and nostr for the ts_ZA locale (swbz#21727)
- Fix LC_NAME for hi_IN locale (swbz#21729)
- Add yesstr and nostr for the xh_ZA locale (swbz#21724)
- Add yesstr and nostr for the zh_CN locale (swbz#21723)
- Fix full weekday names for the ks_IN@devanagari locale (swbz#21721)
- Various fixes to Arabic locales after CLDR import
---
 SUPPORTED  |  2 ++
 glibc.spec | 28 ++++++++++++++++++++++++++--
 sources    |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED b/SUPPORTED
index 29519f9..76ed82e 100644
--- a/SUPPORTED
+++ b/SUPPORTED
@@ -9,6 +9,7 @@ aa_ER@saaho/UTF-8 \
 aa_ET/UTF-8 \
 af_ZA.UTF-8/UTF-8 \
 af_ZA/ISO-8859-1 \
+agr_PE/UTF-8 \
 ak_GH/UTF-8 \
 am_ET/UTF-8 \
 an_ES.UTF-8/UTF-8 \
@@ -388,6 +389,7 @@ sk_SK.UTF-8/UTF-8 \
 sk_SK/ISO-8859-2 \
 sl_SI.UTF-8/UTF-8 \
 sl_SI/ISO-8859-2 \
+sm_WS/UTF-8 \
 so_DJ.UTF-8/UTF-8 \
 so_DJ/ISO-8859-1 \
 so_ET/UTF-8 \
diff --git a/glibc.spec b/glibc.spec
index 3d85b87..12cb025 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.25-685-g031e519
+%define glibcsrcdir  glibc-2.25-717-g3020042
 %define glibcversion 2.25.90
-%define glibcrelease 22%{?dist}
+%define glibcrelease 23%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -2267,6 +2267,30 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Jul 12 2017 Florian Weimer <fweimer@redhat.com> - 2.25.90-23
+- Auto-sync with upstream master,
+  commit 30200427a99e5ddac9bad08599418d44d54aa9aa:
+- Add per-thread cache to malloc
+- Add Samoan language locale for Samoa
+- Add Awajún / Aguaruna locale for Peru
+- CVE-2010-3192: Avoid backtrace from __stack_chk_fail (swbz#12189)
+- Add preadv2, writev2 RWF_NOWAIT flag (swbz#21738)
+- Fix abday strings for ar_JO/ar_LB/ar_SY locales (swbz#21749)
+- Fix abday strings for ar_SA locale (swbz#21748, swbz#19066)
+- Set data_fmt for da_DK locale (swbz#17297)
+- Add yesstr and nostr for the zh_HK locale (swbz#21733)
+- Fix abday strings for the ksIN@devanagari locale (swbz#21743)
+- Do not include _dl_resolv_conflicts in libc.a (swbz#21742)
+- Test __memmove_chk, __memset_chk only in libc.so (swbz#21741)
+- Add iI and eE to  yesexpr and noexpr respectively for ts_ZA locale
+- Add yesstr/nostr for kw_GB locale (swbz#21734)
+- Add yesstr and nostr for the ts_ZA locale (swbz#21727)
+- Fix LC_NAME for hi_IN locale (swbz#21729)
+- Add yesstr and nostr for the xh_ZA locale (swbz#21724)
+- Add yesstr and nostr for the zh_CN locale (swbz#21723)
+- Fix full weekday names for the ks_IN@devanagari locale (swbz#21721)
+- Various fixes to Arabic locales after CLDR import 
+
 * Tue Jul 11 2017 Florian Weimer <fweimer@redhat.com> - 2.25.90-22
 - Reinstantiate stack_t cleanup (#1468904)
 - s390x: Restore PTRACE_GETREGS etc. to get GCC to build (#1469536)
diff --git a/sources b/sources
index 1e39d20..f68dbfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.25-685-g031e519.tar.gz) = 2d22fa77596549e2dd30c635dba922774a6854e370c6578b6fa18712cdfc2c17517ab011bf82d00574447c967bddbb658260c8a0279351f164b5b3a0198672cd
+SHA512 (glibc-2.25-717-g3020042.tar.gz) = 7d9de98eb321928332e7f3c1c695451c651b4b947a701754d072cc0cdb664336f4a75f24643bab5d023f3ec207d3ef1bf070ab86b781d2517a58b3267371b1bd