Pullup ticket #4464 - requested by tron

databases/phpmyadmin: security update

Revisions pulled up:
- databases/phpmyadmin/Makefile                                 1.131
- databases/phpmyadmin/PLIST                                    1.37
- databases/phpmyadmin/distinfo                                 1.88

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sat Jul 26 10:33:02 UTC 2014

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

   Log Message:
   Update "phpmyadmin" package to version 4.2.6. The following bugs have
   been fixed since version 4.2.5:
   - bug #4471 Undefined index warning with referenced column.
   - bug #4027 $cfg['MaxExactCount'] is ignored when BROWSING is back
   - bug #4482 Multi Column sorting (improved user experience)
   - bug #4478 Server validation does not work while in setup/mysqli
   - bug       Undefined variable when grid editing a foreign key column
   - bug #4481 mult_submits.inc.php Undefined variable Error
   - bug #4485 Sorting breaks the copy column feature
   - bug #4440 Javascript error when renaming table
   - bug #4483 'New window' link (selflink) disappears, causing Javascript err=
   or
   - bug #4489 Incorrect detection of privileges for routine creation
   - bug #4459 First few characters of database name aren't clickable when
               expanded
   - bug #4486 [security] XSS injection due to unescaped table comment
   - bug #4488 [security] XSS injection due to unescaped table name (triggers)
   - bug #4492 [security] XSS in AJAX confirmation messages
   - bug #4491 [security] Missing validation for accessing User groups feature


   To generate a diff of this commit:
   cvs rdiff -u -r1.130 -r1.131 pkgsrc/databases/phpmyadmin/Makefile
   cvs rdiff -u -r1.36 -r1.37 pkgsrc/databases/phpmyadmin/PLIST
   cvs rdiff -u -r1.87 -r1.88 pkgsrc/databases/phpmyadmin/distinfo

3 files changed, 8 insertions, 8 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 1a197ba8acb..2d0e69f5004 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129.2.1 2014/07/15 06:53:41 spz Exp $
+# $NetBSD: Makefile,v 1.129.2.2 2014/07/27 06:37:19 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.5
+DIST_VERSION=	4.2.6
 DOC_FILES=	ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION}
 
 APACHE_USER?=	www
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index 373ef32d747..b9a6ebc58c3 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2014/06/04 20:40:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.36.2.1 2014/07/27 06:37:19 spz Exp $
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/LICENSE
 share/doc/phpmyadmin/README
@@ -87,7 +87,6 @@ share/phpmyadmin/js/codemirror/LICENSE
 share/phpmyadmin/js/codemirror/addon/runmode/runmode.js
 share/phpmyadmin/js/codemirror/lib/codemirror.js
 share/phpmyadmin/js/codemirror/mode/sql/sql.js
-share/phpmyadmin/js/columndelete.js
 share/phpmyadmin/js/common.js
 share/phpmyadmin/js/config.js
 share/phpmyadmin/js/cross_framing_protection.js
@@ -197,6 +196,7 @@ share/phpmyadmin/js/keyhandler.js
 share/phpmyadmin/js/line_counts.php
 share/phpmyadmin/js/makegrid.js
 share/phpmyadmin/js/messages.php
+share/phpmyadmin/js/multi_column_sort.js
 share/phpmyadmin/js/navigation.js
 share/phpmyadmin/js/openlayers/OpenLayers.js
 share/phpmyadmin/js/openlayers/img/blank.gif
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index e8bf251179c..023666acb36 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.86.2.1 2014/07/15 06:53:41 spz Exp $
+$NetBSD: distinfo,v 1.86.2.2 2014/07/27 06:37:19 spz Exp $
 
-SHA1 (phpMyAdmin-4.2.5-all-languages.tar.xz) = 5fb995b9e8d0239ad2d2f7f536bb67f7ca46177f
-RMD160 (phpMyAdmin-4.2.5-all-languages.tar.xz) = 2dff82dcba61cdadad9d29e57a47734654b7e0b3
-Size (phpMyAdmin-4.2.5-all-languages.tar.xz) = 5200328 bytes
+SHA1 (phpMyAdmin-4.2.6-all-languages.tar.xz) = 8cf175f19ed820444501a68f94c3349be607941a
+RMD160 (phpMyAdmin-4.2.6-all-languages.tar.xz) = 7695fc90c3d33bfa1908a06eaa93066f2a76110f
+Size (phpMyAdmin-4.2.6-all-languages.tar.xz) = 5134224 bytes
 SHA1 (patch-libraries_vendor_config.php) = af587496e999bf1e92d6c5a9ab8053fe6e92a0f2