aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2022-06-09 13:58:19 +0200
committerJakub Jirutka <jakub@jirutka.cz>2022-06-09 13:12:32 +0000
commitc054a78d3b02ddaa7cc1a3510f146649a3fbd3e4 (patch)
tree3167c672be9f074cf1cb4c164303922fb671f91d
parentb25ef2932bc4a463694bba2f79d57af2aa7b742c (diff)
downloadaports-c054a78d3b02ddaa7cc1a3510f146649a3fbd3e4.tar.gz
aports-c054a78d3b02ddaa7cc1a3510f146649a3fbd3e4.tar.bz2
aports-c054a78d3b02ddaa7cc1a3510f146649a3fbd3e4.tar.xz
main/postgresql13: upgrade to 13.7
-rw-r--r--main/postgresql13/APKBUILD14
-rw-r--r--main/postgresql13/fix-test-temp-schema-cleanup.patch14
2 files changed, 23 insertions, 5 deletions
diff --git a/main/postgresql13/APKBUILD b/main/postgresql13/APKBUILD
index e0ccda5dfb..d863275a1d 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.6
-pkgrel=4
+pkgver=13.7
+pkgrel=0
_majorver=${pkgver%%.*}
# Should this aport provide libpq* and libecpg*? true/false
# Exactly one postgresql aport must be the default one!
@@ -77,15 +77,18 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz
make-split-headers.patch
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
libpgport-pkglibdir.patch.txt
external-libpq.patch.txt
- plperl-5.36-new-warnings-category.patch
pltcl_create_tables.sql
"
builddir="$srcdir/$_pkgname-$pkgver"
# secfixes:
+# 13.7-r0:
+# - CVE-2022-1552
# 13.5-r0:
# - CVE-2021-23214
# - CVE-2021-23222
@@ -471,7 +474,7 @@ _setdiff() {
}
sha512sums="
-2852726a3031b8d469f1c38f3019af02fc5afe40ec27b22288a29acefd30c63a98806bce88a214d0c2f9177f547b0b5010ad64e70bcbe2c2f1d97a27ae1984f8 postgresql-13.6.tar.bz2
+9254f21519c8d4e926f70082503bb5593c91064a3d2a4ea18ac503dfd9aa94751d6f01ce00fca9fec9b2b7af40caf8d0951b661dd8be4d6aa87c1e35b6fa7a41 postgresql-13.7.tar.bz2
1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc initdb.patch
27e00b58fe5c3899c66fc0dde51846c14701bcfedd132b106d676783ba603e8cbdc6e620f29b52dc892bdaa9302052788cf5e575a1659f61c017a12e0d2ee4d0 perl-rpath.patch
92d28f91b57a01afc81a00d386e87b9e2aa812f341a1578f262af372ee905530205592eda595111827582acceacd1bf244d1df130330003f05e74e4ddb5a7c4f per-version-dirs.patch
@@ -484,8 +487,9 @@ d8eb4274a54b94bed4a2ded7ae775c5a95ca0f051b831b859ccf78bf6d2ea6fe89a9a0611771f6ad
5262f4944844bccc839c4441570b9eb2e0792390234ebfdb8ebb7b83380ce5f5de84b038cb03045526da202a185af9c3972c2ae1b9e0e743a95c6e84f4621cf9 make-split-headers.patch
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
f8ed2b7b96fd22cd87c982151e659d82bcae10033a97f403f7847fce6daa8fc580e998cfb3813af9cb59a12f0c6bcc276397c28b1fc48321eed8c7ba5f3f92ed libpgport-pkglibdir.patch.txt
6078defb3da67e7df96665cc130d32b69eebfcaf49d92eef368ea8eea8bb311fab56064c104bc97f53da9cd925301bef696b506af33e0b66d65bc6cd41ec7499 external-libpq.patch.txt
-d3f4c0d3e290ef561dd76800f5597c39ebc9f670c7d2779cc4c44345718e1ba70f0c1dee4a49750921273255491cf1805bf9007b3bd15bc25dc181eb55e6c8cc plperl-5.36-new-warnings-category.patch
5c9bfd9e295dcf678298bf0aa974347a7c311d6e7c2aa76a6920fcb751d01fd1ab77abbec11f3c672f927ad9deaa88e04e370c0b5cd1b60087554c474b748731 pltcl_create_tables.sql
"
diff --git a/main/postgresql13/fix-test-temp-schema-cleanup.patch b/main/postgresql13/fix-test-temp-schema-cleanup.patch
new file mode 100644
index 0000000000..45ced2c05f
--- /dev/null
+++ b/main/postgresql13/fix-test-temp-schema-cleanup.patch
@@ -0,0 +1,14 @@
+A nasty workaround for the faulty test.
+
+Related to https://www.postgresql.org/message-id/20220304.113347.2105652521035137491.horikyota.ntt@gmail.com
+but pg_terminate_backend() accepts the second argument since PostgreSQL 14.
+--- a/src/test/isolation/expected/temp-schema-cleanup.out
++++ b/src/test/isolation/expected/temp-schema-cleanup.out
+@@ -86,6 +86,7 @@
+ SELECT pg_terminate_backend(pg_backend_pid());
+
+ FATAL: terminating connection due to administrator command
++FATAL: terminating connection due to administrator command
+ server closed the connection unexpectedly
+ This probably means the server terminated abnormally
+ before or while processing the request.