aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2019-10-06 19:08:51 +0300
committerNatanael Copa <ncopa@alpinelinux.org>2019-10-07 12:58:14 +0000
commit1e7e68d488fb21d11ae8cbc190d5851bff0e74ab (patch)
tree5a0aadda8ffc0132dad933900712e8a4c55c1ca9
parent86e162b2b28e81a362c732e98078280ae94c4b72 (diff)
downloadaports-1e7e68d488fb21d11ae8cbc190d5851bff0e74ab.tar.bz2
aports-1e7e68d488fb21d11ae8cbc190d5851bff0e74ab.tar.xz
main/postgresql: upgrade to 12.0
-rw-r--r--main/postgresql/APKBUILD12
-rw-r--r--main/postgresql/disable-broken-tests.patch8
-rw-r--r--main/postgresql/fix-psql-segfault.patch34
3 files changed, 9 insertions, 45 deletions
diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD
index d0ac211b74..bd57043b78 100644
--- a/main/postgresql/APKBUILD
+++ b/main/postgresql/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: G.J.R. Timmer <gjr.timmer@gmail.com>
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
pkgname=postgresql
-pkgver=11.5
-pkgrel=2
+pkgver=12.0
+pkgrel=0
pkgdesc="A sophisticated object-relational DBMS"
url="https://www.postgresql.org/"
arch="all"
@@ -15,7 +15,7 @@ pkggroups="postgres"
checkdepends="diffutils"
depends_dev="openssl-dev"
makedepends="$depends_dev libedit-dev zlib-dev libxml2-dev util-linux-dev
- openldap-dev tcl-dev perl-dev python2-dev python3-dev"
+ openldap-dev tcl-dev perl-dev python2-dev python3-dev linux-headers"
subpackages="$pkgname-contrib $pkgname-dev $pkgname-doc libpq $pkgname-libs
$pkgname-client $pkgname-pltcl
$pkgname-plperl $pkgname-plperl-contrib:plperl_contrib
@@ -26,7 +26,6 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2
perl-rpath.patch
conf-unix_socket_directories.patch
disable-broken-tests.patch
- fix-psql-segfault.patch
$pkgname.initd
$pkgname.confd
pg-restore.initd
@@ -308,12 +307,11 @@ _submv() {
done
}
-sha512sums="537148079dc6c33cfb9bf9722171e524707b42ef01369deb968d0d6e8fa9b7f16f6ce67139d9dc45fb7385defbf56aa2c0affe5ee9d76e996f31e47486192141 postgresql-11.5.tar.bz2
+sha512sums="231a0b5c181c33cb01c3f39de1802319b79eceec6997935ab8605dea1f4583a52d0d16e5a70fcdeea313462f062503361d543433ee03d858ba332c72a665f696 postgresql-12.0.tar.bz2
1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc initdb.patch
5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854 perl-rpath.patch
8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f conf-unix_socket_directories.patch
-274e0a5a6e7d179f5327ae2da0274f13d9198d9acbe45f90e2bdadf454f1e32aceac6a1d4ef2b1744c4468994e93b14a38abea877b419b3fd28b8a3273b5d574 disable-broken-tests.patch
-4a241074d27d638743eb56eedbc3cefe5ed4c02b6bf8030940be960d8c09ef88751443162ab405853d8db9ecc4af08ddb250096464d89cae5c0d4d4bf7eeb51f fix-psql-segfault.patch
+c4179fcd8b71791cdc41ea7b622cf82e9bd42ac1de66999234b98a83c0c508c79c492a9301274fe859c06a3f1a8b17b53ab97541ab76801a985f8f0b9b8716e7 disable-broken-tests.patch
224e80f9e62843fd248e625abdd0d9fe477729ff3f9a64fc5c86dd37bb7176d3504107fbed7ce578e3a1db7f60b8cf2abf5fe4862c81f76b6d026e29ca495cfc postgresql.initd
a6d9cba5c7270484b3a22083b2b37742faefb01b6643040050c92235840c601b2e206ebda32804937b729c6cf42c79a558b921900e52fc420df2a03b5f29e1f7 postgresql.confd
f5a1cba051e7d846c2d16703514601cb25729ed96b677c9bd0c199d64552120a8b14b238af01917fdb87106681e12dee6fff7447558155ba273e4f96be5e2892 pg-restore.initd
diff --git a/main/postgresql/disable-broken-tests.patch b/main/postgresql/disable-broken-tests.patch
index 3cfdc4221a..1ebccbc416 100644
--- a/main/postgresql/disable-broken-tests.patch
+++ b/main/postgresql/disable-broken-tests.patch
@@ -66,16 +66,16 @@ have no idea. :(
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
-@@ -84,7 +84,7 @@
+@@ -73,7 +73,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
-@@ -99,7 +99,7 @@
+@@ -89,7 +89,7 @@
test: write_parallel
# no relation related tests can be put in this group
diff --git a/main/postgresql/fix-psql-segfault.patch b/main/postgresql/fix-psql-segfault.patch
deleted file mode 100644
index 8f4cc7902c..0000000000
--- a/main/postgresql/fix-psql-segfault.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9644da5c3ffcf0fb18eca54a61aedb5f53a1c352 Mon Sep 17 00:00:00 2001
-From: Quentin Rameau <quinq@fifth.space>
-Date: Sun, 25 Aug 2019 11:29:45 +0200
-Subject: [PATCH] Fix missing argument handling in psql getopt
-
-When passing an argument option with a missing argument, strcmp would
-be called with the argv terminating NULL.
----
- src/bin/psql/startup.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
-index 4730c73396..cffbfc864e 100644
---- a/src/bin/psql/startup.c
-+++ b/src/bin/psql/startup.c
-@@ -667,12 +667,13 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts *options)
- break;
- case '?':
- /* Actual help option given */
-- if (strcmp(argv[optind - 1], "-?") == 0)
-+ if (optind <= argc &&
-+ strcmp(argv[optind - 1], "-?") == 0)
- {
- usage(NOPAGER);
- exit(EXIT_SUCCESS);
- }
-- /* unknown option reported by getopt */
-+ /* unknown option or missing argument */
- else
- goto unknown_option;
- break;
---
-2.23.0
-