summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json40
-rw-r--r--phpMyAdmin-bundled.php2
-rw-r--r--phpMyAdmin-certs.patch2
-rw-r--r--phpMyAdmin.spec103
4 files changed, 42 insertions, 105 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-certs.patch b/phpMyAdmin-certs.patch
index 15cacac..4021d77 100644
--- a/phpMyAdmin-certs.patch
+++ b/phpMyAdmin-certs.patch
@@ -6,7 +6,7 @@ diff -up ./vendor/composer/ca-bundle/src/CaBundle.php.rpm ./vendor/composer/ca-b
public static function getBundledCaBundlePath()
{
- $caBundleFile = __DIR__.'/../res/cacert.pem';
-+ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always
++ $caBundleFile = '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem'; // System CA, always
// cURL does not understand 'phar://' paths
// see https://github.com/composer/ca-bundle/issues/10
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index fcf99e6..cd90e70 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
#
@@ -11,19 +11,17 @@
# Please, preserve the changelog entries
#
-%bcond_with generators
-
# nginx 1.6 with nginx-filesystem
%global with_nginx 1
# httpd 2.4 with httpd-filesystem
%global with_httpd 1
-%global upstream_version 5.2.1
+%global upstream_version 5.2.3
#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
@@ -49,9 +47,7 @@ BuildRequires: gnupg2
BuildRequires: php(language) >= 7.2.5
BuildRequires: php-cli
BuildRequires: php-json
-%if %{with generators}
BuildRequires: composer-generators
-%endif
Requires(post): coreutils sed
Requires: webserver
@@ -94,82 +90,11 @@ Suggests: httpd
# "twig/twig": "^2.14.9 || ^3.3.5",
# "williamdes/mariadb-mysql-kbs": "^1.2"
Requires: php(language) >= 7.2.5
-Requires: php-hash
Requires: php-iconv
Requires: php-json
Requires: php-mysqli
Requires: php-openssl
-Requires: php-pcre
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
-# 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
-# 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
-# License ISC
-Provides: bundled(php-paragonie-sodium-compat) = v1.19.0
-# License LGPL-3.0-only
-Provides: bundled(php-tecnickcom-tcpdf) = 6.6.2
-# 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
-# License MPL-2.0
-Provides: bundled(php-williamdes-mariadb-mysql-kbs) = v1.2.14
-# main package
-Provides: php-composer(phpmyadmin/phpmyadmin) = %{version}
-%endif
-
Requires: php-dom
Requires: php-intl
Requires: php-posix
@@ -183,15 +108,11 @@ Requires: php-gd
Requires: php-mbstring
# From phpcompatinfo reports for 4.8.0
# notice: recode is optional (iconv or mbstring are preferred / used first)
-Requires: php-date
-Requires: php-filter
Requires: php-libxml
-Requires: php-session
Requires: php-simplexml
-Requires: php-spl
Requires: php-xmlwriter
# System certificates
-Requires: ca-certificates
+Requires: %{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
# Bundled JS library
Provides: bundled(js-codemirror)
@@ -229,9 +150,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'@" \
@@ -240,10 +159,6 @@ sed -e "/'changeLogFile'/s@ROOT_PATH@'%{_pkgdocdir}/'@" \
# For debug
grep '=>' libraries/vendor_config.php
-%if %{without generators}
-php %{SOURCE5} vendor/composer/installed.json
-%endif
-
%build
# Nothing to do
@@ -281,7 +196,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 +238,14 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
%changelog
+* Wed Oct 8 2025 Remi Collet <remi@remirepo.net> - 5.2.3-1
+- update to 5.2.3 (2025-10-08, bugfix release)
+- fix patch to system CA certificates
+- always build with composer-generators
+
+* 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)
generated by cgit (git 2.34.1) at 2025-12-15 22:55:29 +0000