postgresql: updated to 10.4, 9.6.9, 9.5.13, 9.4.18, 9.3.23

SECURITY ISSUES
One security vulnerability has been closed by this release:

CVE-2018-1115: Too-permissive access control list on function pg_logfile_rotate()
Please see the "Updating" section below for post-update steps.

BUG FIXES AND IMPROVEMENTS
This update also fixes over 50 bugs reported in the last several months. Some of these issues affect only version 10, but many affect all supported versions.

These fixes include:
Fix incorrect volatility and parallel-safety markings on several built-in functions to ensure correct query planning optimizations
Several fixes for partitioning, including potential crashes as well as allowing TRUE and FALSE to be used as partition bounds
Fix where a new TOAST value could be assigned to a dead-but-not-yet-vacuumed TOAST OID, which would result in an error similar to "unexpected chunk number 0 (expected 1) for toast value nnnnn"
Fix "CREATE TABLE ... LIKE" with bigint identity columns on 32-bit platforms
Fix memory leak within the runtime of a query that repeatedly executes hash joins
Several crash fixes around queries using GROUPING SET
Avoid failure if a query-cancel or session-termination interrupt occurs while committing a prepared transaction
Reduce locking during autovacuum worker scheduling, which prevents loss of potential worker concurrency
Fix possible slow execution of REFRESH MATERIALIZED VIEW CONCURRENTLY
Several fixes around query plans that use "index-only" scans
Avoid deadlocks in concurrent CREATE INDEX CONCURRENTLY commands that are run under SERIALIZABLE or REPEATABLE READ transaction isolation
Several fixes for SP-GiST indexes, including one collation-aware searches on text columns
Fixes related to counting the number of tuples in partial GiST, SP-GiST, and Bloom indexes
Several fixes for logical decoding and replication
Fix misquoting of values for list-valued GUC variables (e.g. local_preload_libraries, session_preload_libraries, shared_preload_libraries, temp_tablespaces) in dumps
Several fixes for pg_stat_activity
Several fixes for ecpg
Fix for pg_recvlogical to ensure compatibility with PostgreSQL versions released before 10
Several fixes for pg_rewind

17 files changed, 60 insertions, 42 deletions

diff --git a/databases/postgresql10-contrib/PLIST b/databases/postgresql10-contrib/PLIST
index 88a42da2785..f0240e9bdb6 100644
--- a/databases/postgresql10-contrib/PLIST
+++ b/databases/postgresql10-contrib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/10/23 20:33:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/05/13 08:13:46 adam Exp $
 bin/oid2name
 bin/pg_standby
 bin/vacuumlo
@@ -51,6 +51,7 @@ share/doc/postgresql/extension/insert_username.example
 share/doc/postgresql/extension/moddatetime.example
 share/doc/postgresql/extension/refint.example
 share/doc/postgresql/extension/timetravel.example
+share/postgresql/extension/adminpack--1.0--1.1.sql
 share/postgresql/extension/adminpack--1.0.sql
 share/postgresql/extension/adminpack.control
 share/postgresql/extension/autoinc--1.0.sql
diff --git a/databases/postgresql10-docs/PLIST b/databases/postgresql10-docs/PLIST
index 9f25428dd86..e7ffa64ae62 100644
--- a/databases/postgresql10-docs/PLIST
+++ b/databases/postgresql10-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/03/02 17:11:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/05/13 08:13:46 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createuser.1
@@ -917,6 +917,7 @@ share/doc/postgresql/html/release-1-09.html
 share/doc/postgresql/html/release-10-1.html
 share/doc/postgresql/html/release-10-2.html
 share/doc/postgresql/html/release-10-3.html
+share/doc/postgresql/html/release-10-4.html
 share/doc/postgresql/html/release-10.html
 share/doc/postgresql/html/release-6-0.html
 share/doc/postgresql/html/release-6-1-1.html
@@ -1214,6 +1215,7 @@ share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
 share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-22.html
+share/doc/postgresql/html/release-9-3-23.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -1231,6 +1233,7 @@ share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-15.html
 share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-17.html
+share/doc/postgresql/html/release-9-4-18.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -1244,6 +1247,7 @@ share/doc/postgresql/html/release-9-5-1.html
 share/doc/postgresql/html/release-9-5-10.html
 share/doc/postgresql/html/release-9-5-11.html
 share/doc/postgresql/html/release-9-5-12.html
+share/doc/postgresql/html/release-9-5-13.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
@@ -1261,6 +1265,7 @@ share/doc/postgresql/html/release-9-6-5.html
 share/doc/postgresql/html/release-9-6-6.html
 share/doc/postgresql/html/release-9-6-7.html
 share/doc/postgresql/html/release-9-6-8.html
+share/doc/postgresql/html/release-9-6-9.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
diff --git a/databases/postgresql10/Makefile.common b/databases/postgresql10/Makefile.common
index c09b84e8f0b..49a41b120b8 100644
--- a/databases/postgresql10/Makefile.common
+++ b/databases/postgresql10/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2018/03/02 17:11:12 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2018/05/13 08:13:46 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.3
+DISTNAME=	postgresql-10.4
 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 befaadc72d3..9674659c7d2 100644
--- a/databases/postgresql10/distinfo
+++ b/databases/postgresql10/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2018/03/02 17:11:12 adam Exp $
+$NetBSD: distinfo,v 1.6 2018/05/13 08:13:46 adam Exp $
 
-SHA1 (postgresql-10.3.tar.bz2) = 93882ad46aa15fd45bfa53cb7f6532c3070d6964
-RMD160 (postgresql-10.3.tar.bz2) = 4f9f08c957c1c2e5feb9bfc6231c9722fdffe0d2
-SHA512 (postgresql-10.3.tar.bz2) = 05cf82d3483bdf38734e6ff0fef6b80e7f8fd3cb5ea6792ffe222a599d97d1a29638970bf28ebf5bd1f877e8dcd9986d88f5c5e5379e74fe79ce83e20d2babba
-Size (postgresql-10.3.tar.bz2) = 19959653 bytes
+SHA1 (postgresql-10.4.tar.bz2) = 56106299525156834f055b421531f05947ba8691
+RMD160 (postgresql-10.4.tar.bz2) = 0a9246b31ae9786e9f7e486b66ebabb6fd8fd4bf
+SHA512 (postgresql-10.4.tar.bz2) = b7c0d2fdc724e2eb1cda9fc1eb01b47352bbe6ba6357b3e898b7f5990fd78499c8c68dcb3aa9bde7821d71b5882d8856131384e899f8055d89d51cdfdbc9e663
+Size (postgresql-10.4.tar.bz2) = 20201838 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
diff --git a/databases/postgresql93-docs/PLIST b/databases/postgresql93-docs/PLIST
index c81b6da918d..a862735abec 100644
--- a/databases/postgresql93-docs/PLIST
+++ b/databases/postgresql93-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2018/03/02 17:11:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2018/05/13 08:13:46 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1128,6 +1128,7 @@ share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
 share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-22.html
+share/doc/postgresql/html/release-9-3-23.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common
index c0554b7e9b0..22c1ecf1f8d 100644
--- a/databases/postgresql93/Makefile.common
+++ b/databases/postgresql93/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2018/03/02 17:11:10 adam Exp $
+# $NetBSD: Makefile.common,v 1.34 2018/05/13 08:13:46 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/postgresql93-pltcl/Makefile
 # used by databases/postgresql93-server/Makefile
 
-DISTNAME=	postgresql-9.3.22
+DISTNAME=	postgresql-9.3.23
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql93/distinfo b/databases/postgresql93/distinfo
index f5d443dec05..13536f06b1f 100644
--- a/databases/postgresql93/distinfo
+++ b/databases/postgresql93/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.29 2018/03/02 17:11:10 adam Exp $
+$NetBSD: distinfo,v 1.30 2018/05/13 08:13:46 adam Exp $
 
-SHA1 (postgresql-9.3.22.tar.bz2) = 8df59c0d230287c91a658c25cc6955d273a14300
-RMD160 (postgresql-9.3.22.tar.bz2) = 29b7b0a536d812ebed711e8d7dcc09195063aab5
-SHA512 (postgresql-9.3.22.tar.bz2) = 667ff496172626d2fe35c6795935fb07f4f7967a3b0631dd3b96278f8dc00b3d08794f091a5ab060a45d6f2a861e0f10f0e9660f9e343ab34eeabd693104c47f
-Size (postgresql-9.3.22.tar.bz2) = 17022938 bytes
+SHA1 (postgresql-9.3.23.tar.bz2) = 9ac36c8c1867f14a1e3f712be2ef989f6e90f01e
+RMD160 (postgresql-9.3.23.tar.bz2) = 675d522861cab917d5a66082b3e7fcbe31577170
+SHA512 (postgresql-9.3.23.tar.bz2) = bb2d54312de728aa0379ea5bc6385036bbe69d3b7f85bbd78c210840eed19ace29840849caf38d0689e21130a0c94818a362b3927805d8eded53b68e240a52b0
+Size (postgresql-9.3.23.tar.bz2) = 17033683 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = 2a423161cf0c394ff8b8f8cfb3ecffae1c65956a
 SHA1 (patch-configure) = 8fd9dcaa459ba2871b875c4b9c777064f7a57ee2
diff --git a/databases/postgresql94-docs/PLIST b/databases/postgresql94-docs/PLIST
index c1b55dcd320..7848773cffe 100644
--- a/databases/postgresql94-docs/PLIST
+++ b/databases/postgresql94-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2018/03/02 17:11:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2018/05/13 08:13:46 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1148,6 +1148,7 @@ share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
 share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-22.html
+share/doc/postgresql/html/release-9-3-23.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -1165,6 +1166,7 @@ share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-15.html
 share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-17.html
+share/doc/postgresql/html/release-9-4-18.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common
index 97654b6ab9f..d5b1305bb5a 100644
--- a/databases/postgresql94/Makefile.common
+++ b/databases/postgresql94/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2018/03/02 17:11:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.26 2018/05/13 08:13:46 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.17
+DISTNAME=	postgresql-9.4.18
 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 3f33fe8e054..c87a43d506f 100644
--- a/databases/postgresql94/distinfo
+++ b/databases/postgresql94/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2018/03/02 17:11:11 adam Exp $
+$NetBSD: distinfo,v 1.22 2018/05/13 08:13:46 adam Exp $
 
-SHA1 (postgresql-9.4.17.tar.bz2) = 706aea600900e5818eaae2ea9ecc008a08da7585
-RMD160 (postgresql-9.4.17.tar.bz2) = 9028289e7a2dff7182729014e2697ea6b2d88da3
-SHA512 (postgresql-9.4.17.tar.bz2) = 9ac03d460e521dcd142ac463dd5bb0f3e3f47333367bf8d61499ec7e8d0129d338c6f111667d0006df0c8ced9ae8a337d4c1b40eb5f55e6bc8dd5a24dfd376f0
-Size (postgresql-9.4.17.tar.bz2) = 17807762 bytes
+SHA1 (postgresql-9.4.18.tar.bz2) = ce77a18526dee4ee10a0a14da230de3e9239c751
+RMD160 (postgresql-9.4.18.tar.bz2) = 2bdfba37f0c618b7d8c1224bedebe59140410cd7
+SHA512 (postgresql-9.4.18.tar.bz2) = 2e64c3130c3dfc5183a77d72f61714bea34bfe549f55720eee25046e00b913a7effec3d7e43a021766ac957c1fa3c8c5e6c26ccbd8be1b434ae618e1fe9daab6
+Size (postgresql-9.4.18.tar.bz2) = 17828085 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 f5b329b164f..c40481abbe0 100644
--- a/databases/postgresql95-docs/PLIST
+++ b/databases/postgresql95-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2018/03/02 17:11:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2018/05/13 08:13:46 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1169,6 +1169,7 @@ share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
 share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-22.html
+share/doc/postgresql/html/release-9-3-23.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -1186,6 +1187,7 @@ share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-15.html
 share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-17.html
+share/doc/postgresql/html/release-9-4-18.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -1199,6 +1201,7 @@ share/doc/postgresql/html/release-9-5-1.html
 share/doc/postgresql/html/release-9-5-10.html
 share/doc/postgresql/html/release-9-5-11.html
 share/doc/postgresql/html/release-9-5-12.html
+share/doc/postgresql/html/release-9-5-13.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/Makefile.common b/databases/postgresql95/Makefile.common
index fe1b5d1e80a..4309f97790f 100644
--- a/databases/postgresql95/Makefile.common
+++ b/databases/postgresql95/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2018/03/02 17:11:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.20 2018/05/13 08:13:46 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.12
+DISTNAME=	postgresql-9.5.13
 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 246017c954d..c65f61477a4 100644
--- a/databases/postgresql95/distinfo
+++ b/databases/postgresql95/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2018/03/02 17:11:11 adam Exp $
+$NetBSD: distinfo,v 1.15 2018/05/13 08:13:46 adam Exp $
 
-SHA1 (postgresql-9.5.12.tar.bz2) = 5c135e82e6056735dd94c66c24e3822b629769b7
-RMD160 (postgresql-9.5.12.tar.bz2) = d62602e70cff96aec0a5ae5e303b66d3e58099e2
-SHA512 (postgresql-9.5.12.tar.bz2) = ab81bc95fd587f76a1986db5616b63d861b84da0eb9e54478f5298248a81d7a608d1bb1a9e30662c8190d05630106ddb3bb6413c34b003de948417214d342654
-Size (postgresql-9.5.12.tar.bz2) = 18589538 bytes
+SHA1 (postgresql-9.5.13.tar.bz2) = c1c9885b578224995f3663a17b1c3ab3bb7bef13
+RMD160 (postgresql-9.5.13.tar.bz2) = 04338ad5fd9a5400249c32853acb2f041ddebb7e
+SHA512 (postgresql-9.5.13.tar.bz2) = 807b22aabee38326934213de04b782a6b22cd8fe5c5bfd8b6cfa44281924527a715dcd78adbee276746446a7b05036b4714b00a16c650027543dcbafe1888082
+Size (postgresql-9.5.13.tar.bz2) = 18600185 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
 SHA1 (patch-configure) = 18dd4af7f043b090beda157dfd52531b551eafd0
diff --git a/databases/postgresql96-contrib/PLIST b/databases/postgresql96-contrib/PLIST
index 07e2722eb41..82da7bac052 100644
--- a/databases/postgresql96-contrib/PLIST
+++ b/databases/postgresql96-contrib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/11/23 15:22:48 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/05/13 08:13:47 adam Exp $
 bin/oid2name
 bin/pg_standby
 bin/vacuumlo
@@ -52,7 +52,9 @@ share/doc/postgresql/extension/insert_username.example
 share/doc/postgresql/extension/moddatetime.example
 share/doc/postgresql/extension/refint.example
 share/doc/postgresql/extension/timetravel.example
+share/postgresql/extension/adminpack--1.0--1.1.sql
 share/postgresql/extension/adminpack--1.0.sql
+share/postgresql/extension/adminpack--1.1.sql
 share/postgresql/extension/adminpack.control
 share/postgresql/extension/autoinc--1.0.sql
 share/postgresql/extension/autoinc--unpackaged--1.0.sql
diff --git a/databases/postgresql96-docs/PLIST b/databases/postgresql96-docs/PLIST
index ded2b352446..994a81e5ee2 100644
--- a/databases/postgresql96-docs/PLIST
+++ b/databases/postgresql96-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2018/03/02 17:11:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/05/13 08:13:47 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1183,6 +1183,7 @@ share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-20.html
 share/doc/postgresql/html/release-9-3-21.html
 share/doc/postgresql/html/release-9-3-22.html
+share/doc/postgresql/html/release-9-3-23.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
 share/doc/postgresql/html/release-9-3-5.html
@@ -1200,6 +1201,7 @@ share/doc/postgresql/html/release-9-4-14.html
 share/doc/postgresql/html/release-9-4-15.html
 share/doc/postgresql/html/release-9-4-16.html
 share/doc/postgresql/html/release-9-4-17.html
+share/doc/postgresql/html/release-9-4-18.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -1213,6 +1215,7 @@ share/doc/postgresql/html/release-9-5-1.html
 share/doc/postgresql/html/release-9-5-10.html
 share/doc/postgresql/html/release-9-5-11.html
 share/doc/postgresql/html/release-9-5-12.html
+share/doc/postgresql/html/release-9-5-13.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
@@ -1230,6 +1233,7 @@ share/doc/postgresql/html/release-9-6-5.html
 share/doc/postgresql/html/release-9-6-6.html
 share/doc/postgresql/html/release-9-6-7.html
 share/doc/postgresql/html/release-9-6-8.html
+share/doc/postgresql/html/release-9-6-9.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
diff --git a/databases/postgresql96/Makefile.common b/databases/postgresql96/Makefile.common
index 17565d90a52..de2936948c0 100644
--- a/databases/postgresql96/Makefile.common
+++ b/databases/postgresql96/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2018/03/02 17:11:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.14 2018/05/13 08:13:47 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.8
+DISTNAME=	postgresql-9.6.9
 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 af238311f93..13b0bc2ae67 100644
--- a/databases/postgresql96/distinfo
+++ b/databases/postgresql96/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2018/03/02 17:11:11 adam Exp $
+$NetBSD: distinfo,v 1.11 2018/05/13 08:13:47 adam Exp $
 
-SHA1 (postgresql-9.6.8.tar.bz2) = 8e610dd8dbaab69982d12324971b0c6b5225142f
-RMD160 (postgresql-9.6.8.tar.bz2) = b433ed8ee784610c7991f87ba74ca4a22cfb99f6
-SHA512 (postgresql-9.6.8.tar.bz2) = 6b7595c0046308c725d77360b156e979d6bc469b78ac6500f631112f19b2607ca2d816781f8c5fd3bd835c48e079e79ada7af687fbd306a8fec5e160f20dd211
-Size (postgresql-9.6.8.tar.bz2) = 19528927 bytes
+SHA1 (postgresql-9.6.9.tar.bz2) = 086f440fca02044cc1798be22257dc6bcd437381
+RMD160 (postgresql-9.6.9.tar.bz2) = 1ebf7b4f444abd5e843404f30726a4e2a812d9cd
+SHA512 (postgresql-9.6.9.tar.bz2) = 3ce2a8f3a017d9c0bd0f1b475a9ee02bcb6a4119b0d436757911f444f49f5024bb1a1be07ce16a79e71af77799de1bf952b32279b4566bae075f23a50b8545c6
+Size (postgresql-9.6.9.tar.bz2) = 19566222 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
 SHA1 (patch-configure) = db34614cef013a91dc229be319e5f09c657c3f24