diff --git a/.gitignore b/.gitignore index f1c6ce9..4564a94 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ version-0.88.tar.gz /version-0.9921.tar.gz /version-0.9923.tar.gz /version-0.9924.tar.gz +/version-0.9927.tar.gz diff --git a/perl-version.spec b/perl-version.spec index c85a8f2..bc36fe9 100644 --- a/perl-version.spec +++ b/perl-version.spec @@ -7,15 +7,13 @@ Name: perl-version Epoch: 7 -Version: 0.99.24 -%global module_version 0.9924 +Version: 0.99.27 +%global module_version 0.9927 Release: 458%{?dist} Summary: Perl extension for Version Objects License: GPL+ or Artistic URL: https://metacpan.org/release/version -Source0: https://cpan.metacpan.org/authors/id/J/JP/JPEACOCK/version-%{module_version}.tar.gz -# Do not clobber memory when switching a locale, Perl GH#17054, in Perl 5.31.5 -Patch0: version-0.9924-ensure-locale_name_on_entry-isn-t-clobbered.patch +Source0: https://cpan.metacpan.org/authors/id/L/LE/LEONT/version-%{module_version}.tar.gz # Build BuildRequires: findutils BuildRequires: gcc @@ -41,13 +39,13 @@ BuildRequires: perl(warnings) BuildRequires: perl(warnings::register) BuildRequires: perl(XSLoader) # Tests only +BuildRequires: perl(base) BuildRequires: perl(Data::Dumper) BuildRequires: perl(File::Basename) BuildRequires: perl(File::Spec) BuildRequires: perl(IO::Handle) BuildRequires: perl(lib) BuildRequires: perl(List::Util) -BuildRequires: perl(parent) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) >= 0.45 # Optional tests @@ -76,7 +74,6 @@ strongly urged to set 0.77 as a minimum in your code. %prep %setup -q -n version-%{module_version} -%patch0 -p1 %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" UNINST=0 NO_PACKLIST=1 NO_PERLLOCAL=1 @@ -104,6 +101,9 @@ make test %{_mandir}/man3/version::Internals.3pm* %changelog +* Fri Aug 21 2020 Jitka Plesnikova - 7:0.99.27-1 +- 0.9927 bump + * Tue Jul 28 2020 Fedora Release Engineering - 7:0.99.24-458 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index c74f6d6..881a98e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (version-0.9924.tar.gz) = 49cc41d97175bf4367e95b74392908b3d798b0743add356f31f4ffb9fda5560f259c9ab7ee4ab7fecf84b8bc0cf0ac508506dbbe5c474af5233cb60c523528e7 +SHA512 (version-0.9927.tar.gz) = 1f2eff7a7f1455f4ec8751657663ffd6c21acd4644c85833f63f0141eea21b7b6008a381e260064a25943e8e4a85ca3cf94efe6165db2393d4cc054e699b93ee diff --git a/version-0.9924-ensure-locale_name_on_entry-isn-t-clobbered.patch b/version-0.9924-ensure-locale_name_on_entry-isn-t-clobbered.patch deleted file mode 100644 index 97aef57..0000000 --- a/version-0.9924-ensure-locale_name_on_entry-isn-t-clobbered.patch +++ /dev/null @@ -1,65 +0,0 @@ -From eecfc44fbd6659ed35719038ecf2b029fe20cfd5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 25 Nov 2019 16:48:33 +0100 -Subject: [PATCH] Subject: [PATCH] ensure locale_name_on_entry isn't clobbered -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If the return value of setlocale() is static storage, the call to -setlocale(LC_NUMERIC, "C"); could overwrite it. - -If the return value of setlocale() is malloced, the call to -setlocale(LC_NUMERIC, "C"); could free it. - -Either way, we need to copy it. Fixes gh #17054 rt134212 - -Petr Písař: Ported to version-0.9924 from perl commit -bcb1da5c29c3a2534a0e43874974b83c9c8b174c. - -Signed-off-by: Petr Písař ---- - vutil/vutil.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/vutil/vutil.c b/vutil/vutil.c -index 5d183a0..69c8351 100644 ---- a/vutil/vutil.c -+++ b/vutil/vutil.c -@@ -638,6 +638,8 @@ VER_NV: - if ( strNE(locale_name_on_entry, "C") - && strNE(locale_name_on_entry, "POSIX")) - { -+ /* the setlocale() call might free or overwrite the name */ -+ locale_name_on_entry = savepv(locale_name_on_entry); - setlocale(LC_NUMERIC, "C"); - } - else { /* This value indicates to the restore code that we didn't -@@ -661,6 +663,8 @@ VER_NV: - if ( strNE(locale_name_on_entry, "C") - && strNE(locale_name_on_entry, "POSIX")) - { -+ /* the setlocale() call might free or overwrite the name */ -+ locale_name_on_entry = savepv(locale_name_on_entry); - setlocale(LC_NUMERIC, "C"); - } - else { /* This value indicates to the restore code that we -@@ -710,6 +714,7 @@ VER_NV: - - if (locale_name_on_entry) { - setlocale(LC_NUMERIC, locale_name_on_entry); -+ Safefree(locale_name_on_entry); - } - - LC_NUMERIC_UNLOCK; /* End critical section */ -@@ -718,6 +723,7 @@ VER_NV: - - if (locale_name_on_entry) { - setlocale(LC_NUMERIC, locale_name_on_entry); -+ Safefree(locale_name_on_entry); - LC_NUMERIC_UNLOCK; - } - else if (locale_obj_on_entry == PL_underlying_numeric_obj) { --- -2.21.0 -