Pullup ticket #4935 - requested by tnn

databases/postgresql94: security fix

Revisions pulled up:
- databases/postgresql94-docs/PLIST                             1.7
- databases/postgresql94-plperl/Makefile                        1.4
- databases/postgresql94/Makefile                               1.3
- databases/postgresql94/Makefile.common                        1.7
- databases/postgresql94/distinfo                               1.9

---
   Module Name:	pkgsrc
   Committed By:	tnn
   Date:		Thu Feb 25 01:38:56 UTC 2016

   Modified Files:
   	pkgsrc/databases/postgresql94: Makefile.common distinfo
   	pkgsrc/databases/postgresql94-docs: PLIST
   	pkgsrc/databases/postgresql94-plperl: Makefile

   Log Message:
   Update to PostgreSQL 9.4.6 (2016-02-11)

   Heads up: For upgrading past 9.4.5, users of jsonb_path_ops GIN indexes
   should perform a REINDEX, because of a hash calculation fix.

   This release fixes two security issues, as well as several bugs found
   over the last four months.

   CVE-2016-0773 Unicode regular expression buffer overflow
   CVE-2016-0766 PL/Java privilege escalation

---
   Module Name:	pkgsrc
   Committed By:	tnn
   Date:		Thu Feb 25 01:46:57 UTC 2016

   Modified Files:
   	pkgsrc/databases/postgresql94: Makefile

   Log Message:
   drop PKGREVISION after update

5 files changed, 19 insertions, 11 deletions

diff --git a/databases/postgresql94-docs/PLIST b/databases/postgresql94-docs/PLIST
index 0f965ebdb42..f942c95a447 100644
--- a/databases/postgresql94-docs/PLIST
+++ b/databases/postgresql94-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2015/10/10 10:22:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.6.2.1 2016/02/28 11:23:09 bsiegert Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1092,6 +1092,7 @@ share/doc/postgresql/html/release-9-1-16.html
 share/doc/postgresql/html/release-9-1-17.html
 share/doc/postgresql/html/release-9-1-18.html
 share/doc/postgresql/html/release-9-1-19.html
+share/doc/postgresql/html/release-9-1-20.html
 share/doc/postgresql/html/release-9-1-2.html
 share/doc/postgresql/html/release-9-1-3.html
 share/doc/postgresql/html/release-9-1-4.html
@@ -1107,6 +1108,7 @@ share/doc/postgresql/html/release-9-2-11.html
 share/doc/postgresql/html/release-9-2-12.html
 share/doc/postgresql/html/release-9-2-13.html
 share/doc/postgresql/html/release-9-2-14.html
+share/doc/postgresql/html/release-9-2-15.html
 share/doc/postgresql/html/release-9-2-2.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
@@ -1118,6 +1120,7 @@ share/doc/postgresql/html/release-9-2-9.html
 share/doc/postgresql/html/release-9-2.html
 share/doc/postgresql/html/release-9-3-1.html
 share/doc/postgresql/html/release-9-3-10.html
+share/doc/postgresql/html/release-9-3-11.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -1132,11 +1135,13 @@ share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
 share/doc/postgresql/html/release-9-4-5.html
+share/doc/postgresql/html/release-9-4-6.html
 share/doc/postgresql/html/release-9-4.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/resources.html
 share/doc/postgresql/html/role-attributes.html
 share/doc/postgresql/html/role-membership.html
+share/doc/postgresql/html/role-removal.html
 share/doc/postgresql/html/routine-reindex.html
 share/doc/postgresql/html/routine-vacuuming.html
 share/doc/postgresql/html/row-estimation-examples.html
diff --git a/databases/postgresql94-plperl/Makefile b/databases/postgresql94-plperl/Makefile
index 28e68e1ca94..4155a9b92aa 100644
--- a/databases/postgresql94-plperl/Makefile
+++ b/databases/postgresql94-plperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/06/18 14:46:14 adam Exp $
+# $NetBSD: Makefile,v 1.3.6.1 2016/02/28 11:23:09 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:C/-/94-plperl-/}
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
@@ -15,6 +15,10 @@ BUILD_MAKE_FLAGS=	PGXS=1
 BUILD_DIRS=		src/pl/plperl
 MAKE_FILE=		GNUmakefile
 
+# There is some dependency ordering problem in the Makefile,
+# so force the headers to be generated first.
+BUILD_TARGET=		perlchunks.h plperl_opmask.h all
+
 .include "../../databases/postgresql94-client/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql94/Makefile b/databases/postgresql94/Makefile
index 11ac5e52996..021b10bc5b2 100644
--- a/databases/postgresql94/Makefile
+++ b/databases/postgresql94/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2015/06/12 10:48:46 wiz Exp $
+# $NetBSD: Makefile,v 1.2.6.1 2016/02/28 11:23:09 bsiegert Exp $
 
 PKGNAME=	${DISTNAME:C/-/94-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql94-client>=${PKGVERSION_NOREV}:../../databases/postgresql94-client
diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common
index e3243dbb228..d651d7fa840 100644
--- a/databases/postgresql94/Makefile.common
+++ b/databases/postgresql94/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2015/10/10 10:22:20 adam Exp $
+# $NetBSD: Makefile.common,v 1.6.2.1 2016/02/28 11:23:09 bsiegert Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -23,7 +23,7 @@
 # used by databases/postgresql94-server/Makefile
 # used by databases/postgresql94-upgrade/Makefile
 
-DISTNAME=	postgresql-9.4.5
+DISTNAME=	postgresql-9.4.6
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql94/distinfo b/databases/postgresql94/distinfo
index 1498df1ee71..76724ef8c4c 100644
--- a/databases/postgresql94/distinfo
+++ b/databases/postgresql94/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 01:56:26 agc Exp $
+$NetBSD: distinfo,v 1.8.2.1 2016/02/28 11:23:09 bsiegert Exp $
 
-SHA1 (postgresql-9.4.5.tar.bz2) = 266b8e92cdced161b6a98d4eda0810e4b61fcf49
-RMD160 (postgresql-9.4.5.tar.bz2) = 97d81ba71fb5686e066634182789123cb594e0c5
-SHA512 (postgresql-9.4.5.tar.bz2) = 01ad4b5a097efa70f74a9e96b764c32953a9df57d6bf81b893a1e552475f6aba0381580dcd1f27b2c443ce89fecc429eeeb0219af60a0b2f84798f76eb1757f5
-Size (postgresql-9.4.5.tar.bz2) = 17660960 bytes
+SHA1 (postgresql-9.4.6.tar.bz2) = bc5271b113b42e94cf093b6fb799b03092827c71
+RMD160 (postgresql-9.4.6.tar.bz2) = f44d579b0a07a536895b12dc5ef665e71c43cc1b
+SHA512 (postgresql-9.4.6.tar.bz2) = 03e2c68ec7fb40b4886885136692e96ed5d7e50ead8ebd094ede402eeb8ed94a791357e8eff2776a2e4a537ced3d900e032779a33c1fbd920588d89f8b6705ee
+Size (postgresql-9.4.6.tar.bz2) = 17734946 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632