From a7b71f9f73fb5f120d89cffbbfbe035cca17584b Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 8 Feb 2022 15:52:54 +0100
Subject: [PATCH] Auto-sync with upstream branch release/2.35/master

Upstream commit: 24962427071fa532c3c48c918e9d64d719cc8a6c

- Add BZ#28860 reference on NEWS
- linux: Fix missing __convert_scm_timestamps (BZ #28860)
---
 glibc.spec | 10 ++++++++--
 sources    |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index 643cbbe..c6bfe23 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.35-3-ga2f1675634
+%define glibcsrcdir glibc-2.35-5-g2496242707
 %define glibcversion 2.35
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
@@ -152,7 +152,7 @@ end \
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -2161,6 +2161,12 @@ update_gconv_modules_cache ()
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Tue Feb 08 2022 Florian Weimer <fweimer@redhat.com> - 2.35-2
+- Auto-sync with upstream branch release/2.35/master,
+  commit 24962427071fa532c3c48c918e9d64d719cc8a6c:
+- Add BZ#28860 reference on NEWS
+- linux: Fix missing __convert_scm_timestamps (BZ #28860)
+
 * Thu Feb 03 2022 Florian Weimer <fweimer@redhat.com> - 2.35-1
 - glibc 2.35 upstream release
 - Auto-sync with upstream branch release/2.35/master,
diff --git a/sources b/sources
index 19af4c1..5c4b641 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.35-3-ga2f1675634.tar.xz) = 3fed8238c1fcb713a3b04a6f7515355e2bb96aad1f24b20ff1efe558cefd21bed9fee6a5fedeb61f34d1b3d63450d347950d9483bcf037b3a1cf31ee3a387e4d
+SHA512 (glibc-2.35-5-g2496242707.tar.xz) = dedaef3d8a26fc77c9b75737cd11c758c81d6b9f131ecb55940f1e17e8947a021d73904822460cedd4d155c4d4c25f82df069996ec29915d39923429366e94f1