From 45987056f0ecc0b6dfc82a59cb336d9d317abe90 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Jan 2022 09:29:03 +0100 Subject: 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 --- composer.json | 30 ++- installed.json | 667 ++++++++++++++++++++++++++++++++++++++++---------------- phpMyAdmin.spec | 85 +++++--- 3 files changed, 543 insertions(+), 239 deletions(-) diff --git a/composer.json b/composer.json index bcdfad2..c980a03 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "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", @@ -57,18 +57,17 @@ "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" }, "conflict": { "phpseclib/phpseclib": "2.0.8", "tecnickcom/tcpdf": "<6.2", "pragmarx/google2fa": "<6.1.0 || >8.0", - "pragmarx/google2fa-qrcode": "<1.0.1", - "samyoul/u2f-php-server": "<1.1" + "pragmarx/google2fa-qrcode": "<1.0.1" }, "suggest": { - "ext-openssl": "Cookie encryption", + "ext-openssl": "For encryption performance", "ext-curl": "Updates checking", "ext-opcache": "Better performance", "ext-zlib": "For gz import and export", @@ -78,22 +77,24 @@ "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" }, "require-dev": { + "code-lts/u2f-php-server": "^1.2", + "paragonie/sodium_compat": "^1.17", "php-webdriver/webdriver": "^1.11", "phpmyadmin/coding-standard": "^2.1.1", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^0.12.79", - "phpstan/phpstan-phpunit": "^0.12.17", + "phpstan/phpstan": "^1.3", + "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0", "pragmarx/google2fa-qrcode": "^1.0.1", - "samyoul/u2f-php-server": "^1.1", "symfony/console": "^4.4", "symfony/finder": "^4.4", "symfony/twig-bridge": "^4.4", - "tecnickcom/tcpdf": "^6.4.1", - "vimeo/psalm": "^4.7.0" + "tecnickcom/tcpdf": "^6.4.4", + "vimeo/psalm": "^4.17" }, "extra": { "branch-alias": { @@ -117,6 +118,11 @@ }, "config":{ "sort-packages": true, - "discard-changes": true + "discard-changes": true, + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true, + "phpstan/extension-installer": true, + "composer/package-versions-deprecated": true + } } } diff --git a/installed.json b/installed.json index 84a4c1a..e732fea 100644 --- a/installed.json +++ b/installed.json @@ -2,17 +2,17 @@ "packages": [ { "name": "bacon/bacon-qr-code", - "version": "2.0.3", - "version_normalized": "2.0.3.0", + "version": "2.0.4", + "version_normalized": "2.0.4.0", "source": { "type": "git", "url": "https://github.com/Bacon/BaconQrCode.git", - "reference": "3e9d791b67d0a2912922b7b7c7312f4b37af41e4" + "reference": "f73543ac4e1def05f1a70bcd1525c8a157a1ad09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/3e9d791b67d0a2912922b7b7c7312f4b37af41e4", - "reference": "3e9d791b67d0a2912922b7b7c7312f4b37af41e4", + "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f73543ac4e1def05f1a70bcd1525c8a157a1ad09", + "reference": "f73543ac4e1def05f1a70bcd1525c8a157a1ad09", "shasum": "" }, "require": { @@ -28,7 +28,7 @@ "suggest": { "ext-imagick": "to generate QR code images" }, - "time": "2020-10-30T02:02:47+00:00", + "time": "2021-06-18T13:26:35+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -52,10 +52,67 @@ "homepage": "https://github.com/Bacon/BaconQrCode", "support": { "issues": "https://github.com/Bacon/BaconQrCode/issues", - "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.3" + "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.4" }, "install-path": "../bacon/bacon-qr-code" }, + { + "name": "code-lts/u2f-php-server", + "version": "v1.2.0", + "version_normalized": "1.2.0.0", + "source": { + "type": "git", + "url": "https://github.com/code-lts/U2F-php-server.git", + "reference": "59b3b28185e7fa255180a61278f6f65739082771" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/code-lts/U2F-php-server/zipball/59b3b28185e7fa255180a61278f6f65739082771", + "reference": "59b3b28185e7fa255180a61278f6f65739082771", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "php": "^7.1 || ^8.0" + }, + "replace": { + "samyoul/u2f-php-server": "*" + }, + "require-dev": { + "phpunit/phpunit": "^7 || ^8 || ^9" + }, + "time": "2021-12-12T11:02:35+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "CodeLts\\U2F\\U2FServer\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Samuel Hawksby-Robinson", + "email": "samuel@samyoul.com" + }, + { + "name": "William Desportes", + "email": "williamdes@wdes.fr" + } + ], + "description": "Server side handling class for FIDO U2F registration and authentication", + "homepage": "https://github.com/code-lts/U2F-php-server#readme", + "support": { + "issues": "https://github.com/code-lts/U2F-php-server/issues", + "source": "https://github.com/code-lts/U2F-php-server" + }, + "install-path": "../code-lts/u2f-php-server" + }, { "name": "dasprid/enum", "version": "1.0.3", @@ -216,17 +273,17 @@ }, { "name": "paragonie/constant_time_encoding", - "version": "v2.4.0", - "version_normalized": "2.4.0.0", + "version": "v2.5.0", + "version_normalized": "2.5.0.0", "source": { "type": "git", "url": "https://github.com/paragonie/constant_time_encoding.git", - "reference": "f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c" + "reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c", - "reference": "f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/9229e15f2e6ba772f0c55dd6986c563b937170a8", + "reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8", "shasum": "" }, "require": { @@ -236,7 +293,7 @@ "phpunit/phpunit": "^6|^7|^8|^9", "vimeo/psalm": "^1|^2|^3|^4" }, - "time": "2020-12-06T15:14:20+00:00", + "time": "2022-01-17T05:32:27+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -404,17 +461,17 @@ }, { "name": "phpmyadmin/sql-parser", - "version": "5.4.2", - "version_normalized": "5.4.2.0", + "version": "5.5.0", + "version_normalized": "5.5.0.0", "source": { "type": "git", "url": "https://github.com/phpmyadmin/sql-parser.git", - "reference": "b210e219a54df9b9822880780bb3ba0fffa1f542" + "reference": "8ab99cd0007d880f49f5aa1807033dbfa21b1cb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/b210e219a54df9b9822880780bb3ba0fffa1f542", - "reference": "b210e219a54df9b9822880780bb3ba0fffa1f542", + "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/8ab99cd0007d880f49f5aa1807033dbfa21b1cb5", + "reference": "8ab99cd0007d880f49f5aa1807033dbfa21b1cb5", "shasum": "" }, "require": { @@ -425,19 +482,22 @@ "phpmyadmin/motranslator": "<3.0" }, "require-dev": { - "phpmyadmin/coding-standard": "^2.1.1", + "phpmyadmin/coding-standard": "^3.0", "phpmyadmin/motranslator": "^4.0 || ^5.0", - "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.54", - "phpstan/phpstan-phpunit": "^0.12.16", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.2", + "phpstan/phpstan-phpunit": "^1.0", "phpunit/php-code-coverage": "*", - "phpunit/phpunit": "^7.4 || ^8 || ^9" + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "^0.16.1", + "vimeo/psalm": "^4.11", + "zumba/json-serializer": "^3.0" }, "suggest": { "ext-mbstring": "For best performance", "phpmyadmin/motranslator": "Translate messages to your favorite locale" }, - "time": "2021-02-05T14:33:29+00:00", + "time": "2021-12-09T04:31:52+00:00", "bin": [ "bin/highlight-query", "bin/lint-query", @@ -534,17 +594,17 @@ }, { "name": "phpseclib/phpseclib", - "version": "2.0.31", - "version_normalized": "2.0.31.0", + "version": "2.0.35", + "version_normalized": "2.0.35.0", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "233a920cb38636a43b18d428f9a8db1f0a1a08f4" + "reference": "4e16cf3f5f927a7d3f5317820af795c0366c0420" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/233a920cb38636a43b18d428f9a8db1f0a1a08f4", - "reference": "233a920cb38636a43b18d428f9a8db1f0a1a08f4", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4e16cf3f5f927a7d3f5317820af795c0366c0420", + "reference": "4e16cf3f5f927a7d3f5317820af795c0366c0420", "shasum": "" }, "require": { @@ -561,7 +621,7 @@ "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." }, - "time": "2021-04-06T13:56:45+00:00", + "time": "2021-11-28T23:30:39+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -626,7 +686,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/2.0.31" + "source": "https://github.com/phpseclib/phpseclib/tree/2.0.35" }, "funding": [ { @@ -925,98 +985,55 @@ }, "install-path": "../psr/log" }, - { - "name": "samyoul/u2f-php-server", - "version": "v1.1.4", - "version_normalized": "1.1.4.0", - "source": { - "type": "git", - "url": "https://github.com/Samyoul/U2F-php-server.git", - "reference": "0625202c79d570e58525ed6c4ae38500ea3f0883" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Samyoul/U2F-php-server/zipball/0625202c79d570e58525ed6c4ae38500ea3f0883", - "reference": "0625202c79d570e58525ed6c4ae38500ea3f0883", - "shasum": "" - }, - "require": { - "ext-openssl": "*" - }, - "time": "2018-10-26T12:43:39+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-4": { - "Samyoul\\U2F\\U2FServer\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Samuel Hawksby-Robinson", - "email": "samuel@samyoul.com" - } - ], - "description": "Server side handling class for FIDO U2F registration and authentication", - "support": { - "issues": "https://github.com/Samyoul/U2F-php-server/issues", - "source": "https://github.com/Samyoul/U2F-php-server/tree/master" - }, - "install-path": "../samyoul/u2f-php-server" - }, { "name": "symfony/cache", - "version": "v4.4.25", - "version_normalized": "4.4.25.0", + "version": "v4.4.36", + "version_normalized": "4.4.36.0", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "e2486bd59ac996afff25cdbfb823e982a0550c3e" + "reference": "1caa6c63f0ebf3022b88263a2b90260cff33f6dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/e2486bd59ac996afff25cdbfb823e982a0550c3e", - "reference": "e2486bd59ac996afff25cdbfb823e982a0550c3e", + "url": "https://api.github.com/repos/symfony/cache/zipball/1caa6c63f0ebf3022b88263a2b90260cff33f6dc", + "reference": "1caa6c63f0ebf3022b88263a2b90260cff33f6dc", "shasum": "" }, "require": { "php": ">=7.1.3", "psr/cache": "^1.0|^2.0", - "psr/log": "~1.0", + "psr/log": "^1|^2|^3", "symfony/cache-contracts": "^1.1.7|^2", + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2", "symfony/var-exporter": "^4.2|^5.0" }, "conflict": { - "doctrine/dbal": "<2.6", + "doctrine/dbal": "<2.7", "symfony/dependency-injection": "<3.4", "symfony/http-kernel": "<4.4|>=5.0", "symfony/var-dumper": "<4.4" }, "provide": { "psr/cache-implementation": "1.0|2.0", - "psr/simple-cache-implementation": "1.0", + "psr/simple-cache-implementation": "1.0|2.0", "symfony/cache-implementation": "1.0|2.0" }, "require-dev": { "cache/integration-tests": "dev-master", "doctrine/cache": "^1.6|^2.0", - "doctrine/dbal": "^2.6|^3.0", + "doctrine/dbal": "^2.7|^3.0", "predis/predis": "^1.1", - "psr/simple-cache": "^1.0", + "psr/simple-cache": "^1.0|^2.0", "symfony/config": "^4.2|^5.0", "symfony/dependency-injection": "^3.4|^4.1|^5.0", "symfony/filesystem": "^4.4|^5.0", "symfony/http-kernel": "^4.4", "symfony/var-dumper": "^4.4|^5.0" }, - "time": "2021-05-26T17:39:37+00:00", + "time": "2021-12-28T10:59:50+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1048,7 +1065,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v4.4.25" + "source": "https://github.com/symfony/cache/tree/v4.4.36" }, "funding": [ { @@ -1068,31 +1085,31 @@ }, { "name": "symfony/cache-contracts", - "version": "v1.1.10", - "version_normalized": "1.1.10.0", + "version": "v1.1.11", + "version_normalized": "1.1.11.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "8d5489c10ef90aa7413e4921fc3c0520e24cbed7" + "reference": "41c956506500bea5502022f6be81da96fb9c7626" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/8d5489c10ef90aa7413e4921fc3c0520e24cbed7", - "reference": "8d5489c10ef90aa7413e4921fc3c0520e24cbed7", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/41c956506500bea5502022f6be81da96fb9c7626", + "reference": "41c956506500bea5502022f6be81da96fb9c7626", "shasum": "" }, "require": { "php": ">=7.1.3", - "psr/cache": "^1.0" + "psr/cache": "^1.0|^2.0|^3.0" }, "suggest": { "symfony/cache-implementation": "" }, - "time": "2020-09-02T16:08:58+00:00", + "time": "2021-07-13T09:33:53+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-main": "1.1-dev" }, "thanks": { "name": "symfony/contracts", @@ -1130,7 +1147,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v1.1.10" + "source": "https://github.com/symfony/cache-contracts/tree/v1.1.11" }, "funding": [ { @@ -1150,23 +1167,24 @@ }, { "name": "symfony/config", - "version": "v4.4.25", - "version_normalized": "4.4.25.0", + "version": "v4.4.36", + "version_normalized": "4.4.36.0", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "2803882bb10353d277d4539635dd688a053d571c" + "reference": "03218ffbd5faeda5e6a97f9109acebf7973ff385" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/2803882bb10353d277d4539635dd688a053d571c", - "reference": "2803882bb10353d277d4539635dd688a053d571c", + "url": "https://api.github.com/repos/symfony/config/zipball/03218ffbd5faeda5e6a97f9109acebf7973ff385", + "reference": "03218ffbd5faeda5e6a97f9109acebf7973ff385", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/filesystem": "^3.4|^4.0|^5.0", "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php80": "^1.16", "symfony/polyfill-php81": "^1.22" }, "conflict": { @@ -1182,7 +1200,7 @@ "suggest": { "symfony/yaml": "To use the yaml reference dumper" }, - "time": "2021-05-26T11:20:16+00:00", + "time": "2021-12-12T15:06:47+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1210,7 +1228,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v4.4.25" + "source": "https://github.com/symfony/config/tree/v4.4.36" }, "funding": [ { @@ -1230,22 +1248,23 @@ }, { "name": "symfony/dependency-injection", - "version": "v4.4.25", - "version_normalized": "4.4.25.0", + "version": "v4.4.36", + "version_normalized": "4.4.36.0", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "2ed2a0a6c960bf4e2e862ec77b2f2c558b83c64d" + "reference": "24e802b4973d3a60c01fd77bdaac8a66944202e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ed2a0a6c960bf4e2e862ec77b2f2c558b83c64d", - "reference": "2ed2a0a6c960bf4e2e862ec77b2f2c558b83c64d", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/24e802b4973d3a60c01fd77bdaac8a66944202e1", + "reference": "24e802b4973d3a60c01fd77bdaac8a66944202e1", "shasum": "" }, "require": { "php": ">=7.1.3", "psr/container": "^1.0", + "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1.6|^2" }, "conflict": { @@ -1270,7 +1289,7 @@ "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", "symfony/yaml": "" }, - "time": "2021-05-26T17:54:16+00:00", + "time": "2021-12-29T10:03:29+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1298,7 +1317,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v4.4.25" + "source": "https://github.com/symfony/dependency-injection/tree/v4.4.36" }, "funding": [ { @@ -1318,17 +1337,17 @@ }, { "name": "symfony/expression-language", - "version": "v4.4.25", - "version_normalized": "4.4.25.0", + "version": "v4.4.34", + "version_normalized": "4.4.34.0", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", - "reference": "4515f7d3fa614a23c7acc1162d7ef069c165d7af" + "reference": "6331d834d364cce857e5a83368ce19141d5147bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/expression-language/zipball/4515f7d3fa614a23c7acc1162d7ef069c165d7af", - "reference": "4515f7d3fa614a23c7acc1162d7ef069c165d7af", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/6331d834d364cce857e5a83368ce19141d5147bd", + "reference": "6331d834d364cce857e5a83368ce19141d5147bd", "shasum": "" }, "require": { @@ -1336,7 +1355,7 @@ "symfony/cache": "^3.4|^4.0|^5.0", "symfony/service-contracts": "^1.1|^2" }, - "time": "2021-05-26T11:20:16+00:00", + "time": "2021-11-16T18:00:05+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1364,7 +1383,7 @@ "description": "Provides an engine that can compile and evaluate expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/expression-language/tree/v4.4.25" + "source": "https://github.com/symfony/expression-language/tree/v4.4.34" }, "funding": [ { @@ -1384,24 +1403,25 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.25", - "version_normalized": "4.4.25.0", + "version": "v4.4.27", + "version_normalized": "4.4.27.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "2d926ebd76f52352deb3c9577d8c1d4b96eae429" + "reference": "517fb795794faf29086a77d99eb8f35e457837a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/2d926ebd76f52352deb3c9577d8c1d4b96eae429", - "reference": "2d926ebd76f52352deb3c9577d8c1d4b96eae429", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/517fb795794faf29086a77d99eb8f35e457837a7", + "reference": "517fb795794faf29086a77d99eb8f35e457837a7", "shasum": "" }, "require": { "php": ">=7.1.3", - "symfony/polyfill-ctype": "~1.8" + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php80": "^1.16" }, - "time": "2021-05-26T17:30:55+00:00", + "time": "2021-07-21T12:19:41+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1429,7 +1449,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v4.4.25" + "source": "https://github.com/symfony/filesystem/tree/v4.4.27" }, "funding": [ { @@ -1449,26 +1469,29 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.23.0", - "version_normalized": "1.23.0.0", + "version": "v1.24.0", + "version_normalized": "1.24.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + "reference": "30885182c981ab175d4d034db0f6f469898070ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", + "reference": "30885182c981ab175d4d034db0f6f469898070ab", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, "suggest": { "ext-ctype": "For best performance" }, - "time": "2021-02-19T12:13:01+00:00", + "time": "2021-10-20T20:35:02+00:00", "type": "library", "extra": { "branch-alias": { @@ -1511,7 +1534,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" }, "funding": [ { @@ -1531,26 +1554,29 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.0", - "version_normalized": "1.23.0.0", + "version": "v1.24.0", + "version_normalized": "1.24.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-mbstring": "*" + }, "suggest": { "ext-mbstring": "For best performance" }, - "time": "2021-05-27T09:27:20+00:00", + "time": "2021-11-30T18:21:41+00:00", "type": "library", "extra": { "branch-alias": { @@ -1594,7 +1620,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" }, "funding": [ { @@ -1612,25 +1638,272 @@ ], "install-path": "../symfony/polyfill-mbstring" }, + { + "name": "symfony/polyfill-php72", + "version": "v1.24.0", + "version_normalized": "1.24.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "time": "2021-05-27T09:17:38+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "install-path": "../symfony/polyfill-php72" + }, + { + "name": "symfony/polyfill-php73", + "version": "v1.24.0", + "version_normalized": "1.24.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "time": "2021-06-05T21:20:04+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "install-path": "../symfony/polyfill-php73" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.24.0", + "version_normalized": "1.24.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "time": "2021-09-13T13:58:33+00:00", + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "install-path": "../symfony/polyfill-php80" + }, { "name": "symfony/polyfill-php81", - "version": "v1.23.0", - "version_normalized": "1.23.0.0", + "version": "v1.24.0", + "version_normalized": "1.24.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "e66119f3de95efc359483f810c4c3e6436279436" + "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436", - "reference": "e66119f3de95efc359483f810c4c3e6436279436", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", + "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f", "shasum": "" }, "require": { "php": ">=7.1" }, - "time": "2021-05-21T13:25:03+00:00", + "time": "2021-09-13T13:58:11+00:00", "type": "library", "extra": { "branch-alias": { @@ -1676,7 +1949,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0" }, "funding": [ { @@ -1696,17 +1969,17 @@ }, { "name": "symfony/service-contracts", - "version": "v1.1.9", - "version_normalized": "1.1.9.0", + "version": "v1.1.11", + "version_normalized": "1.1.11.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "b776d18b303a39f56c63747bcb977ad4b27aca26" + "reference": "633df678bec3452e04a7b0337c9bcfe7354124b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b776d18b303a39f56c63747bcb977ad4b27aca26", - "reference": "b776d18b303a39f56c63747bcb977ad4b27aca26", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/633df678bec3452e04a7b0337c9bcfe7354124b3", + "reference": "633df678bec3452e04a7b0337c9bcfe7354124b3", "shasum": "" }, "require": { @@ -1716,11 +1989,11 @@ "suggest": { "symfony/service-implementation": "" }, - "time": "2020-07-06T13:19:58+00:00", + "time": "2021-11-04T13:32:43+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-main": "1.1-dev" }, "thanks": { "name": "symfony/contracts", @@ -1758,7 +2031,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v1.1.9" + "source": "https://github.com/symfony/service-contracts/tree/v1.1.11" }, "funding": [ { @@ -1778,26 +2051,27 @@ }, { "name": "symfony/var-exporter", - "version": "v4.4.25", - "version_normalized": "4.4.25.0", + "version": "v4.4.34", + "version_normalized": "4.4.34.0", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "723c038aac53280c8ad4209add93e679a33bbe3f" + "reference": "75a297f25a87ce9343d39241679578886f3fd458" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/723c038aac53280c8ad4209add93e679a33bbe3f", - "reference": "723c038aac53280c8ad4209add93e679a33bbe3f", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/75a297f25a87ce9343d39241679578886f3fd458", + "reference": "75a297f25a87ce9343d39241679578886f3fd458", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=7.1.3", + "symfony/polyfill-php80": "^1.16" }, "require-dev": { "symfony/var-dumper": "^4.4.9|^5.0.9" }, - "time": "2021-05-26T17:39:37+00:00", + "time": "2021-11-22T10:04:59+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1833,7 +2107,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v4.4.25" + "source": "https://github.com/symfony/var-exporter/tree/v4.4.34" }, "funding": [ { @@ -1853,23 +2127,23 @@ }, { "name": "tecnickcom/tcpdf", - "version": "6.4.1", - "version_normalized": "6.4.1.0", + "version": "6.4.4", + "version_normalized": "6.4.4.0", "source": { "type": "git", "url": "https://github.com/tecnickcom/TCPDF.git", - "reference": "5ba838befdb37ef06a16d9f716f35eb03cb1b329" + "reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/5ba838befdb37ef06a16d9f716f35eb03cb1b329", - "reference": "5ba838befdb37ef06a16d9f716f35eb03cb1b329", + "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/42cd0f9786af7e5db4fcedaa66f717b0d0032320", + "reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320", "shasum": "" }, "require": { "php": ">=5.3.0" }, - "time": "2021-03-27T16:00:33+00:00", + "time": "2021-12-31T08:39:24+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -1916,7 +2190,7 @@ ], "support": { "issues": "https://github.com/tecnickcom/TCPDF/issues", - "source": "https://github.com/tecnickcom/TCPDF/tree/6.4.1" + "source": "https://github.com/tecnickcom/TCPDF/tree/6.4.4" }, "funding": [ { @@ -1928,33 +2202,34 @@ }, { "name": "twig/twig", - "version": "v2.13.1", - "version_normalized": "2.13.1.0", + "version": "v2.14.10", + "version_normalized": "2.14.10.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "57e96259776ddcacf1814885fc3950460c8e18ef" + "reference": "95fb194cd4dd6ac373a27af2bde2bad5d3f27aba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/57e96259776ddcacf1814885fc3950460c8e18ef", - "reference": "57e96259776ddcacf1814885fc3950460c8e18ef", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/95fb194cd4dd6ac373a27af2bde2bad5d3f27aba", + "reference": "95fb194cd4dd6ac373a27af2bde2bad5d3f27aba", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3" + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php72": "^1.8" }, "require-dev": { "psr/container": "^1.0", - "symfony/phpunit-bridge": "^4.4.9|^5.0.9" + "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" }, - "time": "2020-08-05T15:09:04+00:00", + "time": "2022-01-03T21:13:26+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "2.13-dev" + "dev-master": "2.14-dev" } }, "installation-source": "dist", @@ -1994,7 +2269,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.13.1" + "source": "https://github.com/twigphp/Twig/tree/v2.14.10" }, "funding": [ { @@ -2010,30 +2285,29 @@ }, { "name": "williamdes/mariadb-mysql-kbs", - "version": "1.2.12", - "version_normalized": "1.2.12.0", + "version": "v1.2.13", + "version_normalized": "1.2.13.0", "source": { "type": "git", "url": "https://github.com/williamdes/mariadb-mysql-kbs.git", - "reference": "b5d4b498ba3d24ab7ad7dd0b79384542e37286a1" + "reference": "f5c1b00d4bcfb27c06595ae172aa69da1815bfa9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/williamdes/mariadb-mysql-kbs/zipball/b5d4b498ba3d24ab7ad7dd0b79384542e37286a1", - "reference": "b5d4b498ba3d24ab7ad7dd0b79384542e37286a1", + "url": "https://api.github.com/repos/williamdes/mariadb-mysql-kbs/zipball/f5c1b00d4bcfb27c06595ae172aa69da1815bfa9", + "reference": "f5c1b00d4bcfb27c06595ae172aa69da1815bfa9", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12", + "phpstan/phpstan": "^1.2", "phpunit/phpunit": "^7 || ^8 || ^9", - "slevomat/coding-standard": "^6.3", - "squizlabs/php_codesniffer": "^3.4", - "swaggest/json-schema": "^0.12.29" + "swaggest/json-schema": "^0.12.29", + "wdes/coding-standard": "^3" }, - "time": "2021-01-02T21:39:05+00:00", + "time": "2021-12-19T22:53:51+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -2071,8 +2345,19 @@ "issues": "https://github.com/williamdes/mariadb-mysql-kbs/issues", "source": "https://github.com/williamdes/mariadb-mysql-kbs" }, + "funding": [ + { + "url": "https://github.com/sponsors/williamdes", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/williamdes/mariadb-mysql-kbs", + "type": "tidelift" + } + ], "install-path": "../williamdes/mariadb-mysql-kbs" } ], - "dev": false + "dev": false, + "dev-package-names": [] } 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 - 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 - 5.1.1-4 +- fix Licence name +- add build dependency on json ext + * Fri Dec 10 2021 Remi Collet - 5.1.1-3 - add flag to use all PHP bundled libraries instead of system ones -- cgit