From e937c0fd877b682056af8edba63013e8e2c5343e Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Sun, 13 Jul 2014 07:39:04 +0000
Subject: [PATCH] Update "phpmyadmin" package to version 4.2.5. The following
 bugs have been fixed since version 4.2.3: - bug #4467 shell_exec() has been
 disabled for security reasons - bug #4470 Error while submitting empty query
 - bug #4463 Fatal error: Class 'PMA_DatabaseInterface' not found - bug #4469
 Fixed cookie based login for installations without mcrypt - bug #4473
 incorrect result count when having clause is used -           mcrypt: remove
 the requirement (64-bit) and the related warning - bug #4449 Mediawiki export
 does not produce table header row; also fix             related PHP warnings
 - bug #4442 New lines are added to query every time - bug #4445 Fatal error
 on SQL Export of join query - bug #4448 Dump binary columns in hexadecimal
 notation not working - Regenerate cookie encryption IV for every session -
 bug #4405 Cannot import (open_basedir): fix another case - bug #4457 SQL tab
 - Insert queries not showing affected row count - bug       Missing warning
 about existing account, on multi-server config - bug #4435 WHERE clause can
 be undefined - bug       SQL export views as tables option getting ignored -
 bug #4464 [security] XSS injection due to unescaped db/table name in         
    navigation hiding - bug #4465 [security] XSS injection due to unescaped
 db/table name in             recent/favorite tables

---
 databases/phpmyadmin/Makefile | 6 ++++--
 databases/phpmyadmin/distinfo | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index b088084cf10d..1a83a25fee8a 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2014/06/09 17:30:56 tron Exp $
+# $NetBSD: Makefile,v 1.130 2014/07/13 07:39:04 tron 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.3
+DIST_VERSION=	4.2.5
 DOC_FILES=	ChangeLog LICENSE README RELEASE-DATE-${DIST_VERSION}
 
 APACHE_USER?=	www
@@ -50,6 +50,8 @@ PKG_SYSCONFSUBDIR?=	phpmyadmin
 
 NO_BUILD=		yes
 
+CHECK_INTERPRETER_SKIP+=	share/phpmyadmin/config.inc.php
+
 INSTALLATION_DIRS+=	${PREFIX}/share/doc/phpmyadmin \
 			${PREFIX}/share/examples/phpmyadmin \
 			${PMDIR} ${PMDIR}/scripts
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index a48525b29d71..b9915eb37c7c 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.86 2014/06/09 17:30:56 tron Exp $
+$NetBSD: distinfo,v 1.87 2014/07/13 07:39:04 tron Exp $
 
-SHA1 (phpMyAdmin-4.2.3-all-languages.tar.xz) = cb2fd0a238fea7de25bd8020bfc23cc1ca801572
-RMD160 (phpMyAdmin-4.2.3-all-languages.tar.xz) = 1cfbc0c0f046cdd91b781ded82ddf2cfa6ccc5d4
-Size (phpMyAdmin-4.2.3-all-languages.tar.xz) = 5092112 bytes
+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 (patch-libraries_vendor_config.php) = af587496e999bf1e92d6c5a9ab8053fe6e92a0f2