From 5ee16d88bff0c64194fe9bc0bdb0c444636b90062afdf5cbbc6efcacbf6de676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 12 Apr 2024 11:08:53 +0000 Subject: [PATCH] - Revert commit 7af2d2037375d58e700f9e1b217efb2c4db66133 as suggested by upstream perl OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=245 --- perl-locale-backport.diff | 14 ++++++++++++++ perl.changes | 8 ++++++++ perl.spec | 4 +++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 perl-locale-backport.diff diff --git a/perl-locale-backport.diff b/perl-locale-backport.diff new file mode 100644 index 0000000..09c72f5 --- /dev/null +++ b/perl-locale-backport.diff @@ -0,0 +1,14 @@ +--- locale.c.orig 2023-11-28 11:57:28.000000000 +0000 ++++ locale.c 2024-04-12 11:06:26.236116452 +0000 +@@ -5280,11 +5280,6 @@ Perl_init_i18nl10n(pTHX_ int printwarn) + DEBUG_Lv(PerlIO_printf(Perl_debug_log, "created C object %p\n", + PL_C_locale_obj)); + +- /* Switch to using the POSIX 2008 interface now. This would happen below +- * anyway, but deferring it can lead to leaks of memory that would also get +- * malloc'd in the interim */ +- uselocale(PL_C_locale_obj); +- + # ifdef USE_LOCALE_NUMERIC + + PL_underlying_numeric_obj = duplocale(PL_C_locale_obj); diff --git a/perl.changes b/perl.changes index 0a615f7..021f943 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Apr 12 13:06:56 CEST 2024 - mls@suse.de + +- Revert commit 7af2d2037375d58e700f9e1b217efb2c4db66133 as suggested + by upstream perl + * fixed locale being clobbered by perl [bsc#1220195] + * new patch: perl-locale-backport.diff + ------------------------------------------------------------------- Tue Feb 27 15:21:49 UTC 2024 - Dominique Leuenberger diff --git a/perl.spec b/perl.spec index 717b4cc..9989675 100644 --- a/perl.spec +++ b/perl.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -54,6 +54,7 @@ Patch12: perl-reproducible.patch Patch13: perl_skip_flaky_tests_powerpc.patch # PATCH-FIX-UPSTREAM unmerged https://www.nntp.perl.org/group/perl.perl5.porters/2018/12/msg253240.html Patch18: perl-reproducible2.patch +Patch19: perl-locale-backport.diff BuildRequires: db-devel BuildRequires: gdbm-devel BuildRequires: libbz2-devel @@ -190,6 +191,7 @@ cp -p %{SOURCE3} . %patch -P 11 %patch -P 12 -p1 %patch -P 18 +%patch -P 19 %build %define _lto_cflags %{nil}