From 7b0f6aa855b6bf8f1f353b77356f7530b6c7de36 Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Tue, 2 Aug 2022 11:04:01 +0200
Subject: [PATCH] up to 2.36

---
 branch.sh               |  4 ++--
 glibc-morelocales.patch |  5 +++--
 glibc.spec              | 10 ++++------
 nss_crash.patch         | 31 -------------------------------
 4 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 nss_crash.patch

diff --git a/branch.sh b/branch.sh
index 275c2d6..2683399 100755
--- a/branch.sh
+++ b/branch.sh
@@ -2,8 +2,8 @@
 set -e
 url=git://sourceware.org/git/glibc.git
 package=glibc
-tag=glibc-2.35
-branch=release/2.35/master
+tag=glibc-2.36
+branch=release/2.36/master
 out=$package-git.patch
 repo=$package.git
 
diff --git a/glibc-morelocales.patch b/glibc-morelocales.patch
index 774a38a..f5a9826 100644
--- a/glibc-morelocales.patch
+++ b/glibc-morelocales.patch
@@ -181,9 +181,9 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED glibc-2.33/localedata
  pl_PL/ISO-8859-2 \
  ps_AF/UTF-8 \
 @@ -377,6 +411,9 @@ pt_PT/ISO-8859-1 \
- pt_PT@euro/ISO-8859-15 \
  quz_PE/UTF-8 \
  raj_IN/UTF-8 \
+ rif_MA/UTF-8 \
 +rm_CH.UTF-8/UTF-8 \
 +rm_CH/ISO-8859-1 \
 +ro_RO.ISO-8859-16/ISO-8859-16 \
@@ -216,7 +216,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED glibc-2.33/localedata
  sl_SI.UTF-8/UTF-8 \
  sl_SI/ISO-8859-2 \
  sm_WS/UTF-8 \
-@@ -412,26 +454,42 @@ so_SO/ISO-8859-1 \
+@@ -412,27 +454,43 @@ so_SO/ISO-8859-1 \
  sq_AL.UTF-8/UTF-8 \
  sq_AL/ISO-8859-1 \
  sq_MK/UTF-8 \
@@ -247,6 +247,7 @@ diff -urNp -x '*.orig' glibc-2.33.org/localedata/SUPPORTED glibc-2.33/localedata
 +sw_UG.UTF-8/UTF-8 \
 +sw_UG.ISO-8859-10/ISO-8859-10 \
 +sw_UG/ISO-8859-1 \
+ syr/UTF-8 \
  szl_PL/UTF-8 \
  ta_IN/UTF-8 \
  ta_LK/UTF-8 \
diff --git a/glibc.spec b/glibc.spec
index 4d386a1..ddd2726 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -43,7 +43,7 @@
 %define		with_static_pie		1
 %endif
 
-%define		core_version	2.35
+%define		core_version	2.36
 %define		llh_version	7:2.6.32.1-1
 
 Summary:	GNU libc
@@ -57,12 +57,12 @@ Summary(tr.UTF-8):	GNU libc
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	%{core_version}
-Release:	8
+Release:	1
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	https://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5:	dd571c67d85d89d7f60b854a4e207423
+# Source0-md5:	00e9b89e043340f688bc93ec03239b57
 Source2:	nscd.init
 Source3:	nscd.sysconfig
 Source4:	nscd.logrotate
@@ -74,13 +74,12 @@ Source7:	%{name}-LD-path.c
 Source9:	nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
 Patch0:		glibc-git.patch
-# Patch0-md5:	74a4b37b13ce8c8cc15b9f05398c58cd
+# Patch0-md5:	e89572dfaa4ed68f99ca86681d04878c
 # against GNU TP (libc domain)
 #Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
 Patch3:		%{name}-crypt-blowfish.patch
 Patch4:		%{name}-no-bash-nls.patch
-Patch5:		nss_crash.patch
 Patch6:		%{name}-paths.patch
 
 Patch10:	%{name}-info.patch
@@ -957,7 +956,6 @@ exit 1
 %patch2 -p1
 %patch3 -p1
 %{!?with_bash_nls:%patch4 -p1}
-%patch5 -p1
 
 %patch6 -p1
 
diff --git a/nss_crash.patch b/nss_crash.patch
deleted file mode 100644
index 489aacc..0000000
--- a/nss_crash.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/nss/nss_database.c b/nss/nss_database.c
-index d56c5b798d..a0522ea7d2 100644
---- a/nss/nss_database.c
-+++ b/nss/nss_database.c
-@@ -424,17 +424,21 @@ nss_database_check_reload_and_get (struct nss_database_state *local,
-      errors here are very unlikely, but the chance that we're entering
-      a container is also very unlikely, so we err on the side of both
-      very unlikely things not happening at the same time.  */
--  if (__stat64_time64 ("/", &str) != 0
--      || (local->root_ino != 0
--	  && (str.st_ino != local->root_ino
--	      ||  str.st_dev != local->root_dev)))
--    {
-+  if (__stat64_time64 ("/", &str) != 0) {
-+    __libc_lock_unlock (local->lock);
-+    return false;
-+  }
-+
-+  if (local->root_ino != 0 && (str.st_ino != local->root_ino
-+                              || str.st_dev != local->root_dev))
-+   {
-       /* Change detected; disable reloading and return current state.  */
-       atomic_store_release (&local->data.reload_disabled, 1);
-       *result = local->data.services[database_index];
-       __libc_lock_unlock (local->lock);
-       return true;
-     }
-+
-   local->root_ino = str.st_ino;
-   local->root_dev = str.st_dev;
-   __libc_lock_unlock (local->lock);
-- 
2.44.0