Pullup ticket #4191 - requested by tron

databases/phpmyadmin: security update

Revisions pulled up:
- databases/phpmyadmin/Makefile                                 1.117
- databases/phpmyadmin/PLIST                                    1.33
- databases/phpmyadmin/distinfo                                 1.74

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Mon Jul 29 20:01:02 UTC 2013

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

   Log Message:
   Update "phpmyadmin" package to version 3.5.8.2. Changes since 3.5.8.1:
   - [security] Fix self-XSS in "Showing rows", see PMASA-2013-8
   - [security] Fix self-XSS in Display chart, see PMASA-2013-9
   - [security] Fix stored XSS in Server status monitor, see PMASA-2013-9
   - [security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9
   - [security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2=
   013-9
   + [security] JSON content type header for version_check.php, see PMASA-2013=
   -9
   + [security] Backport fix for jQuery issue #9521 from jQuery 1.6.3, see PMA=
   SA-2013-9
   + [security] Fix full path disclosure, see PMASA-2013-12
   + [security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-=
   15
   + [security] Fix control user SQL injection in schema_export.php, see PMASA=
   -2013-15
   - [security] Fix self-XSS in schema export, see PMASA-2013-14
   - [security] Fix unencoded json object, see PMASA-2013-11


   To generate a diff of this commit:
   cvs rdiff -u -r1.116 -r1.117 pkgsrc/databases/phpmyadmin/Makefile
   cvs rdiff -u -r1.32 -r1.33 pkgsrc/databases/phpmyadmin/PLIST
   cvs rdiff -u -r1.73 -r1.74 pkgsrc/databases/phpmyadmin/distinfo

3 files changed, 8 insertions, 8 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index f35fc28ee99..c7ac3a03a9e 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2013/04/24 20:06:02 tron Exp $
+# $NetBSD: Makefile,v 1.115.2.1 2013/08/04 18:35:06 spz Exp $
 
 DISTNAME=	phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=	phpmyadmin-${DIST_VERSION:S/-//}
@@ -29,7 +29,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=	3.5.8.1
+DIST_VERSION=	3.5.8.2
 DOC_FILES=	ChangeLog Documentation.txt LICENSE README \
 		RELEASE-DATE-${DIST_VERSION}
 
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index 52889c39753..7644d5fead3 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2012/12/22 10:31:31 tron Exp $
+@comment $NetBSD: PLIST,v 1.32.6.1 2013/08/04 18:35:06 spz Exp $
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
 share/doc/phpmyadmin/LICENSE
@@ -67,7 +67,7 @@ share/phpmyadmin/js/get_image.js.php
 share/phpmyadmin/js/gis_data_editor.js
 share/phpmyadmin/js/import.js
 share/phpmyadmin/js/indexes.js
-share/phpmyadmin/js/jquery/jquery-1.6.2.js
+share/phpmyadmin/js/jquery/jquery-1.6.2+fix-9521.js
 share/phpmyadmin/js/jquery/jquery-ui-1.8.16.custom.js
 share/phpmyadmin/js/jquery/jquery.cookie.js
 share/phpmyadmin/js/jquery/jquery.event.drag-2.0.js
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index cb3d8d6a877..6f68c1aae91 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.73 2013/04/24 20:06:02 tron Exp $
+$NetBSD: distinfo,v 1.73.2.1 2013/08/04 18:35:06 spz Exp $
 
-SHA1 (phpMyAdmin-3.5.8.1-all-languages.tar.xz) = 9ea89659d8ef44badfe51604653991bb4b66eb6b
-RMD160 (phpMyAdmin-3.5.8.1-all-languages.tar.xz) = 6743651f90a8f586f89445a1eea899d4f9b2238a
-Size (phpMyAdmin-3.5.8.1-all-languages.tar.xz) = 3744808 bytes
+SHA1 (phpMyAdmin-3.5.8.2-all-languages.tar.xz) = d64d0274881513782fac3ad4fd4096c9842dec52
+RMD160 (phpMyAdmin-3.5.8.2-all-languages.tar.xz) = b507c62bb5d6c962ba6335a13fa7565d4336b6a0
+Size (phpMyAdmin-3.5.8.2-all-languages.tar.xz) = 3743436 bytes
 SHA1 (patch-libraries_vendor_config.php) = 00e60e3ef59f8e4984bab0ad95e8fbdb82decb75