gentoo resync : 20.10.2021

2 files changed, 40 insertions, 105 deletions

diff --git a/dev-lang/perl/files/perl-5.26.2-hppa.patch b/dev-lang/perl/files/perl-5.26.2-hppa.patch
deleted file mode 100644
index 83ed944353e5..000000000000
--- a/dev-lang/perl/files/perl-5.26.2-hppa.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-https://bugs.gentoo.org/634162
-
-Source:
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869122
-
-Index: perl-5.26.0/op.c
-===================================================================
---- perl-5.26.0.orig/op.c
-+++ perl-5.26.0/op.c
-@@ -14832,6 +14832,7 @@ Perl_custom_op_get_field(pTHX_ const OP
-     SV *keysv;
-     HE *he = NULL;
-     XOP *xop;
-+    XOPRETANY any;
- 
-     static const XOP xop_null = { 0, 0, 0, 0, 0 };
- 
-@@ -14874,58 +14875,37 @@ Perl_custom_op_get_field(pTHX_ const OP
- 	else
- 	    xop = INT2PTR(XOP *, SvIV(HeVAL(he)));
-     }
--    {
--	XOPRETANY any;
--	if(field == XOPe_xop_ptr) {
--	    any.xop_ptr = xop;
--	} else {
--	    const U32 flags = XopFLAGS(xop);
--	    if(flags & field) {
--		switch(field) {
--		case XOPe_xop_name:
--		    any.xop_name = xop->xop_name;
--		    break;
--		case XOPe_xop_desc:
--		    any.xop_desc = xop->xop_desc;
--		    break;
--		case XOPe_xop_class:
--		    any.xop_class = xop->xop_class;
--		    break;
--		case XOPe_xop_peep:
--		    any.xop_peep = xop->xop_peep;
--		    break;
--		default:
--		    NOT_REACHED; /* NOTREACHED */
--		    break;
--		}
--	    } else {
--		switch(field) {
--		case XOPe_xop_name:
--		    any.xop_name = XOPd_xop_name;
--		    break;
--		case XOPe_xop_desc:
--		    any.xop_desc = XOPd_xop_desc;
--		    break;
--		case XOPe_xop_class:
--		    any.xop_class = XOPd_xop_class;
--		    break;
--		case XOPe_xop_peep:
--		    any.xop_peep = XOPd_xop_peep;
--		    break;
--		default:
--		    NOT_REACHED; /* NOTREACHED */
--		    break;
--		}
--	    }
-+
-+    if(field == XOPe_xop_ptr) {
-+        any.xop_ptr = xop;
-+    } else {
-+        const U32 flags = XopFLAGS(xop);
-+        switch(field) {
-+        case XOPe_xop_name:
-+            any.xop_name = (flags & field) ? xop->xop_name : XOPd_xop_name;
-+            break;
-+        case XOPe_xop_desc:
-+            any.xop_desc = (flags & field) ? xop->xop_desc : XOPd_xop_desc;
-+            break;
-+        case XOPe_xop_class:
-+            any.xop_class = (flags & field) ? xop->xop_class : XOPd_xop_class;
-+            break;
-+        case XOPe_xop_peep:
-+            any.xop_peep = (flags & field) ? xop->xop_peep : XOPd_xop_peep;
-+            break;
-+        default:
-+            NOT_REACHED; /* NOTREACHED */
-+            break;
- 	}
--        /* On some platforms (HP-UX, IA64) gcc emits a warning for this function:
--         * op.c: In function 'Perl_custom_op_get_field':
--         * op.c:...: warning: 'any.xop_name' may be used uninitialized in this function [-Wmaybe-uninitialized]
--         * This is because on those platforms (with -DEBUGGING) NOT_REACHED
--         * expands to assert(0), which expands to ((0) ? (void)0 :
--         * __assert(...)), and gcc doesn't know that __assert can never return. */
--	return any;
-     }
-+
-+    /* On some platforms (HP-UX, IA64) gcc emits a warning for this function:
-+     * op.c: In function 'Perl_custom_op_get_field':
-+     * op.c:...: warning: 'any.xop_name' may be used uninitialized in this function [-Wmaybe-uninitialized]
-+     * This is because on those platforms (with -DEBUGGING) NOT_REACHED
-+     * expands to assert(0), which expands to ((0) ? (void)0 :
-+     * __assert(...)), and gcc doesn't know that __assert can never return. */
-+    return any;
- }
- 
- /*
diff --git a/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch b/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch
new file mode 100644
index 000000000000..fc4c55c6899f
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.34.0-gdbm-1.20.patch
@@ -0,0 +1,40 @@
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Wed, 23 Jun 2021 10:26:50 +0300
+Subject: 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).
+
+Origin: backport, https://github.com/Perl/perl5/pull/18924/commits/aacd2398e766500cb5d83c4d76b642fcf31d997a
+Bug: https://github.com/Perl/perl5/issues/18915
+Bug-Debian: https://bugs.debian.org/993514
+---
+ 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 cd0bb6f..494c288 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) {                             \