Pullup ticket #6121 - requested by tm

databases/phpmyadmin: security fix (CVE-2020-5504)

Revisions pulled up:
- databases/phpmyadmin/Makefile                                 1.162
- databases/phpmyadmin/distinfo                                 1.112

---
   Module Name:    pkgsrc
   Committed By:   tm
   Date:           Tue Jan 21 09:50:58 UTC 2020

   Modified Files:
           pkgsrc/databases/phpmyadmin: Makefile distinfo

   Log Message:
   phpmyadmin: update to 4.9.4

   4.9.4 (2020-01-07)
   - issue #15724 Fix 2FA was disabled by a bug
   - issue        [security] Fix SQL injection vulnerability on the user accounts page (PMASA-2020-1)

   4.9.3 (2019-12-26)
   - issue #15570 Fix page contents go underneath of floating menubar in some cases
   - issue #15591 Fix php notice 'Undefined index: foreign_keys_data' on relations view when the user has column access
   - issue #15592 Fix php warning "error_reporting() has been disabled for security reasons"
   - issue #15434 Fix middle click on table sort column name shows a blank page
   - issue        Fix php notice "Undefined index table_create_time" when setting displayed columns on results of a view
   - issue #15571 Fix fatal error when trying to edit row with row checked and button under the table
   - issue #15633 Fix designer set display field broken for php 5.x versions
   - issue #15621 Support CloudFront-Forwarded-Proto header for Amazon CloudFront proxy
   - issue        Fix php 8.0 php notices - Undefined index on login page
   - issue #15640 Fix php 7.4 error when trying to access array offset on value of type null on table browse
   - issue #15641 Fix replication actions where broken (start slave, stop slave, reset, ...)
   - issue #15608 Fix DisableIS is broken when with controluser configured (database list broken)
   - issue #15614 Fix undefined offset on index page for MySQL 5.7.8 (server charset)
   - issue #15692 Fix JavaScript error when user has not enough privilege to view query statistics.
   - issue #14248 Fixed date selection in search menu missing higher Z-index value
   - issue        Fix Uncaught php TypeError on php 8.0 when adding a column to table create form
   - issue #15682 Fix calendar not taking current time as default value
   - issue #15636 Fix php error trying to access array offset on value o type null on replication GUI
   - issue #15695 Fix input field for the time in datetime picker is disabled

2 files changed, 7 insertions, 7 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index d1fc35430be..4b4f7a3af0c 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.161 2019/12/03 12:42:28 tm Exp $
+# $NetBSD: Makefile,v 1.161.4.1 2020/01/27 10:11:21 bsiegert Exp $
 
-DISTNAME=	phpMyAdmin-4.9.2-all-languages
+DISTNAME=	phpMyAdmin-4.9.4-all-languages
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/-all-languages//:tl}
 CATEGORIES=	databases www
 MASTER_SITES=	https://files.phpmyadmin.net/phpMyAdmin/${PKGVERSION_NOREV}/
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 1f8988fca89..ef5870a0db9 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.111 2019/12/03 12:42:28 tm Exp $
+$NetBSD: distinfo,v 1.111.4.1 2020/01/27 10:11:21 bsiegert Exp $
 
-SHA1 (phpMyAdmin-4.9.2-all-languages.tar.xz) = 958126237700284067fbff3eb1afd59d38515918
-RMD160 (phpMyAdmin-4.9.2-all-languages.tar.xz) = 246031909a28c7dc780e3d3afab1600cb12fdfc4
-SHA512 (phpMyAdmin-4.9.2-all-languages.tar.xz) = 426689c31f963a9cbe34b2116888aa0264801aa5ef18fb0e4b89811b032d4018c770538e823bccb684fb066ed27fcf6dc6e0fb4198d1e082e7eea15595b67727
-Size (phpMyAdmin-4.9.2-all-languages.tar.xz) = 6118472 bytes
+SHA1 (phpMyAdmin-4.9.4-all-languages.tar.xz) = b76c020276b619faa7a5aada2ca9e987b2d1e54b
+RMD160 (phpMyAdmin-4.9.4-all-languages.tar.xz) = 75849da37da1911fbfdd7bfbf058417214d74d4a
+SHA512 (phpMyAdmin-4.9.4-all-languages.tar.xz) = 3ddab59725d59bcbe99457a1717f12b53bbd251f0bfcea1582288abfbb4507e50351e3ed0e76961026b0ad351abc806deed4a97f0fa882b34ee095ef314aaf37
+Size (phpMyAdmin-4.9.4-all-languages.tar.xz) = 6134852 bytes
 SHA1 (patch-libraries_vendor__config.php) = b758f5550dd7226d88293fa6614b2283cbd8e3ea