From c996bd1b308be1d591f1d539c55c3f890313a853 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 17 Jan 2020 13:49:44 +0100
Subject: [PATCH] Auto-sync with upstream branch master

Upstream commit: 70ba28f7ab2923d4e36ffc9d5d2e32357353b25c

- Fix tst-pkey.c pkey_alloc return checks and manual
- powerpc: Move cache line size to rtld_global_ro
- powerpc: Initialize rtld_global_ro for static dlopen (swbz#20802)
- Revert outdated translations
- vcs-to-changelog: Add quirk for __nonnull
- elf: Add elf/tst-dlopenfail-2 (swbz#25396, #1395758)
- Clear GL(dl_initfirst) when freeing its link_map (swbz#25396, #1395758)
- Update Translations
- Fix "elf: Add tst-ldconfig-ld_so_conf-update test" on 32bit.
- elf: Add tst-ldconfig-ld_so_conf-update test
- sl_SI locale: Use "." as the thousands separator (swbz#25233)
---
 glibc.spec | 19 +++++++++++++++++--
 sources    |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index 776cf96..69b3801 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.30.9000-470-gcbce69e70d
+%define glibcsrcdir glibc-2.30.9000-492-g70ba28f7ab
 %define glibcversion 2.30.9000
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
@@ -87,7 +87,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 29%{?dist}
+Release: 30%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -2041,6 +2041,21 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Fri Jan 17 2020 Florian Weimer <fweimer@redhat.com> - 2.30.9000-30
+- Auto-sync with upstream branch master,
+  commit 70ba28f7ab2923d4e36ffc9d5d2e32357353b25c:
+- Fix tst-pkey.c pkey_alloc return checks and manual
+- powerpc: Move cache line size to rtld_global_ro
+- powerpc: Initialize rtld_global_ro for static dlopen (swbz#20802)
+- Revert outdated translations
+- vcs-to-changelog: Add quirk for __nonnull
+- elf: Add elf/tst-dlopenfail-2 (swbz#25396, #1395758)
+- Clear GL(dl_initfirst) when freeing its link_map (swbz#25396, #1395758)
+- Update Translations
+- Fix "elf: Add tst-ldconfig-ld_so_conf-update test" on 32bit.
+- elf: Add tst-ldconfig-ld_so_conf-update test
+- sl_SI locale: Use "." as the thousands separator (swbz#25233)
+
 * Mon Jan 06 2020 Arjun Shankar <arjun@redhat.com> - 2.30.9000-29
 - Auto-sync with upstream branch master,
   commit cbce69e70dc4b04fefcc7257e593733b8b03856c:
diff --git a/sources b/sources
index a30de47..00ddde4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.30.9000-470-gcbce69e70d.tar.xz) = 4bdbca82fc733234025c20f2456da90a30ac0e68d7ee46f2a8b2b4b09ffe394a73fe954c7a55456fdb5bd233b5a35b0b2a9a53abf198850662005b71fd91e70a
+SHA512 (glibc-2.30.9000-492-g70ba28f7ab.tar.xz) = e703d0e01937017ae675fea3875123761dfcde9f9af1115b537d414ef4aa8535597f94958fdbca43af004cbbcedfe1eec8557214c255dc671aee8c875af2bca9