summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer-rpm.patch48
-rw-r--r--composer.json2
-rw-r--r--composer.spec23
-rw-r--r--installed.json98
4 files changed, 93 insertions, 78 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 26ee894..5cfb149 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,7 +1,7 @@
diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm 2022-03-16 09:47:01.000000000 +0100
-+++ ./bin/composer 2022-03-16 09:53:25.479618079 +0100
-@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
+--- ./bin/composer.rpm 2022-06-02 06:47:42.000000000 +0200
++++ ./bin/composer 2022-06-02 06:49:45.037192985 +0200
+@@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) {
}
setlocale(LC_ALL, 'C');
@@ -11,9 +11,9 @@ diff -up ./bin/composer.rpm ./bin/composer
use Composer\Console\Application;
use Composer\XdebugHandler\XdebugHandler;
diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2022-03-16 09:47:01.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php 2022-03-16 09:53:25.479618079 +0100
-@@ -418,7 +418,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php 2022-06-02 06:49:45.037192985 +0200
+@@ -425,7 +425,7 @@ EOF;
$filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $checkPlatform));
$filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
if ($this->runScripts) {
$this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm 2022-03-16 09:47:01.000000000 +0100
-+++ ./src/Composer/Compiler.php 2022-03-16 09:53:25.480618076 +0100
+--- ./src/Composer/Compiler.php.rpm 2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/Compiler.php 2022-06-02 06:49:45.037192985 +0200
@@ -107,7 +107,7 @@ class Compiler
// Add Composer resources
$finder = new Finder();
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
;
foreach ($finder as $file) {
diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
---- ./src/Composer/InstalledVersions.php.rpm 2022-03-16 09:47:01.000000000 +0100
-+++ ./src/Composer/InstalledVersions.php 2022-03-16 09:53:25.480618076 +0100
+--- ./src/Composer/InstalledVersions.php.rpm 2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/InstalledVersions.php 2022-06-02 06:49:45.037192985 +0200
@@ -266,7 +266,7 @@ class InstalledVersions
if (null === self::$installed) {
// only require the installed.php file if this file is loaded from its dumped location,
@@ -56,9 +56,9 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
} else {
self::$installed = array();
diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm 2022-03-16 09:54:28.547422853 +0100
-+++ ./src/Composer/Json/JsonFile.php 2022-03-16 09:56:07.126118722 +0100
-@@ -38,7 +38,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm 2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php 2022-06-02 06:49:45.037192985 +0200
+@@ -39,7 +39,7 @@ class JsonFile
/** @deprecated Use \JSON_UNESCAPED_UNICODE */
public const JSON_UNESCAPED_UNICODE = 256;
@@ -67,7 +67,7 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
/** @var string */
private $path;
-@@ -200,7 +200,7 @@ class JsonFile
+@@ -219,7 +219,7 @@ class JsonFile
$isComposerSchemaFile = false;
if (null === $schemaFile) {
$isComposerSchemaFile = true;
@@ -76,9 +76,21 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
}
// Prepend with file:// only when not using a special schema already (e.g. in the phar)
+diff -up ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm ./src/Composer/PHPStan/ConfigReturnTypeExtension.php
+--- ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm 2022-06-02 06:50:28.987916014 +0200
++++ ./src/Composer/PHPStan/ConfigReturnTypeExtension.php 2022-06-02 06:51:05.429709332 +0200
+@@ -30,7 +30,7 @@ final class ConfigReturnTypeExtension im
+
+ public function __construct()
+ {
+- $schema = JsonFile::parseJson((string) file_get_contents(__DIR__.'/../../../res/composer-schema.json'));
++ $schema = JsonFile::parseJson((string) file_get_contents('/usr/share/composer/res/composer-schema.json'));
+ /**
+ * @var string $prop
+ */
diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php
---- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm 2021-10-28 22:44:15.000000000 +0200
-+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2022-03-16 09:53:25.480618076 +0100
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm 2022-05-24 13:56:16.000000000 +0200
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2022-06-02 06:49:45.037192985 +0200
@@ -125,7 +125,7 @@ class CaBundle
*/
public static function getBundledCaBundlePath()
@@ -89,8 +101,8 @@ diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Com
// cURL does not understand 'phar://' paths
// see https://github.com/composer/ca-bundle/issues/10
diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2022-03-16 09:47:01.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2022-03-16 09:53:25.480618076 +0100
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2022-06-02 06:47:42.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2022-06-02 06:49:45.037192985 +0200
@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
private function check(string $json)
{
diff --git a/composer.json b/composer.json
index 80b97d6..7696422 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
"psr/log": "^1.0 || ^2.0 || ^3.0",
"seld/jsonlint": "^1.4",
"seld/phar-utils": "^1.2",
- "symfony/console": "^5.4.1 || ^6.0",
+ "symfony/console": "^5.4.7 || ^6.0.7",
"symfony/filesystem": "^5.4 || ^6.0",
"symfony/finder": "^5.4 || ^6.0",
"symfony/process": "^5.4 || ^6.0",
diff --git a/composer.spec b/composer.spec
index 22da6b4..d83019a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
%bcond_with syslib
%endif
-%global gh_commit 50c47b1f907cfcdb8f072b88164d22b527557ae1
+%global gh_commit 0f43aa1652c447a6bc7c9217ec133313b1d32e72
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 2.0-dev
%global gh_owner composer
@@ -26,7 +26,7 @@
%global api_version 2.3.0
%global run_version 2.2.2
-%global upstream_version 2.3.5
+%global upstream_version 2.3.6
#global upstream_prever RC2
#global upstream_lower rc2
@@ -162,11 +162,11 @@ Requires: php-composer(fedora/autoloader)
Requires: ca-certificates
# Bundled libraries
# License MIT
-Provides: bundled(php-composer-ca-bundle) = 1.3.1
+Provides: bundled(php-composer-ca-bundle) = 1.3.2
Provides: bundled(php-composer-metadata-minifier) = 1.0.0
Provides: bundled(php-composer-pcre) = 2.0.0
Provides: bundled(php-composer-semver) = 3.3.2
-Provides: bundled(php-composer-spdx-licenses) = 1.5.6
+Provides: bundled(php-composer-spdx-licenses) = 1.5.7
Provides: bundled(php-composer-xdebug-handler) = 3.0.3
Provides: bundled(php-justinrainbow-json-schema) = 5.2.12
Provides: bundled(php-psr-container) = 1.1.1
@@ -174,19 +174,19 @@ Provides: bundled(php-psr-log) = 1.1.4
Provides: bundled(php-react-promise) = v2.9.0
Provides: bundled(php-seld-jsonlint) = 1.9.0
Provides: bundled(php-seld-phar-utils) = 1.2.0
-Provides: bundled(php-symfony-console) = v5.4.7
+Provides: bundled(php-symfony-console) = v5.4.9
Provides: bundled(php-symfony-deprecation-contracts) = v2.5.1
-Provides: bundled(php-symfony-filesystem) = v5.4.7
-Provides: bundled(php-symfony-finder) = v5.4.3
+Provides: bundled(php-symfony-filesystem) = v5.4.9
+Provides: bundled(php-symfony-finder) = v5.4.8
Provides: bundled(php-symfony-polyfill-ctype) = v1.25.0
Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.25.0
Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.25.0
Provides: bundled(php-symfony-polyfill-mbstring) = v1.25.0
Provides: bundled(php-symfony-polyfill-php73) = v1.25.0
Provides: bundled(php-symfony-polyfill-php80) = v1.25.0
-Provides: bundled(php-symfony-process) = v5.4.7
+Provides: bundled(php-symfony-process) = v5.4.8
Provides: bundled(php-symfony-service-contracts) = v2.5.1
-Provides: bundled(php-symfony-string) = v5.4.3
+Provides: bundled(php-symfony-string) = v5.4.9
%endif
# From composer.json, suggest
# "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -305,7 +305,7 @@ php -r '
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-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]);
}
foreach($res as $lic => $lib) {
sort($lib);
@@ -417,6 +417,9 @@ exit $ret
%changelog
+* Thu Jun 2 2022 Remi Collet <remi@remirepo.net> - 2.3.6-1
+- update to 2.3.6
+
* Thu Apr 14 2022 Remi Collet <remi@remirepo.net> - 2.3.5-1
- update to 2.3.5
diff --git a/installed.json b/installed.json
index 3a8585d..c54ffec 100644
--- a/installed.json
+++ b/installed.json
@@ -2,17 +2,17 @@
"packages": [
{
"name": "composer/ca-bundle",
- "version": "1.3.1",
- "version_normalized": "1.3.1.0",
+ "version": "1.3.2",
+ "version_normalized": "1.3.2.0",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
- "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b"
+ "reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
- "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/fd5dd441932a7e10ca6e5b490e272d34c8430640",
+ "reference": "fd5dd441932a7e10ca6e5b490e272d34c8430640",
"shasum": ""
},
"require": {
@@ -26,7 +26,7 @@
"symfony/phpunit-bridge": "^4.2 || ^5",
"symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
},
- "time": "2021-10-28T20:44:15+00:00",
+ "time": "2022-05-24T11:56:16+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -61,7 +61,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/ca-bundle/issues",
- "source": "https://github.com/composer/ca-bundle/tree/1.3.1"
+ "source": "https://github.com/composer/ca-bundle/tree/1.3.2"
},
"funding": [
{
@@ -311,17 +311,17 @@
},
{
"name": "composer/spdx-licenses",
- "version": "1.5.6",
- "version_normalized": "1.5.6.0",
+ "version": "1.5.7",
+ "version_normalized": "1.5.7.0",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
- "reference": "a30d487169d799745ca7280bc90fdfa693536901"
+ "reference": "c848241796da2abf65837d51dce1fae55a960149"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a30d487169d799745ca7280bc90fdfa693536901",
- "reference": "a30d487169d799745ca7280bc90fdfa693536901",
+ "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/c848241796da2abf65837d51dce1fae55a960149",
+ "reference": "c848241796da2abf65837d51dce1fae55a960149",
"shasum": ""
},
"require": {
@@ -331,7 +331,7 @@
"phpstan/phpstan": "^0.12.55",
"symfony/phpunit-bridge": "^4.2 || ^5"
},
- "time": "2021-11-18T10:14:14+00:00",
+ "time": "2022-05-23T07:37:50+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -374,7 +374,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/spdx-licenses/issues",
- "source": "https://github.com/composer/spdx-licenses/tree/1.5.6"
+ "source": "https://github.com/composer/spdx-licenses/tree/1.5.7"
},
"funding": [
{
@@ -837,17 +837,17 @@
},
{
"name": "symfony/console",
- "version": "v5.4.7",
- "version_normalized": "5.4.7.0",
+ "version": "v5.4.9",
+ "version_normalized": "5.4.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6"
+ "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/900275254f0a1a2afff1ab0e11abd5587a10e1d6",
- "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6",
+ "url": "https://api.github.com/repos/symfony/console/zipball/829d5d1bf60b2efeb0887b7436873becc71a45eb",
+ "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb",
"shasum": ""
},
"require": {
@@ -885,7 +885,7 @@
"symfony/lock": "",
"symfony/process": ""
},
- "time": "2022-03-31T17:09:19+00:00",
+ "time": "2022-05-18T06:17:34+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -919,7 +919,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v5.4.7"
+ "source": "https://github.com/symfony/console/tree/v5.4.9"
},
"funding": [
{
@@ -1009,17 +1009,17 @@
},
{
"name": "symfony/filesystem",
- "version": "v5.4.7",
- "version_normalized": "5.4.7.0",
+ "version": "v5.4.9",
+ "version_normalized": "5.4.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "3a4442138d80c9f7b600fb297534ac718b61d37f"
+ "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/3a4442138d80c9f7b600fb297534ac718b61d37f",
- "reference": "3a4442138d80c9f7b600fb297534ac718b61d37f",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba",
+ "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba",
"shasum": ""
},
"require": {
@@ -1028,7 +1028,7 @@
"symfony/polyfill-mbstring": "~1.8",
"symfony/polyfill-php80": "^1.16"
},
- "time": "2022-04-01T12:33:59+00:00",
+ "time": "2022-05-20T13:55:35+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1056,7 +1056,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v5.4.7"
+ "source": "https://github.com/symfony/filesystem/tree/v5.4.9"
},
"funding": [
{
@@ -1076,17 +1076,17 @@
},
{
"name": "symfony/finder",
- "version": "v5.4.3",
- "version_normalized": "5.4.3.0",
+ "version": "v5.4.8",
+ "version_normalized": "5.4.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d"
+ "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/231313534dded84c7ecaa79d14bc5da4ccb69b7d",
- "reference": "231313534dded84c7ecaa79d14bc5da4ccb69b7d",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9",
+ "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9",
"shasum": ""
},
"require": {
@@ -1094,7 +1094,7 @@
"symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-php80": "^1.16"
},
- "time": "2022-01-26T16:34:36+00:00",
+ "time": "2022-04-15T08:07:45+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1122,7 +1122,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v5.4.3"
+ "source": "https://github.com/symfony/finder/tree/v5.4.8"
},
"funding": [
{
@@ -1652,24 +1652,24 @@
},
{
"name": "symfony/process",
- "version": "v5.4.7",
- "version_normalized": "5.4.7.0",
+ "version": "v5.4.8",
+ "version_normalized": "5.4.8.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "38a44b2517b470a436e1c944bf9b9ba3961137fb"
+ "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/38a44b2517b470a436e1c944bf9b9ba3961137fb",
- "reference": "38a44b2517b470a436e1c944bf9b9ba3961137fb",
+ "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
+ "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/polyfill-php80": "^1.16"
},
- "time": "2022-03-18T16:18:52+00:00",
+ "time": "2022-04-08T05:07:18+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1697,7 +1697,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v5.4.7"
+ "source": "https://github.com/symfony/process/tree/v5.4.8"
},
"funding": [
{
@@ -1803,17 +1803,17 @@
},
{
"name": "symfony/string",
- "version": "v5.4.3",
- "version_normalized": "5.4.3.0",
+ "version": "v5.4.9",
+ "version_normalized": "5.4.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10"
+ "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10",
- "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10",
+ "url": "https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99",
+ "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99",
"shasum": ""
},
"require": {
@@ -1833,7 +1833,7 @@
"symfony/translation-contracts": "^1.1|^2",
"symfony/var-exporter": "^4.4|^5.0|^6.0"
},
- "time": "2022-01-02T09:53:40+00:00",
+ "time": "2022-04-19T10:40:37+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1872,7 +1872,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v5.4.3"
+ "source": "https://github.com/symfony/string/tree/v5.4.9"
},
"funding": [
{