user/postgresql: bump { 10.12 --> 14.1 }. disable fewer tests. fixes #346.

3 files changed, 21 insertions, 30 deletions

diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD
index 8f7f21355..787e03cdd 100644
--- a/user/postgresql/APKBUILD
+++ b/user/postgresql/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=postgresql
-pkgver=10.12
+pkgver=14.1
 pkgrel=0
 pkgdesc="Featureful object-relational database system (RDBMS)"
 url="https://www.postgresql.org/"
@@ -249,10 +249,10 @@ _submv() {
 	done
 }
 
-sha512sums="6accc66cbbae811509095c33e8a8d17ddd11d9e307267312e3d09df90469db4700a5806166d66f25d77769d3ef88653c98dfc7d05dd053f10434b03e0a9e33b7  postgresql-10.12.tar.bz2
-5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854  perl-rpath.patch
+sha512sums="4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd  postgresql-14.1.tar.bz2
+5772c54378f885fd2924be431f577bcbc134481d17a1331afd42ebeea2995e52364601ca2e2839d3c1dd78c51e4483424d1ed8ef8cdf43889a5a209861396efc  perl-rpath.patch
 8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f  conf-unix_socket_directories.patch
-1966b2a3971f56fbecd8daa45965236d487683e13300e5c000e595bbadbbe9d0e1301fbbfa034f452abe8a4e4a427781f772370b9ff392bb03fc11ee43c9dee7  disable-broken-tests.patch
+323ea2f3b6d71b858153d1f8ae62a98548ce8b2d1e0d9214dd32e858e4ad9bd0194b8b2f6e9540ce6324e394a08f496b2822004c1c3fef11184f267fa401a087  disable-broken-tests.patch
 2c3aab4b24e0e1f60c3bd5aa2e24d93d3480711389e48454ed7cd7713eb27df7e1b29970ba1931ad0ae810458fae9e5cc7b6b6e2a24924eb4c493c6e7088ae75  postgresql.initd
 a6d9cba5c7270484b3a22083b2b37742faefb01b6643040050c92235840c601b2e206ebda32804937b729c6cf42c79a558b921900e52fc420df2a03b5f29e1f7  postgresql.confd
 f5a1cba051e7d846c2d16703514601cb25729ed96b677c9bd0c199d64552120a8b14b238af01917fdb87106681e12dee6fff7447558155ba273e4f96be5e2892  pg-restore.initd
diff --git a/user/postgresql/disable-broken-tests.patch b/user/postgresql/disable-broken-tests.patch
index 0bb5b03fa..20d94d5d5 100644
--- a/user/postgresql/disable-broken-tests.patch
+++ b/user/postgresql/disable-broken-tests.patch
@@ -64,17 +64,18 @@ These symbols are really not provided by libpq.
 I wasted one day trying to figure out what's going on here, but still
 have no idea. :(
 
---- a/src/test/regress/parallel_schedule
-+++ b/src/test/regress/parallel_schedule
-@@ -84,7 +84,7 @@
+diff -ur a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
+--- a/src/test/regress/parallel_schedule	2022-01-08 00:25:45.290000000 +0000
++++ b/src/test/regress/parallel_schedule	2022-01-08 00:26:01.950000000 +0000
+@@ -76,7 +76,7 @@
  # ----------
  # Another group of parallel tests
  # ----------
--test: brin gin gist spgist privileges init_privs security_label collate matview lock replica_identity rowsecurity object_address tablesample groupingsets drop_operator password
-+test: brin gin gist spgist privileges init_privs security_label collate matview lock replica_identity rowsecurity tablesample groupingsets drop_operator password
+-test: brin gin gist spgist privileges init_privs security_label collate matview lock replica_identity rowsecurity object_address tablesample groupingsets drop_operator password identity generated join_hash
++test: brin gin gist spgist privileges init_privs security_label collate matview lock replica_identity rowsecurity tablesample groupingsets drop_operator password identity generated join_hash
  
  # ----------
- # Another group of parallel tests
+ # Additional BRIN tests
 @@ -98,7 +98,7 @@
  test: select_parallel
  
diff --git a/user/postgresql/perl-rpath.patch b/user/postgresql/perl-rpath.patch
index a2505acf7..f1354488e 100644
--- a/user/postgresql/perl-rpath.patch
+++ b/user/postgresql/perl-rpath.patch
@@ -1,22 +1,12 @@
-We configure Postgres with --disable-rpath because for the most part we
-want to leave it to ldconfig to determine where libraries are.  However,
-for some reason the Perl package puts libperl.so in a nonstandard place
-and doesn't add that place to the ldconfig search path.  I think this
-is a Perl packaging bug, myself, but apparently it's not going to change.
-So work around it by adding an rpath spec to plperl.so (only).
-
-Alpine notes:
-This patch is copied from Fedora.
-
---- a/src/pl/plperl/GNUmakefile
-+++ b/src/pl/plperl/GNUmakefile
-@@ -43,6 +43,9 @@
+diff -ur a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
+--- a/src/pl/plperl/GNUmakefile	2022-01-08 00:23:39.350000000 +0000
++++ b/src/pl/plperl/GNUmakefile	2022-01-08 00:24:13.230000000 +0000
+@@ -53,7 +53,7 @@
+ endif # win32
  
- SHLIB_LINK = $(perl_embed_ldflags)
  
-+# Force rpath to be used even though we disable it everywhere else
-+SHLIB_LINK += $(rpath)
-+
- REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=plperl  --load-extension=plperlu
- REGRESS = plperl plperl_lc plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
- # if Perl can support two interpreters in one backend,
+-SHLIB_LINK = $(perl_embed_ldflags)
++SHLIB_LINK = $(perl_embed_ldflags) $(rpath)
+ 
+ REGRESS_OPTS = --dbname=$(PL_TESTDB)
+ REGRESS = plperl_setup plperl plperl_lc plperl_trigger plperl_shared \