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

versions of our database system, including 9.5.4, 9.4.9, 9.3.14, 9.2.18 and
9.1.23. This release fixes two security issues. It also patches a number of
other bugs reported over the last three months. Users who rely on security
isolation between database users should update as soon as possible. Other users
should plan to update at the next convenient downtime.

If you are using the ICU patch, please consult UPDATING.

Improve periodic cleanup, suggested by claudius (at) ambtec.de. [1]

PR:		210941 [1]
Security:	CVE-2016-5423, CVE-2016-5424

16 files changed, 63 insertions, 34 deletions

diff --git a/UPDATING b/UPDATING
index 5c54c6e870b7..15a9625fb9ab 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,23 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20160811:
+  AFFECTS: users of databases/postgresqlNN-server with ICU patch
+  AUTHOR: girgen@FreeBSD.org
+
+  The ICU patch is added to the PostgreSQL-9.5 server. Please note that you
+  must never change between using the ICU patch and using system locale for the
+  same database cluster without REINDEXing all TEXT/VARCHAR columns or
+  dump+restore your database. Failing to do so will result in corrupted indexes
+  due to the differences between the locale definitions. ICU will always be the
+  better choice for speed and correctness. :) 
+
+  Also, the ICU patch used to support other unicode encodings than UTF-8, but
+  that has been removed due to lack of demand and the complicated testing
+  required. If you use another unicode encoding and rely on ICU for collation,
+  please refrain from upgrading the postgresql server and instead contact the
+  author named above.
+
 20160722:
   AFFECTS: users of emulators/virtualbox-ose
   AUTHOR: jkim@FreeBSD.org
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index b5fdcd3cc666..046b3ef72de7 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	9.1.22
-PORTREVISION=	2
+DISTVERSION?=	9.1.23
+PORTREVISION=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
@@ -16,6 +16,9 @@ CONFLICTS?=	${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
 		${PORTNAME}9[^${PORTVERSION:R:E}]-client* \
 		${PORTNAME}${COMPONENT}-9.[^${PORTVERSION:R:E}].*
 
+DEPRECATED=	End-of-life is near
+EXPIRATION_DATE=2016-10-01
+
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
 
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index 3ea9f5200ffc..5a81c4f3fa33 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,4 +1,5 @@
-SHA256 (postgresql/postgresql-9.1.22.tar.bz2) = f619664b0dde4e1a75fdc00c35afb4517002984a462d70967ffcdedfeee5e16e
-SIZE (postgresql/postgresql-9.1.22.tar.bz2) = 15860904
+TIMESTAMP = 1470723784
+SHA256 (postgresql/postgresql-9.1.23.tar.bz2) = 7f7471e8b3b369726f1c1df0e6a163dde63b6546c4bba985c1f36a574c75f6d5
+SIZE (postgresql/postgresql-9.1.23.tar.bz2) = 57
 SHA256 (postgresql/pg-929-icu-2015-04-18.diff.gz) = 9aff1ba25fbe5892a3868bff516df685531c85901c360548e38bf2e5fa0e14ab
 SIZE (postgresql/pg-929-icu-2015-04-18.diff.gz) = 4469
diff --git a/databases/postgresql91-server/files/502.pgsql.in b/databases/postgresql91-server/files/502.pgsql.in
index 2246de33f70d..06026b1d831f 100644
--- a/databases/postgresql91-server/files/502.pgsql.in
+++ b/databases/postgresql91-server/files/502.pgsql.in
@@ -76,7 +76,7 @@ pgsql_backup() {
 	fi
 
 	# cleaning up old data
-	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
+	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
 	    -a -mtime +${daily_pgsql_savedays} -delete
 	echo
 }
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index deb177ddab46..2accbd9f5996 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	9.2.17
-PORTREVISION=	2
+DISTVERSION?=	9.2.18
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
@@ -19,7 +19,7 @@ CONFLICTS?=	${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
 
-ICU_PATCHFILE?=	pg-929-icu-2015-04-18.diff.gz
+ICU_PATCHFILE?=	pg-9218-icu-2016-08-10.diff.gz
 
 OPTIONS_SUB=	yes
 
@@ -30,9 +30,9 @@ USES+=	gmake
 GNU_CONFIGURE=	yes
 .endif
 
-PG_USER=	pgsql
-PG_GROUP=	pgsql
-PG_UID=	70
+PG_USER?=	pgsql
+PG_GROUP?=	pgsql
+PG_UID?=	70
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 INCLUDES+=	-I${LOCALBASE}/include
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 2067875c7c27..c90843a16289 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,4 +1,5 @@
-SHA256 (postgresql/postgresql-9.2.17.tar.bz2) = c660cc0ee42c221ebedc2c75ad0d4b30ec8da488a954df9987a3fc83bcb7363f
-SIZE (postgresql/postgresql-9.2.17.tar.bz2) = 16497200
-SHA256 (postgresql/pg-929-icu-2015-04-18.diff.gz) = 9aff1ba25fbe5892a3868bff516df685531c85901c360548e38bf2e5fa0e14ab
-SIZE (postgresql/pg-929-icu-2015-04-18.diff.gz) = 4469
+TIMESTAMP = 1470919631
+SHA256 (postgresql/postgresql-9.2.18.tar.bz2) = d7aa37d586ae4d46d07a4fac417ff966e45a9dd99bac8b3cd149be8df9ea35f4
+SIZE (postgresql/postgresql-9.2.18.tar.bz2) = 57
+SHA256 (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 2f9c831b3dff866f0b2f6f2a9ef771a4045486bc252a851aadc73c50d376319d
+SIZE (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 5587
diff --git a/databases/postgresql92-server/files/502.pgsql.in b/databases/postgresql92-server/files/502.pgsql.in
index 2246de33f70d..06026b1d831f 100644
--- a/databases/postgresql92-server/files/502.pgsql.in
+++ b/databases/postgresql92-server/files/502.pgsql.in
@@ -76,7 +76,7 @@ pgsql_backup() {
 	fi
 
 	# cleaning up old data
-	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
+	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
 	    -a -mtime +${daily_pgsql_savedays} -delete
 	echo
 }
diff --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile
index f3163018ed85..93d6796b168b 100644
--- a/databases/postgresql93-server/Makefile
+++ b/databases/postgresql93-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.3.13
+DISTVERSION?=	9.3.14
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
@@ -13,4 +13,6 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/bin/pg_controldata src/bin/pg_resetxlog src/pl \
 		src/bin/pg_basebackup
 
+ICU_PATCHFILE?= pg-9314-icu-2016-08-10.diff.gz
+
 .include "${.CURDIR}/../postgresql92-server/Makefile"
diff --git a/databases/postgresql93-server/distinfo b/databases/postgresql93-server/distinfo
index 969093e824af..ac4eefa1e61c 100644
--- a/databases/postgresql93-server/distinfo
+++ b/databases/postgresql93-server/distinfo
@@ -1,4 +1,5 @@
-SHA256 (postgresql/postgresql-9.3.13.tar.bz2) = 5544e1d29bfdb9a815d3533400ae242b8763c399285e5d4020ffdb49c362a72b
-SIZE (postgresql/postgresql-9.3.13.tar.bz2) = 17061824
-SHA256 (postgresql/pg-929-icu-2015-04-18.diff.gz) = 9aff1ba25fbe5892a3868bff516df685531c85901c360548e38bf2e5fa0e14ab
-SIZE (postgresql/pg-929-icu-2015-04-18.diff.gz) = 4469
+TIMESTAMP = 1470919705
+SHA256 (postgresql/postgresql-9.3.14.tar.bz2) = 5c4322f1c42ba1ff4b28383069c56663b46160bb08e85d41fa2ab9a5009d039d
+SIZE (postgresql/postgresql-9.3.14.tar.bz2) = 57
+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/files/502.pgsql.in b/databases/postgresql93-server/files/502.pgsql.in
index 2246de33f70d..06026b1d831f 100644
--- a/databases/postgresql93-server/files/502.pgsql.in
+++ b/databases/postgresql93-server/files/502.pgsql.in
@@ -76,7 +76,7 @@ pgsql_backup() {
 	fi
 
 	# cleaning up old data
-	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
+	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
 	    -a -mtime +${daily_pgsql_savedays} -delete
 	echo
 }
diff --git a/databases/postgresql94-server/Makefile b/databases/postgresql94-server/Makefile
index 4318b806ce55..c52babe2a45e 100644
--- a/databases/postgresql94-server/Makefile
+++ b/databases/postgresql94-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.4.8
+DISTVERSION?=	9.4.9
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
@@ -12,6 +12,6 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/bin/pg_controldata src/bin/pg_resetxlog src/pl \
 		src/bin/pg_basebackup
 
-ICU_PATCHFILE=	pg-941-icu-2015-04-18.diff.gz
+ICU_PATCHFILE=	pg-949-icu-2016-08-10.diff.gz
 
 .include "${.CURDIR}/../postgresql92-server/Makefile"
diff --git a/databases/postgresql94-server/distinfo b/databases/postgresql94-server/distinfo
index c94b51b8d838..9dac280912df 100644
--- a/databases/postgresql94-server/distinfo
+++ b/databases/postgresql94-server/distinfo
@@ -1,4 +1,5 @@
-SHA256 (postgresql/postgresql-9.4.8.tar.bz2) = 4a10640e180e0d9adb587bc25a82dcce6bf507b033637e7fb9d4eeffa33a6b4c
-SIZE (postgresql/postgresql-9.4.8.tar.bz2) = 17740626
-SHA256 (postgresql/pg-941-icu-2015-04-18.diff.gz) = 30c1366539fd0833db37a98b32bd22e8da4538e58f8dbc2ad2f63dc54835609b
-SIZE (postgresql/pg-941-icu-2015-04-18.diff.gz) = 4279
+TIMESTAMP = 1470919711
+SHA256 (postgresql/postgresql-9.4.9.tar.bz2) = c120a62e90214c20d9160da3ca3fbaec97d5f1656f1dd033f60e7297b7a1e1c9
+SIZE (postgresql/postgresql-9.4.9.tar.bz2) = 56
+SHA256 (postgresql/pg-949-icu-2016-08-10.diff.gz) = 8e7f0470b5c04653aee850c58e690d1ca5f7cb3a2acb5d64c793a8412ee9ebfe
+SIZE (postgresql/pg-949-icu-2016-08-10.diff.gz) = 5263
diff --git a/databases/postgresql94-server/files/502.pgsql.in b/databases/postgresql94-server/files/502.pgsql.in
index 2246de33f70d..06026b1d831f 100644
--- a/databases/postgresql94-server/files/502.pgsql.in
+++ b/databases/postgresql94-server/files/502.pgsql.in
@@ -76,7 +76,7 @@ pgsql_backup() {
 	fi
 
 	# cleaning up old data
-	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
+	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
 	    -a -mtime +${daily_pgsql_savedays} -delete
 	echo
 }
diff --git a/databases/postgresql95-server/Makefile b/databases/postgresql95-server/Makefile
index e1015c57afef..333048ec3250 100644
--- a/databases/postgresql95-server/Makefile
+++ b/databases/postgresql95-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.5.3
+DISTVERSION?=	9.5.4
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
@@ -15,6 +15,6 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_xlogdump src/bin/pg_upgrade
 
-ICU_PATCHFILE=	sorry-icu-patch-is-not-quite-ready-for-95-yet
+ICU_PATCHFILE=	pg-954-icu-2016-08-10.diff.gz
 
 .include "${.CURDIR}/../postgresql92-server/Makefile"
diff --git a/databases/postgresql95-server/distinfo b/databases/postgresql95-server/distinfo
index c2e1bc9daab6..9274c41f398a 100644
--- a/databases/postgresql95-server/distinfo
+++ b/databases/postgresql95-server/distinfo
@@ -1,2 +1,5 @@
-SHA256 (postgresql/postgresql-9.5.3.tar.bz2) = 7385c01dc58acba8d7ac4e6ad42782bd7c0b59272862a3a3d5fe378d4503a0b4
-SIZE (postgresql/postgresql-9.5.3.tar.bz2) = 18455394
+TIMESTAMP = 1470919717
+SHA256 (postgresql/postgresql-9.5.4.tar.bz2) = cf5e571164ad66028ecd7dd8819e3765470d45bcd440d258b686be7e69c76ed0
+SIZE (postgresql/postgresql-9.5.4.tar.bz2) = 56
+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/files/502.pgsql.in b/databases/postgresql95-server/files/502.pgsql.in
index 2246de33f70d..06026b1d831f 100644
--- a/databases/postgresql95-server/files/502.pgsql.in
+++ b/databases/postgresql95-server/files/502.pgsql.in
@@ -76,7 +76,7 @@ pgsql_backup() {
 	fi
 
 	# cleaning up old data
-	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
+	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
 	    -a -mtime +${daily_pgsql_savedays} -delete
 	echo
 }