The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 9.6.3, 9.5.7, 9.4.12, 9.3.17, and 9.2.21. This release fixes three security issues. It also patches a number of other bugs reported over the last three months. Users who use the PGREQUIRESSL environment variable to control connections, and users who rely on security isolation between database users when using foreign servers, should update as soon as possible. Other users should plan to update at the next convenient downtime.

23 files changed, 76 insertions, 48 deletions

diff --git a/databases/postgresql92-docs/PLIST b/databases/postgresql92-docs/PLIST
index 959e03c2cfe..934e5a9c658 100644
--- a/databases/postgresql92-docs/PLIST
+++ b/databases/postgresql92-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2017/02/11 10:18:51 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2017/05/12 19:37:54 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -726,6 +726,7 @@ share/doc/postgresql/html/pgtrgm.html
 share/doc/postgresql/html/pgupgrade.html
 share/doc/postgresql/html/planner-optimizer.html
 share/doc/postgresql/html/planner-stats-details.html
+share/doc/postgresql/html/planner-stats-security.html
 share/doc/postgresql/html/planner-stats.html
 share/doc/postgresql/html/plhandler.html
 share/doc/postgresql/html/plperl-builtins.html
@@ -1079,6 +1080,7 @@ share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-20.html
+share/doc/postgresql/html/release-9-2-21.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
diff --git a/databases/postgresql92-server/PLIST b/databases/postgresql92-server/PLIST
index 49732a6aaab..01de91c1e7b 100644
--- a/databases/postgresql92-server/PLIST
+++ b/databases/postgresql92-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2017/02/11 10:18:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2017/05/12 19:37:54 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -253,6 +253,7 @@ share/postgresql/timezone/America/Port_of_Spain
 share/postgresql/timezone/America/Porto_Acre
 share/postgresql/timezone/America/Porto_Velho
 share/postgresql/timezone/America/Puerto_Rico
+share/postgresql/timezone/America/Punta_Arenas
 share/postgresql/timezone/America/Rainy_River
 share/postgresql/timezone/America/Rankin_Inlet
 share/postgresql/timezone/America/Recife
diff --git a/databases/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common
index b0c2426cc56..1ba830346e3 100644
--- a/databases/postgresql92/Makefile.common
+++ b/databases/postgresql92/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2017/02/11 10:18:51 adam Exp $
+# $NetBSD: Makefile.common,v 1.28 2017/05/12 19:37:54 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/postgresql92-pltcl/Makefile
 # used by databases/postgresql92-server/Makefile
 
-DISTNAME=	postgresql-9.2.20
+DISTNAME=	postgresql-9.2.21
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql92/distinfo b/databases/postgresql92/distinfo
index f1929556ded..89a0c49e9ee 100644
--- a/databases/postgresql92/distinfo
+++ b/databases/postgresql92/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2017/02/11 10:18:51 adam Exp $
+$NetBSD: distinfo,v 1.23 2017/05/12 19:37:54 adam Exp $
 
-SHA1 (postgresql-9.2.20.tar.bz2) = 3388c43fea446b223b8e6b0c843a7a2a7f1726a7
-RMD160 (postgresql-9.2.20.tar.bz2) = 9362f8b7dfe7173585e75bd53b5e6d6391e6f5df
-SHA512 (postgresql-9.2.20.tar.bz2) = 16f7861e0372481dbc5c69ac977bab46f592045f32951a245f3677121261640fcc169a75e730d592e36c15c9a120e7d06755550bdabf121ad89d76a17535d0f9
-Size (postgresql-9.2.20.tar.bz2) = 16480653 bytes
+SHA1 (postgresql-9.2.21.tar.bz2) = 150f9dda7c03379933cc4f804f6e37d7c8518114
+RMD160 (postgresql-9.2.21.tar.bz2) = a861209168732ec5bef45f675fa3a7a535d8e210
+SHA512 (postgresql-9.2.21.tar.bz2) = c548cd1ba34ad71dd3f1acde5775ba2e71121f004324fac44dbe123a91d599ced0f1b8be675ed07b77712e8c23f376ff6221349385c19a88c4edbbb186f17861
+Size (postgresql-9.2.21.tar.bz2) = 16508040 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-configure) = 21b27add570cff1a24c440201eb1ed49f8223747
diff --git a/databases/postgresql93-docs/PLIST b/databases/postgresql93-docs/PLIST
index b1ae92e5836..7a81f24d656 100644
--- a/databases/postgresql93-docs/PLIST
+++ b/databases/postgresql93-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2017/02/11 10:18:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2017/05/12 19:37:54 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -746,6 +746,7 @@ share/doc/postgresql/html/pgupgrade.html
 share/doc/postgresql/html/pgxlogdump.html
 share/doc/postgresql/html/planner-optimizer.html
 share/doc/postgresql/html/planner-stats-details.html
+share/doc/postgresql/html/planner-stats-security.html
 share/doc/postgresql/html/planner-stats.html
 share/doc/postgresql/html/plhandler.html
 share/doc/postgresql/html/plperl-builtins.html
@@ -1100,6 +1101,7 @@ share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-20.html
+share/doc/postgresql/html/release-9-2-21.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -1116,6 +1118,7 @@ share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-15.html
 share/doc/postgresql/html/release-9-3-16.html
+share/doc/postgresql/html/release-9-3-17.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
diff --git a/databases/postgresql93-server/PLIST b/databases/postgresql93-server/PLIST
index 8c07c498273..baedd52ead7 100644
--- a/databases/postgresql93-server/PLIST
+++ b/databases/postgresql93-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2017/02/11 10:18:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2017/05/12 19:37:54 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -253,6 +253,7 @@ share/postgresql/timezone/America/Port_of_Spain
 share/postgresql/timezone/America/Porto_Acre
 share/postgresql/timezone/America/Porto_Velho
 share/postgresql/timezone/America/Puerto_Rico
+share/postgresql/timezone/America/Punta_Arenas
 share/postgresql/timezone/America/Rainy_River
 share/postgresql/timezone/America/Rankin_Inlet
 share/postgresql/timezone/America/Recife
diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common
index 0810886e097..1e8c0a73cd6 100644
--- a/databases/postgresql93/Makefile.common
+++ b/databases/postgresql93/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2017/02/11 10:18:52 adam Exp $
+# $NetBSD: Makefile.common,v 1.24 2017/05/12 19:37:54 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.16
+DISTNAME=	postgresql-9.3.17
 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 d600e8a6abf..13a80ffa683 100644
--- a/databases/postgresql93/distinfo
+++ b/databases/postgresql93/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2017/02/11 10:18:52 adam Exp $
+$NetBSD: distinfo,v 1.23 2017/05/12 19:37:54 adam Exp $
 
-SHA1 (postgresql-9.3.16.tar.bz2) = 6b2078f456fa18011fd4ba4c9b6dcf66c1e144e5
-RMD160 (postgresql-9.3.16.tar.bz2) = 46ed5c3532ca7c62d9b12b54e2431c4e9d4e3359
-SHA512 (postgresql-9.3.16.tar.bz2) = 2e379aca5db79ab5795e6f1e4ff8b21b1aa284cfb0d34655430d8b959cebac7982ee6eda66833a1fb208a36a51251c946565982cd5dff619ab334603ded530e7
-Size (postgresql-9.3.16.tar.bz2) = 17108969 bytes
+SHA1 (postgresql-9.3.17.tar.bz2) = 72440056d39023002a154ce959aa124f6ac468c7
+RMD160 (postgresql-9.3.17.tar.bz2) = 4e3fff3eebedf34c68930877fb2943fb0c4029bc
+SHA512 (postgresql-9.3.17.tar.bz2) = 4b6fc079c2bb728b13b72eb2f7d92183ffb1a9b32110d99dfce674032ac499963b75a021265ba08dc95c34ae35a7edac65ef1e658e66ee2da41c1ce646a702dc
+Size (postgresql-9.3.17.tar.bz2) = 17158802 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9
diff --git a/databases/postgresql94-client/PLIST b/databases/postgresql94-client/PLIST
index 5f7b9466704..aa6faf5cab5 100644
--- a/databases/postgresql94-client/PLIST
+++ b/databases/postgresql94-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/02/12 09:34:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/05/12 19:37:54 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createlang
@@ -201,6 +201,7 @@ include/postgresql/server/commands/vacuum.h
 include/postgresql/server/commands/variable.h
 include/postgresql/server/commands/view.h
 include/postgresql/server/common/fe_memutils.h
+include/postgresql/server/common/int128.h
 include/postgresql/server/common/relpath.h
 include/postgresql/server/common/string.h
 include/postgresql/server/common/username.h
diff --git a/databases/postgresql94-docs/PLIST b/databases/postgresql94-docs/PLIST
index c756f466a2c..97c22a37c06 100644
--- a/databases/postgresql94-docs/PLIST
+++ b/databases/postgresql94-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2017/02/11 10:18:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2017/05/12 19:37:54 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -763,6 +763,7 @@ share/doc/postgresql/html/pgupgrade.html
 share/doc/postgresql/html/pgxlogdump.html
 share/doc/postgresql/html/planner-optimizer.html
 share/doc/postgresql/html/planner-stats-details.html
+share/doc/postgresql/html/planner-stats-security.html
 share/doc/postgresql/html/planner-stats.html
 share/doc/postgresql/html/plhandler.html
 share/doc/postgresql/html/plperl-builtins.html
@@ -1120,6 +1121,7 @@ share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-20.html
+share/doc/postgresql/html/release-9-2-21.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -1136,6 +1138,7 @@ share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-15.html
 share/doc/postgresql/html/release-9-3-16.html
+share/doc/postgresql/html/release-9-3-17.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -1148,6 +1151,7 @@ share/doc/postgresql/html/release-9-3.html
 share/doc/postgresql/html/release-9-4-1.html
 share/doc/postgresql/html/release-9-4-10.html
 share/doc/postgresql/html/release-9-4-11.html
+share/doc/postgresql/html/release-9-4-12.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-server/PLIST b/databases/postgresql94-server/PLIST
index a8da4a2d9ba..84e90c2aa63 100644
--- a/databases/postgresql94-server/PLIST
+++ b/databases/postgresql94-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2017/02/11 10:18:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/05/12 19:37:54 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -253,6 +253,7 @@ share/postgresql/timezone/America/Port_of_Spain
 share/postgresql/timezone/America/Porto_Acre
 share/postgresql/timezone/America/Porto_Velho
 share/postgresql/timezone/America/Puerto_Rico
+share/postgresql/timezone/America/Punta_Arenas
 share/postgresql/timezone/America/Rainy_River
 share/postgresql/timezone/America/Rankin_Inlet
 share/postgresql/timezone/America/Recife
diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common
index 267cc202712..ea513893c6c 100644
--- a/databases/postgresql94/Makefile.common
+++ b/databases/postgresql94/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2017/02/11 10:18:52 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2017/05/12 19:37:54 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.11
+DISTNAME=	postgresql-9.4.12
 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 5ed9e82f950..70b5f25ffd1 100644
--- a/databases/postgresql94/distinfo
+++ b/databases/postgresql94/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2017/02/11 10:18:52 adam Exp $
+$NetBSD: distinfo,v 1.15 2017/05/12 19:37:54 adam Exp $
 
-SHA1 (postgresql-9.4.11.tar.bz2) = 3ec451a9ecfb7cad107b76be3acd2279726c8df6
-RMD160 (postgresql-9.4.11.tar.bz2) = 28bc7a27c07d97f83787c2cb273cb2f139670c27
-SHA512 (postgresql-9.4.11.tar.bz2) = a3ed866d82ab4b90c2a7ec2abec0308015845947f42b76e420cce8f268e1c374806a9fab00ba0563d742a53014a30fa0eaa90804a09fd162b76fcbfbeff6b70f
-Size (postgresql-9.4.11.tar.bz2) = 17832915 bytes
+SHA1 (postgresql-9.4.12.tar.bz2) = 88be8d77b653a652dbf9aca513c3b6a8bfa63259
+RMD160 (postgresql-9.4.12.tar.bz2) = 03c436eee4323dfb7629ee9d746715f30ce0da81
+SHA512 (postgresql-9.4.12.tar.bz2) = 69951f9e66069aad1049a0ea9fdcd7bf2f84b42e7c6e0f761d78ab22131a39cf56448ef0ddc28170b66970bf53edf2d2355530fcfc0a2dca92b66d69686b7ecb
+Size (postgresql-9.4.12.tar.bz2) = 17833119 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
diff --git a/databases/postgresql95-client/PLIST b/databases/postgresql95-client/PLIST
index 30b2cdd7c2d..a9ae5ef50d2 100644
--- a/databases/postgresql95-client/PLIST
+++ b/databases/postgresql95-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/05/23 14:27:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/05/12 19:37:55 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createlang
@@ -228,6 +228,7 @@ include/postgresql/server/commands/vacuum.h
 include/postgresql/server/commands/variable.h
 include/postgresql/server/commands/view.h
 include/postgresql/server/common/fe_memutils.h
+include/postgresql/server/common/int128.h
 include/postgresql/server/common/pg_lzcompress.h
 include/postgresql/server/common/relpath.h
 include/postgresql/server/common/restricted_token.h
diff --git a/databases/postgresql95-docs/PLIST b/databases/postgresql95-docs/PLIST
index ea5f76f7a3a..46a419329c0 100644
--- a/databases/postgresql95-docs/PLIST
+++ b/databases/postgresql95-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/02/11 10:18:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/05/12 19:37:55 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -784,6 +784,7 @@ share/doc/postgresql/html/pgupgrade.html
 share/doc/postgresql/html/pgxlogdump.html
 share/doc/postgresql/html/planner-optimizer.html
 share/doc/postgresql/html/planner-stats-details.html
+share/doc/postgresql/html/planner-stats-security.html
 share/doc/postgresql/html/planner-stats.html
 share/doc/postgresql/html/plhandler.html
 share/doc/postgresql/html/plperl-builtins.html
@@ -1141,6 +1142,7 @@ share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-20.html
+share/doc/postgresql/html/release-9-2-21.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -1157,6 +1159,7 @@ share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-15.html
 share/doc/postgresql/html/release-9-3-16.html
+share/doc/postgresql/html/release-9-3-17.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -1169,6 +1172,7 @@ share/doc/postgresql/html/release-9-3.html
 share/doc/postgresql/html/release-9-4-1.html
 share/doc/postgresql/html/release-9-4-10.html
 share/doc/postgresql/html/release-9-4-11.html
+share/doc/postgresql/html/release-9-4-12.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
@@ -1184,6 +1188,7 @@ share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
 share/doc/postgresql/html/release-9-5-5.html
 share/doc/postgresql/html/release-9-5-6.html
+share/doc/postgresql/html/release-9-5-7.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
diff --git a/databases/postgresql95-server/PLIST b/databases/postgresql95-server/PLIST
index 6f987b6875a..234a4417974 100644
--- a/databases/postgresql95-server/PLIST
+++ b/databases/postgresql95-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2017/02/11 10:18:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/05/12 19:37:55 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -254,6 +254,7 @@ share/postgresql/timezone/America/Port_of_Spain
 share/postgresql/timezone/America/Porto_Acre
 share/postgresql/timezone/America/Porto_Velho
 share/postgresql/timezone/America/Puerto_Rico
+share/postgresql/timezone/America/Punta_Arenas
 share/postgresql/timezone/America/Rainy_River
 share/postgresql/timezone/America/Rankin_Inlet
 share/postgresql/timezone/America/Recife
diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common
index b3edd818215..e48a2b309b6 100644
--- a/databases/postgresql95/Makefile.common
+++ b/databases/postgresql95/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2017/02/11 10:18:52 adam Exp $
+# $NetBSD: Makefile.common,v 1.9 2017/05/12 19:37:55 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.6
+DISTNAME=	postgresql-9.5.7
 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 baa88530c25..ea68290c12c 100644
--- a/databases/postgresql95/distinfo
+++ b/databases/postgresql95/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2017/02/11 10:18:52 adam Exp $
+$NetBSD: distinfo,v 1.8 2017/05/12 19:37:55 adam Exp $
 
-SHA1 (postgresql-9.5.6.tar.bz2) = f4260f9be4e6259f347df86ba16f4cf9ed71f46d
-RMD160 (postgresql-9.5.6.tar.bz2) = d52a6aaa014322814426097bb482effacc916a33
-SHA512 (postgresql-9.5.6.tar.bz2) = fabaeb2d4841ca2f2fd7b0f9c90368debc91f569ade5ad4dc9250c27d790a97ed58a670319f0fe59404fce7e986e8dafb1408edbe6fc149531bdb230b1b913fe
-Size (postgresql-9.5.6.tar.bz2) = 18598551 bytes
+SHA1 (postgresql-9.5.7.tar.bz2) = 3bb9675025cf1c2a5722f45a0fc8d0891669e094
+RMD160 (postgresql-9.5.7.tar.bz2) = 50ac7b2e6852e721235d45698ae8e897ae217cfe
+SHA512 (postgresql-9.5.7.tar.bz2) = 0f879a8d7587739aa9a696d60f909f819d567c67dff7c730d5e856639ed78ebc35beeb3cdaf782573d7e62c7056560a934f64cf11ccac6e309f58bb82d1ca78f
+Size (postgresql-9.5.7.tar.bz2) = 18639775 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
diff --git a/databases/postgresql96-client/PLIST b/databases/postgresql96-client/PLIST
index 48e08662fa2..97de9c859e2 100644
--- a/databases/postgresql96-client/PLIST
+++ b/databases/postgresql96-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/10/29 19:41:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/05/12 19:37:55 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createlang
@@ -236,6 +236,7 @@ include/postgresql/server/commands/view.h
 include/postgresql/server/common/config_info.h
 include/postgresql/server/common/controldata_utils.h
 include/postgresql/server/common/fe_memutils.h
+include/postgresql/server/common/int128.h
 include/postgresql/server/common/keywords.h
 include/postgresql/server/common/pg_lzcompress.h
 include/postgresql/server/common/relpath.h
diff --git a/databases/postgresql96-docs/PLIST b/databases/postgresql96-docs/PLIST
index 145c7b1a34b..1b65d5eb661 100644
--- a/databases/postgresql96-docs/PLIST
+++ b/databases/postgresql96-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/02/11 10:18:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/05/12 19:37:55 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -796,6 +796,7 @@ share/doc/postgresql/html/pgvisibility.html
 share/doc/postgresql/html/pgxlogdump.html
 share/doc/postgresql/html/planner-optimizer.html
 share/doc/postgresql/html/planner-stats-details.html
+share/doc/postgresql/html/planner-stats-security.html
 share/doc/postgresql/html/planner-stats.html
 share/doc/postgresql/html/plhandler.html
 share/doc/postgresql/html/plperl-builtins.html
@@ -1155,6 +1156,7 @@ share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-20.html
+share/doc/postgresql/html/release-9-2-21.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -1171,6 +1173,7 @@ share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-15.html
 share/doc/postgresql/html/release-9-3-16.html
+share/doc/postgresql/html/release-9-3-17.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -1183,6 +1186,7 @@ share/doc/postgresql/html/release-9-3.html
 share/doc/postgresql/html/release-9-4-1.html
 share/doc/postgresql/html/release-9-4-10.html
 share/doc/postgresql/html/release-9-4-11.html
+share/doc/postgresql/html/release-9-4-12.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
@@ -1198,9 +1202,11 @@ share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
 share/doc/postgresql/html/release-9-5-5.html
 share/doc/postgresql/html/release-9-5-6.html
+share/doc/postgresql/html/release-9-5-7.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release-9-6-1.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.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
diff --git a/databases/postgresql96-server/PLIST b/databases/postgresql96-server/PLIST
index 7d9eaff26ef..90ca2f3f6e3 100644
--- a/databases/postgresql96-server/PLIST
+++ b/databases/postgresql96-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/02/11 10:18:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/05/12 19:37:55 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -255,6 +255,7 @@ share/postgresql/timezone/America/Port_of_Spain
 share/postgresql/timezone/America/Porto_Acre
 share/postgresql/timezone/America/Porto_Velho
 share/postgresql/timezone/America/Puerto_Rico
+share/postgresql/timezone/America/Punta_Arenas
 share/postgresql/timezone/America/Rainy_River
 share/postgresql/timezone/America/Rankin_Inlet
 share/postgresql/timezone/America/Recife
diff --git a/databases/postgresql96/Makefile.common b/databases/postgresql96/Makefile.common
index 7df2de80ab7..b896f4d990e 100644
--- a/databases/postgresql96/Makefile.common
+++ b/databases/postgresql96/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2017/02/11 10:18:53 adam Exp $
+# $NetBSD: Makefile.common,v 1.3 2017/05/12 19:37:55 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.2
+DISTNAME=	postgresql-9.6.3
 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 f5b19b876e6..02c03785d73 100644
--- a/databases/postgresql96/distinfo
+++ b/databases/postgresql96/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2017/02/11 10:18:53 adam Exp $
+$NetBSD: distinfo,v 1.4 2017/05/12 19:37:55 adam Exp $
 
-SHA1 (postgresql-9.6.2.tar.bz2) = 0ff14271b42233666c4831ac0152b2ea069fdf9d
-RMD160 (postgresql-9.6.2.tar.bz2) = b066967d367e15b88a1f6854dfe4f8324084098a
-SHA512 (postgresql-9.6.2.tar.bz2) = 7c9d61a591408e29d7dc70d6b28ecdf06edf7f8fbf4e014e60a1e4f841fd5734c74a820094f6153e10ef633d48ea73f2a85194f6d2cd519a8f7087a261e9e02b
-Size (postgresql-9.6.2.tar.bz2) = 19478040 bytes
+SHA1 (postgresql-9.6.3.tar.bz2) = 5131272f6f22b38eafee8b090fff8d6b6fe1cff7
+RMD160 (postgresql-9.6.3.tar.bz2) = 48f792f6846a48980d021871df4b4fc45b5bf3ee
+SHA512 (postgresql-9.6.3.tar.bz2) = 97141972e154e6b0e756ee6a4e20f26e82022a9fd4c56305314a3a5567a79ece638e4ac3d513b46138737ae6bd27a098f30013a94767db151181aac9c01290a1
+Size (postgresql-9.6.3.tar.bz2) = 19534323 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632