2a30b8f4b2
Upstream commit: dcaf51b41e259387602774829c45222d0507f90a - elf: Change ldconfig auxcache magic number (bug 32231) - Make tst-strtod-underflow type-generic - Add crt1-2.0.o for glibc 2.0 compatibility tests - Add tests of more strtod special cases - Add more tests of strtod end pointer - Make tst-strtod2 and tst-strtod5 type-generic - powerpc64le: Build new strtod tests with long double ABI flags (bug 32145) - Do not set errno for overflowing NaN payload in strtod/nan (bug 32045) - Improve NaN payload testing - Make __strtod_internal tests type-generic - Fix strtod subnormal rounding (bug 30220) - More thoroughly test underflow / errno in tst-strtod-round - Test errno setting on strtod overflow in tst-strtod-round - Add tests of fread - stdio-common: Add new test for fdopen - libio: Attempt wide backup free only for non-legacy code - debug: Fix read error handling in pcprofiledump - elf: Fix tst-dlopen-tlsreinit1.out test dependency - elf: Avoid re-initializing already allocated TLS in dlopen (bug 31717) - elf: Clarify and invert second argument of _dl_allocate_tls_init - elf: Support recursive use of dynamic TLS in interposed malloc - nptl: Use <support/check.h> facilities in tst-setuid3 - posix: Use <support/check.h> facilities in tst-truncate and tst-truncate64 - ungetc: Fix backup buffer leak on program exit [BZ #27821] - ungetc: Fix uninitialized read when putting into unused streams [BZ #27821] - Make tst-ungetc use libsupport - stdio-common: Add test for vfscanf with matches longer than INT_MAX [BZ #27650] - support: Add FAIL test failure helper - string: strerror, strsignal cannot use buffer after dlmopen (bug 32026) - Define __libc_initial for the static libc - x86: Fix bug in strchrnul-evex512 [BZ #32078] - Adjust check-local-headers test for libaudit 4.0 - x32/cet: Support shadow stack during startup for Linux 6.10 - x86-64: Remove sysdeps/x86_64/x32/dl-machine.h - support: Add options list terminator to the test driver - manual/stdio: Further clarify putc, putwc, getc, and getwc - Fix name space violation in fortify wrappers (bug 32052) - resolv: Fix tst-resolv-short-response for older GCC (bug 32042) - Add mremap tests - mremap: Update manual entry - linux: Update the mremap C implementation [BZ #31968] - Enhanced test coverage for strncmp, wcsncmp - Enhance test coverage for strnlen, wcsnlen Resolves: RHEL-57776 Resolves: RHEL-57777 Resolves: RHEL-61392
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
commit dcaf51b41e259387602774829c45222d0507f90a
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Mon Oct 28 14:45:30 2024 +0100
|
|
|
|
elf: Change ldconfig auxcache magic number (bug 32231)
|
|
|
|
In commit c628c2296392ed3bf2cb8d8470668e64fe53389f (elf: Remove
|
|
ldconfig kernel version check), the layout of auxcache entries
|
|
changed because the osversion field was removed from
|
|
struct aux_cache_file_entry. However, AUX_CACHEMAGIC was not
|
|
changed, so existing files are still used, potentially leading
|
|
to unintended ldconfig behavior. This commit changes AUX_CACHEMAGIC,
|
|
so that the file is regenerated.
|
|
|
|
Reported-by: DJ Delorie <dj@redhat.com>
|
|
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
(cherry picked from commit 0a536f6e2f76e3ef581b3fd9af1e5cf4ddc7a5a2)
|
|
|
|
diff --git a/elf/cache.c b/elf/cache.c
|
|
index 8a618e11fa414abb..62d681df42746d55 100644
|
|
--- a/elf/cache.c
|
|
+++ b/elf/cache.c
|
|
@@ -820,7 +820,7 @@ struct aux_cache_entry
|
|
struct aux_cache_entry *next;
|
|
};
|
|
|
|
-#define AUX_CACHEMAGIC "glibc-ld.so.auxcache-1.0"
|
|
+#define AUX_CACHEMAGIC "glibc-ld.so.auxcache-2.0"
|
|
|
|
struct aux_cache_file_entry
|
|
{
|