Pullup ticket #4502 - requested by tron

databases/phpmyadmin: security update

Revisions pulled up:
- databases/phpmyadmin/Makefile                                 1.134
- databases/phpmyadmin/PLIST                                    1.39
- databases/phpmyadmin/distinfo                                 1.91

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Tue Sep 23 13:47:31 UTC 2014

   Modified Files:
   	pkgsrc/databases/phpmyadmin: Makefile PLIST distinfo

   Log Message:
   Update "phpmyadmin" package to version 4.2.9.

   The following bugs have been fixed since version 4.2.7.1:
   - bug       ajax.js responseHandler: cannot read property of null
   - bug       sql.js: str is undefined
   - bug #4524 Allow for direct selection of "0" on the "user overview" page
   - bug #4529 Undefined index: pos
   - bug #4523 tbl_change.js: insert as new row submit type on multiple
               selected records does not set all AUTO_INCREMENTs to 0 value
   - bug       ajax.js responseHandler: another "cannot read property"
   - bug       tbl_structure.js "cannot read property"
   - bug #4530 [security] DOM based XSS that results to a CSRF that creates a
               ROOT account in certain conditions
   - bug #4516 Odd export behavior
   - bug #4519 Uncaught TypeError: Cannot read property 'success' of null
   - bug #4520 sql.js: cannot read property
   - bug #4521 Initially allowed chart types do not match selected data
   - bug #4518 Export to SQL: CREATE TABLE option AUTO_INCREMENT ignored
   - bug #4522 Duplicate column names while assigning index
   - bug #4487 Export of partitioned table does not import
   - bug       server_privileges.js: cannot read property
   - bug #4527 Importing ODS files with column names having trailing spaces fa=
   ils
   - bug #4413 Navigation Error in Nav Tree for Search Results Past the First =
   Page
   - bug       functions.js: Cannot read property 'replace' of undefined


   To generate a diff of this commit:
   cvs rdiff -u -r1.133 -r1.134 pkgsrc/databases/phpmyadmin/Makefile
   cvs rdiff -u -r1.38 -r1.39 pkgsrc/databases/phpmyadmin/PLIST
   cvs rdiff -u -r1.90 -r1.91 pkgsrc/databases/phpmyadmin/distinfo

3 files changed, 8 insertions, 7 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 8c09e7615b6..cc3686ceac8 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129.2.3 2014/08/27 22:57:04 spz Exp $
+# $NetBSD: Makefile,v 1.129.2.4 2014/09/25 10:11:59 spz Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -28,7 +28,7 @@ MESSAGE_SUBST+=	CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
 		EXDIR=${EXDIR:Q}
 
 CONF_INC_PHP=	${PREFIX}/share/phpmyadmin/config.inc.php
-DIST_VERSION=	4.2.7.1
+DIST_VERSION=	4.2.9
 DOC_FILES=	ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION}
 
 APACHE_USER?=	www
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index 046ccb188f1..13a8f3a849b 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36.2.2 2014/08/27 22:57:04 spz Exp $
+@comment $NetBSD: PLIST,v 1.36.2.3 2014/09/25 10:11:59 spz Exp $
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/LICENSE
 share/doc/phpmyadmin/README
@@ -581,6 +581,7 @@ share/phpmyadmin/js/tbl_select.js
 share/phpmyadmin/js/tbl_structure.js
 share/phpmyadmin/js/tbl_zoom_plot_jqplot.js
 share/phpmyadmin/js/tracekit/tracekit.js
+share/phpmyadmin/js/whitelist.php
 share/phpmyadmin/libraries/Advisor.class.php
 share/phpmyadmin/libraries/Config.class.php
 share/phpmyadmin/libraries/DBQbe.class.php
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 0b912295732..a084ef8d97d 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.86.2.3 2014/08/27 22:57:04 spz Exp $
+$NetBSD: distinfo,v 1.86.2.4 2014/09/25 10:11:59 spz Exp $
 
-SHA1 (phpMyAdmin-4.2.7.1-all-languages.tar.xz) = 2d1fe1190fc039822a3b79f405d14a94def21ef5
-RMD160 (phpMyAdmin-4.2.7.1-all-languages.tar.xz) = bced5f50d2cfe02467fde90046140dca1339e757
-Size (phpMyAdmin-4.2.7.1-all-languages.tar.xz) = 5138420 bytes
+SHA1 (phpMyAdmin-4.2.9-all-languages.tar.xz) = 42ee931e87b5ecbe0ff4c9e092ab4ec809044d87
+RMD160 (phpMyAdmin-4.2.9-all-languages.tar.xz) = 791dd359c70b6653dfdc0a7f0c4defb0678b9f8d
+Size (phpMyAdmin-4.2.9-all-languages.tar.xz) = 5148452 bytes
 SHA1 (patch-libraries_vendor_config.php) = af587496e999bf1e92d6c5a9ab8053fe6e92a0f2