update to 5.2.2 (2025-01-21, security and bugfix release)HEADmaster

3 files changed, 92 insertions, 77 deletions

diff --git a/composer.json b/composer.json
index 4726ad0..247193d 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,7 @@
     "keywords": ["phpmyadmin","mysql","web"],
     "homepage": "https://www.phpmyadmin.net/",
     "support": {
+        "security": "https://www.phpmyadmin.net/security/",
         "forum": "https://www.phpmyadmin.net/support/",
         "issues": "https://github.com/phpmyadmin/phpmyadmin/issues",
         "wiki": "https://wiki.phpmyadmin.net/",
@@ -24,7 +25,15 @@
         "psr-4": {
             "PhpMyAdmin\\": "libraries/classes"
         },
-        "files": ["vendor/phpmyadmin/motranslator/src/functions.php"]
+        "files": ["vendor/phpmyadmin/motranslator/src/functions.php"],
+        "exclude-from-classmap": [
+            "/test/",
+            "/vendor/tecnickcom/tcpdf/tcpdf_barcodes_*.php",
+            "/vendor/tecnickcom/tcpdf/tcpdf_import.php",
+            "/vendor/tecnickcom/tcpdf/tcpdf_parser.php",
+            "/vendor/tecnickcom/tcpdf/include/tcpdf_filters.php",
+            "/vendor/tecnickcom/tcpdf/include/barcodes"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
@@ -53,11 +62,11 @@
         "paragonie/sodium_compat": "^1.17",
         "phpmyadmin/motranslator": "^5.0",
         "phpmyadmin/shapefile": "^3.0.1",
-        "phpmyadmin/sql-parser": "^5.5",
-        "phpmyadmin/twig-i18n-extension": "^4.0",
+        "phpmyadmin/sql-parser": "^5.8",
+        "phpmyadmin/twig-i18n-extension": "^4.1.3 || ^5.0.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0",
-        "slim/psr7": "^1.4",
+        "slim/psr7": "^1.4.1",
         "symfony/config": "^5.2.3",
         "symfony/dependency-injection": "^5.2.3",
         "symfony/expression-language": "^5.2.3",
@@ -85,24 +94,28 @@
         "tecnickcom/tcpdf": "For PDF support",
         "pragmarx/google2fa-qrcode": "^2.1 - For 2FA authentication",
         "bacon/bacon-qr-code": "^2.0 - For 2FA authentication",
-        "code-lts/u2f-php-server": "For FIDO U2F authentication"
+        "code-lts/u2f-php-server": "For FIDO U2F authentication",
+        "web-auth/webauthn-lib": "For better WebAuthn/FIDO2 authentication support"
     },
     "require-dev": {
         "bacon/bacon-qr-code": "^2.0",
         "code-lts/u2f-php-server": "^1.2",
-        "php-webdriver/webdriver": "^1.11",
+        "php-webdriver/webdriver": "^1.13",
         "phpmyadmin/coding-standard": "^3.0.0",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.4.8",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-webmozart-assert": "^1.0",
-        "phpunit/phpunit": "^8.5 || ^9.5",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^1.12",
+        "phpstan/phpstan-deprecation-rules": "^1.2",
+        "phpstan/phpstan-phpunit": "^1.4",
+        "phpstan/phpstan-strict-rules": "^1.6",
+        "phpstan/phpstan-webmozart-assert": "^1.2",
+        "phpunit/phpunit": "^8.5.16 || ^9.6",
         "pragmarx/google2fa-qrcode": "^2.1",
         "psalm/plugin-phpunit": "^0.16.1",
         "roave/security-advisories": "dev-latest",
         "symfony/console": "^5.2.3",
         "tecnickcom/tcpdf": "^6.4.4",
-        "vimeo/psalm": "^4.22"
+        "vimeo/psalm": "^4.30",
+        "web-auth/webauthn-lib": "^3.3.2"
     },
     "extra": {
         "branch-alias": {
@@ -135,5 +148,6 @@
             "phpstan/extension-installer": true,
             "composer/package-versions-deprecated": true
         }
-    }
+    },
+    "version": "5.2.2"
 }
diff --git a/phpMyAdmin-bundled.php b/phpMyAdmin-bundled.php
index ee018ef..bf8a5bf 100644
--- a/phpMyAdmin-bundled.php
+++ b/phpMyAdmin-bundled.php
@@ -22,7 +22,7 @@ if (isset($pkgs['packages'])) {
     foreach($pkgs["packages"] as $pkg) {
 		$lic = implode(" and ", $pkg["license"]);
 		if (!isset($res[$lic])) $res[$lic] = [];
-		$res[$lic][] = sprintf("Provides:  bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]);
+		$res[$lic][] = sprintf("Provides:  bundled(php-composer(%s)) = %s", $pkg["name"], ltrim($pkg["version"], "v"));
 	}
 	ksort($res);
 	foreach($res as $lic => $lib) {
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index fcf99e6..ebc0a8c 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,7 +1,7 @@
 # remirepo:3
 # remirepo spec file for phpMyAdmin
 #
-# Copyright (c) 2008-2024 Remi Collet
+# Copyright (c) 2008-2025 Remi Collet
 #
 # Fedora spec file for phpMyAdmin
 #
@@ -18,12 +18,12 @@
 # httpd 2.4 with httpd-filesystem
 %global with_httpd     1
 
-%global upstream_version 5.2.1
+%global upstream_version 5.2.2
 #global upstream_prever  rc1
 
 Name: phpMyAdmin
 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: A web interface for MySQL and MariaDB
 
 # phpMyAdmin is GPL-2.0-or-later
@@ -104,68 +104,68 @@ Requires:  php-xml
 
 %if %{without generators}
 # License BSD-2-Clause
-Provides:  bundled(php-bacon-bacon-qr-code) = 2.0.8
-Provides:  bundled(php-beberlei-assert) = v3.3.2
-Provides:  bundled(php-code-lts-u2f-php-server) = v1.2.1
-Provides:  bundled(php-dasprid-enum) = 1.0.3
+Provides:  bundled(php-composer(bacon/bacon-qr-code)) = 2.0.8
+Provides:  bundled(php-composer(beberlei/assert)) = 3.3.3
+Provides:  bundled(php-composer(code-lts/u2f-php-server)) = 1.2.2
+Provides:  bundled(php-composer(dasprid/enum)) = 1.0.6
 # License BSD-3-Clause
-Provides:  bundled(php-google-recaptcha) = 1.2.4
-Provides:  bundled(php-nikic-fast-route) = v1.3.0
-Provides:  bundled(php-twig-twig) = v3.5.0
+Provides:  bundled(php-composer(google/recaptcha)) = 1.2.4
+Provides:  bundled(php-composer(nikic/fast-route)) = 1.3.0
+Provides:  bundled(php-composer(twig/twig)) = 3.11.3
 # License GPL-2.0-or-later
-Provides:  bundled(php-phpmyadmin-motranslator) = 5.3.0
-Provides:  bundled(php-phpmyadmin-shapefile) = 3.0.1
-Provides:  bundled(php-phpmyadmin-sql-parser) = 5.7.0
+Provides:  bundled(php-composer(phpmyadmin/motranslator)) = 5.3.1
+Provides:  bundled(php-composer(phpmyadmin/shapefile)) = 3.0.2
+Provides:  bundled(php-composer(phpmyadmin/sql-parser)) = 5.10.3
 # License ISC
-Provides:  bundled(php-paragonie-sodium-compat) = v1.19.0
-# License LGPL-3.0-only
-Provides:  bundled(php-tecnickcom-tcpdf) = 6.6.2
+Provides:  bundled(php-composer(paragonie/sodium_compat)) = 1.21.1
+# License LGPL-3.0-or-later
+Provides:  bundled(php-composer(tecnickcom/tcpdf)) = 6.8.0
 # License MIT
-Provides:  bundled(php-brick-math) = 0.8.17
-Provides:  bundled(php-composer-ca-bundle) = 1.3.5
-Provides:  bundled(php-fgrosse-phpasn1) = v2.5.0
-Provides:  bundled(php-fig-http-message-util) = 1.1.5
-Provides:  bundled(php-league-uri) = 6.4.0
-Provides:  bundled(php-league-uri-interfaces) = 2.3.0
-Provides:  bundled(php-paragonie-constant-time-encoding) = v2.6.3
-Provides:  bundled(php-paragonie-random-compat) = v9.99.100
-Provides:  bundled(php-phpmyadmin-twig-i18n-extension) = v4.0.1
-Provides:  bundled(php-pragmarx-google2fa) = v8.0.1
-Provides:  bundled(php-pragmarx-google2fa-qrcode) = v2.1.1
-Provides:  bundled(php-psr-cache) = 1.0.1
-Provides:  bundled(php-psr-container) = 1.1.1
-Provides:  bundled(php-psr-http-client) = 1.0.1
-Provides:  bundled(php-psr-http-factory) = 1.0.1
-Provides:  bundled(php-psr-http-message) = 1.0.1
-Provides:  bundled(php-psr-log) = 1.1.4
-Provides:  bundled(php-ralouphie-getallheaders) = 3.0.3
-Provides:  bundled(php-ramsey-collection) = 1.1.4
-Provides:  bundled(php-ramsey-uuid) = 4.2.3
-Provides:  bundled(php-slim-psr7) = 1.4
-Provides:  bundled(php-spomky-labs-base64url) = v2.0.4
-Provides:  bundled(php-spomky-labs-cbor-php) = v1.1.1
-Provides:  bundled(php-symfony-cache) = v5.4.19
-Provides:  bundled(php-symfony-cache-contracts) = v2.5.2
-Provides:  bundled(php-symfony-config) = v5.4.19
-Provides:  bundled(php-symfony-dependency-injection) = v5.4.20
-Provides:  bundled(php-symfony-deprecation-contracts) = v2.5.2
-Provides:  bundled(php-symfony-expression-language) = v5.4.19
-Provides:  bundled(php-symfony-filesystem) = v5.4.19
-Provides:  bundled(php-symfony-polyfill-ctype) = v1.27.0
-Provides:  bundled(php-symfony-polyfill-mbstring) = v1.27.0
-Provides:  bundled(php-symfony-polyfill-php73) = v1.27.0
-Provides:  bundled(php-symfony-polyfill-php80) = v1.27.0
-Provides:  bundled(php-symfony-polyfill-php81) = v1.27.0
-Provides:  bundled(php-symfony-process) = v5.4.19
-Provides:  bundled(php-symfony-service-contracts) = v2.5.2
-Provides:  bundled(php-symfony-var-exporter) = v5.4.19
-Provides:  bundled(php-thecodingmachine-safe) = v1.3.3
-Provides:  bundled(php-web-auth-cose-lib) = v3.3.12
-Provides:  bundled(php-web-auth-metadata-service) = v3.3.12
-Provides:  bundled(php-web-auth-webauthn-lib) = v3.3.12
-Provides:  bundled(php-webmozart-assert) = 1.11.0
+Provides:  bundled(php-composer(brick/math)) = 0.8.17
+Provides:  bundled(php-composer(composer/ca-bundle)) = 1.5.5
+Provides:  bundled(php-composer(fgrosse/phpasn1)) = 2.5.0
+Provides:  bundled(php-composer(fig/http-message-util)) = 1.1.5
+Provides:  bundled(php-composer(league/uri)) = 6.4.0
+Provides:  bundled(php-composer(league/uri-interfaces)) = 2.3.0
+Provides:  bundled(php-composer(paragonie/constant_time_encoding)) = 2.7.0
+Provides:  bundled(php-composer(paragonie/random_compat)) = 9.99.100
+Provides:  bundled(php-composer(phpmyadmin/twig-i18n-extension)) = 4.1.3
+Provides:  bundled(php-composer(pragmarx/google2fa)) = 8.0.3
+Provides:  bundled(php-composer(pragmarx/google2fa-qrcode)) = 2.1.1
+Provides:  bundled(php-composer(psr/cache)) = 1.0.1
+Provides:  bundled(php-composer(psr/container)) = 1.1.1
+Provides:  bundled(php-composer(psr/http-client)) = 1.0.3
+Provides:  bundled(php-composer(psr/http-factory)) = 1.1.0
+Provides:  bundled(php-composer(psr/http-message)) = 1.1
+Provides:  bundled(php-composer(psr/log)) = 1.1.4
+Provides:  bundled(php-composer(ralouphie/getallheaders)) = 3.0.3
+Provides:  bundled(php-composer(ramsey/collection)) = 1.1.4
+Provides:  bundled(php-composer(ramsey/uuid)) = 4.2.3
+Provides:  bundled(php-composer(slim/psr7)) = 1.4.1
+Provides:  bundled(php-composer(spomky-labs/base64url)) = 2.0.4
+Provides:  bundled(php-composer(spomky-labs/cbor-php)) = 1.1.1
+Provides:  bundled(php-composer(symfony/cache)) = 5.4.46
+Provides:  bundled(php-composer(symfony/cache-contracts)) = 2.5.4
+Provides:  bundled(php-composer(symfony/config)) = 5.4.46
+Provides:  bundled(php-composer(symfony/dependency-injection)) = 5.4.48
+Provides:  bundled(php-composer(symfony/deprecation-contracts)) = 2.5.4
+Provides:  bundled(php-composer(symfony/expression-language)) = 5.4.45
+Provides:  bundled(php-composer(symfony/filesystem)) = 5.4.45
+Provides:  bundled(php-composer(symfony/polyfill-ctype)) = 1.31.0
+Provides:  bundled(php-composer(symfony/polyfill-mbstring)) = 1.31.0
+Provides:  bundled(php-composer(symfony/polyfill-php73)) = 1.31.0
+Provides:  bundled(php-composer(symfony/polyfill-php80)) = 1.31.0
+Provides:  bundled(php-composer(symfony/polyfill-php81)) = 1.31.0
+Provides:  bundled(php-composer(symfony/process)) = 5.4.47
+Provides:  bundled(php-composer(symfony/service-contracts)) = 2.5.4
+Provides:  bundled(php-composer(symfony/var-exporter)) = 5.4.45
+Provides:  bundled(php-composer(thecodingmachine/safe)) = 1.3.3
+Provides:  bundled(php-composer(web-auth/cose-lib)) = 3.3.12
+Provides:  bundled(php-composer(web-auth/metadata-service)) = 3.3.12
+Provides:  bundled(php-composer(web-auth/webauthn-lib)) = 3.3.12
+Provides:  bundled(php-composer(webmozart/assert)) = 1.11.0
 # License MPL-2.0
-Provides:  bundled(php-williamdes-mariadb-mysql-kbs) = v1.2.14
+Provides:  bundled(php-composer(williamdes/mariadb-mysql-kbs)) = 1.3.0
 # main package
 Provides:  php-composer(phpmyadmin/phpmyadmin) = %{version}
 %endif
@@ -229,9 +229,7 @@ sed -e "/'blowfish_secret'/s@''@'MUSTBECHANGEDONINSTALL'@"  \
 sed -e "/'changeLogFile'/s@ROOT_PATH@'%{_pkgdocdir}/'@" \
     -e "/'licenseFile'/s@ROOT_PATH@'%{_pkgdocdir}/'@" \
     -e "/'configFile'/s@ROOT_PATH@'%{_sysconfdir}/%{name}/'@" \
-%if 0%{?_licensedir:1}
     -e '/licenseFile/s:%_defaultdocdir:%_defaultlicensedir:' \
-%endif
     -e "/versionSuffix/s/''/'-%{release}'/" \
     -e "/tempDir/s@ROOT.*tmp'@'%{_localstatedir}/lib/%{name}/temp'@" \
     -e "/cacheDir/s@ROOT.*cache'@'%{_localstatedir}/lib/%{name}/cache'@" \
@@ -281,7 +279,7 @@ mv     %{buildroot}%{_datadir}/%{name}/libraries/cache %{buildroot}/%{_localstat
 rm -rf    %{buildroot}%{_datadir}/%{name}/examples/
 rm -rf    %{buildroot}%{_datadir}/%{name}/doc/
 mkdir -p  %{buildroot}%{_datadir}/%{name}/doc/
-ln -s %{_pkgdocdir}/html  %{buildroot}%{_datadir}/%{name}/doc/html
+ln -s ../../doc/%{name}/html  %{buildroot}%{_datadir}/%{name}/doc/html
 
 mv -f %{buildroot}%{_datadir}/%{name}/js/vendor/jquery/MIT-LICENSE.txt LICENSE-jquery
 mv -f %{buildroot}%{_datadir}/%{name}/js/vendor/codemirror/LICENSE LICENSE-codemirror
@@ -323,6 +321,9 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
 
 
 %changelog
+* Wed Jan 22 2025 Remi Collet <remi@remirepo.net> - 5.2.2-1
+- update to 5.2.2 (2025-01-21, security and bugfix release)
+
 * Wed Feb  8 2023 Remi Collet <remi@remirepo.net> - 5.2.1-1
 - update to 5.2.1 (2023-02-08, security and bugfix release)