The PostgreSQL Global Development Group has released an update to all supported

versions of our database system, including 10.5, 9.6.10, 9.5.14, 9.4.19,
9.3.24.  This release fixes two security issues as well as bugs reported over
the last three months.

If you have untrusted users accessing your system and you are either running
PostgreSQL 9.5 or a newer version OR have installed the "dblink" or
"postgres_fdw" extensions, you must apply this update as soon as possible. All
other users can upgrade at the next convenient downtime.

Please note that PostgreSQL changed its versioning scheme with the release of
version 10.0, so updating to version 10.5 from any 10.x release is considered a
minor update.

The PostgreSQL Global Development Group also announces that the third beta
release of PostgreSQL 11 is now available for download. This release contains
previews of all features that will be available in the final release of
PostgreSQL 11 (though some details of the release could change before then) as
well as bug fixes that were reported during the second beta.

This release also changes the default option for the server packages to *not*
include XML support per default. If you need this, please check the XML option
knob and build the port.

Releasenotes:	https://www.postgresql.org/about/news/1878/
PR:		229523, 198588
Security:	96eab874-9c79-11e8-b34b-6cc21735f730
Security:	CVE-2018-10915, CVE-2018-10925

4 files changed, 26 insertions, 5 deletions

diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile
index 5f32ed5b7dec..9d296cd7c5c5 100644
--- a/databases/postgresql96-server/Makefile
+++ b/databases/postgresql96-server/Makefile
@@ -1,8 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.6.9
-PORTREVISION?=	1
+DISTVERSION?=	9.6.10
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/postgresql96-server/distinfo b/databases/postgresql96-server/distinfo
index ecae25d709dc..debd0bdb493f 100644
--- a/databases/postgresql96-server/distinfo
+++ b/databases/postgresql96-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1525980867
-SHA256 (postgresql/postgresql-9.6.9.tar.bz2) = b97952e3af02dc1e446f9c4188ff53021cc0eed7ed96f254ae6daf968c443e2e
-SIZE (postgresql/postgresql-9.6.9.tar.bz2) = 19566222
+TIMESTAMP = 1533847550
+SHA256 (postgresql/postgresql-9.6.10.tar.bz2) = 8615acc56646401f0ede97a767dfd27ce07a8ae9c952afdb57163b7234fe8426
+SIZE (postgresql/postgresql-9.6.10.tar.bz2) = 19991204
 SHA256 (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 85f81baa0fc8f692bcf802c8645196d9e3afdef4f760cef712d940b87655486e
 SIZE (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 5998
diff --git a/databases/postgresql96-server/pkg-plist-client b/databases/postgresql96-server/pkg-plist-client
index 1b67b43b9ad0..4fa779f93bd1 100644
--- a/databases/postgresql96-server/pkg-plist-client
+++ b/databases/postgresql96-server/pkg-plist-client
@@ -27,6 +27,7 @@ include/pg_config.h
 include/pg_config_ext.h
 include/pg_config_manual.h
 include/pg_config_os.h
+include/pgtypes.h
 include/pgtypes_date.h
 include/pgtypes_error.h
 include/pgtypes_interval.h
@@ -1018,7 +1019,11 @@ man/man7/WITH.7.gz
 %%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-9.6.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-9.6.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/psql-9.6.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-9.6.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-9.6.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-9.6.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_config-9.6.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-9.6.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-9.6.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/psql-9.6.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/pg_config-9.6.mo
@@ -1026,6 +1031,9 @@ man/man7/WITH.7.gz
 %%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-9.6.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/libpq5-9.6.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/pg_config-9.6.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-9.6.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-9.6.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/psql-9.6.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-9.6.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-9.6.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-9.6.mo
diff --git a/databases/postgresql96-server/pkg-plist-server b/databases/postgresql96-server/pkg-plist-server
index 0175109a9ba2..7ad99d8e5ae0 100644
--- a/databases/postgresql96-server/pkg-plist-server
+++ b/databases/postgresql96-server/pkg-plist-server
@@ -61,9 +61,11 @@ lib/libpgcommon.a
 %%DATADIR%%/extension/plpgsql.control
 %%DATADIR%%/postgres.shdescription
 %%NLS%%share/locale/cs/LC_MESSAGES/initdb-9.6.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-9.6.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-9.6.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-9.6.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_resetxlog-9.6.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-9.6.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-9.6.mo
 %%NLS%%share/locale/de/LC_MESSAGES/initdb-9.6.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-9.6.mo
@@ -140,9 +142,21 @@ lib/libpgcommon.a
 %%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-9.6.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/postgres-9.6.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/initdb-9.6.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-9.6.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-9.6.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-9.6.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/pg_resetxlog-9.6.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-9.6.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-9.6.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/postgres-9.6.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/initdb-9.6.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-9.6.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-9.6.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-9.6.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetxlog-9.6.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-9.6.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-9.6.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/postgres-9.6.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-9.6.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-9.6.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-9.6.mo