From b4f030ae95a143b37ab8a667010b592846de39cb Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 30 Jun 2021 17:51:11 +0200 Subject: [PATCH] Auto-sync with upstream branch master Upstream commit: eb68d7d23cc411acdf68a60f194343a6774d6194 - Linux: Avoid calling malloc indirectly from __get_nprocs (#1975693) - Use Linux 5.13 in build-many-glibcs.py --- glibc.spec | 10 ++++++++-- sources | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/glibc.spec b/glibc.spec index 821f314..a894b21 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.33.9000-834-g734c60ebb6 +%define glibcsrcdir glibc-2.33.9000-836-geb68d7d23c %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: 35%{?dist} +Release: 36%{?dist} # In general, GPLv2+ is used by programs, LGPLv2+ is used for # libraries. @@ -2207,6 +2207,12 @@ fi %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %changelog +* Wed Jun 30 2021 Florian Weimer - 2.33.9000-36 +- Auto-sync with upstream branch master, + commit eb68d7d23cc411acdf68a60f194343a6774d6194: +- Linux: Avoid calling malloc indirectly from __get_nprocs (#1975693) +- Use Linux 5.13 in build-many-glibcs.py + * Wed Jun 30 2021 Florian Weimer - 2.33.9000-35 - Drop glibc-s390x-roundeven.patch, applied upstream. - Move libutil.a into glibc-devel. diff --git a/sources b/sources index ab81f42..ebd258d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibc-2.33.9000-834-g734c60ebb6.tar.xz) = f46a04d81ed78ed704969f2f920e4441e0ca7a4b78229528c54a7065a35a8566a40a0105478714ffe3a7d8072883b8efd4fa4cf1987874e185dec7e21bb87a04 +SHA512 (glibc-2.33.9000-836-geb68d7d23c.tar.xz) = 59f066611bb2c9f590ea9f4ff79d85f97cbf03d6e5900dca93da8a1baec6aa53f5d607d8efbc37720933b82992ff944ac96e1ab600ea21d435e88e8915068cfb