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

19 files changed, 61 insertions, 29 deletions

diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
index e46aff0ead54..fa72652dfcc5 100644
--- a/databases/postgresql10-server/Makefile
+++ b/databases/postgresql10-server/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	10.4
-PORTREVISION?=	1
+DISTVERSION?=	10.5
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
@@ -14,9 +13,9 @@ COMMENT?=	PostgreSQL is the most advanced open-source database available anywher
 LICENSE=	PostgreSQL
 
 .if ${DISTVERSION:C/([0-9]*).*/\1/} == 10
-CONFLICTS+=	${PORTNAME}*-9.*
+CONFLICTS+=	${PORTNAME}9*
 .else
-CONFLICTS+=	${PORTNAME}*-9.[^${PORTVERSION:R:E}].* ${PORTNAME}10*
+CONFLICTS+=	${PORTNAME}9[^${PORTVERSION:R:E}]* ${PORTNAME}10*
 .endif
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
@@ -29,7 +28,6 @@ USES+=		tar:bzip2 cpe
 .if !defined(NO_BUILD)
 USES+=	gmake
 GNU_CONFIGURE=	yes
-LLD_UNSAFE=	yes
 .endif
 
 PG_USER?=	postgres
@@ -102,7 +100,7 @@ USES+=		pkgconfig
 # (requires dump/restore if modified.)
 OPTIONS_DEFINE+=	INTDATE
 INTDATE_DESC=	Builds with 64-bit date/time type
-OPTIONS_DEFAULT+=	XML TZDATA INTDATE
+OPTIONS_DEFAULT+=	TZDATA INTDATE
 .endif
 
 .if !defined(SLAVE_ONLY)
diff --git a/databases/postgresql10-server/distinfo b/databases/postgresql10-server/distinfo
index a8361ed829aa..68978d2f045f 100644
--- a/databases/postgresql10-server/distinfo
+++ b/databases/postgresql10-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525980865
-SHA256 (postgresql/postgresql-10.4.tar.bz2) = 1b60812310bd5756c62d93a9f93de8c28ea63b0df254f428cd1cf1a4d9020048
-SIZE (postgresql/postgresql-10.4.tar.bz2) = 20201838
+TIMESTAMP = 1533847537
+SHA256 (postgresql/postgresql-10.5.tar.bz2) = 6c8e616c91a45142b85c0aeb1f29ebba4a361309e86469e0fb4617b6a73c4011
+SIZE (postgresql/postgresql-10.5.tar.bz2) = 20284578
diff --git a/databases/postgresql10-server/pkg-plist-client b/databases/postgresql10-server/pkg-plist-client
index e841064f5553..2b6321ab7f3b 100644
--- a/databases/postgresql10-server/pkg-plist-client
+++ b/databases/postgresql10-server/pkg-plist-client
@@ -25,6 +25,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
@@ -1010,6 +1011,7 @@ man/man7/WITH.7.gz
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_config-10.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-10.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-10.mo
 %%NLS%%share/locale/de/LC_MESSAGES/ecpg-10.mo
 %%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-10.mo
 %%NLS%%share/locale/de/LC_MESSAGES/libpq5-10.mo
diff --git a/databases/postgresql10-server/pkg-plist-server b/databases/postgresql10-server/pkg-plist-server
index bf471953e67a..b23be3697837 100644
--- a/databases/postgresql10-server/pkg-plist-server
+++ b/databases/postgresql10-server/pkg-plist-server
@@ -62,8 +62,16 @@ lib/libpgcommon.a
 %%DATADIR%%/extension/plpgsql.control
 %%DATADIR%%/postgres.shdescription
 %%NLS%%share/locale/cs/LC_MESSAGES/initdb-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-10.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-10.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-10.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-10.mo
 %%NLS%%share/locale/de/LC_MESSAGES/initdb-10.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-10.mo
diff --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile
index ccd4aecd05d5..18673dcb5a3b 100644
--- a/databases/postgresql93-server/Makefile
+++ b/databases/postgresql93-server/Makefile
@@ -1,8 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.3.23
-PORTREVISION=	0
+DISTVERSION?=	9.3.24
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/postgresql93-server/distinfo b/databases/postgresql93-server/distinfo
index 728efd657f23..e5e00df54894 100644
--- a/databases/postgresql93-server/distinfo
+++ b/databases/postgresql93-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1525980865
-SHA256 (postgresql/postgresql-9.3.23.tar.bz2) = 1d981006dce3851e470b038e88bf496a80813c614c2e89ed7d2c7fb38e66f6cb
-SIZE (postgresql/postgresql-9.3.23.tar.bz2) = 17033683
+TIMESTAMP = 1533847538
+SHA256 (postgresql/postgresql-9.3.24.tar.bz2) = 8214a73a3b2135226bdc1394c9efdcb80f79e504ec700cf9b23d0b6bc2b60da9
+SIZE (postgresql/postgresql-9.3.24.tar.bz2) = 17042985
 SHA256 (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 4be31ad9899d5caf9f57ad7ebfc0d14f0fcf58ad539c82fb353b016fb76c0c30
 SIZE (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 5583
diff --git a/databases/postgresql93-server/pkg-plist-client b/databases/postgresql93-server/pkg-plist-client
index 78586d0acb6d..24f96abafb9b 100644
--- a/databases/postgresql93-server/pkg-plist-client
+++ b/databases/postgresql93-server/pkg-plist-client
@@ -26,6 +26,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
diff --git a/databases/postgresql94-server/Makefile b/databases/postgresql94-server/Makefile
index 55911c83c7cd..f205ea4dec90 100644
--- a/databases/postgresql94-server/Makefile
+++ b/databases/postgresql94-server/Makefile
@@ -1,8 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.4.18
-PORTREVISION=	0
+DISTVERSION?=	9.4.19
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/postgresql94-server/distinfo b/databases/postgresql94-server/distinfo
index 43236066fb5e..ccf5dc7f9be4 100644
--- a/databases/postgresql94-server/distinfo
+++ b/databases/postgresql94-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1525980866
-SHA256 (postgresql/postgresql-9.4.18.tar.bz2) = 428337f2b2f5e3ea21b8a44f88eb89c99a07a324559b99aebe777c9abdf4c4c0
-SIZE (postgresql/postgresql-9.4.18.tar.bz2) = 17828085
+TIMESTAMP = 1533847539
+SHA256 (postgresql/postgresql-9.4.19.tar.bz2) = 03776b036b2a05371083558e10c21cc4b90bde9eb3aff60299c4ce7c084c168b
+SIZE (postgresql/postgresql-9.4.19.tar.bz2) = 17879273
 SHA256 (postgresql/pg-949-icu-2016-10-02.diff.gz) = 34612e685a79874db04bc6b66c700bfc6412042840c532eef0da7832d1f70d43
 SIZE (postgresql/pg-949-icu-2016-10-02.diff.gz) = 5289
diff --git a/databases/postgresql94-server/pkg-plist-client b/databases/postgresql94-server/pkg-plist-client
index 47428471c54d..a4fc0e2c79d5 100644
--- a/databases/postgresql94-server/pkg-plist-client
+++ b/databases/postgresql94-server/pkg-plist-client
@@ -26,6 +26,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
diff --git a/databases/postgresql94-server/pkg-plist-server b/databases/postgresql94-server/pkg-plist-server
index 2445a36db1bf..666e585620bb 100644
--- a/databases/postgresql94-server/pkg-plist-server
+++ b/databases/postgresql94-server/pkg-plist-server
@@ -54,6 +54,7 @@ lib/libpgcommon.a
 %%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
 %%DATADIR%%/extension/plpgsql.control
 %%NLS%%share/locale/cs/LC_MESSAGES/initdb-9.4.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-9.4.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-9.4.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-9.4.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_resetxlog-9.4.mo
diff --git a/databases/postgresql95-server/Makefile b/databases/postgresql95-server/Makefile
index 25f45990fc24..a15933dffbf2 100644
--- a/databases/postgresql95-server/Makefile
+++ b/databases/postgresql95-server/Makefile
@@ -1,8 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.5.13
-PORTREVISION=	0
+DISTVERSION?=	9.5.14
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/postgresql95-server/distinfo b/databases/postgresql95-server/distinfo
index 4708485d633b..3c5984799417 100644
--- a/databases/postgresql95-server/distinfo
+++ b/databases/postgresql95-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1525980866
-SHA256 (postgresql/postgresql-9.5.13.tar.bz2) = 5408b86a0b56fd0140c6a0016bf9179bc7817fa03d5571cca346c9ab122ea5ee
-SIZE (postgresql/postgresql-9.5.13.tar.bz2) = 18600185
+TIMESTAMP = 1533847546
+SHA256 (postgresql/postgresql-9.5.14.tar.bz2) = 3e2cd5ea0117431f72c9917c1bbad578ea68732cb284d1691f37356ca0301a4d
+SIZE (postgresql/postgresql-9.5.14.tar.bz2) = 18687959
 SHA256 (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5fa083ec38087d6a0961642208f012e902221270708b919b92e9eedaa755e365
 SIZE (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5952
diff --git a/databases/postgresql95-server/pkg-plist-client b/databases/postgresql95-server/pkg-plist-client
index 4015b0f92241..d2838e5ec9d3 100644
--- a/databases/postgresql95-server/pkg-plist-client
+++ b/databases/postgresql95-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
diff --git a/databases/postgresql95-server/pkg-plist-server b/databases/postgresql95-server/pkg-plist-server
index 7137a16e8a67..866dba0de614 100644
--- a/databases/postgresql95-server/pkg-plist-server
+++ b/databases/postgresql95-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.5.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-9.5.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-9.5.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-9.5.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/pg_resetxlog-9.5.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-9.5.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-9.5.mo
 %%NLS%%share/locale/de/LC_MESSAGES/initdb-9.5.mo
 %%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-9.5.mo
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