Auto-sync with upstream branch release/2.35/master

Upstream commit: cc9a4a664faac44fe62b6300b878cf5be514658b

- elf: Fix memory leak in _dl_find_object_update (#2065675)
- NEWS: Move PLT tracking slowdown to glibc 2.35.
- hppa: Use END instead of PSEUDO_END in swapcontext.S
- hppa: Implement swapcontext in assembler (bug 28960)
- nss: Protect against errno changes in function lookup (bug 28953)
- nss: Do not mention NSS test modules in <gnu/lib-names.h>
- io: Add fsync call in tst-stat
- nptl: Fix cleanups for stack grows up [BZ# 28899]
- hppa: Fix warnings from _dl_lookup_address
- hppa: Revise gettext trampoline design
- hppa: Fix swapcontext
- Fix elf/tst-audit2 on hppa
- hppa: Fix bind-now audit (BZ #28857)
- localedef: Handle symbolic links when generating locale-archive
This commit is contained in:
Florian Weimer 2022-04-13 17:40:11 +02:00
parent bab2cf683b
commit b104e8d4ff
3 changed files with 22 additions and 31 deletions

View File

@ -1,27 +0,0 @@
commit ea89d5bbd9e5e514b606045d909e6ab87d851c88
Author: Arjun Shankar <arjun@redhat.com>
Date: Thu Feb 24 21:43:09 2022 +0100
localedef: Handle symbolic links when generating locale-archive
Whenever locale data for any locale included symbolic links, localedef
would throw the error "incomplete set of locale files" and exclude it
from the generated locale archive. This commit fixes that.
Co-authored-by: Florian Weimer <fweimer@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index 45408c26c169ff05..eeb2fa6ffecd1dba 100644
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -1397,7 +1397,7 @@ add_locales_to_archive (size_t nlist, char *list[], bool replace)
{
char fullname[fnamelen + 2 * strlen (d->d_name) + 7];
- if (d_type == DT_UNKNOWN)
+ if (d_type == DT_UNKNOWN || d_type == DT_LNK)
{
strcpy (stpcpy (stpcpy (fullname, fname), "/"),
d->d_name);

View File

@ -1,4 +1,4 @@
%define glibcsrcdir glibc-2.35-18-g732dd3a63d
%define glibcsrcdir glibc-2.35-32-gcc9a4a664f
%define glibcversion 2.35
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
@ -152,7 +152,7 @@ end \
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
Release: 4%{?dist}
Release: 5%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries.
@ -224,7 +224,6 @@ Patch15: glibc-rh1070416.patch
Patch17: glibc-cs-path.patch
Patch23: glibc-python3.patch
Patch30: glibc-deprecated-selinux-makedb.patch
Patch31: glibc-localedef-handle-symlinks.patch
##############################################################################
# Continued list of core "glibc" package information:
@ -2170,6 +2169,25 @@ update_gconv_modules_cache ()
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog
* Wed Apr 13 2022 Florian Weimer <fweimer@redhat.com> - 2.35-5
- Drop glibc-localedef-handle-symlinks.patch; applied upstream.
- Auto-sync with upstream branch release/2.35/master,
commit cc9a4a664faac44fe62b6300b878cf5be514658b:
- elf: Fix memory leak in _dl_find_object_update (#2065675)
- NEWS: Move PLT tracking slowdown to glibc 2.35.
- hppa: Use END instead of PSEUDO_END in swapcontext.S
- hppa: Implement swapcontext in assembler (bug 28960)
- nss: Protect against errno changes in function lookup (bug 28953)
- nss: Do not mention NSS test modules in <gnu/lib-names.h>
- io: Add fsync call in tst-stat
- nptl: Fix cleanups for stack grows up [BZ# 28899]
- hppa: Fix warnings from _dl_lookup_address
- hppa: Revise gettext trampoline design
- hppa: Fix swapcontext
- Fix elf/tst-audit2 on hppa
- hppa: Fix bind-now audit (BZ #28857)
- localedef: Handle symbolic links when generating locale-archive
* Wed Mar 02 2022 Arjun Shankar <arjun@redhat.com> - 2.35-4
- Reduce installed size of some langpacks by de-duplicating LC_CTYPE.
- Add glibc-localedef-handle-symlinks.patch so localedef can handle symbolic

View File

@ -1 +1 @@
SHA512 (glibc-2.35-18-g732dd3a63d.tar.xz) = 3c8745401f9c6ff8cada19a90671a71477ca81a84dd32d9d079e2a3b2f226d970560c0b3ebaac26442fbed245b3d8a0d776ef9a2e07b1ba05e41ccaa97cc7222
SHA512 (glibc-2.35-32-gcc9a4a664f.tar.xz) = 5ec536c2c91e742fcd6ca56454c31bbfdcece19062f417f2d8ca834c1e7dc32cd348b6fca86f53d13a1e12a918667102f982590c6ac588c2a688b6677cc20956