From 6b7878d77d9dc55b08fe44a909525be787c672e7 Mon Sep 17 00:00:00 2001 From: Arjun Shankar Date: Apr 23 2024 09:18:01 +0000 Subject: Auto-sync with upstream branch master Upstream commit: 16c8dfba14ff7596ad3aea941a240f8abcdc50e6 - Drop glibc-rh827510.patch, fixed differently upstream. - Revert "Allow glibc to be compiled without EXEC_PAGESIZE" - locale: Handle loading a missing locale twice (Bug 14247) - elf: Do not check for loader mmap on tst-decorate-maps (BZ 31553) - Use --enable-obsolete in build-many-glibcs.py for nios2-linux-gnu - login: Use unsigned 32-bit types for seconds-since-epoch - login: structs utmp, utmpx, lastlog _TIME_BITS independence (bug 30701) - login: Check default sizes of structs utmp, utmpx, lastlog - benchtests: Add random() benchmark - advisories: Add Reported-By - Fix 'Reported-By' to use Camel Case for commit 6a98f4640ea453f - Document CVE-2024-2961 - iconv: ISO-2022-CN-EXT: fix out-of-bound writes when writing escape sequence (CVE-2024-2961) - elf/rtld: Count skipped environment variables for enable_secure --- diff --git a/glibc-rh827510.patch b/glibc-rh827510.patch deleted file mode 100644 index 6115891..0000000 --- a/glibc-rh827510.patch +++ /dev/null @@ -1,37 +0,0 @@ -Short description: Fix newlocale error return. -Author(s): Fedora glibc team -Origin: PATCH -Bug-RHEL: #832516 -Bug-Fedora: #827510 -Bug-Upstream: #14247 -Upstream status: not-submitted - -This needs to go upstream right away to fix the error case for -newlocale not correctly returning an error. - -2012-06-14 Jeff Law - - * locale/loadlocale.c (_nl_load_locale): Delay setting - file->decided until we have successfully loaded the file's - data. - -diff --git a/locale/loadlocale.c b/locale/loadlocale.c -index e3fa187..9fd9216 100644 ---- a/locale/loadlocale.c -+++ b/locale/loadlocale.c -@@ -169,7 +169,6 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) - int save_err; - int alloc = ld_mapped; - -- file->decided = 1; - file->data = NULL; - - fd = __open_nocancel (file->filename, O_RDONLY | O_CLOEXEC); -@@ -278,6 +277,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) - newdata->alloc = alloc; - - file->data = newdata; -+ file->decided = 1; - } - - void diff --git a/glibc.spec b/glibc.spec index 2edf269..93c9492 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%global glibcsrcdir glibc-2.39.9000-167-g14e56bd4ce +%global glibcsrcdir glibc-2.39.9000-180-g16c8dfba14 %global glibcversion 2.39.9000 # Pre-release tarballs are pulled in from git using a command that is # effectively: @@ -170,7 +170,7 @@ Version: %{glibcversion} # - It allows using the Release number without the %%dist tag in the dependency # generator to make the generated requires interchangeable between Rawhide # and ELN (.elnYY < .fcXX). -%global baserelease 13 +%global baserelease 14 Release: %{baserelease}%{?dist} # Licenses: @@ -306,7 +306,6 @@ rpm.define("__debug_install_post bash " .. wrapper ############################################################################## Patch4: glibc-fedora-linux-tcsetattr.patch Patch8: glibc-fedora-manual-dircategory.patch -Patch9: glibc-rh827510.patch Patch13: glibc-fedora-localedata-rh61908.patch Patch17: glibc-cs-path.patch Patch23: glibc-python3.patch @@ -2517,6 +2516,24 @@ update_gconv_modules_cache () %endif %changelog +* Tue Apr 23 2024 Arjun Shankar - 2.39.9000-14 +- Drop glibc-rh827510.patch, fixed differently upstream. +- Auto-sync with upstream branch master, + commit 16c8dfba14ff7596ad3aea941a240f8abcdc50e6: +- Revert "Allow glibc to be compiled without EXEC_PAGESIZE" +- locale: Handle loading a missing locale twice (Bug 14247) +- elf: Do not check for loader mmap on tst-decorate-maps (BZ 31553) +- Use --enable-obsolete in build-many-glibcs.py for nios2-linux-gnu +- login: Use unsigned 32-bit types for seconds-since-epoch +- login: structs utmp, utmpx, lastlog _TIME_BITS independence (bug 30701) +- login: Check default sizes of structs utmp, utmpx, lastlog +- benchtests: Add random() benchmark +- advisories: Add Reported-By +- Fix 'Reported-By' to use Camel Case for commit 6a98f4640ea453f +- Document CVE-2024-2961 +- iconv: ISO-2022-CN-EXT: fix out-of-bound writes when writing escape sequence (CVE-2024-2961) +- elf/rtld: Count skipped environment variables for enable_secure + * Mon Apr 22 2024 Florian Weimer - 2.39.9000-13 - Build POWER10 multilib diff --git a/sources b/sources index 43958e3..0623ae0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibc-2.39.9000-167-g14e56bd4ce.tar.xz) = 9f6d2d99e9ceff8f147b2f9f009bd5d66ac031352ede56f692660c668d1b719f48c53c826158e2e19bb3fc913f2a376081bdde70a9365226645546c9d863ac07 +SHA512 (glibc-2.39.9000-180-g16c8dfba14.tar.xz) = fb4980c13aa21a9318d5d4741165718bc40214db5020ac0dbfd0b0091820e49dea9a073f04cc1af94970dcec734a511e553ac6b708ac8478cadabe5a4e7710e0