From a81a2b456b748b1e29983dbfe26ebbb1d8a02dbc Mon Sep 17 00:00:00 2001
From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org>
Date: Wed, 22 May 2024 17:44:43 +0000
Subject: [PATCH] main/postgresql15: rebuild against perl 5.40.0

---
 main/postgresql15/APKBUILD                    |  4 ++-
 .../fix-test-plperl-5.8-pragma.patch          | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 main/postgresql15/fix-test-plperl-5.8-pragma.patch

diff --git a/main/postgresql15/APKBUILD b/main/postgresql15/APKBUILD
index a17386aa94b..4a9d9781261 100644
--- a/main/postgresql15/APKBUILD
+++ b/main/postgresql15/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 _pkgname=postgresql
 pkgver=15.7
-pkgrel=0
+pkgrel=1
 _majorver=${pkgver%%[_.]*}
 # Should this aport provide libpq* and libecpg*? true/false
 # Exactly one postgresql aport must be the default one!
@@ -86,6 +86,7 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz
 	icu-collations-hack.patch
 	fix-test-check_guc.patch
 	fix-test-postgres_fdw.patch
+	fix-test-plperl-5.8-pragma.patch
 	libpgport-pkglibdir.patch.txt
 	external-libpq.patch.txt
 
@@ -564,6 +565,7 @@ b0688d66fdd7d612c24d9aa69bdd80d30787d2d6409b4524c79b41797144fc743213460e6de9c536
 a98e5ecdd421f68f11b55bf07bf60280cf80508f89c5d21a084c7e7aa3be0a22c88b8e2ce611a13dd5c11efdd052eb9018271b549040c30663b9fd9b7c4fc611  icu-collations-hack.patch
 b64e75778fcb7a8221cf1a3d81c6a1ade3910e3398f63dd6f9be743b1dd7e392ea626dda8da976f4149f838c18ba536e7c9f9da268ae7e03b78268304d89bafc  fix-test-check_guc.patch
 1698362340f0b1f18c4ddecef41bcc9ea2998eaab49b285134415544ab13f44a0265def194768fc7180b4b04d4964cdcaf0252184eaa12d8e417193fb5cf7795  fix-test-postgres_fdw.patch
+48bda2484c505a9537bf442703f1fc466972395584756f175766936d9b3f6afb4999913c49c6040d5318c74e02e5dfdcf2ff8ff8bab15759c58a84aea0edc871  fix-test-plperl-5.8-pragma.patch
 cde5fbf5a39e5de18a40ec1d9ac919dcf166e0ca178a6b9dbdfded8d16b4969b91917a2550bbf33eccd1ecb3bd9e0753a47012e60f4efe720bbef2a2c5368529  libpgport-pkglibdir.patch.txt
 6078defb3da67e7df96665cc130d32b69eebfcaf49d92eef368ea8eea8bb311fab56064c104bc97f53da9cd925301bef696b506af33e0b66d65bc6cd41ec7499  external-libpq.patch.txt
 5c9bfd9e295dcf678298bf0aa974347a7c311d6e7c2aa76a6920fcb751d01fd1ab77abbec11f3c672f927ad9deaa88e04e370c0b5cd1b60087554c474b748731  pltcl_create_tables.sql
diff --git a/main/postgresql15/fix-test-plperl-5.8-pragma.patch b/main/postgresql15/fix-test-plperl-5.8-pragma.patch
new file mode 100644
index 00000000000..2f62e3b216d
--- /dev/null
+++ b/main/postgresql15/fix-test-plperl-5.8-pragma.patch
@@ -0,0 +1,32 @@
+From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org>
+Date: Tue, 21 May 2024 07:20:00 +0000
+Subject: [PATCH] Remove ancient use Perl 5.8.1 pragma
+
+Perl 5.8.1 was released in 2003, so more than 20 years later,
+ensuring we are using at least this version is no longer necessary.
+
+Since Perl 5.39.10, this ancient use pragma is also causing
+a test failure in src/pl/plperl/expected/plperl.out:
+
+ -- check that eval is allowed and eval'd restricted ops are caught
+ DO $$ eval q{chdir '.';}; warn "Caught: $@"; $$ LANGUAGE plperl;
+-WARNING:  Caught: 'chdir' trapped by operation mask at line 1.
++ERROR:  'eval hints' trapped by operation mask at line 1.
++CONTEXT:  PL/Perl anonymous code block
+
+PostgreSQL 16 is not affected as this pragma has been removed in
+https://github.com/postgres/postgres/commit/4c1532763a00c21cbb737bc3855e9a31374b119d
+which also contains changes to configure scripts, documentation,
+readme, and tools. Those changes don't need to be backported here.
+
+
+--- a/src/pl/plperl/plc_perlboot.pl
++++ b/src/pl/plperl/plc_perlboot.pl
+@@ -6,7 +6,6 @@
+ use strict;
+ use warnings;
+ 
+-use 5.008001;
+ use vars qw(%_SHARED $_TD);
+ 
+ PostgreSQL::InServer::Util::bootstrap();