From 2f717376f3f5df88767275345fe9c4c0b75e1b3a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 3 Jun 2021 11:00:18 +0200 Subject: [PATCH] Auto-sync with upstream branch master Upstream commit: 466c1ea15f461edb8e3ffaf5d86d708876343bbf - dlfcn: Rework static dlopen hooks - dlfcn: Eliminate GLIBC_PRIVATE dependency from tststatic2 - dlfcn: Cleanups after -ldl is no longer required - dlfcn: Move dlopen into libc - dlfcn: Move dlvsym into libc - dlfcn: Move dlinfo into libc - dlfcn: Move dladdr1 into libc - dlfcn: Move dlmopen into libc - dlfcn: Move dlsym into libc - dlfcn: Move dladdr into libc - dlfcn: Move dlclose into libc - Improve test coverage of strlen function - fix typo - dlfcn: Move dlerror into libc - Add libc ABI extension kludge for baseline-violating libdl symbols - scripts/versions.awk: Add local: * to all version nodes - Add missing symbols to Version files - Fix use of __pthread_attr_copy in mq_notify (bug 27896) - Use __pthread_attr_copy in mq_notify (bug 27896) - Update floating-point feature test macro handling for C2X - stdio-common: Remove _IO_vfwscanf - aarch64: align stack in clone [BZ #27939] - powerpc: Optimized memcmp for power10 - x86-64: Align child stack to 16 bytes [BZ #27902] --- glibc.spec | 36 +++++++++++++++++++++++++++++++++--- sources | 2 +- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/glibc.spec b/glibc.spec index fb5ce0f..4ccd5e6 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.33.9000-655-g271ec55d0a +%define glibcsrcdir glibc-2.33.9000-679-g466c1ea15f %define glibcversion 2.33.9000 # Pre-release tarballs are pulled in from git using a command that is # effectively: @@ -97,7 +97,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 11%{?dist} +Release: 12%{?dist} # In general, GPLv2+ is used by programs, LGPLv2+ is used for # libraries. @@ -1587,7 +1587,7 @@ grep -e "libmemusage.so" -e "libpcprofile.so" master.filelist >> glibc.filelist ############################################################################### # Static libraries that land in glibc-devel, not glibc-static. -devel_static_library_pattern='/lib\(\(c\|nldbl\|mvec\)_nonshared\|g\|ieee\|mcheck\|pthread\)\.a$' +devel_static_library_pattern='/lib\(\(c\|nldbl\|mvec\)_nonshared\|g\|ieee\|mcheck\|pthread\|dl\)\.a$' # Static libraries neither in glibc-devel nor in glibc-static. other_static_library_pattern='/libpthread_nonshared\.a' @@ -2112,6 +2112,36 @@ fi %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %changelog +* Thu Jun 03 2021 Florian Weimer - 2.33.9000-12 +- libdl is no longer a separate shared object. +- CVE-2021-33574: Use-after-free via mq_notify (#1965410) +- Auto-sync with upstream branch master, + commit 466c1ea15f461edb8e3ffaf5d86d708876343bbf: +- dlfcn: Rework static dlopen hooks +- dlfcn: Eliminate GLIBC_PRIVATE dependency from tststatic2 +- dlfcn: Cleanups after -ldl is no longer required +- dlfcn: Move dlopen into libc +- dlfcn: Move dlvsym into libc +- dlfcn: Move dlinfo into libc +- dlfcn: Move dladdr1 into libc +- dlfcn: Move dlmopen into libc +- dlfcn: Move dlsym into libc +- dlfcn: Move dladdr into libc +- dlfcn: Move dlclose into libc +- Improve test coverage of strlen function +- fix typo +- dlfcn: Move dlerror into libc +- Add libc ABI extension kludge for baseline-violating libdl symbols +- scripts/versions.awk: Add local: * to all version nodes +- Add missing symbols to Version files +- Fix use of __pthread_attr_copy in mq_notify (bug 27896) +- Use __pthread_attr_copy in mq_notify (bug 27896) +- Update floating-point feature test macro handling for C2X +- stdio-common: Remove _IO_vfwscanf +- aarch64: align stack in clone [BZ #27939] +- powerpc: Optimized memcmp for power10 +- x86-64: Align child stack to 16 bytes [BZ #27902] + * Mon May 31 2021 Florian Weimer - 2.33.9000-11 - glibc-sigsetxid-sa_onstack.patch was applied upstream - Auto-sync with upstream branch master, diff --git a/sources b/sources index 9e9164b..123606a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibc-2.33.9000-655-g271ec55d0a.tar.xz) = 7d1605ed459aa2ff389946d600af298c671fa0e06d849ef2f5e352372e0f1775cb8ae6fbfe52edde7314b3077078e4f501d41a7d238033c226b104b129322b76 +SHA512 (glibc-2.33.9000-679-g466c1ea15f.tar.xz) = b000b7ae622ccb3667ce95a6b9ec542b6df140962bb17c1966059b80e7bc3e9751dc7118da3090fcc36d67e5e410fcf855dd28bdc5b9daff484ad583edc0ac8f