From 89cde168e9beb5d90cb8c24e571f4dce984fd8d6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Jan 2021 08:17:24 +0100 Subject: [PATCH 01/21] update to 2.0.9 switch to Symfony 4 switch to phpunit9 (cherry picked from commit 2227dad08d37ddd58edd41a5b119e31e7c86d422) --- composer.spec | 36 +++++++++++++++++++++++------------- sources | 2 +- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/composer.spec b/composer.spec index 1b18982..d4f92cf 100644 --- a/composer.spec +++ b/composer.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2020 Remi Collet +# Copyright (c) 2015-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 62139b2806178adb979d76bd3437534a1a9fd490 +%global gh_commit 591c2c155cac0d2d7f34af41d3b1e29bcbfc685e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,15 +19,15 @@ %global api_version 2.0.0 %global run_version 2.0.0 -%global upstream_version 2.0.8 +%global upstream_version 2.0.9 #global upstream_prever RC2 #global upstream_lower rc2 -%global symfony_prefix php-symfony -%global symfony_path %{_datadir}/php/Symfony -%global symfony_min 2.8 +%global symfony_prefix php-symfony4 +%global symfony_path %{_datadir}/php/Symfony4 +%global symfony_min 4.4 -%global _phpunit %{_bindir}/phpunit +%global _phpunit %{_bindir}/phpunit9 Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} @@ -177,7 +177,7 @@ Documentation: https://getcomposer.org/doc/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -find . -name \*.rpm -exec rm {} \; -print +find . -name \*.rpm -delete -print if grep -r '\.\./res'; then : Patch need to fixed @@ -275,15 +275,20 @@ rm -rf res : Run test suite export BUILDROOT=%{buildroot} -%if 0%{?rhel} == 6 -FILTER="--filter '^((?!(testIntegration|testArchiveCustomFileName|testArchiveTar)).)*$'" -%else FILTER="--filter '^((?!(testIntegration)).)*$'" -%endif + +# Adapt for phunit9 +find tests \ + -name \*.php \ + -exec sed -e '/function setUpBeforeClass(/s/$/:void/' \ + -e '/function tearDownAfterClass(/s/$/:void/' \ + -e '/function setUp(/s/$/:void/' \ + -e '/function tearDown(/s/$/:void/' \ + -i {} \; # testIntegration may hang on local build ret=0 -for cmd in php php72 php73 php74; do +for cmd in php php73 php74 php80; do if which $cmd; then $cmd -d memory_limit=1G %{_phpunit} \ $FILTER \ @@ -308,6 +313,11 @@ exit $ret %changelog +* Thu Jan 28 2021 Remi Collet - 2.0.9-1 +- update to 2.0.9 +- switch to Symfony 4 +- switch to phpunit9 + * Fri Dec 4 2020 Remi Collet - 2.0.8-1 - update to 2.0.8 diff --git a/sources b/sources index 16a0a5d..4a6ff5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.0.8-62139b2.tgz) = 852ff831849c7fe230feadfe4a2b516662d9cd339d885f0ec2a0e2e31ab51c22105deaf6e3fc2d04b97aca4a91b67def8f8ad047636321662963f0fbd2d845ca +SHA512 (composer-2.0.9-591c2c1.tgz) = 130ae4e05a257b9e97516d144dee21a960b85163ee8f9ae609260e9cbb77db6b31325db2ba8db4e76034333e6e0d97e0360ce74e9fe4a8fa258c7988027c9433 From 0239ee5755d643d935266e403bb80f7069b9458d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Feb 2021 07:54:42 +0100 Subject: [PATCH 02/21] v2.0.10 (cherry picked from commit 86efe6bd126511b01502cb106cf861ca61ff8c08) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index d4f92cf..2e1739d 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 591c2c155cac0d2d7f34af41d3b1e29bcbfc685e +%global gh_commit 890c79ff096818e762b42c9624ca1df800ab789b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 2.0.0 %global run_version 2.0.0 -%global upstream_version 2.0.9 +%global upstream_version 2.0.10 #global upstream_prever RC2 #global upstream_lower rc2 @@ -313,6 +313,9 @@ exit $ret %changelog +* Tue Feb 23 2021 Remi Collet - 2.0.10-1 +- update to 2.0.10 + * Thu Jan 28 2021 Remi Collet - 2.0.9-1 - update to 2.0.9 - switch to Symfony 4 diff --git a/sources b/sources index 4a6ff5f..1118235 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.0.9-591c2c1.tgz) = 130ae4e05a257b9e97516d144dee21a960b85163ee8f9ae609260e9cbb77db6b31325db2ba8db4e76034333e6e0d97e0360ce74e9fe4a8fa258c7988027c9433 +SHA512 (composer-2.0.10-890c79f.tgz) = 8d2c6cefe33e33673aded1c0150a3adbb1bf0350f1886281bd09a7f08321555aa07cfb9b43ea5baf2e3475e4e0034fa727f94fd2f458faeaf3a1f6f9fb8a1d1d From c80c6e23b0ee0a87b64cd1cd0826740992d4ea50 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Feb 2021 06:26:17 +0100 Subject: [PATCH 03/21] v2.0.11 (cherry picked from commit 7b8fbe3cc054c23f8fdff596f815614a5c18d82f) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 2e1739d..8398bae 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 890c79ff096818e762b42c9624ca1df800ab789b +%global gh_commit a5a5632da0b1c2d6fa9a3b65f1f4e90d1f04abb9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 2.0.0 %global run_version 2.0.0 -%global upstream_version 2.0.10 +%global upstream_version 2.0.11 #global upstream_prever RC2 #global upstream_lower rc2 @@ -313,6 +313,9 @@ exit $ret %changelog +* Wed Feb 24 2021 Remi Collet - 2.0.11-1 +- update to 2.0.11 + * Tue Feb 23 2021 Remi Collet - 2.0.10-1 - update to 2.0.10 diff --git a/sources b/sources index 1118235..750d5a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.0.10-890c79f.tgz) = 8d2c6cefe33e33673aded1c0150a3adbb1bf0350f1886281bd09a7f08321555aa07cfb9b43ea5baf2e3475e4e0034fa727f94fd2f458faeaf3a1f6f9fb8a1d1d +SHA512 (composer-2.0.11-a5a5632.tgz) = a1b9a2011134f0755b767f069e64e977ebe940242f4d66cfe0572ddf8160d6e600e3398acf996dbd167493e0639d80f18e4b41d4a67416d64560bb3d1343ef86 From 7e99294c2819a689f6c50dac2f160761ca762708 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Apr 2021 13:42:58 +0200 Subject: [PATCH 04/21] v2.0.12 (cherry picked from commit eb76f9d9f1eab1d00f7f31f59724b65c041e3a4e) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 8398bae..7e00b36 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a5a5632da0b1c2d6fa9a3b65f1f4e90d1f04abb9 +%global gh_commit 6c12ce263da71641903e399c3ce8ecb08fd375fb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 2.0.0 %global run_version 2.0.0 -%global upstream_version 2.0.11 +%global upstream_version 2.0.12 #global upstream_prever RC2 #global upstream_lower rc2 @@ -313,6 +313,9 @@ exit $ret %changelog +* Thu Apr 1 2021 Remi Collet - 2.0.12-1 +- update to 2.0.12 + * Wed Feb 24 2021 Remi Collet - 2.0.11-1 - update to 2.0.11 diff --git a/sources b/sources index 750d5a4..7da8768 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.0.11-a5a5632.tgz) = a1b9a2011134f0755b767f069e64e977ebe940242f4d66cfe0572ddf8160d6e600e3398acf996dbd167493e0639d80f18e4b41d4a67416d64560bb3d1343ef86 +SHA512 (composer-2.0.12-6c12ce2.tgz) = 9a57258d3cd6fdd392d2d3f6f373eccc91bc744460754bbb1e12c15c3939b6a7114c70b4bf7583829a4b853e201d8405dcc51af77af71d37ade36c1cd020d286 From 081d225f84bd6649d7a9617698042373937a926b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 May 2021 08:24:24 +0200 Subject: [PATCH 05/21] update to 2.0.13 add dependency on composer/metadata-minifier (cherry picked from commit eff6dc02da4d794dacada47cfd0e485e58b6886b) --- composer.spec | 14 ++++++++++++-- sources | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 7e00b36..fed40e9 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 6c12ce263da71641903e399c3ce8ecb08fd375fb +%global gh_commit 986e8b86b7b570632ad0a905c3726c33dd4c0efb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 2.0.0 %global run_version 2.0.0 -%global upstream_version 2.0.12 +%global upstream_version 2.0.13 #global upstream_prever RC2 #global upstream_lower rc2 @@ -51,6 +51,7 @@ BuildRequires: php-cli %if %{with_tests} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) +BuildRequires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) BuildRequires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) BuildRequires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2) @@ -61,6 +62,7 @@ BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-com BuildRequires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) %else BuildRequires: php-composer-ca-bundle +BuildRequires: php-composer-metadata-minifier BuildRequires: php-composer-semver3 BuildRequires: php-composer-spdx-licenses >= 1.2 BuildRequires: php-composer-xdebug-handler >= 1.1 @@ -88,6 +90,7 @@ BuildRequires: php-PsrLog >= 1.1 # From composer.json, "require": { # "php": "^5.3.2 || ^7.0", # "composer/ca-bundle": "^1.0", +# "composer/metadata-minifier": "^1.0", # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", # "composer/xdebug-handler": "^1.1", @@ -104,6 +107,7 @@ Requires: php(language) >= 5.3.2 Requires: php-cli %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) +Requires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) Requires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) Requires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2) @@ -114,6 +118,7 @@ Requires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-com Requires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) %else Requires: php-composer-ca-bundle +Requires: php-composer-metadata-minifier Requires: php-composer-semver3 Requires: php-composer-spdx-licenses >= 1.2 Requires: php-composer-xdebug-handler >= 1.1 @@ -196,6 +201,7 @@ cat << 'EOF' | tee -a src/Composer/autoload.php '%{_datadir}/php/Seld/PharUtils/autoload.php', '%{_datadir}/php/Composer/CaBundle/autoload.php', '%{_datadir}/php/Composer/Spdx/autoload.php', + '%{_datadir}/php/Composer/MetadataMinifier/autoload.php', '%{_datadir}/php/Composer/Semver3/autoload.php', '%{_datadir}/php/Composer/XdebugHandler/autoload.php', '%{_datadir}/php/Psr/Log/autoload.php', @@ -313,6 +319,10 @@ exit $ret %changelog +* Tue Apr 27 2021 Remi Collet - 2.0.13-1 +- update to 2.0.13 +- add dependency on composer/metadata-minifier + * Thu Apr 1 2021 Remi Collet - 2.0.12-1 - update to 2.0.12 diff --git a/sources b/sources index 7da8768..6c703bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.0.12-6c12ce2.tgz) = 9a57258d3cd6fdd392d2d3f6f373eccc91bc744460754bbb1e12c15c3939b6a7114c70b4bf7583829a4b853e201d8405dcc51af77af71d37ade36c1cd020d286 +SHA512 (composer-2.0.13-986e8b8.tgz) = 293e9a3b1ab924e48ff66525b381df889ff7a074187aedd388058f9c6dc815257a5f1537d47818b1da19857c629f2fb6bfa4d7b20096e1c9fb65f3e0fb8b1fa4 From b6249865fdd7bbc3126b7d6c7a47b7accc4d0061 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 May 2021 10:03:34 +0200 Subject: [PATCH 06/21] update to 2.0.14 switch to composer/xdebug-handler v2 (cherry picked from commit 9c51eff13aa9b95d55e8de533673c8ad084522f3) --- composer.spec | 30 +++++++++++++++++------------- sources | 2 +- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/composer.spec b/composer.spec index fed40e9..b37d1cd 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 986e8b86b7b570632ad0a905c3726c33dd4c0efb +%global gh_commit 92b2ccbef65292ba9f2004271ef47c7231e2eed5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 2.0.0 %global run_version 2.0.0 -%global upstream_version 2.0.13 +%global upstream_version 2.0.14 #global upstream_prever RC2 #global upstream_lower rc2 @@ -54,7 +54,7 @@ BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-com BuildRequires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) BuildRequires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) -BuildRequires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2) +BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) @@ -65,7 +65,7 @@ BuildRequires: php-composer-ca-bundle BuildRequires: php-composer-metadata-minifier BuildRequires: php-composer-semver3 BuildRequires: php-composer-spdx-licenses >= 1.2 -BuildRequires: php-composer-xdebug-handler >= 1.1 +BuildRequires: php-composer-xdebug-handler2 BuildRequires: php-jsonlint >= 1.4 BuildRequires: php-seld-phar-utils BuildRequires: php-PsrLog @@ -78,7 +78,7 @@ BuildRequires: %{symfony_prefix}-filesystem >= %{symfony_min} BuildRequires: %{symfony_prefix}-process >= %{symfony_min} BuildRequires: php-zip # From composer.json, "require-dev": { -# "symfony/phpunit-bridge": "^4.2 || ^5.0", +# "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0", # "phpspec/prophecy": "^1.10" BuildRequires: %{_phpunit} # For autoloader @@ -93,15 +93,15 @@ BuildRequires: php-PsrLog >= 1.1 # "composer/metadata-minifier": "^1.0", # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", -# "composer/xdebug-handler": "^1.1", +# "composer/xdebug-handler": "^2.0", # "justinrainbow/json-schema": "^5.2.10", # "psr/log": "^1.0" # "seld/jsonlint": "~1.4", # "seld/phar-utils": "^1.0", -# "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", -# "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", -# "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", -# "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", +# "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", +# "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", +# "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", +# "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", # "react/promise": "^1.2 || ^2.7" Requires: php(language) >= 5.3.2 Requires: php-cli @@ -110,7 +110,7 @@ Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-com Requires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) Requires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) -Requires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2) +Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) @@ -121,7 +121,7 @@ Requires: php-composer-ca-bundle Requires: php-composer-metadata-minifier Requires: php-composer-semver3 Requires: php-composer-spdx-licenses >= 1.2 -Requires: php-composer-xdebug-handler >= 1.1 +Requires: php-composer-xdebug-handler2 Requires: php-jsonlint >= 1.4 Requires: php-seld-phar-utils Requires: php-PsrLog @@ -193,6 +193,7 @@ phpab --template fedora --output src/Composer/autoload.php src/Composer cat << 'EOF' | tee -a src/Composer/autoload.php \Fedora\Autoloader\Dependencies::required([ + '%{_datadir}/php/Composer/XdebugHandler2/autoload.php', /* before symfony which load composer */ '%{symfony_path}/Component/Console/autoload.php', '%{symfony_path}/Component/Finder/autoload.php', '%{symfony_path}/Component/Process/autoload.php', @@ -203,7 +204,6 @@ cat << 'EOF' | tee -a src/Composer/autoload.php '%{_datadir}/php/Composer/Spdx/autoload.php', '%{_datadir}/php/Composer/MetadataMinifier/autoload.php', '%{_datadir}/php/Composer/Semver3/autoload.php', - '%{_datadir}/php/Composer/XdebugHandler/autoload.php', '%{_datadir}/php/Psr/Log/autoload.php', '%{_datadir}/php/JsonSchema5/autoload.php', '%{_datadir}/php/React/Promise/autoload.php', @@ -319,6 +319,10 @@ exit $ret %changelog +* Sat May 22 2021 Remi Collet - 2.0.14-1 +- update to 2.0.14 +- switch to composer/xdebug-handler v2 + * Tue Apr 27 2021 Remi Collet - 2.0.13-1 - update to 2.0.13 - add dependency on composer/metadata-minifier diff --git a/sources b/sources index 6c703bb..c528f73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.0.13-986e8b8.tgz) = 293e9a3b1ab924e48ff66525b381df889ff7a074187aedd388058f9c6dc815257a5f1537d47818b1da19857c629f2fb6bfa4d7b20096e1c9fb65f3e0fb8b1fa4 +SHA512 (composer-2.0.14-92b2ccb.tgz) = 24a1cb0140220cdaf3555f47f086184cee36f89953b3494cce9d485316c41ed472221abc5aeb9ce0dde572d6d6f5e0fdf01869a76e3475810f5408a89f5f47ff From 18f9adbd01d2bee13ca7ddc194460a67aef49998 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 May 2021 15:59:44 +0200 Subject: [PATCH 07/21] disable XDG directories usage, see #1955455 (cherry picked from commit ce36f5cbc0d66cc2df2785be25266877e097a927) --- composer-noxdg.patch | 14 ++++++++++++++ composer.spec | 10 ++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 composer-noxdg.patch diff --git a/composer-noxdg.patch b/composer-noxdg.patch new file mode 100644 index 0000000..fc6b127 --- /dev/null +++ b/composer-noxdg.patch @@ -0,0 +1,14 @@ +diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php +--- ./src/Composer/Factory.php.noxdg 2021-05-31 15:37:50.548115679 +0200 ++++ ./src/Composer/Factory.php 2021-05-31 15:39:05.192882880 +0200 +@@ -653,6 +653,10 @@ class Factory + */ + private static function useXdg() + { ++ // As XDG is very patially implemted ++ // resulting in command/code in ~/.config ++ return false; ++ + foreach (array_keys($_SERVER) as $key) { + if (strpos($key, 'XDG_') === 0) { + return true; diff --git a/composer.spec b/composer.spec index b37d1cd..1d4279a 100644 --- a/composer.spec +++ b/composer.spec @@ -31,7 +31,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP License: MIT @@ -45,6 +45,8 @@ Source5: makesrc.sh # Use our autoloader, resources path, fix for tests Patch0: %{name}-rpm.patch +# Disable XDG support as only partially implemented +Patch1: %{name}-noxdg.patch BuildArch: noarch BuildRequires: php-cli @@ -182,7 +184,8 @@ Documentation: https://getcomposer.org/doc/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm -find . -name \*.rpm -delete -print +%patch1 -p1 -b .noxdg +find . \( -name \*.rpm -o -name \*noxdg \) -delete -print if grep -r '\.\./res'; then : Patch need to fixed @@ -319,6 +322,9 @@ exit $ret %changelog +* Mon May 31 2021 Remi Collet - 2.0.14-2 +- disable XDG directories usage, see #1955455 + * Sat May 22 2021 Remi Collet - 2.0.14-1 - update to 2.0.14 - switch to composer/xdebug-handler v2 From 24eb9f198365d28eb381e1044bbdfa3453c0a7ea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Jun 2021 14:14:39 +0200 Subject: [PATCH 08/21] v2.1.0 (cherry picked from commit cd3c36fec4299be1e94ddbdfad18b2fc24b6fff4) --- composer.spec | 17 ++++++++++------- sources | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/composer.spec b/composer.spec index 1d4279a..c22019e 100644 --- a/composer.spec +++ b/composer.spec @@ -10,18 +10,18 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 92b2ccbef65292ba9f2004271ef47c7231e2eed5 +%global gh_commit 59bb0df323c75308e6a72c6c9bc7dc8cc577f1ca %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer %global gh_project composer %global with_tests %{?_without_tests:0}%{!?_without_tests:1} -%global api_version 2.0.0 -%global run_version 2.0.0 +%global api_version 2.1.0 +%global run_version 2.1.0 -%global upstream_version 2.0.14 -#global upstream_prever RC2 -#global upstream_lower rc2 +%global upstream_version 2.1.0 +#global upstream_prever RC1 +#global upstream_lower rc1 %global symfony_prefix php-symfony4 %global symfony_path %{_datadir}/php/Symfony4 @@ -31,7 +31,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP License: MIT @@ -322,6 +322,9 @@ exit $ret %changelog +* Thu Jun 3 2021 Remi Collet - 2.1.0-1 +- update to 2.1.0 + * Mon May 31 2021 Remi Collet - 2.0.14-2 - disable XDG directories usage, see #1955455 diff --git a/sources b/sources index c528f73..dc23112 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.0.14-92b2ccb.tgz) = 24a1cb0140220cdaf3555f47f086184cee36f89953b3494cce9d485316c41ed472221abc5aeb9ce0dde572d6d6f5e0fdf01869a76e3475810f5408a89f5f47ff +SHA512 (composer-2.1.0-59bb0df.tgz) = d4c4d9fc79fe8996a3844d09ee7496d4e881328140595730aebaccf05c55dad0bc2777d18cfab20a3a3b7f6680aeaeae8350c365d6593e4eee31d4ddca4c2a8d From 829344ee498291e66dbd8f5eb379ae5b3eb83cff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Jun 2021 09:28:18 +0200 Subject: [PATCH 09/21] v2.1.1 (cherry picked from commit 7b632dc3d9f2b8cb155bd1bed6ef2ac9d494336a) --- composer-rpm.patch | 36 ++++++++++++++++++------------------ composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/composer-rpm.patch b/composer-rpm.patch index 130d62d..bbf0feb 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2020-12-04 08:01:03.000000000 +0100 -+++ ./bin/composer 2020-12-04 08:07:35.946138601 +0100 +--- ./bin/composer.rpm 2021-06-04 09:21:49.000000000 +0200 ++++ ./bin/composer 2021-06-04 09:21:53.808648766 +0200 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== ' } @@ -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 2020-12-04 08:01:03.000000000 +0100 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2020-12-04 08:07:35.946138601 +0100 -@@ -373,7 +373,7 @@ EOF; +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2021-06-04 09:21:49.000000000 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2021-06-04 09:21:53.808648766 +0200 +@@ -395,7 +395,7 @@ EOF; $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform)); $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); @@ -23,9 +23,9 @@ 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 2020-12-04 08:01:03.000000000 +0100 -+++ ./src/Composer/Compiler.php 2020-12-04 08:07:35.946138601 +0100 -@@ -98,7 +98,7 @@ class Compiler +--- ./src/Composer/Compiler.php.rpm 2021-06-04 09:21:49.000000000 +0200 ++++ ./src/Composer/Compiler.php 2021-06-04 09:21:53.808648766 +0200 +@@ -100,7 +100,7 @@ class Compiler // Add Composer resources $finder = new Finder(); $finder->files() @@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ; foreach ($finder as $file) { diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2020-12-04 08:01:03.000000000 +0100 -+++ ./src/Composer/Json/JsonFile.php 2020-12-04 08:07:35.946138601 +0100 +--- ./src/Composer/Json/JsonFile.php.rpm 2021-06-04 09:21:49.000000000 +0200 ++++ ./src/Composer/Json/JsonFile.php 2021-06-04 09:23:51.867361526 +0200 @@ -34,7 +34,7 @@ class JsonFile const JSON_PRETTY_PRINT = 128; const JSON_UNESCAPED_UNICODE = 256; @@ -46,19 +46,19 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php private $path; private $httpDownloader; -@@ -179,7 +179,7 @@ class JsonFile - } - +@@ -188,7 +188,7 @@ class JsonFile + $isComposerSchemaFile = false; if (null === $schemaFile) { + $isComposerSchemaFile = true; - $schemaFile = __DIR__ . self::COMPOSER_SCHEMA_PATH; + $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH; } // Prepend with file:// only when not using a special schema already (e.g. in the phar) diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php ---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2020-12-04 08:01:03.000000000 +0100 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2020-12-04 08:07:35.947138597 +0100 -@@ -113,7 +113,8 @@ class ComposerSchemaTest extends TestCas +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2021-06-04 09:21:49.000000000 +0200 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2021-06-04 09:21:53.808648766 +0200 +@@ -93,7 +93,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { $validator = new Validator(); @@ -69,8 +69,8 @@ diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/ if (!$validator->isValid()) { $errors = $validator->getErrors(); diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php ---- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2020-12-04 08:07:35.947138597 +0100 -+++ ./tests/Composer/Test/PolyfillTestCase.php 2020-12-04 08:09:14.344707638 +0100 +--- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2021-06-04 09:21:49.000000000 +0200 ++++ ./tests/Composer/Test/PolyfillTestCase.php 2021-06-04 09:21:53.808648766 +0200 @@ -15,10 +15,35 @@ namespace Composer\Test { use PHPUnit\Framework\Constraint\LogicalNot; use PHPUnit\Framework\Constraint\StringContains; diff --git a/composer.spec b/composer.spec index c22019e..4296ace 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 59bb0df323c75308e6a72c6c9bc7dc8cc577f1ca +%global gh_commit e338749d4e6cc97e1136c210ce0212d4a59e3a58 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.0 +%global upstream_version 2.1.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -322,6 +322,9 @@ exit $ret %changelog +* Fri Jun 4 2021 Remi Collet - 2.1.1-1 +- update to 2.1.1 + * Thu Jun 3 2021 Remi Collet - 2.1.0-1 - update to 2.1.0 diff --git a/sources b/sources index dc23112..16b1877 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.0-59bb0df.tgz) = d4c4d9fc79fe8996a3844d09ee7496d4e881328140595730aebaccf05c55dad0bc2777d18cfab20a3a3b7f6680aeaeae8350c365d6593e4eee31d4ddca4c2a8d +SHA512 (composer-2.1.1-e338749.tgz) = ff9357bf222dc70fdd5069b9aab8c67cfb57c65d6d7606afc3796c1122051b43dadd11d85839ecff0d474de5c0530ef51a011af91c651dfe3c11a3520ff754ac From 18fa170fd163338397960aff8950ab4f62752191 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Jun 2021 08:31:12 +0200 Subject: [PATCH 10/21] fix Composer\InstalledVersions RPM installation (cherry picked from commit b6110c1b547d41a2bc39488ed2146d29199c44ca) --- composer-rpm.patch | 15 +++++++++++++++ composer.spec | 5 ++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/composer-rpm.patch b/composer-rpm.patch index bbf0feb..5f05a85 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -108,3 +108,18 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po } else { abstract class PolyfillTestCase extends TestCase { +--- ./src/Composer/InstalledVersions.php.rpm 2021-06-07 08:18:59.326450774 +0200 ++++ ./src/Composer/InstalledVersions.php 2021-06-07 08:19:11.525413189 +0200 +@@ -315,10 +315,9 @@ + } + } + +- if (null === self::$installed) { +- self::$installed = require __DIR__ . '/installed.php'; ++ if (null !== self::$installed) { ++ $installed[] = self::$installed; + } +- $installed[] = self::$installed; + + return $installed; + } diff --git a/composer.spec b/composer.spec index 4296ace..e16fceb 100644 --- a/composer.spec +++ b/composer.spec @@ -31,7 +31,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP License: MIT @@ -322,6 +322,9 @@ exit $ret %changelog +* Mon Jun 7 2021 Remi Collet - 2.1.1-2 +- fix Composer\InstalledVersions RPM installation + * Fri Jun 4 2021 Remi Collet - 2.1.1-1 - update to 2.1.1 From 9154eee0f85532dfda0d6255a972434b34266d17 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Jun 2021 17:04:25 +0200 Subject: [PATCH 11/21] v2.1.2 (cherry picked from commit bc88e9c1f5d286b9dcc0b597aa273c93ddbf8df9) --- composer-rpm.patch | 32 +++++++++++++++++++------------- composer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/composer-rpm.patch b/composer-rpm.patch index 5f05a85..d63b69b 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -110,16 +110,22 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po { --- ./src/Composer/InstalledVersions.php.rpm 2021-06-07 08:18:59.326450774 +0200 +++ ./src/Composer/InstalledVersions.php 2021-06-07 08:19:11.525413189 +0200 -@@ -315,10 +315,9 @@ - } - } - -- if (null === self::$installed) { -- self::$installed = require __DIR__ . '/installed.php'; -+ if (null !== self::$installed) { -+ $installed[] = self::$installed; - } -- $installed[] = self::$installed; - - return $installed; - } +@@ -251,7 +251,7 @@ class InstalledVersions + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 +- if (substr(__DIR__, -8, 1) !== 'C') { ++ if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) { + self::$installed = include __DIR__ . '/installed.php'; + } else { + self::$installed = array(); +@@ -324,7 +324,7 @@ class InstalledVersions + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 +- if (substr(__DIR__, -8, 1) !== 'C') { ++ if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) { + self::$installed = require __DIR__ . '/installed.php'; + } else { + self::$installed = array(); + diff --git a/composer.spec b/composer.spec index e16fceb..0fb2123 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit e338749d4e6cc97e1136c210ce0212d4a59e3a58 +%global gh_commit 1845e6854aa3f37f2c6c24bc525541b00b8b28e4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.1 +%global upstream_version 2.1.2 #global upstream_prever RC1 #global upstream_lower rc1 @@ -31,7 +31,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP License: MIT @@ -322,6 +322,9 @@ exit $ret %changelog +* Mon Jun 7 2021 Remi Collet - 2.1.2-1 +- update to 2.1.2 + * Mon Jun 7 2021 Remi Collet - 2.1.1-2 - fix Composer\InstalledVersions RPM installation diff --git a/sources b/sources index 16b1877..d9bd512 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.1-e338749.tgz) = ff9357bf222dc70fdd5069b9aab8c67cfb57c65d6d7606afc3796c1122051b43dadd11d85839ecff0d474de5c0530ef51a011af91c651dfe3c11a3520ff754ac +SHA512 (composer-2.1.2-1845e68.tgz) = ee7b4d29c0caca94be4a4b94fc42d4152445348f733cefae107097f1328a87dc09e0cd0c825e461abcf990c941048e2480b50a645809d82c2e783e818c8054b1 From 8178a2000550e4596e00a79fc2f3a3f92d267f56 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 10 Jun 2021 07:31:30 +0200 Subject: [PATCH 12/21] v2.1.3 (cherry picked from commit 07f73f3a643d77273ee386e46bd5eabeb048d1c7) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 0fb2123..51bfe93 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 1845e6854aa3f37f2c6c24bc525541b00b8b28e4 +%global gh_commit fc5c4573aafce3a018eb7f1f8f91cea423970f2e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.2 +%global upstream_version 2.1.3 #global upstream_prever RC1 #global upstream_lower rc1 @@ -322,6 +322,9 @@ exit $ret %changelog +* Thu Jun 10 2021 Remi Collet - 2.1.3-1 +- update to 2.1.3 + * Mon Jun 7 2021 Remi Collet - 2.1.2-1 - update to 2.1.2 diff --git a/sources b/sources index d9bd512..0323d79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.2-1845e68.tgz) = ee7b4d29c0caca94be4a4b94fc42d4152445348f733cefae107097f1328a87dc09e0cd0c825e461abcf990c941048e2480b50a645809d82c2e783e818c8054b1 +SHA512 (composer-2.1.3-fc5c457.tgz) = e959d4e83a1b47d3f81e4ad9fded7b99bd43deb1ba1fc78d8f9819504813ca897a5a0a65cfe09b4f4f2eff7ba631b6d34a016a7fe5831747fd82b53818ec016b From 166fc6f4f287025bd4fa884dcbe53fdfd72aa43a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 Jul 2021 15:42:04 +0200 Subject: [PATCH 13/21] update to 2.1.4 raise dependency on justinrainbow/json-schema 5.2.11 (cherry picked from commit 7c68b5d75caa4d75059aa3e56b09ea30f55983dc) (cherry picked from commit 7532a50ee66b2091e8bc98ba7870b14daa24e381) --- composer.spec | 47 +++++++++++++---------------------------------- sources | 2 +- 2 files changed, 14 insertions(+), 35 deletions(-) diff --git a/composer.spec b/composer.spec index 51bfe93..e53b8f8 100644 --- a/composer.spec +++ b/composer.spec @@ -10,16 +10,17 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit fc5c4573aafce3a018eb7f1f8f91cea423970f2e +%bcond_without tests + +%global gh_commit 5701b38ec6c66dd143658e6aa18e1808d2d5dc4b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer %global gh_project composer -%global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.3 +%global upstream_version 2.1.4 #global upstream_prever RC1 #global upstream_lower rc1 @@ -50,8 +51,7 @@ Patch1: %{name}-noxdg.patch BuildArch: noarch BuildRequires: php-cli -%if %{with_tests} -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +%if %{with tests} BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) BuildRequires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) BuildRequires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) @@ -60,20 +60,8 @@ BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-com BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-composer(justinrainbow/json-schema) < 6) +BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) BuildRequires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) -%else -BuildRequires: php-composer-ca-bundle -BuildRequires: php-composer-metadata-minifier -BuildRequires: php-composer-semver3 -BuildRequires: php-composer-spdx-licenses >= 1.2 -BuildRequires: php-composer-xdebug-handler2 -BuildRequires: php-jsonlint >= 1.4 -BuildRequires: php-seld-phar-utils -BuildRequires: php-PsrLog -BuildRequires: php-justinrainbow-json-schema5 >= 5.2.10 -BuildRequires: php-react-promise >= 2.7 -%endif BuildRequires: %{symfony_prefix}-console >= %{symfony_min} BuildRequires: %{symfony_prefix}-finder >= %{symfony_min} BuildRequires: %{symfony_prefix}-filesystem >= %{symfony_min} @@ -96,7 +84,7 @@ BuildRequires: php-PsrLog >= 1.1 # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", # "composer/xdebug-handler": "^2.0", -# "justinrainbow/json-schema": "^5.2.10", +# "justinrainbow/json-schema": "^5.2.11", # "psr/log": "^1.0" # "seld/jsonlint": "~1.4", # "seld/phar-utils": "^1.0", @@ -107,7 +95,6 @@ BuildRequires: php-PsrLog >= 1.1 # "react/promise": "^1.2 || ^2.7" Requires: php(language) >= 5.3.2 Requires: php-cli -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) Requires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) Requires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) @@ -116,20 +103,8 @@ Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-com Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -Requires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-composer(justinrainbow/json-schema) < 6) +Requires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) Requires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) -%else -Requires: php-composer-ca-bundle -Requires: php-composer-metadata-minifier -Requires: php-composer-semver3 -Requires: php-composer-spdx-licenses >= 1.2 -Requires: php-composer-xdebug-handler2 -Requires: php-jsonlint >= 1.4 -Requires: php-seld-phar-utils -Requires: php-PsrLog -Requires: php-justinrainbow-json-schema5 >= 5.2.10 -Requires: php-react-promise >= 2.7 -%endif Requires: %{symfony_prefix}-console >= %{symfony_min} Requires: %{symfony_prefix}-finder >= %{symfony_min} Requires: %{symfony_prefix}-process >= %{symfony_min} @@ -274,7 +249,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %check -%if %{with_tests} +%if %{with tests} : Online tests rm tests/Composer/Test/Util/RemoteFilesystemTest.php @@ -322,6 +297,10 @@ exit $ret %changelog +* Thu Jul 22 2021 Remi Collet - 2.1.4-1 +- update to 2.1.4 +- raise dependency on justinrainbow/json-schema 5.2.11 + * Thu Jun 10 2021 Remi Collet - 2.1.3-1 - update to 2.1.3 diff --git a/sources b/sources index 0323d79..a9ae0fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.3-fc5c457.tgz) = e959d4e83a1b47d3f81e4ad9fded7b99bd43deb1ba1fc78d8f9819504813ca897a5a0a65cfe09b4f4f2eff7ba631b6d34a016a7fe5831747fd82b53818ec016b +SHA512 (composer-2.1.4-5701b38.tgz) = 4c1cbdc74a0d42e1dfecd7a303ef2eca82b2da477c6c3b45a49f11048f501732a3dabf41ad4d7cdcc35ebff0a976c381d617e8f019c19ea9a1e357e45b00c785 From 241a3f75f102a3df6e7f91b803a223f3921e8bea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Jul 2021 11:43:04 +0200 Subject: [PATCH 14/21] v2.1.5 (cherry picked from commit c13424a7bad7b2e856a762b871d4059bf3b923f6) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index e53b8f8..45ada82 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 5701b38ec6c66dd143658e6aa18e1808d2d5dc4b +%global gh_commit ac679902e9f66b85a8f9d8c1c88180f609a8745d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.4 +%global upstream_version 2.1.5 #global upstream_prever RC1 #global upstream_lower rc1 @@ -297,6 +297,9 @@ exit $ret %changelog +* Fri Jul 23 2021 Remi Collet - 2.1.5-1 +- update to 2.1.5 + * Thu Jul 22 2021 Remi Collet - 2.1.4-1 - update to 2.1.4 - raise dependency on justinrainbow/json-schema 5.2.11 diff --git a/sources b/sources index a9ae0fa..d4f2600 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.4-5701b38.tgz) = 4c1cbdc74a0d42e1dfecd7a303ef2eca82b2da477c6c3b45a49f11048f501732a3dabf41ad4d7cdcc35ebff0a976c381d617e8f019c19ea9a1e357e45b00c785 +SHA512 (composer-2.1.5-ac67990.tgz) = fde3bea2f997748df264247fa7722f80b626b020cef8ab16fe3528567d4f6cbbbf5febf0ff5e1eda5b28e15f198c332862e855d900b679bd64cdec3afdd1ac39 From 1255664210c66a3f76dd1aada8a204e70a126f03 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Sep 2021 12:19:15 +0200 Subject: [PATCH 15/21] v2.1.6 (cherry picked from commit ab4babeb93e4ad202fe01b90a1e87d9af387cf33) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 45ada82..a178755 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit ac679902e9f66b85a8f9d8c1c88180f609a8745d +%global gh_commit e5cac5f9d2354d08b67f1d21c664ae70d748c603 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.5 +%global upstream_version 2.1.6 #global upstream_prever RC1 #global upstream_lower rc1 @@ -297,6 +297,9 @@ exit $ret %changelog +* Mon Aug 23 2021 Remi Collet - 2.1.6-1 +- update to 2.1.6 + * Fri Jul 23 2021 Remi Collet - 2.1.5-1 - update to 2.1.5 diff --git a/sources b/sources index d4f2600..5d50acd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.5-ac67990.tgz) = fde3bea2f997748df264247fa7722f80b626b020cef8ab16fe3528567d4f6cbbbf5febf0ff5e1eda5b28e15f198c332862e855d900b679bd64cdec3afdd1ac39 +SHA512 (composer-2.1.6-e5cac5f.tgz) = 465bba1054853c951dabd618560b4a8ccf2ff39370d53b4b7d0c6682cbfba6298fc1d52f129436356802ef978c88ef885f8d4fa8437ce18221dbea82c7ca079a From 8d08e832c3cd9274d9680974c961a25c6676ea15 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Sep 2021 15:51:25 +0200 Subject: [PATCH 16/21] v2.1.7 (cherry picked from commit 22d335b4c238877b9c66542b65294fd678959e35) --- composer-rpm.patch | 72 +++++++++++++++++++++++----------------------- composer.spec | 9 ++++-- sources | 2 +- 3 files changed, 43 insertions(+), 40 deletions(-) diff --git a/composer-rpm.patch b/composer-rpm.patch index d63b69b..cbb4b3c 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2021-06-04 09:21:49.000000000 +0200 -+++ ./bin/composer 2021-06-04 09:21:53.808648766 +0200 +--- ./bin/composer.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./bin/composer 2021-09-14 15:45:33.025118009 +0200 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== ' } @@ -11,8 +11,8 @@ 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 2021-06-04 09:21:49.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2021-06-04 09:21:53.808648766 +0200 +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2021-09-14 15:45:33.025118009 +0200 @@ -395,7 +395,7 @@ EOF; $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform)); @@ -23,9 +23,9 @@ 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 2021-06-04 09:21:49.000000000 +0200 -+++ ./src/Composer/Compiler.php 2021-06-04 09:21:53.808648766 +0200 -@@ -100,7 +100,7 @@ class Compiler +--- ./src/Composer/Compiler.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./src/Composer/Compiler.php 2021-09-14 15:45:33.025118009 +0200 +@@ -118,7 +118,7 @@ class Compiler // Add Composer resources $finder = new Finder(); $finder->files() @@ -34,9 +34,30 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ->sort($finderSort) ; foreach ($finder as $file) { +diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php +--- ./src/Composer/InstalledVersions.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./src/Composer/InstalledVersions.php 2021-09-14 15:45:33.026118007 +0200 +@@ -251,7 +251,7 @@ class InstalledVersions + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 +- if (substr(__DIR__, -8, 1) !== 'C') { ++ if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) { + self::$installed = include __DIR__ . '/installed.php'; + } else { + self::$installed = array(); +@@ -324,7 +324,7 @@ class InstalledVersions + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 +- if (substr(__DIR__, -8, 1) !== 'C') { ++ if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) { + self::$installed = require __DIR__ . '/installed.php'; + } else { + self::$installed = array(); diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2021-06-04 09:21:49.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2021-06-04 09:23:51.867361526 +0200 +--- ./src/Composer/Json/JsonFile.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./src/Composer/Json/JsonFile.php 2021-09-14 15:46:22.434026477 +0200 @@ -34,7 +34,7 @@ class JsonFile const JSON_PRETTY_PRINT = 128; const JSON_UNESCAPED_UNICODE = 256; @@ -44,9 +65,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php - const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json'; + const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; + /** @var string */ private $path; - private $httpDownloader; -@@ -188,7 +188,7 @@ class JsonFile +@@ -191,7 +191,7 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { $isComposerSchemaFile = true; @@ -56,8 +77,8 @@ 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 ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php ---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2021-06-04 09:21:49.000000000 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2021-06-04 09:21:53.808648766 +0200 +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2021-09-14 15:45:33.025118009 +0200 @@ -93,7 +93,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { @@ -69,8 +90,8 @@ diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/ if (!$validator->isValid()) { $errors = $validator->getErrors(); diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php ---- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2021-06-04 09:21:49.000000000 +0200 -+++ ./tests/Composer/Test/PolyfillTestCase.php 2021-06-04 09:21:53.808648766 +0200 +--- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./tests/Composer/Test/PolyfillTestCase.php 2021-09-14 15:45:33.026118007 +0200 @@ -15,10 +15,35 @@ namespace Composer\Test { use PHPUnit\Framework\Constraint\LogicalNot; use PHPUnit\Framework\Constraint\StringContains; @@ -108,24 +129,3 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po } else { abstract class PolyfillTestCase extends TestCase { ---- ./src/Composer/InstalledVersions.php.rpm 2021-06-07 08:18:59.326450774 +0200 -+++ ./src/Composer/InstalledVersions.php 2021-06-07 08:19:11.525413189 +0200 -@@ -251,7 +251,7 @@ class InstalledVersions - if (null === self::$installed) { - // only require the installed.php file if this file is loaded from its dumped location, - // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 -- if (substr(__DIR__, -8, 1) !== 'C') { -+ if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) { - self::$installed = include __DIR__ . '/installed.php'; - } else { - self::$installed = array(); -@@ -324,7 +324,7 @@ class InstalledVersions - if (null === self::$installed) { - // only require the installed.php file if this file is loaded from its dumped location, - // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 -- if (substr(__DIR__, -8, 1) !== 'C') { -+ if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) { - self::$installed = require __DIR__ . '/installed.php'; - } else { - self::$installed = array(); - diff --git a/composer.spec b/composer.spec index a178755..a7b7a97 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit e5cac5f9d2354d08b67f1d21c664ae70d748c603 +%global gh_commit f381e45f0b83a602a315613e08fffe0d8f2288c8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.6 +%global upstream_version 2.1.7 #global upstream_prever RC1 #global upstream_lower rc1 @@ -272,7 +272,7 @@ find tests \ # testIntegration may hang on local build ret=0 -for cmd in php php73 php74 php80; do +for cmd in php php73 php74 php80 php81; do if which $cmd; then $cmd -d memory_limit=1G %{_phpunit} \ $FILTER \ @@ -297,6 +297,9 @@ exit $ret %changelog +* Tue Sep 14 2021 Remi Collet - 2.1.7-1 +- update to 2.1.7 + * Mon Aug 23 2021 Remi Collet - 2.1.6-1 - update to 2.1.6 diff --git a/sources b/sources index 5d50acd..fc16048 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.6-e5cac5f.tgz) = 465bba1054853c951dabd618560b4a8ccf2ff39370d53b4b7d0c6682cbfba6298fc1d52f129436356802ef978c88ef885f8d4fa8437ce18221dbea82c7ca079a +SHA512 (composer-2.1.7-f381e45.tgz) = 9c51231f619a6678f61efe3ed789d723eb315a391d8561f660f80e75eb22c7b47bbe6c6d74c6b91a17734fe973633f22fc7802f5ccbaebd6b1089fd29c5a65f0 From ca89a410f6ee6fe912a13d18354bfb37fbf8f509 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Sep 2021 15:25:51 +0200 Subject: [PATCH 17/21] v2.1.8 (cherry picked from commit 1bea4b046b75b24b1cda7b6663b9da0c646b3c5c) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index a7b7a97..d8f26e8 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit f381e45f0b83a602a315613e08fffe0d8f2288c8 +%global gh_commit 24d38e9686092de05214cafa187dc282a5d89497 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.7 +%global upstream_version 2.1.8 #global upstream_prever RC1 #global upstream_lower rc1 @@ -297,6 +297,9 @@ exit $ret %changelog +* Sat Sep 18 2021 Remi Collet - 2.1.8-1 +- update to 2.1.8 + * Tue Sep 14 2021 Remi Collet - 2.1.7-1 - update to 2.1.7 diff --git a/sources b/sources index fc16048..1616837 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.7-f381e45.tgz) = 9c51231f619a6678f61efe3ed789d723eb315a391d8561f660f80e75eb22c7b47bbe6c6d74c6b91a17734fe973633f22fc7802f5ccbaebd6b1089fd29c5a65f0 +SHA512 (composer-2.1.8-24d38e9.tgz) = 558ca00ad8ae77d3705397f2a5cfb4cf79550c82e8be37b15a04c60d138d52d433fd432321ca6288137a81e4d806681312e26c6d39291a6825e9cf4bcc08e793 From 47c174644197c14d5a5ff529e4d5d1add9754a45 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Oct 2021 10:28:52 +0200 Subject: [PATCH 18/21] v2.1.9 (cherry picked from commit bc9b5b34de0dddaeffebd4b8a6a937b68a778d0f) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index d8f26e8..49c7e61 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 24d38e9686092de05214cafa187dc282a5d89497 +%global gh_commit e558c88f28d102d497adec4852802c0dc14c7077 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.8 +%global upstream_version 2.1.9 #global upstream_prever RC1 #global upstream_lower rc1 @@ -297,6 +297,9 @@ exit $ret %changelog +* Tue Oct 5 2021 Remi Collet - 2.1.9-1 +- update to 2.1.9 + * Sat Sep 18 2021 Remi Collet - 2.1.8-1 - update to 2.1.8 diff --git a/sources b/sources index 1616837..85e5bf8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.8-24d38e9.tgz) = 558ca00ad8ae77d3705397f2a5cfb4cf79550c82e8be37b15a04c60d138d52d433fd432321ca6288137a81e4d806681312e26c6d39291a6825e9cf4bcc08e793 +SHA512 (composer-2.1.9-e558c88.tgz) = 63daa157d4d2ea5c5d037df8ecaf06984ccb7d95a772b7a2edb4c197d44b9bbc692b77100f1cb07b0127509535deace4505943777e8ca7c61175f3d98510d762 From e6eb44ca74c4bd1c11b1743dd63b73179d99c36d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Nov 2021 08:42:03 +0100 Subject: [PATCH 19/21] update to 2.1.10 allow psr/log v2 (cherry picked from commit c1fca0e48e87077470cc11646acaeae243b97380) --- composer.spec | 19 +++++++++++++------ sources | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/composer.spec b/composer.spec index 49c7e61..3dbda30 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit e558c88f28d102d497adec4852802c0dc14c7077 +%global gh_commit ea5f64d1a15c66942979b804c9fb3686be852ca0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.9 +%global upstream_version 2.1.10 #global upstream_prever RC1 #global upstream_lower rc1 @@ -59,7 +59,7 @@ BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-com BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) BuildRequires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) BuildRequires: %{symfony_prefix}-console >= %{symfony_min} @@ -85,7 +85,7 @@ BuildRequires: php-PsrLog >= 1.1 # "composer/spdx-licenses": "^1.2", # "composer/xdebug-handler": "^2.0", # "justinrainbow/json-schema": "^5.2.11", -# "psr/log": "^1.0" +# "psr/log": "^1.0 || ^2.0" # "seld/jsonlint": "~1.4", # "seld/phar-utils": "^1.0", # "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", @@ -102,7 +102,7 @@ Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-com Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) Requires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) Requires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) Requires: %{symfony_prefix}-console >= %{symfony_min} @@ -182,7 +182,10 @@ cat << 'EOF' | tee -a src/Composer/autoload.php '%{_datadir}/php/Composer/Spdx/autoload.php', '%{_datadir}/php/Composer/MetadataMinifier/autoload.php', '%{_datadir}/php/Composer/Semver3/autoload.php', - '%{_datadir}/php/Psr/Log/autoload.php', + [ + '%{_datadir}/php/Psr/Log2/autoload.php', + '%{_datadir}/php/Psr/Log/autoload.php', + ], '%{_datadir}/php/JsonSchema5/autoload.php', '%{_datadir}/php/React/Promise/autoload.php', ]); @@ -297,6 +300,10 @@ exit $ret %changelog +* Sat Oct 30 2021 Remi Collet - 2.1.10-1 +- update to 2.1.10 +- allow psr/log v2 + * Tue Oct 5 2021 Remi Collet - 2.1.9-1 - update to 2.1.9 diff --git a/sources b/sources index 85e5bf8..fe1d0c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.9-e558c88.tgz) = 63daa157d4d2ea5c5d037df8ecaf06984ccb7d95a772b7a2edb4c197d44b9bbc692b77100f1cb07b0127509535deace4505943777e8ca7c61175f3d98510d762 +SHA512 (composer-2.1.10-ea5f64d.tgz) = fa8f0665864037fd0908e80a47880822a988f939209875b1a5e5469b83a0231d9b1f0af29bde889788bfd0e78ffc54d7502e03980de40538190b95e339b39740 From 4c8280f9a8457c982ba1e588548d562b02db8195 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Nov 2021 13:42:03 +0100 Subject: [PATCH 20/21] v2.1.11 (cherry picked from commit b9eef84abedf437714b69a5d0e51986e944b658f) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 3dbda30..e5246c7 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit ea5f64d1a15c66942979b804c9fb3686be852ca0 +%global gh_commit ddc81bb4718747cc93330ccf832e6be8a6c1d015 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.10 +%global upstream_version 2.1.11 #global upstream_prever RC1 #global upstream_lower rc1 @@ -300,6 +300,9 @@ exit $ret %changelog +* Tue Nov 2 2021 Remi Collet - 2.1.11-1 +- update to 2.1.11 + * Sat Oct 30 2021 Remi Collet - 2.1.10-1 - update to 2.1.10 - allow psr/log v2 diff --git a/sources b/sources index fe1d0c7..fcee2a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.10-ea5f64d.tgz) = fa8f0665864037fd0908e80a47880822a988f939209875b1a5e5469b83a0231d9b1f0af29bde889788bfd0e78ffc54d7502e03980de40538190b95e339b39740 +SHA512 (composer-2.1.11-ddc81bb.tgz) = 340fd1e1320f523e3df36a9318bc2728abc6695eafbe1cee70edf6b65c5f7fd4bd0ae1aa3419da8fa7fe04a7503e787d65a683955aef87975851bbcf84963b94 From bdf3e95e77db567b43757cd88386767302afc57f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Nov 2021 08:37:46 +0100 Subject: [PATCH 21/21] v2.1.12 (cherry picked from commit 13c11c61de3d02bbb20288391c70b483988a8708) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index e5246c7..80eb123 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit ddc81bb4718747cc93330ccf832e6be8a6c1d015 +%global gh_commit 6e3c2b122e0ec41a7e885fcaf19fa15e2e0819a0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.11 +%global upstream_version 2.1.12 #global upstream_prever RC1 #global upstream_lower rc1 @@ -300,6 +300,9 @@ exit $ret %changelog +* Tue Nov 9 2021 Remi Collet - 2.1.12-1 +- update to 2.1.12 + * Tue Nov 2 2021 Remi Collet - 2.1.11-1 - update to 2.1.11 diff --git a/sources b/sources index fcee2a7..d953e33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.11-ddc81bb.tgz) = 340fd1e1320f523e3df36a9318bc2728abc6695eafbe1cee70edf6b65c5f7fd4bd0ae1aa3419da8fa7fe04a7503e787d65a683955aef87975851bbcf84963b94 +SHA512 (composer-2.1.12-6e3c2b1.tgz) = 834e06a70deb4bed4887e6acf626de2a2b27f3cf42cc405dcdbe74cf25ab14750123dfd780243e3fec0920adc0ac96ed72517600f39134e3730f17dc7a7060b6