user/postgresql: woo bump to 10.4 we're current again, also fix crap

1 files changed, 25 insertions, 23 deletions

diff --git a/user/postgresql/APKBUILD b/user/postgresql/APKBUILD
index e618eeb39..8cd12f153 100644
--- a/user/postgresql/APKBUILD
+++ b/user/postgresql/APKBUILD
@@ -1,26 +1,26 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 # Contributor: G.J.R. Timmer <gjr.timmer@gmail.com>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=postgresql
-pkgver=10.0
+pkgver=10.4
 pkgrel=0
-pkgdesc="A sophisticated object-relational DBMS"
-url="http://www.postgresql.org/"
+pkgdesc="Featureful object-relational database system (RDBMS)"
+url="https://www.postgresql.org/"
 arch="all"
-license="BSD"
-depends="postgresql-client tzdata"
 options="!checkroot"
-install="$pkgname.pre-upgrade"
+license="PostgreSQL"
 pkgusers="postgres"
 pkggroups="postgres"
-checkdepends="diffutils"
+depends="postgresql-client tzdata"
 depends_dev="openssl-dev"
 makedepends="$depends_dev libedit-dev zlib-dev libxml2-dev util-linux-dev
 	openldap-dev tcl-dev perl-dev python3-dev"
+checkdepends="diffutils"
 subpackages="$pkgname-contrib $pkgname-dev $pkgname-doc libpq $pkgname-libs
 	$pkgname-client $pkgname-pltcl
 	$pkgname-plperl $pkgname-plperl-contrib:plperl_contrib
 	$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
@@ -32,8 +32,6 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/$pkgname-$pkgver.tar.bz2
 	pg-restore.confd
 	pltcl_create_tables.sql
 	"
-builddir="$srcdir/$pkgname-$pkgver"
-options="!checkroot"
 
 # secfixes:
 #   9.6.4-r0:
@@ -44,6 +42,16 @@ options="!checkroot"
 #   - CVE-2017-7484
 #   - CVE-2017-7485
 #   - CVE-2017-7486
+#   10.1-r0:
+#   - CVE-2017-15098
+#   - CVE-2017-15099
+#   10.2-r0:
+#   - CVE-2018-1052
+#   - CVE-2018-1053
+#   10.3-r0:
+#   - CVE-2018-1058
+#   10.4-r0:
+#   - CVE-2018-1115
 
 prepare() {
 	default_prepare
@@ -55,12 +63,7 @@ prepare() {
 }
 
 build() {
-	_configure
-	make world
-}
-
-# Note: (...) instead of {...} is NOT a typo!
-_configure() (
+	export PYTHON=/usr/bin/python3
 	export CFLAGS="${CFLAGS/-Os/-O2}"
 	export CPPFLAGS="${CPPFLAGS/-Os/-O2}"
 
@@ -79,7 +82,8 @@ _configure() (
 		--with-perl \
 		--with-python \
 		--with-tcl
-)
+	make world
+}
 
 check() {
 	cd "$builddir"
@@ -89,11 +93,6 @@ check() {
 	_run_tests contrib
 }
 
-check() {
-	cd "$builddir"
-	make check
-}
-
 package() {
 	cd "$builddir"
 
@@ -216,6 +215,9 @@ plpython3_contrib() {
 	cd "$builddir"
 	make -C contrib/hstore_plpython DESTDIR="$subpkgdir" install
 	make -C contrib/ltree_plpython DESTDIR="$subpkgdir" install
+
+	cd "$subpkgdir"/usr/share/postgresql/extension/
+	rm *plpython2* *plpythonu*
 }
 
 _plcontrib() {
@@ -247,7 +249,7 @@ _submv() {
 	done
 }
 
-sha512sums="88295af13db77a85a604c925aa627d383fdac62c1185119bba87753ce4167a13aed0f055a7a1329b3051f8757c6ba7529baed00a564ef0cfbee685720f282678  postgresql-10.0.tar.bz2
+sha512sums="b7c0d2fdc724e2eb1cda9fc1eb01b47352bbe6ba6357b3e898b7f5990fd78499c8c68dcb3aa9bde7821d71b5882d8856131384e899f8055d89d51cdfdbc9e663  postgresql-10.4.tar.bz2
 1f8e7dc58f5b0a12427cf2fd904ffa898a34f23f3332c8382b94e0d991c007289e7913a69e04498f3d93fc5701855796c207b4b1cc4a0b366f586050124d7fcc  initdb.patch
 5f9d8bb4957194069d01af8ab3abc6d4d83a7e7f8bd7ebe1caae5361d621a3e58f91b14b952958138a794e0a80bc154fbb7e3e78d211e2a95b9b7901335de854  perl-rpath.patch
 8439a6fdfdea0a4867daeb8bc23d6c825f30c00d91d4c39f48653f5ee77341f23282ce03a77aad94b5369700f11d2cb28d5aee360e59138352a9ab331a9f9d0f  conf-unix_socket_directories.patch