postgresqlNN: updated to 11.4, 10.9, 9.6.14, 9.5.18, 9.4.23

PostgreSQL 11.4, 10.9, 9.6.14, 9.5.18, 9.4.23, and 12 Beta 2 Released!

The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 11.4, 10.9, 9.6.14, 9.5.18, and 9.4.23, as well as the second beta of PostgreSQL 12. This release fixes one security issue and over 25 bugs since the previous cumulative update in May.

Security Issues

This release closes one security vulnerability:
CVE-2019-10164: Stack-based buffer overflow via setting a password
Versions affected: 10, 11, 12 beta.

Bug Fixes and Improvements

Fix assorted errors in run-time partition pruning that could lead to wrong answers in queries on partitioned tables
pg_dump now recreates table partitions using CREATE TABLE and ALTER TABLE .. ATTACH PARTITION rather than including PARTITION OF in the creation command
Improve how initdb determines which system time zone to select if there are equivalent names for the time zone. Also explicitly prefer UTC over UCT
Fix possible crash while trying to copy trigger definitions to a new partition
Fix failure of ALTER TABLE .. ALTER COLUMN TYPE when the table has a partial exclusion constraint
Fix failure of COMMENT command for comments on domains
Several fixes related to aggregation
Fix faulty generation of merge-append plans that could lead to "could not find pathkey item to sort" errors
Fix failures on dump/restore where views contained queries with duplicate join names
Fix conversion of JSON string literals to JSON-type output columns in json_to_record() and json_populate_record()
Fix incorrect optimization of {1,1} quantifiers in regular expressions
Fix issue for B-tree indexes during edge case failure involving columns covered with the INCLUDE clause, which manifests itself with errors during VACUUM. If you are affected by this issue, you will need to reindex the specific index
Fix race condition in check to see whether a pre-existing shared memory segment is still in use by a conflicting postmaster
Fix for the walreceiver process that avoids a crash or deadlock on shutdown
Avoid possible hang in libpq if using SSL and OpenSSL's pending-data buffer contains an exact multiple of 256 bytes
Fix ordering of GRANT commands emitted by pg_dump and pg_dumpall for databases and tablespaces
Fix misleading error reports from reindexdb
Ensure that vacuumdb returns correct status if an error occurs while using parallel jobs
Fix contrib/auto_explain to not cause problems in parallel queries, which resulted in failures like "could not find key N in shm TOC"
Account for possible data modifications by local BEFORE ROW UPDATE triggers in contrib/postgres_fdw
On Windows, avoid failure when the database encoding is set to SQL_ASCII and we attempt to log a non-ASCII string

21 files changed, 47 insertions, 131 deletions

diff --git a/databases/postgresql10-docs/PLIST b/databases/postgresql10-docs/PLIST
index 0b902821b90..c4209caf1a8 100644
--- a/databases/postgresql10-docs/PLIST
+++ b/databases/postgresql10-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/05/13 20:38:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/06/23 07:55:58 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -916,6 +916,7 @@ share/doc/postgresql/html/release-10-5.html
 share/doc/postgresql/html/release-10-6.html
 share/doc/postgresql/html/release-10-7.html
 share/doc/postgresql/html/release-10-8.html
+share/doc/postgresql/html/release-10-9.html
 share/doc/postgresql/html/release-10.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html
diff --git a/databases/postgresql10-server/MESSAGE.rcd b/databases/postgresql10-server/MESSAGE.rcd
deleted file mode 100644
index a1f34038164..00000000000
--- a/databases/postgresql10-server/MESSAGE.rcd
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.rcd,v 1.1 2019/05/28 13:40:40 jperkin Exp $
-
-To enable this package, put the following into your /etc/rc.conf:
-
-	pgsql=YES
-	pgsql_flags="-l"     # enables SSL connections (TCP/IP and
-			     # ~pgsql/data/server.crt required)
-
-and ensure that
-
-	${RCD_SCRIPTS_DIR}/pgsql start
-
-is run at the appropriate time.
-
-Note: PostgreSQL accepts TCP/IP connections on localhost address by default.
-
-===========================================================================
diff --git a/databases/postgresql10/Makefile.common b/databases/postgresql10/Makefile.common
index c1bc0db4efa..775c57b635e 100644
--- a/databases/postgresql10/Makefile.common
+++ b/databases/postgresql10/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2019/05/13 20:38:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.13 2019/06/23 07:55:58 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql10-pltcl/Makefile
 # used by databases/postgresql10-server/Makefile
 
-DISTNAME=	postgresql-10.8
+DISTNAME=	postgresql-10.9
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql10/distinfo b/databases/postgresql10/distinfo
index 4b0369b0cb5..9827b95748d 100644
--- a/databases/postgresql10/distinfo
+++ b/databases/postgresql10/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2019/05/13 20:38:11 adam Exp $
+$NetBSD: distinfo,v 1.11 2019/06/23 07:55:58 adam Exp $
 
-SHA1 (postgresql-10.8.tar.bz2) = ae18d37852ff0b2c4262da606e1178b8666f3269
-RMD160 (postgresql-10.8.tar.bz2) = 0536828acedd4e2786456a4d2fac510fabb2acf5
-SHA512 (postgresql-10.8.tar.bz2) = c9cd0298f553e13e32d4315e17e9e61c1fd011391c5203282d9040f26fd08c85f749e6f2cea3bcc42d1ca153a1272bcd773196ef3bf2bdfb74cd12c5f523b7ca
-Size (postgresql-10.8.tar.bz2) = 18958913 bytes
+SHA1 (postgresql-10.9.tar.bz2) = 8c5f14580f52f6f98baf5c2b148eff8613c0e2d1
+RMD160 (postgresql-10.9.tar.bz2) = e8167eec821418c9fc38c4938febab439a1b1d2d
+SHA512 (postgresql-10.9.tar.bz2) = 4e2f30a0fd262f2e3ce5fc836425be635326600cd6cd4e117c57f59ea7ab2e9ea463a8d357fe7adb8c0dd0094e43d08efc2a137f8f9975715a5908e35920f98e
+Size (postgresql-10.9.tar.bz2) = 18981395 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
diff --git a/databases/postgresql11-docs/PLIST b/databases/postgresql11-docs/PLIST
index 47f6ac8f990..bd26e36ea3f 100644
--- a/databases/postgresql11-docs/PLIST
+++ b/databases/postgresql11-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2019/05/13 20:38:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/06/23 07:55:58 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -947,6 +947,7 @@ share/doc/postgresql/html/regress.html
 share/doc/postgresql/html/release-11-1.html
 share/doc/postgresql/html/release-11-2.html
 share/doc/postgresql/html/release-11-3.html
+share/doc/postgresql/html/release-11-4.html
 share/doc/postgresql/html/release-11.html
 share/doc/postgresql/html/release-prior.html
 share/doc/postgresql/html/release.html
diff --git a/databases/postgresql11-pltcl/PLIST b/databases/postgresql11-pltcl/PLIST
index 1a3dc6e7d1a..643423e03ce 100644
--- a/databases/postgresql11-pltcl/PLIST
+++ b/databases/postgresql11-pltcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/10/23 16:02:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/06/23 07:55:58 adam Exp $
 lib/postgresql/pltcl.so
 share/locale/cs/LC_MESSAGES/pltcl-11.mo
 share/locale/de/LC_MESSAGES/pltcl-11.mo
@@ -12,6 +12,7 @@ share/locale/ru/LC_MESSAGES/pltcl-11.mo
 share/locale/sv/LC_MESSAGES/pltcl-11.mo
 share/locale/tr/LC_MESSAGES/pltcl-11.mo
 share/locale/vi/LC_MESSAGES/pltcl-11.mo
+share/locale/zh_CN/LC_MESSAGES/pltcl-11.mo
 share/postgresql/extension/pltcl--1.0.sql
 share/postgresql/extension/pltcl--unpackaged--1.0.sql
 share/postgresql/extension/pltcl.control
diff --git a/databases/postgresql11-server/MESSAGE.rcd b/databases/postgresql11-server/MESSAGE.rcd
deleted file mode 100644
index a1f34038164..00000000000
--- a/databases/postgresql11-server/MESSAGE.rcd
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.rcd,v 1.1 2019/05/28 13:40:40 jperkin Exp $
-
-To enable this package, put the following into your /etc/rc.conf:
-
-	pgsql=YES
-	pgsql_flags="-l"     # enables SSL connections (TCP/IP and
-			     # ~pgsql/data/server.crt required)
-
-and ensure that
-
-	${RCD_SCRIPTS_DIR}/pgsql start
-
-is run at the appropriate time.
-
-Note: PostgreSQL accepts TCP/IP connections on localhost address by default.
-
-===========================================================================
diff --git a/databases/postgresql11/Makefile.common b/databases/postgresql11/Makefile.common
index 2e08b0211e0..6f6aca68be2 100644
--- a/databases/postgresql11/Makefile.common
+++ b/databases/postgresql11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2019/05/13 20:38:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2019/06/23 07:55:58 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql11-pltcl/Makefile
 # used by databases/postgresql11-server/Makefile
 
-DISTNAME=	postgresql-11.3
+DISTNAME=	postgresql-11.4
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql11/distinfo b/databases/postgresql11/distinfo
index cd5fd8adbfd..1afdced019b 100644
--- a/databases/postgresql11/distinfo
+++ b/databases/postgresql11/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2019/05/13 20:38:11 adam Exp $
+$NetBSD: distinfo,v 1.5 2019/06/23 07:55:58 adam Exp $
 
-SHA1 (postgresql-11.3.tar.bz2) = 99b54b4ec4b519c9617f942348d5be328f916773
-RMD160 (postgresql-11.3.tar.bz2) = ea1ca7da67da585ad22c87fa9bd7d40f962978e1
-SHA512 (postgresql-11.3.tar.bz2) = 03269bb88f44f3a81d5e3a8ca2fe59f63f784436840f08870b2e539755629cbde8ac288e0bb4472ee93294a88b37b814ddff48444254c1a3f7a10b4bb64f7133
-Size (postgresql-11.3.tar.bz2) = 19718775 bytes
+SHA1 (postgresql-11.4.tar.bz2) = 962721e866cb2f9e4d1e4768833180d7ba59f509
+RMD160 (postgresql-11.4.tar.bz2) = 74afcef82d626536da9d77fbe247d88d00a19f0a
+SHA512 (postgresql-11.4.tar.bz2) = 159fb84134e05ddc58e40a879ca52ed4d58ced7bcd1e7310d59bda84f9055339a31a92cfaab2c063a88685f7417b9a828534394bf9a2477fc33d1fb6cd26186b
+Size (postgresql-11.4.tar.bz2) = 19759635 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
diff --git a/databases/postgresql94-docs/PLIST b/databases/postgresql94-docs/PLIST
index 6001e4f37d3..9d7014e406c 100644
--- a/databases/postgresql94-docs/PLIST
+++ b/databases/postgresql94-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2019/05/13 20:38:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2019/06/23 07:55:59 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -861,6 +861,7 @@ share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-20.html
 share/doc/postgresql/html/release-9-4-21.html
 share/doc/postgresql/html/release-9-4-22.html
+share/doc/postgresql/html/release-9-4-23.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
 share/doc/postgresql/html/release-9-4-5.html
diff --git a/databases/postgresql94-server/MESSAGE.rcd b/databases/postgresql94-server/MESSAGE.rcd
deleted file mode 100644
index a1f34038164..00000000000
--- a/databases/postgresql94-server/MESSAGE.rcd
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.rcd,v 1.1 2019/05/28 13:40:40 jperkin Exp $
-
-To enable this package, put the following into your /etc/rc.conf:
-
-	pgsql=YES
-	pgsql_flags="-l"     # enables SSL connections (TCP/IP and
-			     # ~pgsql/data/server.crt required)
-
-and ensure that
-
-	${RCD_SCRIPTS_DIR}/pgsql start
-
-is run at the appropriate time.
-
-Note: PostgreSQL accepts TCP/IP connections on localhost address by default.
-
-===========================================================================
diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common
index 17b066ed43a..8c51c873bd2 100644
--- a/databases/postgresql94/Makefile.common
+++ b/databases/postgresql94/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2019/05/13 20:38:12 adam Exp $
+# $NetBSD: Makefile.common,v 1.31 2019/06/23 07:55:59 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql94-pltcl/Makefile
 # used by databases/postgresql94-server/Makefile
 
-DISTNAME=	postgresql-9.4.22
+DISTNAME=	postgresql-9.4.23
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql94/distinfo b/databases/postgresql94/distinfo
index 10ebb9fa51e..14a2d39c059 100644
--- a/databases/postgresql94/distinfo
+++ b/databases/postgresql94/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2019/05/13 20:38:12 adam Exp $
+$NetBSD: distinfo,v 1.27 2019/06/23 07:55:59 adam Exp $
 
-SHA1 (postgresql-9.4.22.tar.bz2) = 68ee53f1781442e429e37808973bddb7ecf1a0f5
-RMD160 (postgresql-9.4.22.tar.bz2) = ce13b87c2aabcc4900819c9388c2e43b47c9d3da
-SHA512 (postgresql-9.4.22.tar.bz2) = f11623a89b2320616fd53eda52da544bdfcb63bff08cb78fccde134ef628eee7ee90b3de6952f4e08c10297d356624faabf0e5b181b0105f51797796cd04efef
-Size (postgresql-9.4.22.tar.bz2) = 16848787 bytes
+SHA1 (postgresql-9.4.23.tar.bz2) = 383e80d113e8d70828aceab5aadefc996f95225c
+RMD160 (postgresql-9.4.23.tar.bz2) = c9b438a695296abc0d6af5181a7e95758410cf1a
+SHA512 (postgresql-9.4.23.tar.bz2) = b1eb392b939ac8369c76e4ecc142c78f380afc498b60ec0ea97acb16c21ffa5c11a24c2c46463032865955b7c531492c08feb6ef1efc46a549369f026594ea61
+Size (postgresql-9.4.23.tar.bz2) = 16848808 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
 SHA1 (patch-configure) = 1c0fee3fb270863eb39118a65769ce170391cfec
diff --git a/databases/postgresql95-docs/PLIST b/databases/postgresql95-docs/PLIST
index fc890de94b0..aa33c2fa9c9 100644
--- a/databases/postgresql95-docs/PLIST
+++ b/databases/postgresql95-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2019/05/13 20:38:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2019/06/23 07:55:59 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -876,6 +876,7 @@ share/doc/postgresql/html/release-9-5-14.html
 share/doc/postgresql/html/release-9-5-15.html
 share/doc/postgresql/html/release-9-5-16.html
 share/doc/postgresql/html/release-9-5-17.html
+share/doc/postgresql/html/release-9-5-18.html
 share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
diff --git a/databases/postgresql95-server/MESSAGE.rcd b/databases/postgresql95-server/MESSAGE.rcd
deleted file mode 100644
index a1f34038164..00000000000
--- a/databases/postgresql95-server/MESSAGE.rcd
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.rcd,v 1.1 2019/05/28 13:40:40 jperkin Exp $
-
-To enable this package, put the following into your /etc/rc.conf:
-
-	pgsql=YES
-	pgsql_flags="-l"     # enables SSL connections (TCP/IP and
-			     # ~pgsql/data/server.crt required)
-
-and ensure that
-
-	${RCD_SCRIPTS_DIR}/pgsql start
-
-is run at the appropriate time.
-
-Note: PostgreSQL accepts TCP/IP connections on localhost address by default.
-
-===========================================================================
diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common
index d571fce7ec6..ad966032138 100644
--- a/databases/postgresql95/Makefile.common
+++ b/databases/postgresql95/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2019/05/13 20:38:12 adam Exp $
+# $NetBSD: Makefile.common,v 1.25 2019/06/23 07:55:59 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql95-pltcl/Makefile
 # used by databases/postgresql95-server/Makefile
 
-DISTNAME=	postgresql-9.5.17
+DISTNAME=	postgresql-9.5.18
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql95/distinfo b/databases/postgresql95/distinfo
index 0d8f2baa5d2..8ac7186bc1f 100644
--- a/databases/postgresql95/distinfo
+++ b/databases/postgresql95/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2019/05/13 20:38:12 adam Exp $
+$NetBSD: distinfo,v 1.20 2019/06/23 07:55:59 adam Exp $
 
-SHA1 (postgresql-9.5.17.tar.bz2) = 3b70737eedb2f5fc90d420de4c21188c72e50030
-RMD160 (postgresql-9.5.17.tar.bz2) = 9b1557114f5696ea539544757c660f0d48daaca8
-SHA512 (postgresql-9.5.17.tar.bz2) = bb468528b1f18166cda0be136f31a632859ffe6e6800233b1cb0e91ce11d2d00d3dc108a74580b5552a4d30b9f1b6849c91576cd497beac788c429815c66eac5
-Size (postgresql-9.5.17.tar.bz2) = 17563469 bytes
+SHA1 (postgresql-9.5.18.tar.bz2) = fddca7bd9cbb7ec3d0f14c42c364706d3a978412
+RMD160 (postgresql-9.5.18.tar.bz2) = ea8c8449ae4c487495a26eba854f4f8d66d1a2a9
+SHA512 (postgresql-9.5.18.tar.bz2) = 0487ac2891c800de045135d4b153659ec10c28750a09e0b87343f8e7145a11f1783ed0b6ca60829776faae1430c8050cc7661c780f171f1b2621f1673a32e6d1
+Size (postgresql-9.5.18.tar.bz2) = 17570161 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
 SHA1 (patch-configure) = 18dd4af7f043b090beda157dfd52531b551eafd0
diff --git a/databases/postgresql96-docs/PLIST b/databases/postgresql96-docs/PLIST
index cf75238b23e..49c18b131a0 100644
--- a/databases/postgresql96-docs/PLIST
+++ b/databases/postgresql96-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2019/05/13 20:38:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2019/06/23 07:55:59 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -886,6 +886,7 @@ share/doc/postgresql/html/release-9-6-10.html
 share/doc/postgresql/html/release-9-6-11.html
 share/doc/postgresql/html/release-9-6-12.html
 share/doc/postgresql/html/release-9-6-13.html
+share/doc/postgresql/html/release-9-6-14.html
 share/doc/postgresql/html/release-9-6-2.html
 share/doc/postgresql/html/release-9-6-3.html
 share/doc/postgresql/html/release-9-6-4.html
diff --git a/databases/postgresql96-server/MESSAGE.rcd b/databases/postgresql96-server/MESSAGE.rcd
deleted file mode 100644
index a1f34038164..00000000000
--- a/databases/postgresql96-server/MESSAGE.rcd
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.rcd,v 1.1 2019/05/28 13:40:40 jperkin Exp $
-
-To enable this package, put the following into your /etc/rc.conf:
-
-	pgsql=YES
-	pgsql_flags="-l"     # enables SSL connections (TCP/IP and
-			     # ~pgsql/data/server.crt required)
-
-and ensure that
-
-	${RCD_SCRIPTS_DIR}/pgsql start
-
-is run at the appropriate time.
-
-Note: PostgreSQL accepts TCP/IP connections on localhost address by default.
-
-===========================================================================
diff --git a/databases/postgresql96/Makefile.common b/databases/postgresql96/Makefile.common
index 107a48bbd63..82c22854383 100644
--- a/databases/postgresql96/Makefile.common
+++ b/databases/postgresql96/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2019/05/13 20:38:12 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2019/06/23 07:55:59 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql96-pltcl/Makefile
 # used by databases/postgresql96-server/Makefile
 
-DISTNAME=	postgresql-9.6.13
+DISTNAME=	postgresql-9.6.14
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql96/distinfo b/databases/postgresql96/distinfo
index 8147de4f450..7a039ac86f6 100644
--- a/databases/postgresql96/distinfo
+++ b/databases/postgresql96/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2019/05/13 20:38:12 adam Exp $
+$NetBSD: distinfo,v 1.16 2019/06/23 07:55:59 adam Exp $
 
-SHA1 (postgresql-9.6.13.tar.bz2) = 32b9bd28f68426a42c596d1fcedeb971401aee88
-RMD160 (postgresql-9.6.13.tar.bz2) = 02a09368968a2962791310e94d68bd6380bb2d3d
-SHA512 (postgresql-9.6.13.tar.bz2) = 65cc70410ad4a1a738b92855b92eecdbb9efbbca0eb9a45a138d47b696c8f9c9cd19073fbfdf5c80eea7633d0be29b4ed8acbadd38724acf8f18c90bb30f9b26
-Size (postgresql-9.6.13.tar.bz2) = 18767279 bytes
+SHA1 (postgresql-9.6.14.tar.bz2) = 12ebacbe8138c17a4748b2c3ec6b7473a40a4ca1
+RMD160 (postgresql-9.6.14.tar.bz2) = 541d2fb47049910990b8bab0376506551dd092ef
+SHA512 (postgresql-9.6.14.tar.bz2) = dccc183a6992ef4ece4ef5c638339708ab484e571ecd66ed993c9071cd55f250b4277fd3367f9a5ee545aa83e29dc5f7a239200e200e3314d5acc847f35e790c
+Size (postgresql-9.6.14.tar.bz2) = 18787744 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
 SHA1 (patch-configure) = db34614cef013a91dc229be319e5f09c657c3f24