aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalle Girgensohn <girgen@FreeBSD.org>2015-06-25 19:57:24 +0000
committerPalle Girgensohn <girgen@FreeBSD.org>2015-06-25 19:57:24 +0000
commit3af9e3e58cd18f18164e05c46cd475132cb9a356 (patch)
treeb38070f56891640a3b97244fd8aa3dfa10354699
parentf7a52d338863c9d119a89860d9824e8ab6eb3b96 (diff)
downloadports-3af9e3e58cd18f18164e05c46cd475132cb9a356.tar.gz
ports-3af9e3e58cd18f18164e05c46cd475132cb9a356.zip
MFH: 383112,383272,384223,384279,387089,388585,389267
Data Corruption Fix For users of PostgreSQL versions 9.3 or 9.4, this release fixes a problem where the database will fail to protect against "multixact wraparound", resulting in data corruption or loss. Users with a high transaction rate (1 million or more per hour) in a database with many foreign keys are especially vulnerable. We strongly urge all users of 9.4 and 9.3 to update their installations in the next few days. Earlier update releases attempted to fix an issue in PostgreSQL 9.3 and 9.4 with "multixact wraparound", but failed to account for issues doing multixact cleanup during crash recovery. This could cause servers to be unable to restart after a crash. As such, all users of 9.3 and 9.4 should apply this update as soon as possible. Users of versions 9.2 and earlier are not affected by this issue. Security: fc38cd83-00b3-11e5-8ebd-0026551a22dc Security: CVE-2015-0241 Security: CVE-2015-0242 Security: CVE-2015-0243 Security: CVE-2015-0244 Security: CVE-2014-8161 URL: http://www.postgresql.org/about/news/1590/ URL: http://www.postgresql.org/about/news/1592/ Approved by: ports-secteam (delphij)
Notes
Notes: svn path=/branches/2015Q2/; revision=390595
-rw-r--r--databases/postgresql84-server/Makefile3
-rw-r--r--databases/postgresql84-server/distinfo4
-rw-r--r--databases/postgresql90-client/Makefile2
-rw-r--r--databases/postgresql90-server/Makefile6
-rw-r--r--databases/postgresql90-server/distinfo8
-rw-r--r--databases/postgresql91-client/Makefile2
-rw-r--r--databases/postgresql91-server/Makefile11
-rw-r--r--databases/postgresql91-server/distinfo8
-rw-r--r--databases/postgresql91-server/pkg-plist-contrib3
-rw-r--r--databases/postgresql92-client/Makefile2
-rw-r--r--databases/postgresql92-server/Makefile11
-rw-r--r--databases/postgresql92-server/distinfo8
-rw-r--r--databases/postgresql92-server/pkg-plist-contrib3
-rw-r--r--databases/postgresql93-client/Makefile2
-rw-r--r--databases/postgresql93-server/Makefile4
-rw-r--r--databases/postgresql93-server/distinfo8
-rw-r--r--databases/postgresql93-server/pkg-plist-contrib3
-rw-r--r--databases/postgresql94-client/Makefile2
-rw-r--r--databases/postgresql94-server/Makefile6
-rw-r--r--databases/postgresql94-server/distinfo8
-rw-r--r--databases/postgresql94-server/pkg-plist-contrib3
21 files changed, 56 insertions, 51 deletions
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 02cb8afb92dc..c984f29a92e1 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -25,7 +25,7 @@ DIST_SUBDIR= postgresql
DEPRECATED= "EOL was reached in July 2014"
EXPIRATION_DATE=2015-05-10
-ICU_PATCHFILE?= pg-8421-icu-2014-06-09.diff.gz
+ICU_PATCHFILE?= pg-8421-icu-2015-04-18.diff.gz
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}
@@ -60,6 +60,7 @@ INSTALL_DIRS?= ${BUILD_DIRS}
.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
SERVER_ONLY= yes
+PORTREVISION= 2
COMPONENT= -server
USE_RC_SUBR= postgresql
USES+= pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g}
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index 172048acd66c..ec0935278e56 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,4 +1,4 @@
SHA256 (postgresql/postgresql-8.4.22.tar.bz2) = 5c1d56ce77448706d9dd03b2896af19d9ab1b9b8dcdb96c39707c74675ca3826
SIZE (postgresql/postgresql-8.4.22.tar.bz2) = 14651732
-SHA256 (postgresql/pg-8421-icu-2014-06-09.diff.gz) = 39b88088adbe4cbfa207db0dd0ed0411a34af762ac9fa967e84eef6bcf8821ad
-SIZE (postgresql/pg-8421-icu-2014-06-09.diff.gz) = 4380
+SHA256 (postgresql/pg-8421-icu-2015-04-18.diff.gz) = 440fc4ab7995435304f85a583051a28d8c80908e2cdc84f687a42db329c8faac
+SIZE (postgresql/pg-8421-icu-2015-04-18.diff.gz) = 4398
diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile
index cdc9a8294239..dbf1f5cc89e6 100644
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postgresql
COMMENT= PostgreSQL database (client)
-PORTREVISION= 1
+PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../postgresql90-server
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index ee0b66aad4f7..264e1b39d147 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -1,15 +1,13 @@
# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
# $FreeBSD$
-DISTVERSION?= 9.0.19
+DISTVERSION?= 9.0.22
PORTREVISION?= 0
PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
-USES+= cpe
-
-ICU_PATCHFILE?= pg-9017-icu-2014-06-09.diff.gz
+ICU_PATCHFILE?= pg-9019-icu-2015-04-18.diff.gz
BUILD_DIRS?= src/timezone src/backend src/backend/utils/mb/conversion_procs \
src/backend/snowball src/backend/replication/libpqwalreceiver \
src/bin/initdb src/bin/pg_ctl \
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index e3922dc932ca..c514c32c9c61 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.0.19.tar.bz2) = 53ad12bca99ba8ff0e002e39e50634c4dba1035232be1475cb77b3f6579385c0
-SIZE (postgresql/postgresql-9.0.19.tar.bz2) = 15019406
-SHA256 (postgresql/pg-9017-icu-2014-06-09.diff.gz) = a28988885b532e73c2d6e67c6d2d9593f34d4360f2b4c9f6c419a373e16f149f
-SIZE (postgresql/pg-9017-icu-2014-06-09.diff.gz) = 4395
+SHA256 (postgresql/postgresql-9.0.22.tar.bz2) = 94d4b20d854cd7fa4c9c322c0b602751edbc5ca0d4f29fe92f996e28bb32f8a5
+SIZE (postgresql/postgresql-9.0.22.tar.bz2) = 15046629
+SHA256 (postgresql/pg-9019-icu-2015-04-18.diff.gz) = 44436558d3414b964e6acda18148188be88446b3773d133a4b3b0d63d17bd807
+SIZE (postgresql/pg-9019-icu-2015-04-18.diff.gz) = 4412
diff --git a/databases/postgresql91-client/Makefile b/databases/postgresql91-client/Makefile
index 41a8fe3afbfb..736c7e3af73a 100644
--- a/databases/postgresql91-client/Makefile
+++ b/databases/postgresql91-client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postgresql
COMMENT= PostgreSQL database (client)
-PORTREVISION= 1
+PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../postgresql91-server
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index da2613395366..311b08f9a26a 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= postgresql
-DISTVERSION?= 9.1.15
+DISTVERSION?= 9.1.18
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= PGSQL
@@ -12,8 +12,6 @@ PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
COMMENT?= The most advanced open-source database available anywhere
-USES+= cpe
-
#CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
# ${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \
# ${PORTNAME}9[^${PORTVERSION:R:E}]-client* \
@@ -22,7 +20,7 @@ USES+= cpe
WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION}
DIST_SUBDIR= postgresql
-ICU_PATCHFILE?= pg-928-icu-2014-06-09.diff.gz
+ICU_PATCHFILE?= pg-929-icu-2015-04-18.diff.gz
.if !defined(SLAVE_ONLY)
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}
@@ -31,7 +29,7 @@ UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX}
.endif
PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT}
-USES+= tar:bzip2
+USES+= tar:bzip2 cpe
.if !defined(NO_BUILD)
USES+= gmake
GNU_CONFIGURE= yes
@@ -60,6 +58,7 @@ INSTALL_DIRS?= src/timezone src/backend \
src/bin/pg_controldata src/bin/pg_resetxlog src/pl \
src/bin/pg_basebackup
BUILD_DIRS?= src/port ${INSTALL_DIRS}
+INSTALL_TARGET?=install-strip
.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
COMPONENT= -server
@@ -202,8 +201,6 @@ CFLAGS+= -O3 -funroll-loops
. if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
INSTALL_TARGET= install
-. else
-INSTALL_TARGET= install-strip
. endif
.if ${PORT_OPTIONS:MGSSAPI}
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index 7c24243bd1f3..9b0f186512c3 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.1.15.tar.bz2) = 67d6deaf15cdc35fcdff2c319234d0577a86bce6f363e4f0e4e987e419e0de5f
-SIZE (postgresql/postgresql-9.1.15.tar.bz2) = 15768092
-SHA256 (postgresql/pg-928-icu-2014-06-09.diff.gz) = 6f856ee0fd27118650f806fb674220d9851a0183ffa125e6fbe5468dfabeea5c
-SIZE (postgresql/pg-928-icu-2014-06-09.diff.gz) = 4449
+SHA256 (postgresql/postgresql-9.1.18.tar.bz2) = 2726d526666904b454f87fe2ae54357c2ab9eb8aba299a4c904829b7598584a8
+SIZE (postgresql/postgresql-9.1.18.tar.bz2) = 15822081
+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/pkg-plist-contrib b/databases/postgresql91-server/pkg-plist-contrib
index ccd78c777f86..b39a23f3d2d0 100644
--- a/databases/postgresql91-server/pkg-plist-contrib
+++ b/databases/postgresql91-server/pkg-plist-contrib
@@ -69,7 +69,10 @@ share/doc/postgresql/extension/timetravel.example
%%DATADIR%%/extension/chkpass--1.0.sql
%%DATADIR%%/extension/chkpass--unpackaged--1.0.sql
%%DATADIR%%/extension/chkpass.control
+%%DATADIR%%/extension/citext--1.0--1.1.sql
%%DATADIR%%/extension/citext--1.0.sql
+%%DATADIR%%/extension/citext--1.1--1.0.sql
+%%DATADIR%%/extension/citext--1.1.sql
%%DATADIR%%/extension/citext--unpackaged--1.0.sql
%%DATADIR%%/extension/citext.control
%%DATADIR%%/extension/cube--1.0.sql
diff --git a/databases/postgresql92-client/Makefile b/databases/postgresql92-client/Makefile
index d5e0008a7551..2158be7b38f7 100644
--- a/databases/postgresql92-client/Makefile
+++ b/databases/postgresql92-client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postgresql
COMMENT= PostgreSQL database (client)
-PORTREVISION= 1
+PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../postgresql92-server
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index b3747e07315c..c4c485604973 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= postgresql
-DISTVERSION?= 9.2.10
+DISTVERSION?= 9.2.13
PORTREVISION?= 0
CATEGORIES?= databases
MASTER_SITES= PGSQL
@@ -12,8 +12,6 @@ PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
COMMENT?= The most advanced open-source database available anywhere
-USES+= cpe
-
CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \
${PORTNAME}9[^${PORTVERSION:R:E}]-client* \
@@ -22,7 +20,7 @@ CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION}
DIST_SUBDIR= postgresql
-ICU_PATCHFILE?= pg-928-icu-2014-06-09.diff.gz
+ICU_PATCHFILE?= pg-929-icu-2015-04-18.diff.gz
.if !defined(SLAVE_ONLY)
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}
@@ -31,7 +29,7 @@ UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}${PKGNAMESUFFIX}
.endif
PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT}
-USES+= tar:bzip2
+USES+= tar:bzip2 cpe
.if !defined(NO_BUILD)
USES+= gmake
GNU_CONFIGURE= yes
@@ -60,6 +58,7 @@ INSTALL_DIRS?= src/timezone src/backend \
src/bin/pg_controldata src/bin/pg_resetxlog src/pl \
src/bin/pg_basebackup
BUILD_DIRS?= src/port ${INSTALL_DIRS}
+INSTALL_TARGET?=install-strip
.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
SERVER_ONLY= yes
@@ -201,8 +200,6 @@ CFLAGS+= -O3 -funroll-loops
. if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-debug
INSTALL_TARGET= install
-. else
-INSTALL_TARGET= install-strip
. endif
.if ${PORT_OPTIONS:MGSSAPI}
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index f7f2b20334c4..bcd68ad23dd5 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.2.10.tar.bz2) = 35545bbfead46f70936a7f3f39ccef13e02cdb79c2b3ef3688888df5b18d73ad
-SIZE (postgresql/postgresql-9.2.10.tar.bz2) = 16353487
-SHA256 (postgresql/pg-928-icu-2014-06-09.diff.gz) = 6f856ee0fd27118650f806fb674220d9851a0183ffa125e6fbe5468dfabeea5c
-SIZE (postgresql/pg-928-icu-2014-06-09.diff.gz) = 4449
+SHA256 (postgresql/postgresql-9.2.13.tar.bz2) = 5dcbd6209a8c0f508504fa433486583a42caaa240c823e1b3576db8a72db6a44
+SIZE (postgresql/postgresql-9.2.13.tar.bz2) = 16401289
+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/postgresql92-server/pkg-plist-contrib b/databases/postgresql92-server/pkg-plist-contrib
index 3e505e9cf3b9..3f7d52e541ea 100644
--- a/databases/postgresql92-server/pkg-plist-contrib
+++ b/databases/postgresql92-server/pkg-plist-contrib
@@ -71,7 +71,10 @@ share/doc/postgresql/extension/timetravel.example
%%DATADIR%%/extension/chkpass--1.0.sql
%%DATADIR%%/extension/chkpass--unpackaged--1.0.sql
%%DATADIR%%/extension/chkpass.control
+%%DATADIR%%/extension/citext--1.0--1.1.sql
%%DATADIR%%/extension/citext--1.0.sql
+%%DATADIR%%/extension/citext--1.1--1.0.sql
+%%DATADIR%%/extension/citext--1.1.sql
%%DATADIR%%/extension/citext--unpackaged--1.0.sql
%%DATADIR%%/extension/citext.control
%%DATADIR%%/extension/cube--1.0.sql
diff --git a/databases/postgresql93-client/Makefile b/databases/postgresql93-client/Makefile
index da041c94c0cd..440733029f4c 100644
--- a/databases/postgresql93-client/Makefile
+++ b/databases/postgresql93-client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postgresql
COMMENT= PostgreSQL database (client)
-PORTREVISION= 1
+PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../postgresql93-server
diff --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile
index 3dda88ea0ea0..f55827440aac 100644
--- a/databases/postgresql93-server/Makefile
+++ b/databases/postgresql93-server/Makefile
@@ -1,14 +1,12 @@
# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
# $FreeBSD$
-DISTVERSION?= 9.3.6
+DISTVERSION?= 9.3.9
PORTREVISION?= 0
PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
-USES+= cpe
-
INSTALL_DIRS?= src/common src/timezone src/backend \
src/backend/utils/mb/conversion_procs \
src/backend/snowball src/backend/replication/libpqwalreceiver \
diff --git a/databases/postgresql93-server/distinfo b/databases/postgresql93-server/distinfo
index 2718b5717716..cac6443bc76e 100644
--- a/databases/postgresql93-server/distinfo
+++ b/databases/postgresql93-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.3.6.tar.bz2) = 2368cb61e68d9581da7bfdb61bdf39ffbe59d2d95609b0e93adb3b6b8fd6ca14
-SIZE (postgresql/postgresql-9.3.5.tar.bz2) = 16889913
-SHA256 (postgresql/pg-928-icu-2014-06-09.diff.gz) = 6f856ee0fd27118650f806fb674220d9851a0183ffa125e6fbe5468dfabeea5c
-SIZE (postgresql/pg-928-icu-2014-06-09.diff.gz) = 4449
+SHA256 (postgresql/postgresql-9.3.9.tar.bz2) = f73bd0ec2028511732430beb22414a022d2114231366e8cbe78c149793910549
+SIZE (postgresql/postgresql-9.3.9.tar.bz2) = 16959310
+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/postgresql93-server/pkg-plist-contrib b/databases/postgresql93-server/pkg-plist-contrib
index aad07eac03f9..f3c537f500a6 100644
--- a/databases/postgresql93-server/pkg-plist-contrib
+++ b/databases/postgresql93-server/pkg-plist-contrib
@@ -74,7 +74,10 @@ share/doc/postgresql/extension/timetravel.example
%%DATADIR%%/extension/chkpass--1.0.sql
%%DATADIR%%/extension/chkpass--unpackaged--1.0.sql
%%DATADIR%%/extension/chkpass.control
+%%DATADIR%%/extension/citext--1.0--1.1.sql
%%DATADIR%%/extension/citext--1.0.sql
+%%DATADIR%%/extension/citext--1.1--1.0.sql
+%%DATADIR%%/extension/citext--1.1.sql
%%DATADIR%%/extension/citext--unpackaged--1.0.sql
%%DATADIR%%/extension/citext.control
%%DATADIR%%/extension/cube--1.0.sql
diff --git a/databases/postgresql94-client/Makefile b/databases/postgresql94-client/Makefile
index 3fd3ae8a265d..1b73b28cf9ee 100644
--- a/databases/postgresql94-client/Makefile
+++ b/databases/postgresql94-client/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postgresql
COMMENT= PostgreSQL database (client)
-PORTREVISION= 1
+PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../postgresql94-server
diff --git a/databases/postgresql94-server/Makefile b/databases/postgresql94-server/Makefile
index ca97adb80bcb..312fbf8cfa6c 100644
--- a/databases/postgresql94-server/Makefile
+++ b/databases/postgresql94-server/Makefile
@@ -1,11 +1,13 @@
# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
# $FreeBSD$
-DISTVERSION?= 9.4.1
+DISTVERSION?= 9.4.4
PORTREVISION?= 0
MAINTAINER?= pgsql@FreeBSD.org
+USES+= cpe
+
INSTALL_DIRS?= src/common src/timezone src/backend \
src/backend/utils/mb/conversion_procs \
src/backend/snowball src/backend/replication/libpqwalreceiver \
@@ -13,6 +15,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-940-icu-2014-06-09.diff.gz
+ICU_PATCHFILE= pg-941-icu-2015-04-18.diff.gz
.include "${.CURDIR}/../postgresql92-server/Makefile"
diff --git a/databases/postgresql94-server/distinfo b/databases/postgresql94-server/distinfo
index 55ef9b39198c..8eb07f6aa184 100644
--- a/databases/postgresql94-server/distinfo
+++ b/databases/postgresql94-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.4.1.tar.bz2) = 29ddb77c820095b8f52e5455e9c6c6c20cf979b0834ed1986a8857b84888c3a6
-SIZE (postgresql/postgresql-9.4.1.tar.bz2) = 17549976
-SHA256 (postgresql/pg-940-icu-2014-06-09.diff.gz) = 83de4b99c37aec1ad741c686cb2ea7f4bccff516c357ae71032b2d1f8da0d1c1
-SIZE (postgresql/pg-940-icu-2014-06-09.diff.gz) = 4259
+SHA256 (postgresql/postgresql-9.4.4.tar.bz2) = 538ed99688d6fdbec6fd166d1779cf4588bf2f16c52304e5ef29f904c43b0013
+SIZE (postgresql/postgresql-9.4.4.tar.bz2) = 17616272
+SHA256 (postgresql/pg-941-icu-2015-04-18.diff.gz) = 30c1366539fd0833db37a98b32bd22e8da4538e58f8dbc2ad2f63dc54835609b
+SIZE (postgresql/pg-941-icu-2015-04-18.diff.gz) = 4279
diff --git a/databases/postgresql94-server/pkg-plist-contrib b/databases/postgresql94-server/pkg-plist-contrib
index a0dfaa409dd2..0b3aeda218c2 100644
--- a/databases/postgresql94-server/pkg-plist-contrib
+++ b/databases/postgresql94-server/pkg-plist-contrib
@@ -77,7 +77,10 @@ share/doc/postgresql/extension/timetravel.example
%%DATADIR%%/extension/chkpass--1.0.sql
%%DATADIR%%/extension/chkpass--unpackaged--1.0.sql
%%DATADIR%%/extension/chkpass.control
+%%DATADIR%%/extension/citext--1.0--1.1.sql
%%DATADIR%%/extension/citext--1.0.sql
+%%DATADIR%%/extension/citext--1.1--1.0.sql
+%%DATADIR%%/extension/citext--1.1.sql
%%DATADIR%%/extension/citext--unpackaged--1.0.sql
%%DATADIR%%/extension/citext.control
%%DATADIR%%/extension/cube--1.0.sql