aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2022-08-12 08:05:48 +0200
committerJakub Jirutka <jakub@jirutka.cz>2022-08-15 00:12:44 +0000
commit4efdbd37472d2567f1d0b15b4db5a430fff15f69 (patch)
tree2f8204df755e4fec6c61f2166791e17204605c29
parentad67e13f1e6945c69ff33675726709162180b934 (diff)
downloadaports-4efdbd37472d2567f1d0b15b4db5a430fff15f69.tar.gz
aports-4efdbd37472d2567f1d0b15b4db5a430fff15f69.tar.bz2
aports-4efdbd37472d2567f1d0b15b4db5a430fff15f69.tar.xz
main/postgresql13: security upgrade to 13.8 - CVE-2022-2625
-rw-r--r--main/postgresql13/APKBUILD10
-rw-r--r--main/postgresql13/plperl-5.36-new-warnings-category.patch38
2 files changed, 5 insertions, 43 deletions
diff --git a/main/postgresql13/APKBUILD b/main/postgresql13/APKBUILD
index 5b04a43e77..d9fb68081e 100644
--- a/main/postgresql13/APKBUILD
+++ b/main/postgresql13/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: G.J.R. Timmer <gjr.timmer@gmail.com>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
_pkgname=postgresql
-pkgver=13.7
-pkgrel=2
+pkgver=13.8
+pkgrel=0
_majorver=${pkgver%%.*}
# Should this aport provide libpq* and libecpg*? true/false
# Exactly one postgresql aport must be the default one!
@@ -78,7 +78,6 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz
jit-datalayout-mismatch-on-s390x.patch
pg_config-add-major-version.patch
fix-test-temp-schema-cleanup.patch
- plperl-5.36-new-warnings-category.patch
dont-use-locale-a-on-musl.patch
icu-collations-hack.patch
libpgport-pkglibdir.patch.txt
@@ -89,6 +88,8 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz
builddir="$srcdir/$_pkgname-$pkgver"
# secfixes:
+# 13.8-r0:
+# - CVE-2022-2625
# 13.7-r0:
# - CVE-2022-1552
# 13.5-r0:
@@ -476,7 +477,7 @@ _setdiff() {
}
sha512sums="
-9254f21519c8d4e926f70082503bb5593c91064a3d2a4ea18ac503dfd9aa94751d6f01ce00fca9fec9b2b7af40caf8d0951b661dd8be4d6aa87c1e35b6fa7a41 postgresql-13.7.tar.bz2
+3b39448b291342a5e9b610d410c222aeb85f8acf95632e73e138ae316133af3dadc795a6e706f6447f543cf10df3c786da4f1afa1d91489b50eb77e2d9ed5d84 postgresql-13.8.tar.bz2
1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc initdb.patch
27e00b58fe5c3899c66fc0dde51846c14701bcfedd132b106d676783ba603e8cbdc6e620f29b52dc892bdaa9302052788cf5e575a1659f61c017a12e0d2ee4d0 perl-rpath.patch
92d28f91b57a01afc81a00d386e87b9e2aa812f341a1578f262af372ee905530205592eda595111827582acceacd1bf244d1df130330003f05e74e4ddb5a7c4f per-version-dirs.patch
@@ -490,7 +491,6 @@ d8eb4274a54b94bed4a2ded7ae775c5a95ca0f051b831b859ccf78bf6d2ea6fe89a9a0611771f6ad
87f470bb8d08050dd955bd6f1da291891970027e6cd001452efc0bd6a57ac46187082393cd5910c289fc6e1daaf0967415393629379c07aed4e78b8e87e5fff7 jit-datalayout-mismatch-on-s390x.patch
7790e4e4374f7bdc6b4484ba87a5fa709d30d3cbdce61ee7bf9c5dfce40cb51c7bd54ab42f4050fb48eede08ef573624d819128e57cc8c976e01202854740308 pg_config-add-major-version.patch
1826ad7dfea705b9f62bb913e45865b9d9aefec9b6115aa9f4a648caa8ce85767ebf342ca1acbc49ca645599360d6218a2b6cd022930d240f2c5702b9e87281b fix-test-temp-schema-cleanup.patch
-d3f4c0d3e290ef561dd76800f5597c39ebc9f670c7d2779cc4c44345718e1ba70f0c1dee4a49750921273255491cf1805bf9007b3bd15bc25dc181eb55e6c8cc plperl-5.36-new-warnings-category.patch
b0688d66fdd7d612c24d9aa69bdd80d30787d2d6409b4524c79b41797144fc743213460e6de9c536bfb72da089f92cf89731f15137b1407fd04ca97fd393bfd2 dont-use-locale-a-on-musl.patch
0ebee9cf40a7e84e8eda3998c0dd0f7601d9288233411f45f9710fcafc5f4ca3e4a91e8e1b552cc4f4d2c0e8fa6512703b1094e501f132ea2842db0398e62934 icu-collations-hack.patch
f8ed2b7b96fd22cd87c982151e659d82bcae10033a97f403f7847fce6daa8fc580e998cfb3813af9cb59a12f0c6bcc276397c28b1fc48321eed8c7ba5f3f92ed libpgport-pkglibdir.patch.txt
diff --git a/main/postgresql13/plperl-5.36-new-warnings-category.patch b/main/postgresql13/plperl-5.36-new-warnings-category.patch
deleted file mode 100644
index 68f906d2ea..0000000000
--- a/main/postgresql13/plperl-5.36-new-warnings-category.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: rubicon <rubicon@mailo.com>
-Date: Thu, 02 Jun 2022 09:57:43 +0000
-Subject: [PATCH] Fix compatibility of PL/Perl testsuite with Perl 5.36
-
-Perl 5.36 moves the "Useless use of sort in scalar context" warning
-from the old "void" category to a new "scalar" category. This causes
-the PL/Perl testsuite to fail because the expected warning is not
-produced when it sets warnings in the "void" category as FATAL.
-
-This patch adds the "scalar" category to the list of FATAL warnings,
-so the warning is produced as expected by the testsuite. The "void"
-category needs to be kept for compatibility with older Perl versions.
-
-Reference: https://perldoc.perl.org/perl5360delta#Changes-to-Existing-Diagnostics
-
-
---- a/src/pl/plperl/expected/plperl.out
-+++ b/src/pl/plperl/expected/plperl.out
-@@ -725,7 +725,7 @@
- CONTEXT: PL/Perl anonymous code block
- -- check that we can "use warnings" (in this case to turn a warn into an error)
- -- yields "ERROR: Useless use of sort in scalar context."
--DO $do$ use warnings FATAL => qw(void) ; my @y; my $x = sort @y; 1; $do$ LANGUAGE plperl;
-+DO $do$ use warnings FATAL => qw(void scalar) ; my @y; my $x = sort @y; 1; $do$ LANGUAGE plperl;
- ERROR: Useless use of sort in scalar context at line 1.
- CONTEXT: PL/Perl anonymous code block
- -- make sure functions marked as VOID without an explicit return work
---- a/src/pl/plperl/sql/plperl.sql
-+++ b/src/pl/plperl/sql/plperl.sql
-@@ -470,7 +470,7 @@
-
- -- check that we can "use warnings" (in this case to turn a warn into an error)
- -- yields "ERROR: Useless use of sort in scalar context."
--DO $do$ use warnings FATAL => qw(void) ; my @y; my $x = sort @y; 1; $do$ LANGUAGE plperl;
-+DO $do$ use warnings FATAL => qw(void scalar) ; my @y; my $x = sort @y; 1; $do$ LANGUAGE plperl;
-
- -- make sure functions marked as VOID without an explicit return work
- CREATE OR REPLACE FUNCTION myfuncs() RETURNS void AS $$