svn commit: r509493 - in branches/2019Q3: Mk/Uses databases/postgresql10-docs databases/postgresql10-plperl databases/postgresql10-plpython databases/postgresql10-pltcl databases/postgresql10-serve...

Wed Aug 21 07:19:03 UTC 2019

Author: girgen
Date: Wed Aug 21 07:18:56 2019
New Revision: 509493
URL: https://svnweb.freebsd.org/changeset/ports/509493

Log:
  MFH: r508390
  
  iThe PostgreSQL Global Development Group has released an update to all
  supported versions of our database system, including 11.5, 10.10,
  9.6.15, 9.5.19, and 9.4.24, as well as the third beta of PostgreSQL 12.
  This release fixes two security issues in the PostgreSQL server, two
  security issues found in one of the PostgreSQL Windows installers, and
  over 40 bugs reported since the previous release.
  
  Users should install these updates as soon as possible.
  
  A Note on the PostgreSQL 12 Beta
  ================================
  
  In the spirit of the open source PostgreSQL community, we strongly
  encourage you to test the new features of PostgreSQL 12 in your database
  systems to help us eliminate any bugs or other issues that may exist.
  While we do not advise you to run PostgreSQL 12 Beta 3 in your
  production environments, we encourage you to find ways to run your
  typical application workloads against this beta release.
  
  Your testing and feedback will help the community ensure that the
  PostgreSQL 12 release upholds our standards of providing a stable,
  reliable release of the world's most advanced open source relational
  database.
  
  Security Issues
  ===============
  
  Two security vulnerabilities have been closed by this release:
  
  * CVE-2019-10208: `TYPE` in `pg_temp` executes arbitrary SQL during
  `SECURITY DEFINER` execution
  
  Versions Affected: 9.4 - 11
  
  Given a suitable `SECURITY DEFINER` function, an attacker can execute
  arbitrary SQL under the identity of the function owner.  An attack
  requires `EXECUTE` permission on the function, which must itself contain
  a function call having inexact argument type match.  For example,
  `length('foo'::varchar)` and `length('foo')` are inexact, while
  `length('foo'::text)` is exact.  As part of exploiting this
  vulnerability, the attacker uses `CREATE DOMAIN` to create a type in a
  `pg_temp` schema. The attack pattern and fix are similar to that for
  CVE-2007-2138.
  
  Writing `SECURITY DEFINER` functions continues to require following the
  considerations noted in the documentation:
  
  https://www.postgresql.org/docs/devel/sql-createfunction.html#SQL-CREATEFUNCTION-SECURITY
  
  The PostgreSQL project thanks Tom Lane for reporting this problem.
  
  * CVE-2019-10209: Memory disclosure in cross-type comparison for hashed
  subplan
  
  Versions Affected: 11
  
  In a database containing hypothetical, user-defined hash equality operators, an
  attacker could read arbitrary bytes of server memory. For an attack to become
  possible, a superuser would need to create unusual operators. It is possible
  for operators not purpose-crafted for attack to have the properties that enable
  an attack, but we are not aware of specific examples.
  
  The PostgreSQL project thanks Andreas Seltenreich for reporting this problem.
  
  Approved by:	ports-secteam@

Added:
  branches/2019Q3/databases/postgresql12-client/
     - copied from r508390, head/databases/postgresql12-client/
  branches/2019Q3/databases/postgresql12-contrib/
     - copied from r508390, head/databases/postgresql12-contrib/
  branches/2019Q3/databases/postgresql12-docs/
     - copied from r508390, head/databases/postgresql12-docs/
  branches/2019Q3/databases/postgresql12-pgtcl/
     - copied from r508390, head/databases/postgresql12-pgtcl/
  branches/2019Q3/databases/postgresql12-plperl/
     - copied from r508390, head/databases/postgresql12-plperl/
  branches/2019Q3/databases/postgresql12-plpython/
     - copied from r508390, head/databases/postgresql12-plpython/
  branches/2019Q3/databases/postgresql12-pltcl/
     - copied from r508390, head/databases/postgresql12-pltcl/
  branches/2019Q3/databases/postgresql12-server/
     - copied from r508390, head/databases/postgresql12-server/
Modified:
  branches/2019Q3/Mk/Uses/pgsql.mk
  branches/2019Q3/databases/postgresql10-docs/Makefile
  branches/2019Q3/databases/postgresql10-plperl/Makefile
  branches/2019Q3/databases/postgresql10-plpython/Makefile
  branches/2019Q3/databases/postgresql10-pltcl/Makefile
  branches/2019Q3/databases/postgresql10-server/Makefile
  branches/2019Q3/databases/postgresql10-server/distinfo
  branches/2019Q3/databases/postgresql11-docs/Makefile
  branches/2019Q3/databases/postgresql11-pgtcl/Makefile
  branches/2019Q3/databases/postgresql11-plperl/Makefile
  branches/2019Q3/databases/postgresql11-plpython/Makefile
  branches/2019Q3/databases/postgresql11-pltcl/Makefile
  branches/2019Q3/databases/postgresql11-server/distinfo
  branches/2019Q3/databases/postgresql94-docs/Makefile
  branches/2019Q3/databases/postgresql94-plperl/Makefile
  branches/2019Q3/databases/postgresql94-plpython/Makefile
  branches/2019Q3/databases/postgresql94-pltcl/Makefile
  branches/2019Q3/databases/postgresql94-server/Makefile
  branches/2019Q3/databases/postgresql94-server/distinfo
  branches/2019Q3/databases/postgresql95-docs/Makefile
  branches/2019Q3/databases/postgresql95-plperl/Makefile
  branches/2019Q3/databases/postgresql95-plpython/Makefile
  branches/2019Q3/databases/postgresql95-pltcl/Makefile
  branches/2019Q3/databases/postgresql95-server/Makefile
  branches/2019Q3/databases/postgresql95-server/distinfo
  branches/2019Q3/databases/postgresql96-docs/Makefile
  branches/2019Q3/databases/postgresql96-plperl/Makefile
  branches/2019Q3/databases/postgresql96-plpython/Makefile
  branches/2019Q3/databases/postgresql96-pltcl/Makefile
  branches/2019Q3/databases/postgresql96-server/Makefile
  branches/2019Q3/databases/postgresql96-server/distinfo
Directory Properties:
  branches/2019Q3/   (props changed)

Modified: branches/2019Q3/Mk/Uses/pgsql.mk
==============================================================================

--- branches/2019Q3/Mk/Uses/pgsql.mk	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/Mk/Uses/pgsql.mk	Wed Aug 21 07:18:56 2019	(r509493)
@@ -41,7 +41,7 @@ _INCLUDE_USES_PGSQL_MK=	yes
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-VALID_PGSQL_VER=	9.4 9.5 9.6 10 11
+VALID_PGSQL_VER=	9.4 9.5 9.6 10 11 12
 
 # Override non-default LIBVERS like this:
 #PGSQL99_LIBVER=6

Modified: branches/2019Q3/databases/postgresql10-docs/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql10-docs/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql10-docs/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=10
 
-.include "${.CURDIR}/../postgresql96-docs/Makefile"
+.include "${.CURDIR}/../postgresql12-docs/Makefile"

Modified: branches/2019Q3/databases/postgresql10-plperl/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql10-plperl/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql10-plperl/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	10
 
-.include "${.CURDIR}/../postgresql95-plperl/Makefile"
+.include "${.CURDIR}/../postgresql12-plperl/Makefile"

Modified: branches/2019Q3/databases/postgresql10-plpython/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql10-plpython/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql10-plpython/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -2,4 +2,4 @@
 
 WANT_PGSQL_VER=	10
 
-.include "${.CURDIR}/../postgresql95-plpython/Makefile"
+.include "${.CURDIR}/../postgresql12-plpython/Makefile"

Modified: branches/2019Q3/databases/postgresql10-pltcl/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql10-pltcl/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql10-pltcl/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	10
 
-.include "${.CURDIR}/../postgresql96-pltcl/Makefile"
+.include "${.CURDIR}/../postgresql12-pltcl/Makefile"

Modified: branches/2019Q3/databases/postgresql10-server/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql10-server/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql10-server/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy at FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	10.9
+DISTVERSION?=	10.10
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
@@ -24,4 +24,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.include "${.CURDIR}/../postgresql11-server/Makefile"
+.include "${.CURDIR}/../postgresql12-server/Makefile"

Modified: branches/2019Q3/databases/postgresql10-server/distinfo
==============================================================================
--- branches/2019Q3/databases/postgresql10-server/distinfo	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql10-server/distinfo	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561409430
-SHA256 (postgresql/postgresql-10.9.tar.bz2) = 958b317fb007e94f3bef7e2a6641875db8f7f9d73db9f283324f3d6e8f5b0f54
-SIZE (postgresql/postgresql-10.9.tar.bz2) = 18981395
+TIMESTAMP = 1565174246
+SHA256 (postgresql/postgresql-10.10.tar.bz2) = ad4f9b8575f98ed6091bf9bb2cb16f0e52795a5f66546c1f499ca5c69b21f253
+SIZE (postgresql/postgresql-10.10.tar.bz2) = 19012049

Modified: branches/2019Q3/databases/postgresql11-docs/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql11-docs/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql11-docs/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=11
 
-.include "${.CURDIR}/../postgresql96-docs/Makefile"
+.include "${.CURDIR}/../postgresql12-docs/Makefile"

Modified: branches/2019Q3/databases/postgresql11-pgtcl/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql11-pgtcl/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql11-pgtcl/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PORTREVISION=	0
 PKGNAMESUFFIX=	-postgresql11
 
 CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql10-*

Modified: branches/2019Q3/databases/postgresql11-plperl/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql11-plperl/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql11-plperl/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	11
 
-.include "${.CURDIR}/../postgresql95-plperl/Makefile"
+.include "${.CURDIR}/../postgresql12-plperl/Makefile"

Modified: branches/2019Q3/databases/postgresql11-plpython/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql11-plpython/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql11-plpython/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -2,4 +2,4 @@
 
 WANT_PGSQL_VER=	11
 
-.include "${.CURDIR}/../postgresql95-plpython/Makefile"
+.include "${.CURDIR}/../postgresql12-plpython/Makefile"

Modified: branches/2019Q3/databases/postgresql11-pltcl/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql11-pltcl/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql11-pltcl/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	11
 
-.include "${.CURDIR}/../postgresql96-pltcl/Makefile"
+.include "${.CURDIR}/../postgresql12-pltcl/Makefile"

Modified: branches/2019Q3/databases/postgresql11-server/distinfo
==============================================================================
--- branches/2019Q3/databases/postgresql11-server/distinfo	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql11-server/distinfo	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561409449
-SHA256 (postgresql/postgresql-11.4.tar.bz2) = 02802ddffd1590805beddd1e464dd28a46a41a5f1e1df04bab4f46663195cc8b
-SIZE (postgresql/postgresql-11.4.tar.bz2) = 19759635
+TIMESTAMP = 1565174257
+SHA256 (postgresql/postgresql-11.5.tar.bz2) = 7fdf23060bfc715144cbf2696cf05b0fa284ad3eb21f0c378591c6bca99ad180
+SIZE (postgresql/postgresql-11.5.tar.bz2) = 19773087

Modified: branches/2019Q3/databases/postgresql94-docs/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql94-docs/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql94-docs/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=9.4
 
-.include "${.CURDIR}/../postgresql96-docs/Makefile"
+.include "${.CURDIR}/../postgresql12-docs/Makefile"

Modified: branches/2019Q3/databases/postgresql94-plperl/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql94-plperl/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql94-plperl/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	9.4
 
-.include "${.CURDIR}/../postgresql95-plperl/Makefile"
+.include "${.CURDIR}/../postgresql12-plperl/Makefile"

Modified: branches/2019Q3/databases/postgresql94-plpython/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql94-plpython/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql94-plpython/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -2,4 +2,4 @@
 
 WANT_PGSQL_VER=	9.4
 
-.include "${.CURDIR}/../postgresql95-plpython/Makefile"
+.include "${.CURDIR}/../postgresql12-plpython/Makefile"

Modified: branches/2019Q3/databases/postgresql94-pltcl/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql94-pltcl/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql94-pltcl/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	9.4
 
-.include "${.CURDIR}/../postgresql96-pltcl/Makefile"
+.include "${.CURDIR}/../postgresql12-pltcl/Makefile"

Modified: branches/2019Q3/databases/postgresql94-server/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql94-server/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql94-server/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy at FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.4.23
+DISTVERSION?=	9.4.24
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
@@ -22,4 +22,4 @@ PG_USER?=	pgsql
 PG_GROUP?=	pgsql
 PG_UID?=	70
 
-.include "${.CURDIR}/../postgresql11-server/Makefile"
+.include "${.CURDIR}/../postgresql12-server/Makefile"

Modified: branches/2019Q3/databases/postgresql94-server/distinfo
==============================================================================
--- branches/2019Q3/databases/postgresql94-server/distinfo	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql94-server/distinfo	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1561409461
-SHA256 (postgresql/postgresql-9.4.23.tar.bz2) = 0d009c08b0c82b12484950bba10ae8bfd6f0c7bafd8f086ab756c483dd231d9b
-SIZE (postgresql/postgresql-9.4.23.tar.bz2) = 16848808
+TIMESTAMP = 1565174268
+SHA256 (postgresql/postgresql-9.4.24.tar.bz2) = 52253d67dd46a7463a9d7c5e82bf959931fa4c11ec56293150210fa82a0f9429
+SIZE (postgresql/postgresql-9.4.24.tar.bz2) = 16842941
 SHA256 (postgresql/pg-949-icu-2016-10-02.diff.gz) = 34612e685a79874db04bc6b66c700bfc6412042840c532eef0da7832d1f70d43
 SIZE (postgresql/pg-949-icu-2016-10-02.diff.gz) = 5289

Modified: branches/2019Q3/databases/postgresql95-docs/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql95-docs/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql95-docs/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=9.5
 
-.include "${.CURDIR}/../postgresql96-docs/Makefile"
+.include "${.CURDIR}/../postgresql12-docs/Makefile"

Modified: branches/2019Q3/databases/postgresql95-plperl/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql95-plperl/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql95-plperl/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,27 +1,6 @@
 # Created by: Palle Girgensohn <girgen at partitur.se>
 # $FreeBSD$
 
-PORTNAME=	postgresql
-# Keep the ?=, this port is used as master by the other plperl.
-PORTREVISION?=	0
-CATEGORIES=	databases perl5
-PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
+WANT_PGSQL_VER=	9.5
 
-MAINTAINER=	pgsql at FreeBSD.org
-COMMENT=	Write SQL functions for PostgreSQL using Perl5
-
-RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server
-
-MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
-
-WANT_PGSQL_VER?=9.5
-
-USES+=		perl5 readline
-CONFIGURE_ARGS=	--with-perl
-
-BUILD_DIRS=	src/backend src/pl/plperl
-INSTALL_DIRS=	src/pl/plperl
-SLAVE_ONLY=	yes
-COMPONENT=	-plperl
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../postgresql12-plperl/Makefile"

Modified: branches/2019Q3/databases/postgresql95-plpython/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql95-plpython/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql95-plpython/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,27 +1,5 @@
 # $FreeBSD$
 
-PORTNAME=	postgresql
-CATEGORIES=	databases python
-# Keep the ?=, it is used as master by the other plpython ports.
-PORTREVISION?=	0
-PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
+WANT_PGSQL_VER=	9.5
 
-MAINTAINER=	pgsql at FreeBSD.org
-COMMENT=	Module for using Python to write SQL functions
-
-USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
-WANT_PGSQL=	server
-
-MASTERDIR=	${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server
-
-WANT_PGSQL_VER?=	9.5
-WANT_PYTHON_USE?=	python
-
-CONFIGURE_ARGS=	--with-python
-COMPONENT=	-plpython
-
-BUILD_DIRS=	src/backend src/pl/plpython
-INSTALL_DIRS=	src/pl/plpython
-SLAVE_ONLY=	yes
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../postgresql12-plpython/Makefile"

Modified: branches/2019Q3/databases/postgresql95-pltcl/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql95-pltcl/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql95-pltcl/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	9.5
 
-.include "${.CURDIR}/../postgresql96-pltcl/Makefile"
+.include "${.CURDIR}/../postgresql12-pltcl/Makefile"

Modified: branches/2019Q3/databases/postgresql95-server/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql95-server/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql95-server/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy at FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.5.18
+DISTVERSION?=	9.5.19
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
@@ -25,4 +25,4 @@ PG_USER?=	pgsql
 PG_GROUP?=	pgsql
 PG_UID?=	70
  
-.include "${.CURDIR}/../postgresql11-server/Makefile"
+.include "${.CURDIR}/../postgresql12-server/Makefile"

Modified: branches/2019Q3/databases/postgresql95-server/distinfo
==============================================================================
--- branches/2019Q3/databases/postgresql95-server/distinfo	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql95-server/distinfo	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1561409472
-SHA256 (postgresql/postgresql-9.5.18.tar.bz2) = dfc940487ed5acd5f657d6d02d53a18f9699888d4b0f820071e4564ed2f9f3dd
-SIZE (postgresql/postgresql-9.5.18.tar.bz2) = 17570161
+TIMESTAMP = 1565174279
+SHA256 (postgresql/postgresql-9.5.19.tar.bz2) = 960caa26612bca8a3791d1c0bdc5c6d24b3d15841becb617470424edbc5e1bb3
+SIZE (postgresql/postgresql-9.5.19.tar.bz2) = 17571998
 SHA256 (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5fa083ec38087d6a0961642208f012e902221270708b919b92e9eedaa755e365
 SIZE (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5952

Modified: branches/2019Q3/databases/postgresql96-docs/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql96-docs/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql96-docs/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,46 +1,6 @@
 # Created by: Palle Girgensohn <girgen at pingpong.net>
 # $FreeBSD$
 
-PORTNAME=	postgresql
-PORTREVISION=	0
-PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S,.,,}-docs
+WANT_PGSQL_VER=9.6
 
-MAINTAINER=	pgsql at FreeBSD.org
-COMMENT=	The PostgreSQL documentation set
-
-MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
-WANT_PGSQL_VER?=9.6
-
-DISTV=		${DISTVERSION:R}
-
-SLAVE_ONLY=	YES
-COMPONENT=	-docs
-
-PGDOCSREL?=	${DOCSDIR_REL}/release-${PGSQL_VER}
-PGDOCSDIR?=	${PREFIX}/${PGDOCSREL}
-
-sgmldir=	${LOCALBASE}/share/sgml
-dbdir=		${sgmldir}/docbook
-
-BUILD_DEPENDS+=	onsgmls:textproc/opensp			\
-		openjade:textproc/openjade			\
-		${sgmldir}/iso8879/catalog:textproc/iso8879	\
-		${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \
-		docbook-sgml>0:textproc/docbook-sgml
-CONFIGURE_ARGS=	--without-readline
-NO_ARCH=	yes
-
-do-build:
-	${MAKE_CMD} -C ${WRKSRC} html
-
-do-install:
-	@ ${MKDIR} ${STAGEDIR}${PGDOCSDIR}
-	( cd ${WRKSRC}/doc/src/sgml/html && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} )
-
-post-install:
-	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST}
-	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type d) | ${SORT} -r | \
-	     ${SED} 's,.*, at unexec rmdir %D/& 2>/dev/null || true,' >>${TMPPLIST}
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../postgresql12-docs/Makefile"

Modified: branches/2019Q3/databases/postgresql96-plperl/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql96-plperl/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql96-plperl/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -3,4 +3,4 @@
 
 WANT_PGSQL_VER=	9.6
 
-.include "${.CURDIR}/../postgresql95-plperl/Makefile"
+.include "${.CURDIR}/../postgresql12-plperl/Makefile"

Modified: branches/2019Q3/databases/postgresql96-plpython/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql96-plpython/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql96-plpython/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -2,4 +2,4 @@
 
 WANT_PGSQL_VER=	9.6
 
-.include "${.CURDIR}/../postgresql95-plpython/Makefile"
+.include "${.CURDIR}/../postgresql12-plpython/Makefile"

Modified: branches/2019Q3/databases/postgresql96-pltcl/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql96-pltcl/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql96-pltcl/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,32 +1,6 @@
 # Created by: Palle Girgensohn <girgen at partitur.se>
 # $FreeBSD$
 
-PORTNAME=	postgresql
-# Keep the ?=, it is used by the other pltcl ports.
-PORTREVISION?=	0
-CATEGORIES=	databases tcl
-PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
+WANT_PGSQL_VER=	9.6
 
-MAINTAINER=	pgsql at FreeBSD.org
-COMMENT=	Module for using Tcl to write SQL functions
-
-MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
-
-WANT_PGSQL_VER?=9.6
-
-USES+=		tcl pgsql:${WANT_PGSQL_VER}
-WANT_PGSQL=	server
-
-CONFIGURE_ARGS=	--with-tcl --without-tk \
-		--with-tclconfig="${TCL_LIBDIR}" \
-		--with-includes="${TCL_INCLUDEDIR}"
-
-CONFIGURE_ENV+=	TCLSH="${TCLSH}"
-MAKE_ENV+=	TCL_INCDIR="${TCL_INCLUDEDIR}"
-
-BUILD_DIRS=	src/backend src/pl/tcl
-INSTALL_DIRS=	src/pl/tcl
-SLAVE_ONLY=	yes
-COMPONENT=	-pltcl
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../postgresql12-pltcl/Makefile"

Modified: branches/2019Q3/databases/postgresql96-server/Makefile
==============================================================================
--- branches/2019Q3/databases/postgresql96-server/Makefile	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql96-server/Makefile	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy at FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.6.14
+DISTVERSION?=	9.6.15
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
@@ -19,11 +19,7 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_xlogdump src/bin/pg_upgrade
 
-PG_USER?=	postgres
-PG_GROUP?=	postgres
-PG_UID?=	770
-
 ICU_PATCHFILE=	pg-96b4-icu-2016-10-02.diff.gz
 OPTIONS_DEFAULT+=ICU
 
-.include "${.CURDIR}/../postgresql11-server/Makefile"
+.include "${.CURDIR}/../postgresql12-server/Makefile"

Modified: branches/2019Q3/databases/postgresql96-server/distinfo
==============================================================================
--- branches/2019Q3/databases/postgresql96-server/distinfo	Wed Aug 21 07:14:17 2019	(r509492)
+++ branches/2019Q3/databases/postgresql96-server/distinfo	Wed Aug 21 07:18:56 2019	(r509493)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1561409286
-SHA256 (postgresql/postgresql-9.6.14.tar.bz2) = 3f08c265c9ae814f727461408ab24fdf3d954c4f7ae42d9c97b3c7e03fc31a22
-SIZE (postgresql/postgresql-9.6.14.tar.bz2) = 18787744
+TIMESTAMP = 1565174281
+SHA256 (postgresql/postgresql-9.6.15.tar.bz2) = 3cd9fe9af247167f863030842c1a57f58bdf3e5d50a94997d34a802b6032170a
+SIZE (postgresql/postgresql-9.6.15.tar.bz2) = 18799121
 SHA256 (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 85f81baa0fc8f692bcf802c8645196d9e3afdef4f760cef712d940b87655486e
 SIZE (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 5998
