From 7e4694d522cb95a42594fdfd75140a96792292dc Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 28 Jul 2017 21:00:29 +0200
Subject: [PATCH] Auto-sync with upstream master

Upstream commit: d95fcb2df478efbf4f8537ba898374043ac4561f
---
 SUPPORTED  |  2 ++
 glibc.spec | 18 ++++++++++++++++--
 sources    |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/SUPPORTED b/SUPPORTED
index e1a2b41..1755814 100644
--- a/SUPPORTED
+++ b/SUPPORTED
@@ -53,6 +53,7 @@ ar_YE.UTF-8/UTF-8 \
 ar_YE/ISO-8859-6 \
 ayc_PE/UTF-8 \
 az_AZ/UTF-8 \
+az_IR/UTF-8 \
 as_IN/UTF-8 \
 ast_ES.UTF-8/UTF-8 \
 ast_ES/ISO-8859-15 \
@@ -311,6 +312,7 @@ lv_LV/ISO-8859-13 \
 lzh_TW/UTF-8 \
 mag_IN/UTF-8 \
 mai_IN/UTF-8 \
+mai_NP/UTF-8 \
 mg_MG.UTF-8/UTF-8 \
 mg_MG/ISO-8859-15 \
 mhr_RU/UTF-8 \
diff --git a/glibc.spec b/glibc.spec
index 41c1dfb..b17a06f 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.25-754-g00d7a37
+%define glibcsrcdir  glibc-2.25-818-gd95fcb2
 %define glibcversion 2.25.90
-%define glibcrelease 28%{?dist}
+%define glibcrelease 29%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -2270,6 +2270,20 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Jul 28 2017 Florian Weimer <fweimer@redhat.com> - 2.25.90-29
+- Auto-sync with upstream master,
+  commit d95fcb2df478efbf4f8537ba898374043ac4561f:
+- rwlock: Fix explicit hand-over (swbz#21298)
+- tunables: Use direct syscall for access (swbz#21744)
+- Avoid accessing corrupted stack from __stack_chk_fail (swbz#21752)
+- Remove extra semicolons in struct pthread_mutex (swbz#21804)
+- grp: Fix cast-after-dereference (another big-endian group merge issue)
+- S390: fix sys/ptrace.h to make it includible again after asm/ptrace.h
+- Don't add stack_chk_fail_local.o to libc.a (swbz#21740)
+- i386: Test memmove_chk and memset_chk only in libc.so (swbz#21741)
+- Add new locales az_IR, mai_NP (swbz#14172)
+- Various locale improvements
+
 * Thu Jul 27 2017 Carlos O'Donell <codonell@redhat.com> - 2.25.90-28
 - Adjust to new rpm debuginfo generation (#1475009).
 
diff --git a/sources b/sources
index 8eaf07c..14fbd71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.25-754-g00d7a37.tar.gz) = 6014efc875141245a966707096e2b746fbfa3b82bd0f80a6c6101d4fdea6ac974c1b033bce20162c76aa5213035cb13ccfaef7d820a89ea808c3d6d94530226d
+SHA512 (glibc-2.25-818-gd95fcb2.tar.gz) = a005f40a8dead4f15546805e84e0f2c5e1be058d0dcaf58696fe9fd99650fd8f2350800abe3de2a759bec45f768cf73eb3db0a389d3aeb1f54e43956d5b771cf