From: Peter Michael Green Date: Thu, 3 Feb 2022 11:21:15 +0000 (+0000) Subject: Manual merge of version 2.32-4+rpi1 and 2.33-5 to produce 2.33-5+rpi1 X-Git-Tag: raspbian/2.33-5+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=27e0aa6005b9062562554d2708400a65e7ae4a57;p=glibc.git Manual merge of version 2.32-4+rpi1 and 2.33-5 to produce 2.33-5+rpi1 --- 0f5c5562ae0c5c8d9a9304a05a429923f60f60c9 diff --cc debian/changelog index aadccac49,08b144f5b..7d4a514c9 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,213 +1,226 @@@ - glibc (2.32-4+rpi1) bookworm-staging; urgency=medium ++glibc (2.33-5+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 2.25-2+rpi1 by Peter Michael Green at Wed, 29 Nov 2017 03:00:21 +0000] + * Disable testsuite. + + [changes introduced in 2.32-4+rpi1 by Peter Michale Green] + * Change mode on sysdeps/x86_64/configure to 644, dgit does + like modes being changed by patches, the corresponding files + for other architectures are all 644 and we don't really care + about x86-64 in raspbian anyway. + - -- Peter Michael Green Sat, 25 Sep 2021 12:22:52 +0000 ++ -- Peter Michael Green Thu, 03 Feb 2022 11:20:32 +0000 ++ + glibc (2.33-5) unstable; urgency=medium + + * debian/patches/git-updates.diff: update from upstream stable branch: + - Fix build failure on hppa and ia64. Closes: #1004390. + - Fix autopkgtest failure on arm64. + + -- Aurelien Jarno Wed, 26 Jan 2022 23:01:02 +0100 + + glibc (2.33-4) unstable; urgency=medium + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch: + - Fix FTBFS on powerpc and ppc64 with recent binutils snapshots. + - Fix autopkgtest on armhf. + - Fix an unexpected return value from realpath() for too long results + (CVE-2021-3998). + - Fix a an off-by-one buffer overflow/underflow in getcwd() + (CVE-2021-3999). + - debian/patches/any/local-ldso-disable-hwcap.diff: rebase. + + [ Samuel Thibault ] + * debian/patches/hurd-i386/git-pthread_kill_exited.diff: Fix pthread_kill on + exiting/ted thread. + * debian/patches/hurd-i386/git-reply_bogus.diff: Fix cleaning the reply + port. + + -- Aurelien Jarno Tue, 25 Jan 2022 00:13:12 +0100 + + glibc (2.33-3) unstable; urgency=medium + + [ Samuel Thibault ] + * debian/patches/hurd-i386/git-ttydefaults.diff: New patch to fix default + character for termio cc[VSTATE]. + * debian/patches/hurd-i386/git-const.diff: Constify RPCs server-side. + - debian/control: Bump mig build-dep accordingly. + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch: + - Fix FTBFS on ppc64el with recent binutils snapshots. Closes: #1003847. + - Fix crashes in bzero/memset on i386 with SSE2 when the cache size cannot + be determined. Closes: #1003574, #1003610. + - Fix a buffer overflow in sunrpc svcunix_create (CVE-2022-23218). + - Fix a buffer overflow in sunrpc clnt_create (CVE-2022-23219). + + [ Gunnar Hjalmarsson ] + * debian/local/usr_sbin/update-locale: tweak validation of args to + update-locale(). + + -- Aurelien Jarno Tue, 18 Jan 2022 19:06:44 +0100 + + glibc (2.33-2) unstable; urgency=medium + + [ Samuel Thibault ] + * debian/patches/hurd-i386/unsubmitted-getaux_at_secure.diff: Fix according + to new __getauxval2 function. + * debian/libc0.3.symbols.hurd-i386: Add vm_region_create_proxy. + * debian/patches/hurd-i386/git-lib-map.diff: Unlock libraries load + addresses. + * debian/patches/hurd-i386/git-large-text.diff: Fix clang startup. + * debian/patches/hurd-i386/git-get_dtable.diff: Implement msg_get_dtable. + * debian/patches/hurd-i386/git-auth-leak.diff: Fix auth port leaks. + * debian/patches/hurd-i386/git-nuke_ports_on_exec.diff: Fix ports leaks. + * debian/testsuite-xfail-debian.mk: Update hurd tests. + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch: + - Fix syscall() on ppc64 with POWER9 CPUs. Closes: #1003201. + + -- Aurelien Jarno Thu, 06 Jan 2022 22:32:53 +0100 + + glibc (2.33-1) unstable; urgency=medium + + * Upload to unstable. + * debian/control.in/libc: drop ${locale-compat:Depends} leftover from + Provides. + * debian/patches/any/submitted-localedef-check-magic.patch: rename into + git-localedef-check-magic.patch. + + -- Aurelien Jarno Sun, 12 Dec 2021 12:04:30 +0100 + + glibc (2.33-0experimental3) experimental; urgency=medium + + [ Samuel Thibault ] + * debian/testsuite-xfail-debian.mk: Update hurd tests. + * debian/debhelper.in/libc.preinst: Require gnumach kernel >= + 1.8+git20210923 for the xrstor fix, needed for the ifunc-optimized memcpy + etc. + * debian/patches/hurd-i386/git-htl-init_sigset.diff: Fix sudo. + + [ Aurelien Jarno ] + * debian/debhelper.in/libc-dev{,-alt}.install, debian/rules.d/build.mk: + install an empty libpthread_nonshared.a to support broken closed source + software. Closes: #971273. + * debian/sysdeps/arm64.mk: enable Memory Tagging Extension (MTE) (heap) + checking on arm64. Closes: #995269. + * debian/patches/git-updates.diff: update from upstream stable branch. + * debian/patches/any/local-revert-bz13979.diff: re-add patch removed in + 2.33-0experimental0, but limited to removing the warning when + optimizations are disabled and _FORTIFY_SOURCE > 0. At least cgo and + gnucobol3 always invoke the compiler with _FORTIFY_SOURCE > 0, even when + the optimizations are disabled. + + -- Aurelien Jarno Sun, 05 Dec 2021 19:12:47 +0100 + + glibc (2.33-0experimental2) experimental; urgency=medium + + [ Samuel Thibault ] + * debian/testsuite-xfail-debian.mk: Update hurd tests. + * debian/patches/hurd-i386/tg-sysvshm.diff: Fix spurious plt. + + -- Aurelien Jarno Wed, 22 Sep 2021 22:09:53 +0200 + + glibc (2.33-0experimental1) experimental; urgency=medium + + [ Samuel Thibault ] + * debian/testsuite-xfail-debian.mk: Update hurd tests. + + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch. + + -- Aurelien Jarno Wed, 15 Sep 2021 07:56:46 +0200 + + glibc (2.33-0experimental0) experimental; urgency=medium + + [ Aurelien Jarno ] + * New upstream release: + - debian/symbols.wildcard: add 2.33. + - debian/sysdeps/hurd-i386.mk: do not disable ifunc on hurd-i386, it is + now supported. + - debian/patches/alpha/local-string-functions.diff: upstreamed. + - debian/patches/hppa/git-fcntl.h-update.diff: rebased. + - debian/patches/hurd-i386/git-posix_openpt.diff: upstreamed. + - debian/patches/hurd-i386/git-hurdsig-SA_SIGINFO.diff: upstreamed. + - debian/patches/hurd-i386/git-sbrk-end.diff: upstreamed. + - debian/patches/hurd-i386/git-sigstate_thread_reference.diff: upstreamed. + - debian/patches/hurd-i386/git-sched_sets.diff: upstreamed. + - debian/patches/hurd-i386/git-sched_gets_hidden.diff: upstreamed. + - debian/patches/hurd-i386/git-bsd4.3-ioctls.diff: upstreamed. + - debian/patches/hurd-i386/git-clock-cputime.diff: upstreamed. + - debian/patches/hurd-i386/git-WAIT.diff: upstreamed. + - debian/patches/hurd-i386/git-cthreads.diff: upstreamed. + - debian/patches/hurd-i386/git-cthreads-symbols.diff: upstreamed. + - debian/patches/hurd-i386/git-libpthread_plt.diff: upstreamed. + - debian/patches/hurd-i386/git-lll-initializer.diff: upstreamed. + - debian/patches/hurd-i386/git-lll-ptr.diff: upstreamed. + - debian/patches/hurd-i386/git-ld-library-path-checks.diff: upstreamed. + - debian/patches/hurd-i386/git-lll-wait-intr.diff: upstreamed. + - debian/patches/hurd-i386/git-lll-private.diff: upstreamed. + - debian/patches/hurd-i386/git-futex-internal.diff: upstreamed. + - debian/patches/hurd-i386/git-libc-open.diff: upstreamed. + - debian/patches/hurd-i386/git-sem-pshared.diff: upstreamed. + - debian/patches/hurd-i386/git-sem-open-init.diff: upstreamed. + - debian/patches/hurd-i386/git-sem-open.diff: upstreamed. + - debian/patches/hurd-i386/git-siginfo_uesp.diff: upstreamed. + - debian/patches/hurd-i386/git-mmap-EINVAL.diff: upstreamed. + - debian/patches/hurd-i386/git-waitid.diff: upstreamed. + - debian/patches/hurd-i386/git-hurd-version.diff: upstreamed. + - debian/patches/hurd-i386/git-mmap_addr.diff: upstreamed. + - debian/patches/hurd-i386/git-ELF_MACHINE_USER_ADDRESS_MASK.diff: + upstreamed. + - debian/patches/hurd-i386/git-drop-rmh.diff: rebased. + - debian/patches/hurd-i386/local-enable-ldconfig.diff: rebased. + - debian/patches/hurd-i386/tg-EIEIO-fr.diff: rebased. + - debian/patches/hurd-i386/tg-EGREGIOUS-fr.diff: rebased. + - debian/patches/i386/unsubmitted-quiet-ldconfig.diff: rebased. + - debian/patches/kfreebsd/submitted-auxv.diff: rebased. + - debian/patches/kfreebsd/local-no-execfn.diff: rebased. + - debian/patches/riscv64/git-riscv64-gnu-ifunc.diff: upstreamed. + - debian/patches/all/local-ldd.diff: updated to take into account the new + exit values returned by ld.so. Closes: #982203. + - debian/local/etc/nss: import latest version from upstream and keep + installing it in /etc/defaults/nss, until we find a way to move this + file to the libnss-nis package. + - debian/patches/all/local-nis-shadow.diff: removed, obsolete. + - debian/patches/all/submitted-po-fr-fixes.diff: rebased. + - debian/patches/any/local-ldso-disable-hwcap.diff: rebased. + - debian/patches/any/local-nss-upgrade.diff: removed, obsolete. The patch + was added to prepare the upgrade from glibc 2.2.X to 2.3.X, but has never + been useful due to a typo in the NSS module name. In addition the new NSS + code is able to use an in-memory version of a module if it has been + removed from disk. + - debian/patches/any/local-revert-bz13979.diff: removed, obsolete. 8+ + years after, AC macros should have been fixed. + - debian/patches/any/git-ld.so-cache-endianness-markup.diff: upstreamed. + - debian/patches/hurd-i386/submitted-net.diff: rebased. + - debian/patches/hurd-i386/unsubmitted-getaux_at_secure.diff: rebased. + - debian/debhelper.in/libc-bin.install: move zdump to /usr/bin. + + [ Samuel Thibault ] + * debian/testsuite-xfail-debian.mk: Update tests. + + -- Aurelien Jarno Mon, 06 Sep 2021 07:03:55 +0200 + + glibc (2.32-5) unstable; urgency=medium + + [ Aurelien Jarno ] + * debian/control.in/libc: add a breaks against tinydns (<< 1:1.05-14). + Closes: #997912. + * debian/debhelper.in/libc-bin.postinst: stop replacing older versions from + /etc/nsswitch.conf. Closes: #998008. + * debian/patches/git-updates.diff: update from upstream stable branch: + - Fix bad conversion from ISO-2022-JP-3 with iconv (CVE-2021-43396). + Closes: #998622. + * debian/control.in/main: rename libselinux-dev build-dependency into + libselinux1-dev. + * debian/patches/any/submitted-localedef-check-magic.patch: new patch to + display a proper error message for bad locale-archive files. Closes: + #993772. + + -- Aurelien Jarno Sun, 05 Dec 2021 16:46:21 +0100 glibc (2.32-4) unstable; urgency=medium diff --cc debian/patches/git-updates.diff index 28614ee5d,e2323104c..9f3ca126c --- a/debian/patches/git-updates.diff +++ b/debian/patches/git-updates.diff @@@ -6064,135 -6894,10 +6894,8 @@@ index 0000000000..642dbde5d +} + +#include - diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile - index a6736aef25..9736a13e7b 100644 - --- a/sysdeps/x86/Makefile - +++ b/sysdeps/x86/Makefile - @@ -12,6 +12,12 @@ endif - ifeq ($(subdir),setjmp) - gen-as-const-headers += jmp_buf-ssp.sym - sysdep_routines += __longjmp_cancel - +ifneq ($(enable-cet),no) - +ifneq ($(have-tunables),no) - +tests += tst-setjmp-cet - +tst-setjmp-cet-ENV = GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on - +endif - +endif - endif - - ifeq ($(subdir),string) - diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c - index 217c21c34f..3fb4a028d8 100644 - --- a/sysdeps/x86/cacheinfo.c - +++ b/sysdeps/x86/cacheinfo.c - @@ -808,7 +808,7 @@ init_cacheinfo (void) - threads = 1 << ((ecx >> 12) & 0x0f); - } - - - if (threads == 0) - + if (threads == 0 || cpu_features->basic.family >= 0x17) - { - /* If APIC ID width is not available, use logical - processor count. */ - @@ -823,8 +823,22 @@ init_cacheinfo (void) - if (threads > 0) - shared /= threads; - - - /* Account for exclusive L2 and L3 caches. */ - - shared += core; - + /* Get shared cache per ccx for Zen architectures. */ - + if (cpu_features->basic.family >= 0x17) - + { - + unsigned int eax; - + - + /* Get number of threads share the L3 cache in CCX. */ - + __cpuid_count (0x8000001D, 0x3, eax, ebx, ecx, edx); - + - + unsigned int threads_per_ccx = ((eax >> 14) & 0xfff) + 1; - + shared *= threads_per_ccx; - + } - + else - + { - + /* Account for exclusive L2 and L3 caches. */ - + shared += core; - + } - } - } - - @@ -854,14 +868,20 @@ init_cacheinfo (void) - __x86_shared_cache_size = shared; - } - - - /* The large memcpy micro benchmark in glibc shows that 6 times of - - shared cache size is the approximate value above which non-temporal - - store becomes faster on a 8-core processor. This is the 3/4 of the - - total shared cache size. */ - + /* The default setting for the non_temporal threshold is 3/4 of one - + thread's share of the chip's cache. For most Intel and AMD processors - + with an initial release date between 2017 and 2020, a thread's typical - + share of the cache is from 500 KBytes to 2 MBytes. Using the 3/4 - + threshold leaves 125 KBytes to 500 KBytes of the thread's data - + in cache after a maximum temporal copy, which will maintain - + in cache a reasonable portion of the thread's stack and other - + active data. If the threshold is set higher than one thread's - + share of the cache, it has a substantial risk of negatively - + impacting the performance of other threads running on the chip. */ - __x86_shared_non_temporal_threshold - = (cpu_features->non_temporal_threshold != 0 - ? cpu_features->non_temporal_threshold - - : __x86_shared_cache_size * threads * 3 / 4); - + : __x86_shared_cache_size * 3 / 4); - - /* NB: The REP MOVSB threshold must be greater than VEC_SIZE * 8. */ - unsigned int minimum_rep_movsb_threshold; - diff --git a/sysdeps/x86/dl-cet.c b/sysdeps/x86/dl-cet.c - index 03572f7af6..3cc54a8d53 100644 - --- a/sysdeps/x86/dl-cet.c - +++ b/sysdeps/x86/dl-cet.c - @@ -47,7 +47,10 @@ dl_cet_check (struct link_map *m, const char *program) - /* No legacy object check if both IBT and SHSTK are always on. */ - if (enable_ibt_type == cet_always_on - && enable_shstk_type == cet_always_on) - - return; - + { - + THREAD_SETMEM (THREAD_SELF, header.feature_1, GL(dl_x86_feature_1)); - + return; - + } - - /* Check if IBT is enabled by kernel. */ - bool ibt_enabled - diff --git a/sysdeps/x86/dl-prop.h b/sysdeps/x86/dl-prop.h - index 89911e19e2..4eb3b85a7b 100644 - --- a/sysdeps/x86/dl-prop.h - +++ b/sysdeps/x86/dl-prop.h - @@ -145,15 +145,15 @@ _dl_process_cet_property_note (struct link_map *l, - } - - static inline void __attribute__ ((unused)) - -_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph) - +_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph) - { - const ElfW(Nhdr) *note = (const void *) (ph->p_vaddr + l->l_addr); - _dl_process_cet_property_note (l, note, ph->p_memsz, ph->p_align); - } - - static inline int __attribute__ ((always_inline)) - -_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz, - - void *data) - +_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type, - + uint32_t datasz, void *data) - { - return 0; - } - diff --git a/sysdeps/x86/tst-setjmp-cet.c b/sysdeps/x86/tst-setjmp-cet.c - new file mode 100644 - index 0000000000..42c795d2a8 - --- /dev/null - +++ b/sysdeps/x86/tst-setjmp-cet.c - @@ -0,0 +1 @@ - +#include diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure -old mode 100644 -new mode 100755 -index 198554d788..75c96d60d4 +index 84f82c2406..fc1840e23f --- a/sysdeps/x86_64/configure +++ b/sysdeps/x86_64/configure @@ -107,39 +107,6 @@ if test x"$build_mathvec" = xnotset; then diff --cc sysdeps/x86_64/configure index fc1840e23,75c96d60d..75c96d60d mode 100644,100755..100644 --- a/sysdeps/x86_64/configure +++ b/sysdeps/x86_64/configure