The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 9.6.4, 9.5.8, 9.4.13, 9.3.18, and 9.2.22. This release fixes three security issues. It also patches over 50 other bugs reported over the last three months. Users who are affected by the below security issues should update as soon as possible. Users affected by CVE-2017-7547 will need to perform additional steps after upgrading to resolve the issue. Other users should plan to update at the next convenient downtime.

Three security vulnerabilities have been closed by this release:
* CVE-2017-7546: Empty password accepted in some authentication methods
* CVE-2017-7547: The "pg_user_mappings" catalog view discloses passwords to users lacking server privileges
* CVE-2017-7548: lo_put() function ignores ACLs

23 files changed, 104 insertions, 85 deletions

diff --git a/databases/postgresql92-docs/PLIST b/databases/postgresql92-docs/PLIST
index 934e5a9c658..0cf3d5e999f 100644
--- a/databases/postgresql92-docs/PLIST
+++ b/databases/postgresql92-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2017/05/12 19:37:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.22 2017/08/13 19:25:17 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1081,6 +1081,7 @@ 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-22.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/Makefile.common b/databases/postgresql92/Makefile.common
index 1ba830346e3..87d1021cc6a 100644
--- a/databases/postgresql92/Makefile.common
+++ b/databases/postgresql92/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2017/05/12 19:37:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.29 2017/08/13 19:25:17 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.21
+DISTNAME=	postgresql-9.2.22
 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 89a0c49e9ee..99ad59b5f00 100644
--- a/databases/postgresql92/distinfo
+++ b/databases/postgresql92/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2017/05/12 19:37:54 adam Exp $
+$NetBSD: distinfo,v 1.24 2017/08/13 19:25:17 adam Exp $
 
-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 (postgresql-9.2.22.tar.bz2) = 43c15380592adb2f34f1fa8b856b7cbff1ea79f7
+RMD160 (postgresql-9.2.22.tar.bz2) = aaef1dd1a38d8dba77d06f29bdc4ca2476ca7685
+SHA512 (postgresql-9.2.22.tar.bz2) = 3e5ab04c2be2719579b2ebbf64b220522acfd9ea74029dd2ed699f60230da224bdc99de4ee5529b513e5586de0377764c4e54deb3dd93d5c53c4d666dce2b6b7
+Size (postgresql-9.2.22.tar.bz2) = 16531224 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-configure) = 21b27add570cff1a24c440201eb1ed49f8223747
@@ -15,4 +15,4 @@ SHA1 (patch-src_backend_utils_adt_datetime.c) = b220c39272bf8d2bda95119adcbab5b2
 SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 20578ab950465db07dab757db2fae4c4570cbbe1
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 2b7448d6dd8550e2ea61f40728a2780068b93d07
-SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
+SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174
diff --git a/databases/postgresql92/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql92/patches/patch-src_pl_plperl_plperl.h
index 63d0749fc31..56d5cb59bf2 100644
--- a/databases/postgresql92/patches/patch-src_pl_plperl_plperl.h
+++ b/databases/postgresql92/patches/patch-src_pl_plperl_plperl.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2012/10/05 21:03:10 adam Exp $
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.2 2017/08/13 19:25:17 adam Exp $
 
---- src/pl/plperl/plperl.h.orig	2011-09-22 23:57:57.000000000 +0200
-+++ src/pl/plperl/plperl.h	2011-10-12 20:36:11.783264869 +0200
-@@ -44,12 +44,21 @@
+--- src/pl/plperl/plperl.h.orig	2017-08-07 21:19:50.000000000 +0000
++++ src/pl/plperl/plperl.h
+@@ -44,6 +44,10 @@
  #undef vsnprintf
  #endif
  
@@ -11,10 +11,11 @@ $NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2012/10/05 21:03:10 adam Exp $
 +#define list_tail sun_list_tail
 +#endif
  
- /* required for perl API */
- #include "EXTERN.h"
- #include "perl.h"
+ /*
+  * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
+@@ -62,6 +66,11 @@
  #include "XSUB.h"
+ #endif
  
 +#ifdef __sun
 +#undef list_head
diff --git a/databases/postgresql93-docs/PLIST b/databases/postgresql93-docs/PLIST
index 7a81f24d656..3666d0b195b 100644
--- a/databases/postgresql93-docs/PLIST
+++ b/databases/postgresql93-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2017/05/12 19:37:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/08/13 19:25:17 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1102,6 +1102,7 @@ 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-22.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
@@ -1119,6 +1120,7 @@ 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-18.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/Makefile.common b/databases/postgresql93/Makefile.common
index 1e8c0a73cd6..18bc95c8b0c 100644
--- a/databases/postgresql93/Makefile.common
+++ b/databases/postgresql93/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2017/05/12 19:37:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.25 2017/08/13 19:25:17 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.17
+DISTNAME=	postgresql-9.3.18
 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 13a80ffa683..42f73eb67a8 100644
--- a/databases/postgresql93/distinfo
+++ b/databases/postgresql93/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2017/05/12 19:37:54 adam Exp $
+$NetBSD: distinfo,v 1.24 2017/08/13 19:25:17 adam Exp $
 
-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 (postgresql-9.3.18.tar.bz2) = f24bb2dab1e6396c80ee32c172ed91da3f450742
+RMD160 (postgresql-9.3.18.tar.bz2) = 26e40fae3ca8732f936a55bc00b5757bc8826433
+SHA512 (postgresql-9.3.18.tar.bz2) = df3f2e0bb396cac74021fcc1a989d04515c12e73846b7392ae859c32668d73ae0027607426072672b6228d7533cc512f72b5729bf5c8f7b0e8d0270727784455
+Size (postgresql-9.3.18.tar.bz2) = 17194269 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9
@@ -18,4 +18,4 @@ SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 98a49b9fc6677c4c930b574
 SHA1 (patch-src_interfaces_libpq_Makefile) = 0066301bc8b31b9e26c79153427537bc3865ef4d
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
-SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
+SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174
diff --git a/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h
index 4bdec461002..56d5cb59bf2 100644
--- a/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h
+++ b/databases/postgresql93/patches/patch-src_pl_plperl_plperl.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2013/09/10 15:32:32 adam Exp $
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.2 2017/08/13 19:25:17 adam Exp $
 
---- src/pl/plperl/plperl.h.orig	2011-09-22 23:57:57.000000000 +0200
-+++ src/pl/plperl/plperl.h	2011-10-12 20:36:11.783264869 +0200
-@@ -44,12 +44,21 @@
+--- src/pl/plperl/plperl.h.orig	2017-08-07 21:19:50.000000000 +0000
++++ src/pl/plperl/plperl.h
+@@ -44,6 +44,10 @@
  #undef vsnprintf
  #endif
  
@@ -11,10 +11,11 @@ $NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2013/09/10 15:32:32 adam Exp $
 +#define list_tail sun_list_tail
 +#endif
  
- /* required for perl API */
- #include "EXTERN.h"
- #include "perl.h"
+ /*
+  * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
+@@ -62,6 +66,11 @@
  #include "XSUB.h"
+ #endif
  
 +#ifdef __sun
 +#undef list_head
diff --git a/databases/postgresql94-docs/PLIST b/databases/postgresql94-docs/PLIST
index 97c22a37c06..59673b4646d 100644
--- a/databases/postgresql94-docs/PLIST
+++ b/databases/postgresql94-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2017/05/12 19:37:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/08/13 19:25:17 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1122,6 +1122,7 @@ 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-22.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
@@ -1139,6 +1140,7 @@ 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-18.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
@@ -1152,6 +1154,7 @@ 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-13.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 ea513893c6c..fc3dd323529 100644
--- a/databases/postgresql94/Makefile.common
+++ b/databases/postgresql94/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2017/05/12 19:37:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.17 2017/08/13 19:25:17 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.12
+DISTNAME=	postgresql-9.4.13
 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 70b5f25ffd1..c4c93df9e37 100644
--- a/databases/postgresql94/distinfo
+++ b/databases/postgresql94/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2017/05/12 19:37:54 adam Exp $
+$NetBSD: distinfo,v 1.16 2017/08/13 19:25:17 adam Exp $
 
-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 (postgresql-9.4.13.tar.bz2) = 01d663713daf2eb4f668da96141bb12b0b5b649a
+RMD160 (postgresql-9.4.13.tar.bz2) = 818adb86f14a7b3cd56801355bffb2824c86295f
+SHA512 (postgresql-9.4.13.tar.bz2) = 98e5721ab1ebc88070a5c2c9ef10e4fc21825de495db71f011577aa15fdd31c2dc0429d48e1624f7161c9d31dd75de4d8cf4ed2e34006ed6d1852f04a948e932
+Size (postgresql-9.4.13.tar.bz2) = 17867502 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
@@ -17,6 +17,6 @@ SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = af0971de415b6b44ae3520c
 SHA1 (patch-src_interfaces_libpq_Makefile) = 0066301bc8b31b9e26c79153427537bc3865ef4d
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
-SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
+SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174
 SHA1 (patch-src_timezone_localtime.c) = 9b5748ef94b11b8798121ac85d2bb18cb99b3812
 SHA1 (patch-src_timezone_strftime.c) = f1f37e424dd70c0b2ad905ef491f9d9574bd3266
diff --git a/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h
index 38766e26646..56d5cb59bf2 100644
--- a/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h
+++ b/databases/postgresql94/patches/patch-src_pl_plperl_plperl.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2015/01/14 21:01:18 adam Exp $
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.2 2017/08/13 19:25:17 adam Exp $
 
---- src/pl/plperl/plperl.h.orig	2011-09-22 23:57:57.000000000 +0200
-+++ src/pl/plperl/plperl.h	2011-10-12 20:36:11.783264869 +0200
-@@ -44,12 +44,21 @@
+--- src/pl/plperl/plperl.h.orig	2017-08-07 21:19:50.000000000 +0000
++++ src/pl/plperl/plperl.h
+@@ -44,6 +44,10 @@
  #undef vsnprintf
  #endif
  
@@ -11,10 +11,11 @@ $NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2015/01/14 21:01:18 adam Exp $
 +#define list_tail sun_list_tail
 +#endif
  
- /* required for perl API */
- #include "EXTERN.h"
- #include "perl.h"
+ /*
+  * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
+@@ -62,6 +66,11 @@
  #include "XSUB.h"
+ #endif
  
 +#ifdef __sun
 +#undef list_head
diff --git a/databases/postgresql95-client/Makefile b/databases/postgresql95-client/Makefile
index 6d933065f0a..0158d78695d 100644
--- a/databases/postgresql95-client/Makefile
+++ b/databases/postgresql95-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2017/06/05 12:30:56 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2017/08/13 19:25:18 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/95-client-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql95/Makefile.common"
diff --git a/databases/postgresql95-docs/PLIST b/databases/postgresql95-docs/PLIST
index 46a419329c0..ddbba342173 100644
--- a/databases/postgresql95-docs/PLIST
+++ b/databases/postgresql95-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2017/05/12 19:37:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/08/13 19:25:18 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1143,6 +1143,7 @@ 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-22.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
@@ -1160,6 +1161,7 @@ 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-18.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
@@ -1173,6 +1175,7 @@ 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-13.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
@@ -1189,6 +1192,7 @@ 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-8.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/Makefile.common b/databases/postgresql95/Makefile.common
index e48a2b309b6..b77ff15a8d5 100644
--- a/databases/postgresql95/Makefile.common
+++ b/databases/postgresql95/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2017/05/12 19:37:55 adam Exp $
+# $NetBSD: Makefile.common,v 1.10 2017/08/13 19:25:17 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.7
+DISTNAME=	postgresql-9.5.8
 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 ea68290c12c..68a872ed8b1 100644
--- a/databases/postgresql95/distinfo
+++ b/databases/postgresql95/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2017/05/12 19:37:55 adam Exp $
+$NetBSD: distinfo,v 1.9 2017/08/13 19:25:17 adam Exp $
 
-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 (postgresql-9.5.8.tar.bz2) = 4d25c445f3bf5fdc60d64522696a84bb2bb52cc3
+RMD160 (postgresql-9.5.8.tar.bz2) = 2df485c15aee32da5d8f7e7e73e6d615bf069d81
+SHA512 (postgresql-9.5.8.tar.bz2) = 4a11f0a16df460391c8250122ca8bf1ab76e49672a8c003ed09718bb4ce2aa57757e7aaec6e41b53d0d1ada293172b974761606647fcc8b4fce8807490b6ef10
+Size (postgresql-9.5.8.tar.bz2) = 18670910 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
@@ -16,4 +16,4 @@ SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = a15012ae34d4ecd1eb2bc29
 SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
-SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
+SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174
diff --git a/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h
index c28abe5cdd3..3747378f2be 100644
--- a/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h
+++ b/databases/postgresql95/patches/patch-src_pl_plperl_plperl.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2016/02/25 21:37:35 tnn Exp $
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.2 2017/08/13 19:25:18 adam Exp $
 
---- src/pl/plperl/plperl.h.orig	2011-09-22 23:57:57.000000000 +0200
-+++ src/pl/plperl/plperl.h	2011-10-12 20:36:11.783264869 +0200
-@@ -44,12 +44,21 @@
+--- src/pl/plperl/plperl.h.orig	2017-08-07 21:19:50.000000000 +0000
++++ src/pl/plperl/plperl.h
+@@ -44,6 +44,10 @@
  #undef vsnprintf
  #endif
  
@@ -11,10 +11,11 @@ $NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2016/02/25 21:37:35 tnn Exp $
 +#define list_tail sun_list_tail
 +#endif
  
- /* required for perl API */
- #include "EXTERN.h"
- #include "perl.h"
+ /*
+  * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
+@@ -62,6 +66,11 @@
  #include "XSUB.h"
+ #endif
  
 +#ifdef __sun
 +#undef list_head
diff --git a/databases/postgresql96-client/Makefile b/databases/postgresql96-client/Makefile
index f11e394610d..0a84f74fb1a 100644
--- a/databases/postgresql96-client/Makefile
+++ b/databases/postgresql96-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2017/06/05 12:30:56 fhajny Exp $
+# $NetBSD: Makefile,v 1.3 2017/08/13 19:25:18 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/96-client-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql96/Makefile.common"
diff --git a/databases/postgresql96-client/PLIST b/databases/postgresql96-client/PLIST
index 97de9c859e2..8b288d5e511 100644
--- a/databases/postgresql96-client/PLIST
+++ b/databases/postgresql96-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/05/12 19:37:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/08/13 19:25:18 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createlang
@@ -831,6 +831,7 @@ share/locale/sv/LC_MESSAGES/pg_controldata-9.6.mo
 share/locale/sv/LC_MESSAGES/pg_ctl-9.6.mo
 share/locale/sv/LC_MESSAGES/pg_resetxlog-9.6.mo
 share/locale/sv/LC_MESSAGES/pgscripts-9.6.mo
+share/locale/sv/LC_MESSAGES/psql-9.6.mo
 share/locale/ta/LC_MESSAGES/pg_config-9.6.mo
 share/locale/tr/LC_MESSAGES/ecpg-9.6.mo
 share/locale/tr/LC_MESSAGES/ecpglib6-9.6.mo
diff --git a/databases/postgresql96-docs/PLIST b/databases/postgresql96-docs/PLIST
index 1b65d5eb661..052a2afe318 100644
--- a/databases/postgresql96-docs/PLIST
+++ b/databases/postgresql96-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2017/05/12 19:37:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/08/13 19:25:18 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1157,6 +1157,7 @@ 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-22.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
@@ -1174,6 +1175,7 @@ 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-18.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
@@ -1187,6 +1189,7 @@ 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-13.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
@@ -1203,10 +1206,12 @@ 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-8.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-4.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 b896f4d990e..0b61e4d2600 100644
--- a/databases/postgresql96/Makefile.common
+++ b/databases/postgresql96/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2017/05/12 19:37:55 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2017/08/13 19:25:18 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.3
+DISTNAME=	postgresql-9.6.4
 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 02c03785d73..1000329edee 100644
--- a/databases/postgresql96/distinfo
+++ b/databases/postgresql96/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2017/05/12 19:37:55 adam Exp $
+$NetBSD: distinfo,v 1.5 2017/08/13 19:25:18 adam Exp $
 
-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 (postgresql-9.6.4.tar.bz2) = f10e2e5c09e041616e25bd41a9ea91be98534d9d
+RMD160 (postgresql-9.6.4.tar.bz2) = 1e4b8ed5c1d3b97bbcb269cd379fd83248801d8c
+SHA512 (postgresql-9.6.4.tar.bz2) = b0527efacce6efc09340b68c8c56483cd884676e01cb6bfb4f9ce63226a394bdb0bcf3d832f84e4dff5ceecf09ef4cf93e9fbd0ac453ec85efb11ac50a7dff39
+Size (postgresql-9.6.4.tar.bz2) = 19566875 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
@@ -16,4 +16,4 @@ SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = a15012ae34d4ecd1eb2bc29
 SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
-SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
+SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174
diff --git a/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h b/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h
index 23875264422..3747378f2be 100644
--- a/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h
+++ b/databases/postgresql96/patches/patch-src_pl_plperl_plperl.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2016/10/29 19:41:55 adam Exp $
+$NetBSD: patch-src_pl_plperl_plperl.h,v 1.2 2017/08/13 19:25:18 adam Exp $
 
---- src/pl/plperl/plperl.h.orig	2011-09-22 23:57:57.000000000 +0200
-+++ src/pl/plperl/plperl.h	2011-10-12 20:36:11.783264869 +0200
-@@ -44,12 +44,21 @@
+--- src/pl/plperl/plperl.h.orig	2017-08-07 21:19:50.000000000 +0000
++++ src/pl/plperl/plperl.h
+@@ -44,6 +44,10 @@
  #undef vsnprintf
  #endif
  
@@ -11,10 +11,11 @@ $NetBSD: patch-src_pl_plperl_plperl.h,v 1.1 2016/10/29 19:41:55 adam Exp $
 +#define list_tail sun_list_tail
 +#endif
  
- /* required for perl API */
- #include "EXTERN.h"
- #include "perl.h"
+ /*
+  * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
+@@ -62,6 +66,11 @@
  #include "XSUB.h"
+ #endif
  
 +#ifdef __sun
 +#undef list_head