From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 25 Jan 2022 17:14:54 +0000 (+0100)
Subject: Rel 11; fixes: CVE-2022-23219, CVE-2022-23218, CVE-2021-3999, CVE-2021-3998
X-Git-Tag: auto/th/glibc-2.34-11
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=2030f4f9cc2c0e6c82e9b5ac1d2dc489e37329a7;p=packages%2Fglibc.git

Rel 11; fixes: CVE-2022-23219, CVE-2022-23218, CVE-2021-3999, CVE-2021-3998
---

diff --git a/glibc-tzfile-noassert.patch b/glibc-tzfile-noassert.patch
deleted file mode 100644
index d98691a..0000000
--- a/glibc-tzfile-noassert.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libc/time/tzfile.c.orig	2004-03-20 01:37:50.000000000 +0100
-+++ libc/time/tzfile.c	2004-06-29 17:40:15.000000000 +0200
-@@ -313,7 +313,9 @@
-     {
-       /* This should only happen if there are no transition rules.
- 	 In this case there should be only one single type.  */
--      assert (num_types == 1);
-+      if(__builtin_expect((num_types != 1), 0))
-+	goto ret_free_transitions;
-+      /* assert (num_types == 1);  -- disabled, don't crash */
-       __tzname[0] = __tzstring (zone_names);
-     }
-   if (__tzname[1] == NULL)
diff --git a/glibc.spec b/glibc.spec
index beba62a..3a6f9a9 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -51,7 +51,7 @@ Summary(tr.UTF-8):	GNU libc
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	%{core_version}
-Release:	10
+Release:	11
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
@@ -68,7 +68,7 @@ Source7:	%{name}-LD-path.c
 Source9:	nscd.tmpfiles
 # use branch.sh to update glibc-git.patch
 Patch0:		glibc-git.patch
-# Patch0-md5:	61bcc311b2e01d2d130413099010f982
+# Patch0-md5:	0f273932f5b4a7c6efd0984f5f3176a4
 # against GNU TP (libc domain)
 #Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
@@ -83,7 +83,7 @@ Patch11:	%{name}-autoconf.patch
 
 Patch14:	%{name}-sparc-errno_fix.patch
 Patch15:	%{name}-new-charsets.patch
-Patch16:	%{name}-tzfile-noassert.patch
+
 # additions pending for upstream merge or taken from other distros
 Patch17:	%{name}-morelocales.patch
 # fixes mostly pending for upstream merge
@@ -964,7 +964,7 @@ exit 1
 
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
+
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1