From ac81c2f6e66487ef135003e60ea5e58abd324769 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Fri, 23 Jul 2021 09:44:00 +0200
Subject: [PATCH] Auto-sync with upstream branch master

Upstream commit: 9a7ab0769b295cbf5232140401742a8f34bda3de

- hurd: Fix glob lstat compatibility
- socket: Add time64 alias for setsockopt
- socket: Add time64 alias for getsockopt
- mcheck Fix malloc_usable_size [BZ #22057]
- Remove malloc hooks [BZ #23328]
- Move malloc_{g,s}et_state to libc_malloc_debug
- glibc.malloc.check: Wean away from malloc hooks
- mtrace: Wean away from malloc hooks
- Simplify __malloc_initialized
- mcheck: Wean away from malloc hooks [BZ #23489]
- Move malloc hooks into a compat DSO
- Remove __morecore and __default_morecore
- Remove __after_morecore_hook
- Make mcheck tests conditional on GLIBC_2.23 or earlier
- posix: Add sysconf(_SC_{MIN,}SIGSTKSZ) support
- malloc: Fix tst-mallocfork3-malloc-check link
- ARC: elf: make type safe
- ARC: fp: (micro)optimize FPU_STATUS read by eliding FWE bit clearing
---
 glibc.spec | 26 ++++++++++++++++++++++++--
 sources    |  2 +-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index 16ac0d9..2022d4e 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.33.9000-961-g77ede5f010
+%define glibcsrcdir glibc-2.33.9000-979-g9a7ab0769b
 %define glibcversion 2.33.9000
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
@@ -111,7 +111,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 47%{?dist}
+Release: 48%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -2241,6 +2241,28 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Fri Jul 23 2021 Florian Weimer <fweimer@redhat.com> - 2.33.9000-48
+- Auto-sync with upstream branch master,
+  commit 9a7ab0769b295cbf5232140401742a8f34bda3de:
+- hurd: Fix glob lstat compatibility
+- socket: Add time64 alias for setsockopt
+- socket: Add time64 alias for getsockopt
+- mcheck Fix malloc_usable_size [BZ #22057]
+- Remove malloc hooks [BZ #23328]
+- Move malloc_{g,s}et_state to libc_malloc_debug
+- glibc.malloc.check: Wean away from malloc hooks
+- mtrace: Wean away from malloc hooks
+- Simplify __malloc_initialized
+- mcheck: Wean away from malloc hooks [BZ #23489]
+- Move malloc hooks into a compat DSO
+- Remove __morecore and __default_morecore
+- Remove __after_morecore_hook
+- Make mcheck tests conditional on GLIBC_2.23 or earlier
+- posix: Add sysconf(_SC_{MIN,}SIGSTKSZ) support
+- malloc: Fix tst-mallocfork3-malloc-check link
+- ARC: elf: make type safe
+- ARC: fp: (micro)optimize FPU_STATUS read by eliding FWE bit clearing
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.33.9000-47
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 43c35af..a07b3f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.33.9000-961-g77ede5f010.tar.xz) = 34abd3ec969f76b6d98122cd78d650a1b9b5da9f0a96b7392a07b529c37487974852b469359b5f420ab9ad5876ef1e79877bd7a26e26d2e13e4006a109e65f93
+SHA512 (glibc-2.33.9000-979-g9a7ab0769b.tar.xz) = 97b1abcb3d64a0b34a2ccd7d2984b466df96579824cf1847d1183ae56ccde13334dcc99d65ab08860a17754bd8e682c1bb356be3c338eb3c4ddb2f1813847372