Update PostgreSQL to latest versions.

Security Fixes for Regular Expressions, PL/Java

This release closes security hole CVE-2016-0773, an issue with regular
expression (regex) parsing. Prior code allowed users to pass in expressions
which included out-of-range Unicode characters, triggering a backend crash.
This issue is critical for PostgreSQL systems with untrusted users or which
generate regexes based on user input.

The update also fixes CVE-2016-0766, a privilege escalation issue for users of
PL/Java.  Certain custom configuration settings (GUCS) for PL/Java will now be
modifiable only by the database superuser

URL:		http://www.postgresql.org/about/news/1644/
Security:	CVE-2016-0773, CVE-2016-0766

4 files changed, 15 insertions, 13 deletions

diff --git a/databases/postgresql94-server/Makefile b/databases/postgresql94-server/Makefile
index a617b0d1e140..69cea4a7d062 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.5
+DISTVERSION?=	9.4.6
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
diff --git a/databases/postgresql94-server/distinfo b/databases/postgresql94-server/distinfo
index c88472cb9384..01aaf55fdbc1 100644
--- a/databases/postgresql94-server/distinfo
+++ b/databases/postgresql94-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.4.5.tar.bz2) = b87c50c66b6ea42a9712b5f6284794fabad0616e6ae420cf0f10523be6d94a39
-SIZE (postgresql/postgresql-9.4.5.tar.bz2) = 17660960
+SHA256 (postgresql/postgresql-9.4.6.tar.bz2) = cbce1f4d01a6142c5d8bebe125623c5198ec04f363da7dd3d3b3a4100b4140a6
+SIZE (postgresql/postgresql-9.4.6.tar.bz2) = 17734946
 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/files/502.pgsql.in b/databases/postgresql94-server/files/502.pgsql.in
index e92f01f992cd..2246de33f70d 100644
--- a/databases/postgresql94-server/files/502.pgsql.in
+++ b/databases/postgresql94-server/files/502.pgsql.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/databases/postgresql92-server/files/502.pgsql.in,v 1.4 2011-10-18 09:03:32 girgen Exp $
+# $FreeBSD$
 #
 # Maintenance shell script to vacuum and backup database
 # Put this in /usr/local/etc/periodic/daily, and it will be run 
@@ -19,14 +19,6 @@
 # daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
 # daily_pgsql_vacuum_enable="YES" # do vacuum
 
-daily_pgsql_user=%%PG_USER%%
-daily_pgsql_vacuum_args="-U ${daily_pgsql_user} -qaz"
-daily_pgsql_pgdump_args="-U ${daily_pgsql_user} -bF c"
-daily_pgsql_pgdumpall_globals_args="-U ${daily_pgsql_user}"
-# backupdir is relative to ~pgsql home directory unless it begins with a slash:
-daily_pgsql_backupdir="~${daily_pgsql_user}/backups"
-daily_pgsql_savedays="7"
-
 # If there is a global system configuration file, suck it in.
 #
 if [ -r /etc/defaults/periodic.conf ]
@@ -35,6 +27,15 @@ then
     source_periodic_confs
 fi
 
+: ${daily_pgsql_user:="%%PG_USER%%"}
+: ${daily_pgsql_port:=5432}
+: ${daily_pgsql_vacuum_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz"}
+: ${daily_pgsql_pgdump_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c"}
+: ${daily_pgsql_pgdumpall_globals_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port}"}
+# backupdir is relative to ~pgsql home directory unless it begins with a slash:
+: ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
+: ${daily_pgsql_savedays:="7"}
+
 # allow '~´ in dir name
 eval backupdir=${daily_pgsql_backupdir}
 
@@ -82,7 +83,7 @@ pgsql_backup() {
 
 case "$daily_pgsql_backup_enable" in
     [Yy][Ee][Ss])
-	dbnames=`su -l %%PG_USER%% -c "umask 077; psql -q -t -A -d template1 -U %%PG_USER%% -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+	dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
 	pgsql_backup $dbnames
 	;;
 
diff --git a/databases/postgresql94-server/pkg-plist-client b/databases/postgresql94-server/pkg-plist-client
index b50538171dc6..473301efb4bf 100644
--- a/databases/postgresql94-server/pkg-plist-client
+++ b/databases/postgresql94-server/pkg-plist-client
@@ -591,6 +591,7 @@ lib/libpq.a
 lib/libpq.so
 lib/libpq.so.5
 lib/postgresql/pgxs/config/install-sh
+lib/postgresql/pgxs/config/missing
 lib/postgresql/pgxs/src/Makefile.global
 lib/postgresql/pgxs/src/Makefile.port
 lib/postgresql/pgxs/src/Makefile.shlib