4 files changed, 23 insertions, 54 deletions
diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD
index fef7c4ef2..b5f40acbb 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.10
+pkgver=14.15
 pkgrel=0
 pkgdesc="Featureful object-relational database system (RDBMS)"
 url="https://www.postgresql.org/"
@@ -22,7 +22,6 @@ subpackages="$pkgname-contrib $pkgname-dev $pkgname-doc libpq $pkgname-libs
 	$pkgname-plpython3 $pkgname-plpython3-contrib:plpython3_contrib"
 install="$pkgname.pre-upgrade"
 source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2
-	initdb.patch
 	perl-rpath.patch
 	conf-unix_socket_directories.patch
 	disable-broken-tests.patch
@@ -62,9 +61,8 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 
-	local file; for file in $pkgname.initd $pkgname.confd; do
+	for file in $pkgname.initd $pkgname.confd; do
 		sed "s|@VERSION@|${pkgver%.*}|" "$srcdir"/$file > $file
 	done
 }
@@ -93,16 +91,12 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-
 	_run_tests src/test
 	_run_tests src/pl
 	_run_tests contrib
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install install-docs
 
 	cd "$pkgdir"
@@ -167,7 +161,6 @@ contrib() {
 	depends=""
 
 	cd "$builddir"
-
 	# Avoid installing plperl and plpython extensions, these will be
 	# installed into separate subpackages.
 	sed -Ei -e 's/(.*_plperl)/#\1/' \
@@ -250,17 +243,16 @@ _run_tests() {
 }
 
 _submv() {
-	local path; for path in "$@"; do
+	for path in "$@"; do
 		mkdir -p "$subpkgdir/${path%/*}"
 		mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
 	done
 }
 
-sha512sums="60cafe4b27a194949aff482dcce4fa096a9916f37205868437a32afb8964df71934b619a0b891fe85eb7c7f9b11775cffbbedca589e78feb6c4184eb224b48bc  postgresql-10.10.tar.bz2
-1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc  initdb.patch
-5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854  perl-rpath.patch
+sha512sums="227f9551167ee62e5185d6f6777e100ecc09f497b9ee1b5a8e659de8d4c237b0f9a97005706bbf64c3e839271e2630f6a417ba98dfce47bcb4c27e8641a7c6ef  postgresql-14.15.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/initdb.patch b/user/postgresql/initdb.patch
deleted file mode 100644
index 59a872a49..000000000
--- a/user/postgresql/initdb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
---- a/src/bin/initdb/initdb.c
-+++ b/src/bin/initdb/initdb.c
-@@ -3259,9 +3259,7 @@
- 	/* translator: This is a placeholder in a shell command. */
- 	appendPQExpBuffer(start_db_cmd, " -l %s start", _("logfile"));
- 
--	printf(_("\nSuccess. You can now start the database server using:\n\n"
--			 "    %s\n\n"),
--		   start_db_cmd->data);
-+	printf(_("\nSuccess.\n\n"));
- 
- 	destroyPQExpBuffer(start_db_cmd);
- 
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 \