Accepting request 974828 from home:dstoecker:branches:devel:languages:perl
- Update to 5.34.1 - maintenance release B::Deparse has been upgraded from version 1.56 to 1.57. Encode has been upgraded from version 3.08 to 3.08_01. GDBM_File has been upgraded from version 1.19 to 1.19_01. Module::CoreList has been upgraded from version 5.20210520 to 5.20220313. perl5db.pl has been upgraded from version 1.60 to 1.60_01. - Drop c029d660f2fe60699cf64bbb3fa9f671a1a370d5.patch (upstream) OBS-URL: https://build.opensuse.org/request/show/974828 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=211
This commit is contained in:
		@@ -1,37 +0,0 @@
 | 
			
		||||
From c029d660f2fe60699cf64bbb3fa9f671a1a370d5 Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Sergey Poznyakoff <gray@gnu.org>
 | 
			
		||||
Date: Wed, 23 Jun 2021 00:15:54 +0300
 | 
			
		||||
Subject: [PATCH] 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 cd0bb6f26ff..494c2889ca8 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) {                             \
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								perl-5.34.0.tar.xz
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								perl-5.34.0.tar.xz
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								perl-5.34.1.tar.xz
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								perl-5.34.1.tar.xz
									 (Stored with Git LFS)
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										11
									
								
								perl.changes
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								perl.changes
									
									
									
									
									
								
							@@ -1,3 +1,14 @@
 | 
			
		||||
-------------------------------------------------------------------
 | 
			
		||||
Wed May  4 06:41:37 UTC 2022 - Dirk Stoecker <opensuse@dstoecker.de>
 | 
			
		||||
 | 
			
		||||
- Update to 5.34.1 - maintenance release
 | 
			
		||||
  B::Deparse has been upgraded from version 1.56 to 1.57.
 | 
			
		||||
  Encode has been upgraded from version 3.08 to 3.08_01.
 | 
			
		||||
  GDBM_File has been upgraded from version 1.19 to 1.19_01.
 | 
			
		||||
  Module::CoreList has been upgraded from version 5.20210520 to 5.20220313.
 | 
			
		||||
  perl5db.pl has been upgraded from version 1.60 to 1.60_01.
 | 
			
		||||
- Drop c029d660f2fe60699cf64bbb3fa9f671a1a370d5.patch (upstream)
 | 
			
		||||
 | 
			
		||||
-------------------------------------------------------------------
 | 
			
		||||
Thu Mar  3 13:33:03 UTC 2022 - Andreas Schwab <schwab@suse.de>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										12
									
								
								perl.spec
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								perl.spec
									
									
									
									
									
								
							@@ -21,11 +21,12 @@
 | 
			
		||||
%define name_suffix -%{flavor}
 | 
			
		||||
%endif
 | 
			
		||||
 | 
			
		||||
%define pversion 5.34.0
 | 
			
		||||
%define pversion 5.34.1
 | 
			
		||||
%define compatversion 5.34.0
 | 
			
		||||
# set to %nil when equal to pversion
 | 
			
		||||
%global versionlist %nil
 | 
			
		||||
%global versionlist 5.34.0
 | 
			
		||||
Name:           perl%{?name_suffix}
 | 
			
		||||
Version:        5.34.0
 | 
			
		||||
Version:        5.34.1
 | 
			
		||||
Release:        0
 | 
			
		||||
Summary:        The Perl interpreter
 | 
			
		||||
License:        Artistic-1.0 OR GPL-1.0-or-later
 | 
			
		||||
@@ -50,8 +51,6 @@ Patch11:        perl-5.18.2-overflow.diff
 | 
			
		||||
Patch12:        perl-reproducible.patch
 | 
			
		||||
# PATCH-FIX-OPENSUSE skip flaky tests powerpc as bypass https://bugzilla.suse.com/show_bug.cgi?id=1063176
 | 
			
		||||
Patch13:        perl_skip_flaky_tests_powerpc.patch
 | 
			
		||||
# PATCH-FIX-UPSTREAM https://github.com/Perl/perl5/pull/18919 - Fix build with gdbm 1.20
 | 
			
		||||
Patch15:        https://github.com/Perl/perl5/commit/c029d660f2fe60699cf64bbb3fa9f671a1a370d5.patch
 | 
			
		||||
# PATCH-FIX-UPSTREAM unmerged https://www.nntp.perl.org/group/perl.perl5.porters/2018/12/msg253240.html
 | 
			
		||||
Patch18:        perl-reproducible2.patch
 | 
			
		||||
BuildRequires:  db-devel
 | 
			
		||||
@@ -66,7 +65,7 @@ Requires:       perl-base = %{version}
 | 
			
		||||
Suggests:       perl-doc = %{version}
 | 
			
		||||
Provides:       perl-500
 | 
			
		||||
Provides:       perl-Archive-Tar = 2.38
 | 
			
		||||
Provides:       perl(:MODULE_COMPAT_%{pversion})
 | 
			
		||||
Provides:       perl(:MODULE_COMPAT_%{compatversion})
 | 
			
		||||
Obsoletes:      perl-Archive-Tar <= 2.38
 | 
			
		||||
Provides:       perl-autodie = 2.34
 | 
			
		||||
Obsoletes:      perl-autodie <= 2.34
 | 
			
		||||
@@ -186,7 +185,6 @@ cp -p %{SOURCE3} .
 | 
			
		||||
%patch9 -p1
 | 
			
		||||
%patch11
 | 
			
		||||
%patch12 -p1
 | 
			
		||||
%patch15 -p1
 | 
			
		||||
%patch18
 | 
			
		||||
 | 
			
		||||
%build
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user