diff --git a/.gitignore b/.gitignore index db6c057..7364676 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ perl-5.12.1.tar.gz /perl-5.32.0.tar.xz /perl-5.32.1.tar.xz /perl-5.34.0.tar.xz +/perl-5.34.1.tar.xz diff --git a/perl-5.35.1-Fix-GDBM_File-to-compile-with-version-1.20-and-earli.patch b/perl-5.35.1-Fix-GDBM_File-to-compile-with-version-1.20-and-earli.patch deleted file mode 100644 index 6157add..0000000 --- a/perl-5.35.1-Fix-GDBM_File-to-compile-with-version-1.20-and-earli.patch +++ /dev/null @@ -1,40 +0,0 @@ -From aacd2398e766500cb5d83c4d76b642fcf31d997a Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Wed, 23 Jun 2021 10:26:50 +0300 -Subject: [PATCH 1/3] Fix GDBM_File to compile with version 1.20 and earlier - -* ext/GDBM_File/GDBM_File.xs (ITEM_NOT_FOUND): Define conditionally, -depending on the GDBM_VERSION_MAJOR and GDBM_VERSION_MINOR. -Don't assume GDBM_ITEM_NOT_FOUND is a define (it isn't since -gdbm commit d3e27957). ---- - ext/GDBM_File/GDBM_File.xs | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs -index cd0bb6f26f..494c2889ca 100644 ---- a/ext/GDBM_File/GDBM_File.xs -+++ b/ext/GDBM_File/GDBM_File.xs -@@ -145,14 +145,13 @@ output_datum(pTHX_ SV *arg, char *str, int size) - #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt") - #endif - --#ifndef GDBM_ITEM_NOT_FOUND --# define GDBM_ITEM_NOT_FOUND GDBM_NO_ERROR --#endif -- -+#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 - /* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR - if the requested key did not exist */ --#define ITEM_NOT_FOUND() \ -- (gdbm_errno == GDBM_ITEM_NOT_FOUND || gdbm_errno == GDBM_NO_ERROR) -+# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR) -+#else -+# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND) -+#endif - - #define CHECKDB(db) do { \ - if (!db->dbp) { \ --- -2.31.1 - diff --git a/perl-5.35.1-Fix-definition-of-ITEM_NOT_FOUND-for-pre-1.13-versio.patch b/perl-5.35.1-Fix-definition-of-ITEM_NOT_FOUND-for-pre-1.13-versio.patch deleted file mode 100644 index cc0d4de..0000000 --- a/perl-5.35.1-Fix-definition-of-ITEM_NOT_FOUND-for-pre-1.13-versio.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5bc1e5fdd87aa205011512cd1e6cc655bcf677fd Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Wed, 23 Jun 2021 15:31:42 +0300 -Subject: [PATCH 3/3] Fix definition of ITEM_NOT_FOUND for pre-1.13 versions. - ---- - ext/GDBM_File/GDBM_File.xs | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs -index 494c2889ca..0125b5dcac 100644 ---- a/ext/GDBM_File/GDBM_File.xs -+++ b/ext/GDBM_File/GDBM_File.xs -@@ -145,10 +145,11 @@ output_datum(pTHX_ SV *arg, char *str, int size) - #define gdbm_setopt(db,optflag,optval,optlen) not_here("gdbm_setopt") - #endif - --#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 --/* Prior to 1.13, gdbm_fetch family functions set gdbm_errno to GDBM_NO_ERROR -- if the requested key did not exist */ --# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR) -+#if GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR < 13 -+/* Prior to 1.13, only gdbm_fetch set GDBM_ITEM_NOT_FOUND if the requested -+ key did not exist. Other similar functions would set GDBM_NO_ERROR instead. -+ The GDBM_ITEM_NOT_FOUND existed as early as in 1.7.3 */ -+# define ITEM_NOT_FOUND() (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == GDBM_ITEM_NOT_FOUND) - #else - # define ITEM_NOT_FOUND() (gdbm_errno == GDBM_ITEM_NOT_FOUND) - #endif --- -2.31.1 - diff --git a/perl-5.35.1-Raise-version-number-in-ext-GDBM_File-GDBM_File.pm.patch b/perl-5.35.1-Raise-version-number-in-ext-GDBM_File-GDBM_File.pm.patch deleted file mode 100644 index 4013a14..0000000 --- a/perl-5.35.1-Raise-version-number-in-ext-GDBM_File-GDBM_File.pm.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ea57297a58b8f10ab885c19eec48ea076116cc1f Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Wed, 23 Jun 2021 14:24:47 +0300 -Subject: [PATCH 2/3] Raise version number in ext/GDBM_File/GDBM_File.pm - ---- - ext/GDBM_File/GDBM_File.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/GDBM_File/GDBM_File.pm b/ext/GDBM_File/GDBM_File.pm -index d837536f80..cb08d091b8 100644 ---- a/ext/GDBM_File/GDBM_File.pm -+++ b/ext/GDBM_File/GDBM_File.pm -@@ -363,7 +363,7 @@ require XSLoader; - ); - - # This module isn't dual life, so no need for dev version numbers. --$VERSION = '1.19'; -+$VERSION = '1.20'; - - XSLoader::load(); - --- -2.31.1 - diff --git a/perl.spec b/perl.spec index a37f369..f715a14 100644 --- a/perl.spec +++ b/perl.spec @@ -1,4 +1,4 @@ -%global perl_version 5.34.0 +%global perl_version 5.34.1 %global perl_epoch 4 %global perl_arch_stem -thread-multi %global perl_archname %{_arch}-%{_os}%{perl_arch_stem} @@ -168,12 +168,6 @@ Patch12: perl-5.27.8-hints-linux-Add-lphtread-to-lddlflags.patch # Pass the correct CFLAGS to dtrace Patch13: perl-5.28.0-Pass-CFLAGS-to-dtrace.patch -# Fix GDBM_File to compile with gdbm version 1.20 and earlier, GH#18915 -# in upstream after 5.35.1 -Patch14: perl-5.35.1-Fix-GDBM_File-to-compile-with-version-1.20-and-earli.patch -Patch15: perl-5.35.1-Raise-version-number-in-ext-GDBM_File-GDBM_File.pm.patch -Patch16: perl-5.35.1-Fix-definition-of-ITEM_NOT_FOUND-for-pre-1.13-versio.patch - # Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048 Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch @@ -231,7 +225,7 @@ BuildRequires: rsyslog # compat macro needed for rebuild -%global perl_compat perl(:MODULE_COMPAT_5.34.0) +%global perl_compat perl(:MODULE_COMPAT_5.34.1) Requires: %perl_compat Requires: perl-interpreter%{?_isa} = %{perl_epoch}:%{perl_version}-%{release} @@ -412,6 +406,7 @@ Summary: The libraries for the perl run-time License: (GPL+ or Artistic) and BSD and HSRL and MIT and UCD and Public domain # Compat provides Provides: %perl_compat +Provides: perl(:MODULE_COMPAT_5.34.0) # Interpreter version to fulfil required genersted from "require 5.006;" Provides: perl(:VERSION) = %{perl_version} # Integeres are 64-bit on all platforms @@ -2114,8 +2109,8 @@ relative to the bin directory. %package GDBM_File Summary: Perl5 access to the gdbm library License: GPL+ or Artistic -Epoch: 0 -Version: 1.20 +Epoch: 1 +Version: 1.19 Requires: %perl_compat %if %{defined perl_bootstrap} %gendep_perl_GDBM_File @@ -2732,7 +2727,7 @@ encoder/decoder. These encoding methods are specified in RFC 2045 - MIME Summary: What modules are shipped with versions of perl License: GPL+ or Artistic Epoch: 1 -Version: 5.20210520 +Version: 5.20220313 Requires: %perl_compat Requires: perl(List::Util) Requires: perl(version) >= 0.88 @@ -4198,9 +4193,6 @@ you're not running VMS, this module does nothing. %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 %patch200 -p1 %patch201 -p1 @@ -4221,7 +4213,6 @@ perl -x patchlevel.h \ 'Fedora Patch11: Replace EU::MakeMaker dependency with EU::MM::Utils in IPC::Cmd (bug #1129443)' \ 'Fedora Patch12: Link XS modules to pthread library to fix linking with -z defs' \ 'Fedora Patch13: Pass the correct CFLAGS to dtrace' \ - 'Fedora Patch14: Fix GDBM_File to compile with gdbm version 1.20 (bug#1974288)' \ 'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \ 'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \ %{nil} @@ -7000,8 +6991,9 @@ popd # Old changelog entries are preserved in CVS. %changelog -* Thu Mar 03 2022 Michal Josef Špaček - 4:5.34.0-486 +* Tue Mar 15 2022 Michal Josef Špaček - 4:5.34.1-486 - Fix minimal version for Perl debugger +- 5.34.1 bump * Mon Feb 07 2022 Jitka Plesnikova - 4:5.34.0-485 - The test XS-APItest/t/printf.t was fixed by gcc-12.0.1-0.6.fc36 diff --git a/sources b/sources index cca6124..c9aa5bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (perl-5.34.0.tar.xz) = 691b4b31eacec357191fba777612b4e3eae59e946a22998a50766697c0d61db1d42a9b3bc1e41abf0d1ca1893e4a7c06d7bf3290480cf03d7f79befd7a8a3267 +SHA512 (perl-5.34.1.tar.xz) = 9261958291b49eea30c120a89e5ee32dc6a5fd46de4869c89c3d6a4c1162d6cf192ebe429d01a293eda93d8680ce15294af27717fd4ec4c75f511c1fa820fdac