diff options
Diffstat (limited to 'phpMyAdmin.spec')
| -rw-r--r-- | phpMyAdmin.spec | 85 |
1 files changed, 49 insertions, 36 deletions
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index fbc8740..c37dcff 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -1,7 +1,7 @@ # remirepo spec file for phpMyAdmin # remirepo:3 # -# Copyright (c) 2008-2021 Remi Collet +# Copyright (c) 2008-2022 Remi Collet # # Fedora spec file for phpMyAdmin # @@ -31,12 +31,12 @@ %global with_httpd 0 %endif -%global upstream_version 5.1.1 +%global upstream_version 5.1.2 #global upstream_prever rc2 Name: phpMyAdmin Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: A web interface for MySQL and MariaDB # MIT (js/jquery/, js/jqplot, js/codemirror/, js/tracekit/) @@ -46,7 +46,7 @@ Summary: A web interface for MySQL and MariaDB License: GPLv2+ and MIT and BSD %else # BSD: bacon/bacon-qr-code, dasprid/enum, google/recaptcha, nikic/fast-route, -# samyoul/u2f-php-server, twig/twig +# code-lts/u2f-php-server, twig/twig # MIT: paragonie/constant_time_encoding, phpmyadmin/twig-i18n-extension, # phpseclib/phpseclib, pragmarx/google2fa, pragmarx/google2fa-qrcode, # psr/*, symfony/* @@ -75,6 +75,7 @@ BuildRequires: php-symfony4-common >= 4.4.9 %else # to run phpMyAdmin-bundled.php BuildRequires: php-cli +BuildRequires: php-json %endif Requires(post): coreutils sed @@ -106,7 +107,7 @@ Suggests: httpd # "nikic/fast-route": "^1.3", # "phpmyadmin/motranslator": "^5.0", # "phpmyadmin/shapefile": "^2.0", -# "phpmyadmin/sql-parser": "^5.0", +# "phpmyadmin/sql-parser": "^5.5", # "phpmyadmin/twig-i18n-extension": "^3.0", # "phpseclib/phpseclib": "^2.0", # "symfony/config": "^4.4.9", @@ -114,7 +115,7 @@ Suggests: httpd # "symfony/expression-language": "^4.4.9", # "symfony/polyfill-ctype": "^1.17.0", # "symfony/polyfill-mbstring": "^1.17.0", -# "twig/twig": "^2.9 || ^3", +# "twig/twig": "^2.14.9 || ^3.3.5", # "williamdes/mariadb-mysql-kbs": "^1.2" Requires: php(language) >= 7.1.3 Requires: php-hash @@ -130,14 +131,14 @@ Requires: (php-composer(google/recaptcha) >= 1.1 with php-compose Requires: (php-composer(nikic/fast-route) >= 1.3 with php-composer(nikic/fast-route) < 2) Requires: (php-composer(phpmyadmin/motranslator) >= 5.0 with php-composer(phpmyadmin/motranslator) < 6) Requires: (php-composer(phpmyadmin/shapefile) >= 2.0 with php-composer(phpmyadmin/shapefile) < 3) -Requires: (php-composer(phpmyadmin/sql-parser) >= 5.0 with php-composer(phpmyadmin/sql-parser) < 6) +Requires: (php-composer(phpmyadmin/sql-parser) >= 5.5 with php-composer(phpmyadmin/sql-parser) < 6) Requires: (php-composer(phpmyadmin/twig-i18n-extension) >= 3.0 with php-composer(phpmyadmin/twig-i18n-extension) < 4) Requires: (php-composer(phpseclib/phpseclib) >= 2.0.9 with php-composer(phpseclib/phpseclib) < 3) Requires: (php-composer(symfony/config) >= 4.4.9 with php-composer(symfony/config) < 5) Requires: (php-composer(symfony/dependency-injection) >= 4.4.9 with php-composer(symfony/dependency-injection) < 5) Requires: (php-composer(symfony/expression-language) >= 4.4.9 with php-composer(symfony/expression-language) < 5) Requires: (php-composer(symfony/polyfill-mbstring) >= 1.17 with php-composer(symfony/polyfill-mbstring) < 2) -Requires: (php-composer(twig/twig) >= 2.9 with php-composer(twig/twig) < 4) +Requires: (php-composer(twig/twig) >= 2.14.9 with php-composer(twig/twig) < 4) Requires: (php-composer(williamdes/mariadb-mysql-kbs) >= 1.2 with php-composer(williamdes/mariadb-mysql-kbs) < 2) # remirepo:15 %else @@ -145,14 +146,14 @@ Requires: php-google-recaptcha >= 1.1 Requires: php-nikic-fast-route >= 1.3 Requires: php-phpmyadmin-motranslator5 >= 5.0 Requires: php-phpmyadmin-shapefile >= 2.0 -Requires: php-phpmyadmin-sql-parser5 +Requires: php-phpmyadmin-sql-parser5 >= 5.5 Requires: php-phpmyadmin-twig-i18n-extension Requires: php-phpseclib >= 2.0.9 Requires: php-symfony4-config >= 4.4.9 Requires: php-symfony4-dependency-injection >= 4.4.9 Requires: php-symfony4-expression-language >= 4.4.9 Requires: php-symfony-polyfill >= 1.17 -Requires: php-twig2 >= 2.9 +Requires: php-twig2 >= 2.14.9 Requires: php-williamdes-mariadb-mysql-kbs >= 1.2 %endif # Autoloader @@ -167,58 +168,60 @@ Requires: php-composer(fedora/autoloader) # "ext-gd2": "For image transformations", # "ext-mbstring": "For best performance", # "tecnickcom/tcpdf": "For PDF support", -# "pragmarx/google2fa-qrcode": "For 2FA authentication", -# "samyoul/u2f-php-server": "For FIDO U2F authentication" +# "code-lts/u2f-php-server": "For FIDO U2F authentication", +# "paragonie/sodium_compat": "For modern encryption support" # "conflict": { # "phpseclib/phpseclib": "2.0.8", # "tecnickcom/tcpdf": "<6.2", -# "pragmarx/google2fa-qrcode": "<1.0.1", -# "samyoul/u2f-php-server": "<1.1" +# "pragmarx/google2fa-qrcode": "<1.0.1" # remirepo:1 %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Recommends: php-opcache Recommends: php-composer(tecnickcom/tcpdf) >= 6.3 Recommends: php-composer(pragmarx/google2fa-qrcode) >= 1.0.1 -Recommends: php-composer(samyoul/u2f-php-server) >= 1.1 +Recommends: php-composer(code-lts/u2f-php-server) >= 1.2 Recommends: php-tcpdf-dejavu-sans-fonts >= 6.2 # remirepo:6 %else Requires: php-tcpdf >= 6.4.1 Requires: php-pragmarx-google2fa-qrcode >= 1.0.1 -Requires: php-samyoul-u2f-php-server >= 1.1 +Requires: php-code-lts-u2f-php-server >= 1.2 Requires: php-tcpdf-dejavu-sans-fonts >= 6.2 %endif %else -Provides: bundled(php-bacon-bacon-qr-code) = 2.0.3 +Provides: bundled(php-bacon-bacon-qr-code) = 2.0.4 +Provides: bundled(php-code-lts-u2f-php-server) = v1.2.0 Provides: bundled(php-dasprid-enum) = 1.0.3 Provides: bundled(php-google-recaptcha) = 1.2.4 Provides: bundled(php-nikic-fast-route) = v1.3.0 -Provides: bundled(php-paragonie-constant-time-encoding) = v2.4.0 +Provides: bundled(php-paragonie-constant-time-encoding) = v2.5.0 Provides: bundled(php-phpmyadmin-motranslator) = 5.2.0 Provides: bundled(php-phpmyadmin-shapefile) = 2.1 -Provides: bundled(php-phpmyadmin-sql-parser) = 5.4.2 +Provides: bundled(php-phpmyadmin-sql-parser) = 5.5.0 Provides: bundled(php-phpmyadmin-twig-i18n-extension) = v3.0.0 -Provides: bundled(php-phpseclib-phpseclib) = 2.0.31 +Provides: bundled(php-phpseclib-phpseclib) = 2.0.35 Provides: bundled(php-pragmarx-google2fa) = 8.0.0 Provides: bundled(php-pragmarx-google2fa-qrcode) = v1.0.3 Provides: bundled(php-psr-cache) = 1.0.1 Provides: bundled(php-psr-container) = 1.0.0 Provides: bundled(php-psr-log) = 1.1.4 -Provides: bundled(php-samyoul-u2f-php-server) = v1.1.4 -Provides: bundled(php-symfony-cache) = v4.4.25 -Provides: bundled(php-symfony-cache-contracts) = v1.1.10 -Provides: bundled(php-symfony-config) = v4.4.25 -Provides: bundled(php-symfony-dependency-injection) = v4.4.25 -Provides: bundled(php-symfony-expression-language) = v4.4.25 -Provides: bundled(php-symfony-filesystem) = v4.4.25 -Provides: bundled(php-symfony-polyfill-ctype) = v1.23.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.23.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.23.0 -Provides: bundled(php-symfony-service-contracts) = v1.1.9 -Provides: bundled(php-symfony-var-exporter) = v4.4.25 -Provides: bundled(php-tecnickcom-tcpdf) = 6.4.1 -Provides: bundled(php-twig-twig) = v2.13.1 -Provides: bundled(php-williamdes-mariadb-mysql-kbs) = 1.2.12 +Provides: bundled(php-symfony-cache) = v4.4.36 +Provides: bundled(php-symfony-cache-contracts) = v1.1.11 +Provides: bundled(php-symfony-config) = v4.4.36 +Provides: bundled(php-symfony-dependency-injection) = v4.4.36 +Provides: bundled(php-symfony-expression-language) = v4.4.34 +Provides: bundled(php-symfony-filesystem) = v4.4.27 +Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.24.0 +Provides: bundled(php-symfony-polyfill-php72) = v1.24.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.24.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.24.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.24.0 +Provides: bundled(php-symfony-service-contracts) = v1.1.11 +Provides: bundled(php-symfony-var-exporter) = v4.4.34 +Provides: bundled(php-tecnickcom-tcpdf) = 6.4.4 +Provides: bundled(php-twig-twig) = v2.14.10 +Provides: bundled(php-williamdes-mariadb-mysql-kbs) = v1.2.13 Requires: php-dom Requires: php-intl Requires: php-posix @@ -327,7 +330,7 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::optional([ '%{_datadir}/php/tcpdf/autoload.php', '%{_datadir}/php/PragmaRX/Google2FAQRCode/autoload.php', - '%{_datadir}/php/Samyoul/U2F/U2FServer/autoload.php', + '%{_datadir}/php/CodeLts/U2F/U2FServer/autoload.php', ]); EOF %else @@ -417,6 +420,16 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %changelog +* Sun Jan 23 2022 Remi Collet <remi@remirepo.net> - 5.1.2-1 +- update to 5.1.2 (2022-01-22, security and bugfix release) +- raise dependency on phpmyadmin/sql-parser 5.5 +- raise dependency on twig/twig 2.14.9 +- switch from samyoul/u2f-php-server to code-lts/u2f-php-server + +* Thu Jan 13 2022 Remi Collet <remi@remirepo.net> - 5.1.1-4 +- fix Licence name +- add build dependency on json ext + * Fri Dec 10 2021 Remi Collet <remi@remirepo.net> - 5.1.1-3 - add flag to use all PHP bundled libraries instead of system ones |