phpmyadmin: update to 4.9.10

4.9.10 (2022-02-10)
- issue #17308 Fix broken pagination links in the navigation sidebar

3 files changed, 12 insertions, 25 deletions

diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 5b8bc9e39aa..ae6aef616ef 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.168 2022/03/25 12:59:46 mef Exp $
+# $NetBSD: Makefile,v 1.169 2022/04/22 18:06:05 tm Exp $
 
-DISTNAME=	phpMyAdmin-4.9.9-all-languages
+DISTNAME=	phpMyAdmin-4.9.10-all-languages
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/-all-languages//:tl}
 CATEGORIES=	databases www
 MASTER_SITES=	https://files.phpmyadmin.net/phpMyAdmin/${PKGVERSION_NOREV}/
@@ -27,12 +27,9 @@ DEPENDS+=	${PHP_PKG_PREFIX}-mcrypt>=5.3.0:../../security/php-mcrypt
 DEPENDS+=	${PHP_PKG_PREFIX}-pecl-mcrypt>=1.0.1:../../security/php-pecl-mcrypt
 .endif
 
-USE_LANGUAGE=	# none
+USE_LANGUAGES=	# none
 USE_TOOLS+=	pax
 
-REPLACE_BASH+=	vendor/pragmarx/google2fa/tests/tools/test.sh
-REPLACE_BASH+=	vendor/pragmarx/google2fa/tests/tools/analyse.sh
-
 APACHE_USER?=	www
 APACHE_GROUP?=	www
 
@@ -68,8 +65,7 @@ REPLACE_FILES.php+=	vendor/bin/lint-query
 REPLACE_FILES.php+=	vendor/phpmyadmin/sql-parser/bin/tokenize-query
 REPLACE_FILES.php+=	vendor/bin/tokenize-query
 
-REPLACE_SH+=	vendor/twig/twig/drupal_test.sh \
-		vendor/pragmarx/google2fa/tests/tools/helpers.sh
+REPLACE_SH+=	vendor/twig/twig/drupal_test.sh
 
 CONF_FILES+=	${EXDIR}/apache.conf ${PKG_SYSCONFDIR}/apache.conf
 
@@ -80,7 +76,7 @@ NO_BUILD=		yes
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths+=	${WRKDIR}/phpmyadmin.conf
-SUBST_FILES.paths+=	${WRKSRC}/libraries/vendor_config.php
+SUBST_FILES.paths+=	libraries/vendor_config.php
 SUBST_VARS.paths=	PMDIR
 SUBST_VARS.paths+=	PMVARDIR
 SUBST_SED.paths+=	-e "s|@PMCONFDIR@|${PMCONFDIR}/|g"
diff --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index 5c585fedc31..ad9a660ff40 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.53 2022/02/02 13:41:12 tm Exp $
+@comment $NetBSD: PLIST,v 1.54 2022/04/22 18:06:05 tm Exp $
 share/doc/phpmyadmin/CONTRIBUTING.md
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/LICENSE
@@ -1884,22 +1884,16 @@ share/phpmyadmin/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php
 share/phpmyadmin/vendor/phpseclib/phpseclib/phpseclib/openssl.cnf
 share/phpmyadmin/vendor/pragmarx/google2fa/.scrutinizer.yml
 share/phpmyadmin/vendor/pragmarx/google2fa/.travis.yml
-share/phpmyadmin/vendor/pragmarx/google2fa/CHANGELOG.md
 share/phpmyadmin/vendor/pragmarx/google2fa/LICENSE.md
 share/phpmyadmin/vendor/pragmarx/google2fa/README.md
 share/phpmyadmin/vendor/pragmarx/google2fa/RELICENSED.md
+share/phpmyadmin/vendor/pragmarx/google2fa/changelog.md
 share/phpmyadmin/vendor/pragmarx/google2fa/composer.json
 share/phpmyadmin/vendor/pragmarx/google2fa/composer.lock
 share/phpmyadmin/vendor/pragmarx/google2fa/docs/playground.jpg
 share/phpmyadmin/vendor/pragmarx/google2fa/phpunit.xml
-share/phpmyadmin/vendor/pragmarx/google2fa/src/Exceptions/Contracts/Google2FA.php
-share/phpmyadmin/vendor/pragmarx/google2fa/src/Exceptions/Contracts/IncompatibleWithGoogleAuthenticator.php
-share/phpmyadmin/vendor/pragmarx/google2fa/src/Exceptions/Contracts/InvalidAlgorithm.php
-share/phpmyadmin/vendor/pragmarx/google2fa/src/Exceptions/Contracts/InvalidCharacters.php
-share/phpmyadmin/vendor/pragmarx/google2fa/src/Exceptions/Contracts/SecretKeyTooShort.php
-share/phpmyadmin/vendor/pragmarx/google2fa/src/Exceptions/Google2FAException.php
 share/phpmyadmin/vendor/pragmarx/google2fa/src/Exceptions/IncompatibleWithGoogleAuthenticatorException.php
-share/phpmyadmin/vendor/pragmarx/google2fa/src/Exceptions/InvalidAlgorithmException.php
+share/phpmyadmin/vendor/pragmarx/google2fa/src/Exceptions/InsecureCallException.php
 share/phpmyadmin/vendor/pragmarx/google2fa/src/Exceptions/InvalidCharactersException.php
 share/phpmyadmin/vendor/pragmarx/google2fa/src/Exceptions/SecretKeyTooShortException.php
 share/phpmyadmin/vendor/pragmarx/google2fa/src/Google2FA.php
@@ -1911,9 +1905,6 @@ share/phpmyadmin/vendor/pragmarx/google2fa/tests/.gitkeep
 share/phpmyadmin/vendor/pragmarx/google2fa/tests/Constants.php
 share/phpmyadmin/vendor/pragmarx/google2fa/tests/Google2FATest.php
 share/phpmyadmin/vendor/pragmarx/google2fa/tests/bootstrap.php
-share/phpmyadmin/vendor/pragmarx/google2fa/tests/tools/analyse.sh
-share/phpmyadmin/vendor/pragmarx/google2fa/tests/tools/helpers.sh
-share/phpmyadmin/vendor/pragmarx/google2fa/tests/tools/test.sh
 share/phpmyadmin/vendor/pragmarx/google2fa/upgrading.md
 share/phpmyadmin/vendor/psr/container/LICENSE
 share/phpmyadmin/vendor/psr/container/README.md
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index b33d4f86e4d..cbfb93d01ab 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.117 2022/02/02 13:41:12 tm Exp $
+$NetBSD: distinfo,v 1.118 2022/04/22 18:06:05 tm Exp $
 
-BLAKE2s (phpMyAdmin-4.9.9-all-languages.tar.xz) = 918db2d97b323f32193c5c1fbb770305f6911b2f9d138300f7280a0296e75247
-SHA512 (phpMyAdmin-4.9.9-all-languages.tar.xz) = e4058523e73f697f7f12609076ef296235d6f21b2d3ab01bb96e0272818107f0962c9db3e64bf2c9ac031c80c7d039a6a815ba49a58619f7e819b0f86234be87
-Size (phpMyAdmin-4.9.9-all-languages.tar.xz) = 6119588 bytes
+BLAKE2s (phpMyAdmin-4.9.10-all-languages.tar.xz) = 0eb2179c30d0aa570435f65486fb07f5dc34d5b2bd3b454a31c89c12ce5b38ee
+SHA512 (phpMyAdmin-4.9.10-all-languages.tar.xz) = 9d12a4ffcfd32a6dcf8558103fea4e178f1c7daabb4b0f57a18d0e0608b6e6549eb7b8cff0337275986c41090e8b81aa2d11bd321e5a7bf52d4bf99d35deabde
+Size (phpMyAdmin-4.9.10-all-languages.tar.xz) = 6115796 bytes
 SHA1 (patch-libraries_vendor__config.php) = b758f5550dd7226d88293fa6614b2283cbd8e3ea