From 9c6161ae38806dd288ba9c7c3b6efdf0b378a65e Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 11 Sep 2024 19:50:15 +0100 Subject: [PATCH 1/2] sys-libs/glibc: fix invalid free in stdio for 2.40 Pull it in as an emergency patch in files/ for 2.40-r1 and revbump to 2.40-r2. Other branches were affected briefly upstream but we hadn't pulled those in yet. Closes: https://bugs.gentoo.org/939446 Bug: https://sourceware.org/PR32164 Signed-off-by: Sam James --- .../glibc/files/glibc-2.40-libio-legacy.patch | 30 +++++++++++++++++++ ...bc-2.40-r1.ebuild => glibc-2.40-r2.ebuild} | 1 + 2 files changed, 31 insertions(+) create mode 100644 sys-libs/glibc/files/glibc-2.40-libio-legacy.patch rename sys-libs/glibc/{glibc-2.40-r1.ebuild => glibc-2.40-r2.ebuild} (99%) diff --git a/sys-libs/glibc/files/glibc-2.40-libio-legacy.patch b/sys-libs/glibc/files/glibc-2.40-libio-legacy.patch new file mode 100644 index 0000000000000..e0b3b6c354559 --- /dev/null +++ b/sys-libs/glibc/files/glibc-2.40-libio-legacy.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/939446 +https://sourceware.org/PR32164 +https://sourceware.org/git/?p=glibc.git;a=commit;h=7073164add3b874cf0c19ca0fb84236f6bb0985d + +From 7073164add3b874cf0c19ca0fb84236f6bb0985d Mon Sep 17 00:00:00 2001 +From: Siddhesh Poyarekar +Date: Tue, 3 Sep 2024 14:58:33 -0400 +Subject: [PATCH] libio: Attempt wide backup free only for non-legacy code + +_wide_data and _mode are not available in legacy code, so do not attempt +to free the wide backup buffer in legacy code. + +Resolves: BZ #32137 and BZ #27821 + +Signed-off-by: Siddhesh Poyarekar +Reviewed-by: Florian Weimer +(cherry picked from commit ae4d44b1d501421ad9a3af95279b8f4d1546f1ce) +--- a/libio/genops.c ++++ b/libio/genops.c +@@ -819,7 +819,7 @@ _IO_unbuffer_all (void) + /* Free up the backup area if it was ever allocated. */ + if (_IO_have_backup (fp)) + _IO_free_backup_area (fp); +- if (fp->_mode > 0 && _IO_have_wbackup (fp)) ++ if (!legacy && fp->_mode > 0 && _IO_have_wbackup (fp)) + _IO_free_wbackup_area (fp); + + if (! (fp->_flags & _IO_UNBUFFERED) +-- +2.43.5 diff --git a/sys-libs/glibc/glibc-2.40-r1.ebuild b/sys-libs/glibc/glibc-2.40-r2.ebuild similarity index 99% rename from sys-libs/glibc/glibc-2.40-r1.ebuild rename to sys-libs/glibc/glibc-2.40-r2.ebuild index 1c018dc68f75d..e0f6fc6aebc8e 100644 --- a/sys-libs/glibc/glibc-2.40-r1.ebuild +++ b/sys-libs/glibc/glibc-2.40-r2.ebuild @@ -979,6 +979,7 @@ src_prepare() { fi einfo "Applying Gentoo Glibc patchset ${patchsetname}" eapply "${WORKDIR}"/patches + eapply "${FILESDIR}"/${P}-libio-legacy.patch einfo "Done." fi From 3d29aec46e21a2ce66b39dc08ea8b559943520d2 Mon Sep 17 00:00:00 2001 From: Andrei Horodniceanu Date: Wed, 11 Sep 2024 19:27:31 +0300 Subject: [PATCH 2/2] dev-lang/perl: fix compilation in EPREFIX bootstrap Closes: https://bugs.gentoo.org/939014 Signed-off-by: Andrei Horodniceanu Closes: https://github.com/gentoo/gentoo/pull/38568 Signed-off-by: Sam James --- ...ix-compilation-in-eprefix-bug-939014.patch | 51 +++++++++++++++++++ dev-lang/perl/perl-5.40.0.ebuild | 4 ++ 2 files changed, 55 insertions(+) create mode 100644 dev-lang/perl/files/perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch diff --git a/dev-lang/perl/files/perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch b/dev-lang/perl/files/perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch new file mode 100644 index 0000000000000..3362947876b14 --- /dev/null +++ b/dev-lang/perl/files/perl-5.40.0-fix-compilation-in-eprefix-bug-939014.patch @@ -0,0 +1,51 @@ +https://bugs.gentoo.org/939014 +https://github.com/Perl/perl5/pull/22569 + +From bd0ab509f890a6638bd5033ef58526f8c74f7e4b Mon Sep 17 00:00:00 2001 +From: Andrei Horodniceanu +Date: Wed, 4 Sep 2024 12:46:44 +0300 +Subject: [PATCH] locale.c: Fix compilation on platforms with only a C locale + +Signed-off-by: Andrei Horodniceanu +--- a/AUTHORS ++++ b/AUTHORS +@@ -103,6 +103,7 @@ Andreas König + Andreas Marienborg + Andreas Schwab + Andreas Voegele ++Andrei Horodniceanu + Andrei Yelistratov + Andrej Borsenkow + Andrew Bettison +--- a/locale.c ++++ b/locale.c +@@ -8963,6 +8963,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn) + * categories into our internal indices. */ + if (map_LC_ALL_position_to_index[0] == LC_ALL_INDEX_) { + ++# ifdef PERL_LC_ALL_CATEGORY_POSITIONS_INIT + /* Use this array, initialized by a config.h constant */ + int lc_all_category_positions[] = PERL_LC_ALL_CATEGORY_POSITIONS_INIT; + STATIC_ASSERT_STMT( C_ARRAY_LENGTH(lc_all_category_positions) +@@ -8975,6 +8976,21 @@ Perl_init_i18nl10n(pTHX_ int printwarn) + map_LC_ALL_position_to_index[i] = + get_category_index(lc_all_category_positions[i]); + } ++# else ++ /* It is possible for both PERL_LC_ALL_USES_NAME_VALUE_PAIRS and ++ * PERL_LC_ALL_CATEGORY_POSITIONS_INIT not to be defined, e.g. on ++ * systems with only a C locale during ./Configure. Assume that this ++ * can only happen as part of some sort of bootstrapping so allow ++ * compilation to succeed by ignoring correctness. ++ */ ++ for (unsigned int i = 0; ++ i < C_ARRAY_LENGTH(map_LC_ALL_position_to_index); ++ i++) ++ { ++ map_LC_ALL_position_to_index[i] = 0; ++ } ++# endif ++ + } + + LOCALE_UNLOCK; diff --git a/dev-lang/perl/perl-5.40.0.ebuild b/dev-lang/perl/perl-5.40.0.ebuild index cd9a0e1fd69ea..92d162e038f94 100644 --- a/dev-lang/perl/perl-5.40.0.ebuild +++ b/dev-lang/perl/perl-5.40.0.ebuild @@ -81,6 +81,10 @@ PDEPEND=" ) " +PATCHES=( + "${FILESDIR}/${P}-fix-compilation-in-eprefix-bug-939014.patch" +) + # bug 390719, bug 523624 # virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker