From 9523edb2d5c816bc4bbff60e4b7a055a64d775e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:26:09 +0000 Subject: [PATCH 001/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- composer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index 1b18982..42bdc87 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 @@ -308,6 +308,9 @@ exit $ret %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Dec 4 2020 Remi Collet - 2.0.8-1 - update to 2.0.8 From 2227dad08d37ddd58edd41a5b119e31e7c86d422 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Jan 2021 08:17:24 +0100 Subject: [PATCH 002/126] update to 2.0.9 switch to Symfony 4 switch to phpunit9 --- composer.spec | 38 ++++++++++++++++++++++++-------------- sources | 2 +- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/composer.spec b/composer.spec index 42bdc87..dde042d 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,19 +19,19 @@ %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}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP License: MIT @@ -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 + * Tue Jan 26 2021 Fedora Release Engineering - 2.0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild 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 89cde168e9beb5d90cb8c24e571f4dce984fd8d6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Jan 2021 08:17:24 +0100 Subject: [PATCH 003/126] 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 86efe6bd126511b01502cb106cf861ca61ff8c08 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Feb 2021 07:54:42 +0100 Subject: [PATCH 004/126] v2.0.10 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index dde042d..30576e8 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 0239ee5755d643d935266e403bb80f7069b9458d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Feb 2021 07:54:42 +0100 Subject: [PATCH 005/126] 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 7b8fbe3cc054c23f8fdff596f815614a5c18d82f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Feb 2021 06:26:17 +0100 Subject: [PATCH 006/126] v2.0.11 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 30576e8..4d960c1 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 c80c6e23b0ee0a87b64cd1cd0826740992d4ea50 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Feb 2021 06:26:17 +0100 Subject: [PATCH 007/126] 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 eb76f9d9f1eab1d00f7f31f59724b65c041e3a4e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Apr 2021 13:42:58 +0200 Subject: [PATCH 008/126] v2.0.12 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 4d960c1..02793c1 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 7e99294c2819a689f6c50dac2f160761ca762708 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Apr 2021 13:42:58 +0200 Subject: [PATCH 009/126] 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 eff6dc02da4d794dacada47cfd0e485e58b6886b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 May 2021 08:24:24 +0200 Subject: [PATCH 010/126] update to 2.0.13 add dependency on composer/metadata-minifier --- composer.spec | 14 ++++++++++++-- sources | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 02793c1..ea4a5ff 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 081d225f84bd6649d7a9617698042373937a926b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 May 2021 08:24:24 +0200 Subject: [PATCH 011/126] 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 9c51eff13aa9b95d55e8de533673c8ad084522f3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 May 2021 10:03:34 +0200 Subject: [PATCH 012/126] update to 2.0.14 switch to composer/xdebug-handler v2 --- composer.spec | 30 +++++++++++++++++------------- sources | 2 +- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/composer.spec b/composer.spec index ea4a5ff..cdc315f 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 b6249865fdd7bbc3126b7d6c7a47b7accc4d0061 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 May 2021 10:03:34 +0200 Subject: [PATCH 013/126] 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 ce36f5cbc0d66cc2df2785be25266877e097a927 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 May 2021 15:59:44 +0200 Subject: [PATCH 014/126] disable XDG directories usage, see #1955455 --- 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 cdc315f..eea1ed9 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 18f9adbd01d2bee13ca7ddc194460a67aef49998 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 May 2021 15:59:44 +0200 Subject: [PATCH 015/126] 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 cd3c36fec4299be1e94ddbdfad18b2fc24b6fff4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Jun 2021 14:14:39 +0200 Subject: [PATCH 016/126] v2.1.0 --- composer.spec | 17 ++++++++++------- sources | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/composer.spec b/composer.spec index eea1ed9..6b75d39 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 24eb9f198365d28eb381e1044bbdfa3453c0a7ea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Jun 2021 14:14:39 +0200 Subject: [PATCH 017/126] 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 7b632dc3d9f2b8cb155bd1bed6ef2ac9d494336a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Jun 2021 09:28:18 +0200 Subject: [PATCH 018/126] v2.1.1 --- 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 6b75d39..07299e1 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 829344ee498291e66dbd8f5eb379ae5b3eb83cff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Jun 2021 09:28:18 +0200 Subject: [PATCH 019/126] 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 b6110c1b547d41a2bc39488ed2146d29199c44ca Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Jun 2021 08:31:12 +0200 Subject: [PATCH 020/126] fix Composer\InstalledVersions RPM installation --- 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 07299e1..e601518 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 18fa170fd163338397960aff8950ab4f62752191 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Jun 2021 08:31:12 +0200 Subject: [PATCH 021/126] 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 bc88e9c1f5d286b9dcc0b597aa273c93ddbf8df9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Jun 2021 17:04:25 +0200 Subject: [PATCH 022/126] v2.1.2 --- 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 e601518..221d175 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 9154eee0f85532dfda0d6255a972434b34266d17 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Jun 2021 17:04:25 +0200 Subject: [PATCH 023/126] 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 07f73f3a643d77273ee386e46bd5eabeb048d1c7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 10 Jun 2021 07:31:30 +0200 Subject: [PATCH 024/126] v2.1.3 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 221d175..3db1bc5 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 8178a2000550e4596e00a79fc2f3a3f92d267f56 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 10 Jun 2021 07:31:30 +0200 Subject: [PATCH 025/126] 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 108a81f03319390adf4de96e489f065d38570f3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 14:57:24 +0000 Subject: [PATCH 026/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 881d9d8c7809f816565a00aa793b14aed82a2502 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 19:55:48 +0000 Subject: [PATCH 027/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- composer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index 3db1bc5..b4f36e5 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 +* Wed Jul 21 2021 Fedora Release Engineering - 2.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 10 2021 Remi Collet - 2.1.3-1 - update to 2.1.3 From 7c68b5d75caa4d75059aa3e56b09ea30f55983dc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 Jul 2021 15:42:04 +0200 Subject: [PATCH 028/126] update to 2.1.4 raise dependency on justinrainbow/json-schema 5.2.11 --- composer.spec | 49 ++++++++++++++----------------------------------- sources | 2 +- 2 files changed, 15 insertions(+), 36 deletions(-) diff --git a/composer.spec b/composer.spec index b4f36e5..d99dca9 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 @@ -31,7 +32,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP License: MIT @@ -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 + * Wed Jul 21 2021 Fedora Release Engineering - 2.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild 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 166fc6f4f287025bd4fa884dcbe53fdfd72aa43a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 Jul 2021 15:42:04 +0200 Subject: [PATCH 029/126] 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 c13424a7bad7b2e856a762b871d4059bf3b923f6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Jul 2021 11:43:04 +0200 Subject: [PATCH 030/126] v2.1.5 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index d99dca9..85b49e7 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 241a3f75f102a3df6e7f91b803a223f3921e8bea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Jul 2021 11:43:04 +0200 Subject: [PATCH 031/126] 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 ab4babeb93e4ad202fe01b90a1e87d9af387cf33 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Sep 2021 12:19:15 +0200 Subject: [PATCH 032/126] v2.1.6 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 85b49e7..761ec99 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 1255664210c66a3f76dd1aada8a204e70a126f03 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Sep 2021 12:19:15 +0200 Subject: [PATCH 033/126] 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 22d335b4c238877b9c66542b65294fd678959e35 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Sep 2021 15:51:25 +0200 Subject: [PATCH 034/126] v2.1.7 --- 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 761ec99..087bbc5 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 8d08e832c3cd9274d9680974c961a25c6676ea15 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Sep 2021 15:51:25 +0200 Subject: [PATCH 035/126] 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 1bea4b046b75b24b1cda7b6663b9da0c646b3c5c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Sep 2021 15:25:51 +0200 Subject: [PATCH 036/126] v2.1.8 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 087bbc5..5cd75a2 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 ca89a410f6ee6fe912a13d18354bfb37fbf8f509 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Sep 2021 15:25:51 +0200 Subject: [PATCH 037/126] 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 bc9b5b34de0dddaeffebd4b8a6a937b68a778d0f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Oct 2021 10:28:52 +0200 Subject: [PATCH 038/126] v2.1.9 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 5cd75a2..2c187bc 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 47c174644197c14d5a5ff529e4d5d1add9754a45 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Oct 2021 10:28:52 +0200 Subject: [PATCH 039/126] 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 c1fca0e48e87077470cc11646acaeae243b97380 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Nov 2021 08:42:03 +0100 Subject: [PATCH 040/126] update to 2.1.10 allow psr/log v2 --- composer.spec | 19 +++++++++++++------ sources | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/composer.spec b/composer.spec index 2c187bc..6f221a6 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 e6eb44ca74c4bd1c11b1743dd63b73179d99c36d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Nov 2021 08:42:03 +0100 Subject: [PATCH 041/126] 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 b9eef84abedf437714b69a5d0e51986e944b658f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Nov 2021 13:42:03 +0100 Subject: [PATCH 042/126] v2.1.11 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 6f221a6..6a6992b 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 4c8280f9a8457c982ba1e588548d562b02db8195 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Nov 2021 13:42:03 +0100 Subject: [PATCH 043/126] 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 13c11c61de3d02bbb20288391c70b483988a8708 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Nov 2021 08:37:46 +0100 Subject: [PATCH 044/126] v2.1.12 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 6a6992b..f5ef1b3 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 From bdf3e95e77db567b43757cd88386767302afc57f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Nov 2021 08:37:46 +0100 Subject: [PATCH 045/126] 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 From 9b68f26232274d3ae1c4b3c00b701dfbefd2a643 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 Nov 2021 11:43:39 +0100 Subject: [PATCH 046/126] v2.1.14 --- composer.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer.spec b/composer.spec index f5ef1b3..0182bfb 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 6e3c2b122e0ec41a7e885fcaf19fa15e2e0819a0 +%global gh_commit cd28fc05b0c9d3beaf58b57018725c4dc15a6446 %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.12 +%global upstream_version 2.1.14 #global upstream_prever RC1 #global upstream_lower rc1 @@ -88,7 +88,7 @@ BuildRequires: php-PsrLog >= 1.1 # "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", +# "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.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", @@ -275,7 +275,7 @@ find tests \ # testIntegration may hang on local build ret=0 -for cmd in php php73 php74 php80 php81; do +for cmd in php php74 php80 php81; do if which $cmd; then $cmd -d memory_limit=1G %{_phpunit} \ $FILTER \ @@ -300,6 +300,9 @@ exit $ret %changelog +* Tue Nov 30 2021 Remi Collet - 2.1.14-1 +- update to 2.1.14 + * Tue Nov 9 2021 Remi Collet - 2.1.12-1 - update to 2.1.12 diff --git a/sources b/sources index d953e33..2b196b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.12-6e3c2b1.tgz) = 834e06a70deb4bed4887e6acf626de2a2b27f3cf42cc405dcdbe74cf25ab14750123dfd780243e3fec0920adc0ac96ed72517600f39134e3730f17dc7a7060b6 +SHA512 (composer-2.1.14-cd28fc0.tgz) = 318a2642cdd4db84fd7888f5ac4e190d5c03c870a620e024135da5493090e5fc3066c147cfca62013b17e5c4ab15fc13ce72aeaffd2a443017b6ce710ffd0278 From 0f53a95fd0ec35870ed1973c4ad68e5c0dbe774c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Dec 2021 11:56:15 +0100 Subject: [PATCH 047/126] update to 2.2.0 add dependency on composer/pcre --- composer.spec | 18 +++++++++++++----- sources | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/composer.spec b/composer.spec index 0182bfb..6ab2cbf 100644 --- a/composer.spec +++ b/composer.spec @@ -12,15 +12,15 @@ %bcond_without tests -%global gh_commit cd28fc05b0c9d3beaf58b57018725c4dc15a6446 +%global gh_commit e174a4c4324f50a6f2de472aa1055c24a2fe2b2a %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 api_version 2.1.0 -%global run_version 2.1.0 +%global api_version 2.2.0 +%global run_version 2.2.0 -%global upstream_version 2.1.14 +%global upstream_version 2.2.0 #global upstream_prever RC1 #global upstream_lower rc1 @@ -62,6 +62,7 @@ BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-com 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: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) BuildRequires: %{symfony_prefix}-console >= %{symfony_min} BuildRequires: %{symfony_prefix}-finder >= %{symfony_min} BuildRequires: %{symfony_prefix}-filesystem >= %{symfony_min} @@ -92,7 +93,8 @@ BuildRequires: php-PsrLog >= 1.1 # "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" +# "react/promise": "^1.2 || ^2.7", +# "composer/pcre": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) @@ -105,6 +107,7 @@ Requires: (php-composer(seld/phar-utils) >= 1.0 with php-com 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: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) Requires: %{symfony_prefix}-console >= %{symfony_min} Requires: %{symfony_prefix}-finder >= %{symfony_min} Requires: %{symfony_prefix}-process >= %{symfony_min} @@ -182,6 +185,7 @@ 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/Pcre/autoload.php', [ '%{_datadir}/php/Psr/Log2/autoload.php', '%{_datadir}/php/Psr/Log/autoload.php', @@ -300,6 +304,10 @@ exit $ret %changelog +* Wed Dec 22 2021 Remi Collet - 2.2.0-1 +- update to 2.2.0 +- add dependency on composer/pcre + * Tue Nov 30 2021 Remi Collet - 2.1.14-1 - update to 2.1.14 diff --git a/sources b/sources index 2b196b1..6ffe111 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.14-cd28fc0.tgz) = 318a2642cdd4db84fd7888f5ac4e190d5c03c870a620e024135da5493090e5fc3066c147cfca62013b17e5c4ab15fc13ce72aeaffd2a443017b6ce710ffd0278 +SHA512 (composer-2.2.0-e174a4c.tgz) = 55b7c49708ee6d7776fa1422bbbbc2001a3d69ab86e42ef2c9657c2a824aae2be5fb6e149d2f5af56de6831bf7c3cfc7109a43b165d3423ac2394243db1475f7 From 4d4a8a1acc0e9c61da5631e2cac28285a1fba347 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Dec 2021 07:43:19 +0100 Subject: [PATCH 048/126] v2.2.1 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 6ab2cbf..27474ec 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit e174a4c4324f50a6f2de472aa1055c24a2fe2b2a +%global gh_commit bbc265e16561ab8e0f5e7cac395ea72640251f0c %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.2.0 %global run_version 2.2.0 -%global upstream_version 2.2.0 +%global upstream_version 2.2.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -304,6 +304,9 @@ exit $ret %changelog +* Thu Dec 23 2021 Remi Collet - 2.2.1-1 +- update to 2.2.1 + * Wed Dec 22 2021 Remi Collet - 2.2.0-1 - update to 2.2.0 - add dependency on composer/pcre diff --git a/sources b/sources index 6ffe111..5d80a7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.0-e174a4c.tgz) = 55b7c49708ee6d7776fa1422bbbbc2001a3d69ab86e42ef2c9657c2a824aae2be5fb6e149d2f5af56de6831bf7c3cfc7109a43b165d3423ac2394243db1475f7 +SHA512 (composer-2.2.1-bbc265e.tgz) = 0afb658d09f96fb3ccb73fcd8a60d9e0aaa2bf7decf6c3081e9c57be920e88d261eedda4cd1298df35c4e67c7932910ed7d29c79ca00ec1d63cb5ff1347550db From 850346b461a05342b3d79b9f44fd145166a5bfce Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Jan 2022 08:10:35 +0100 Subject: [PATCH 049/126] v2.2.3 --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index 27474ec..8562066 100644 --- a/composer.spec +++ b/composer.spec @@ -12,15 +12,15 @@ %bcond_without tests -%global gh_commit bbc265e16561ab8e0f5e7cac395ea72640251f0c +%global gh_commit 3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a %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 api_version 2.2.0 -%global run_version 2.2.0 +%global run_version 2.2.2 -%global upstream_version 2.2.1 +%global upstream_version 2.2.3 #global upstream_prever RC1 #global upstream_lower rc1 @@ -304,6 +304,9 @@ exit $ret %changelog +* Sat Jan 1 2022 Remi Collet - 2.2.3-1 +- update to 2.2.3 + * Thu Dec 23 2021 Remi Collet - 2.2.1-1 - update to 2.2.1 diff --git a/sources b/sources index 5d80a7a..36d9283 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.1-bbc265e.tgz) = 0afb658d09f96fb3ccb73fcd8a60d9e0aaa2bf7decf6c3081e9c57be920e88d261eedda4cd1298df35c4e67c7932910ed7d29c79ca00ec1d63cb5ff1347550db +SHA512 (composer-2.2.3-3c92ba5.tgz) = 406bec56bea0150f6fb63d269f8beaf9f12733cdd50c547eeaedb34f5a2b500bffa10834ff85c9f6edd95f80cec8763e85fe9248fd891a18cfd1a99e8141501f From 889766206cdb64c7a8f4eff2b4ba0662bf507110 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Jan 2022 08:02:16 +0100 Subject: [PATCH 050/126] v2.2.4 --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index 8562066..91a5503 100644 --- a/composer.spec +++ b/composer.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2021 Remi Collet +# Copyright (c) 2015-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a +%global gh_commit 8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.3 +%global upstream_version 2.2.4 #global upstream_prever RC1 #global upstream_lower rc1 @@ -304,6 +304,9 @@ exit $ret %changelog +* Sun Jan 9 2022 Remi Collet - 2.2.4-1 +- update to 2.2.4 + * Sat Jan 1 2022 Remi Collet - 2.2.3-1 - update to 2.2.3 diff --git a/sources b/sources index 36d9283..0c91968 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.3-3c92ba5.tgz) = 406bec56bea0150f6fb63d269f8beaf9f12733cdd50c547eeaedb34f5a2b500bffa10834ff85c9f6edd95f80cec8763e85fe9248fd891a18cfd1a99e8141501f +SHA512 (composer-2.2.4-8a5ad75.tgz) = 383c9bcfb39f772c8dfb316b798c383afa0ed899e081c5c03395b52bf3dc5263472719677dde65c412f9a8ca8bcfccacfc097a2465901d1671d232d496d8e868 From 9bb7c5678171ca0e7ae5a4597f7986492f8dbf89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 23:43:12 +0000 Subject: [PATCH 051/126] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- composer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index 91a5503..b47c90a 100644 --- a/composer.spec +++ b/composer.spec @@ -32,7 +32,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP License: MIT @@ -304,6 +304,9 @@ exit $ret %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Jan 9 2022 Remi Collet - 2.2.4-1 - update to 2.2.4 From 20b248a36985e012a3f5764cf409fa304269937f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Jan 2022 10:09:45 +0100 Subject: [PATCH 052/126] v2.2.5 --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index b47c90a..62b7a0f 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f +%global gh_commit 22c41ef275c7bb64fa28fb2c0871a39666832cb9 %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.4 +%global upstream_version 2.2.5 #global upstream_prever RC1 #global upstream_lower rc1 @@ -32,7 +32,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP License: MIT @@ -304,6 +304,9 @@ exit $ret %changelog +* Sat Jan 22 2022 Remi Collet - 2.2.5-1 +- update to 2.2.5 + * Wed Jan 19 2022 Fedora Release Engineering - 2.2.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 0c91968..b3069cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.4-8a5ad75.tgz) = 383c9bcfb39f772c8dfb316b798c383afa0ed899e081c5c03395b52bf3dc5263472719677dde65c412f9a8ca8bcfccacfc097a2465901d1671d232d496d8e868 +SHA512 (composer-2.2.5-22c41ef.tgz) = 5854ee3efca274c6c88e327244edec91c3e297db0921382a0cd30767d87db0407040245055b7b3484c6932afd4b97bbc99d25e87afa8ebb00173591c6948b7fb From 01bbe4863e571beb02bd69170fef9dad54cf4f2e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Jan 2022 11:05:08 +0100 Subject: [PATCH 053/126] use system libraries on Fedora, bundled libraries on EL --- composer-noxdg.patch | 6 +-- composer-rpm.patch | 54 +++++++++++++++---------- composer.spec | 96 +++++++++++++++++++++++++++++++++++++------- makesrc.sh | 34 ++++++++++------ sources | 2 +- 5 files changed, 140 insertions(+), 52 deletions(-) diff --git a/composer-noxdg.patch b/composer-noxdg.patch index fc6b127..607e449 100644 --- a/composer-noxdg.patch +++ b/composer-noxdg.patch @@ -1,7 +1,7 @@ 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 +--- ./src/Composer/Factory.php.noxdg 2022-01-25 09:39:15.000000000 +0100 ++++ ./src/Composer/Factory.php 2022-01-25 09:50:21.374957261 +0100 +@@ -701,6 +701,10 @@ class Factory */ private static function useXdg() { diff --git a/composer-rpm.patch b/composer-rpm.patch index cbb4b3c..bdf807b 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2021-09-14 15:45:17.000000000 +0200 -+++ ./bin/composer 2021-09-14 15:45:33.025118009 +0200 +--- ./bin/composer.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./bin/composer 2022-01-25 09:50:21.372957269 +0100 @@ -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 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; +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2022-01-25 09:50:21.373957265 +0100 +@@ -419,7 +419,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 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 +--- ./src/Composer/Compiler.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./src/Composer/Compiler.php 2022-01-25 09:50:21.373957265 +0100 +@@ -125,7 +125,7 @@ class Compiler // Add Composer resources $finder = new Finder(); $finder->files() @@ -35,9 +35,9 @@ 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 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 +--- ./src/Composer/InstalledVersions.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./src/Composer/InstalledVersions.php 2022-01-25 09:50:21.373957265 +0100 +@@ -264,7 +264,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 @@ -46,7 +46,7 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio self::$installed = include __DIR__ . '/installed.php'; } else { self::$installed = array(); -@@ -324,7 +324,7 @@ class InstalledVersions +@@ -337,7 +337,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 @@ -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 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 +--- ./src/Composer/Json/JsonFile.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./src/Composer/Json/JsonFile.php 2022-01-25 09:50:21.373957265 +0100 +@@ -35,7 +35,7 @@ class JsonFile const JSON_PRETTY_PRINT = 128; 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; -@@ -191,7 +191,7 @@ class JsonFile +@@ -197,7 +197,7 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { $isComposerSchemaFile = true; @@ -77,9 +77,9 @@ 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-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 +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2022-01-25 09:50:21.373957265 +0100 +@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { $validator = new Validator(); @@ -90,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-09-14 15:45:17.000000000 +0200 -+++ ./tests/Composer/Test/PolyfillTestCase.php 2021-09-14 15:45:33.026118007 +0200 +--- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./tests/Composer/Test/PolyfillTestCase.php 2022-01-25 09:50:21.373957265 +0100 @@ -15,10 +15,35 @@ namespace Composer\Test { use PHPUnit\Framework\Constraint\LogicalNot; use PHPUnit\Framework\Constraint\StringContains; @@ -129,3 +129,15 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po } else { abstract class PolyfillTestCase extends TestCase { +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 2022-01-25 09:50:57.595802751 +0100 ++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2022-01-25 09:51:36.038638770 +0100 +@@ -125,7 +125,7 @@ class CaBundle + */ + public static function getBundledCaBundlePath() + { +- $caBundleFile = __DIR__.'/../res/cacert.pem'; ++ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always + + // cURL does not understand 'phar://' paths + // see https://github.com/composer/ca-bundle/issues/10 diff --git a/composer.spec b/composer.spec index 62b7a0f..72f5399 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,13 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs +%if 0%{?fedora} %bcond_without tests +%bcond_without syslib +%else +%bcond_with tests +%bcond_with syslib +%endif %global gh_commit 22c41ef275c7bb64fa28fb2c0871a39666832cb9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) @@ -32,9 +38,10 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP +# composer and all dependencies are MIT License: MIT URL: https://getcomposer.org/ Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz @@ -50,7 +57,10 @@ Patch0: %{name}-rpm.patch Patch1: %{name}-noxdg.patch BuildArch: noarch +# platform set in makesrc.sh +BuildRequires: php(language) >= 7.4 BuildRequires: php-cli +BuildRequires: php-json %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) @@ -58,8 +68,8 @@ BuildRequires: (php-composer(composer/semver) >= 3.0 with php-com BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 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) < 3) +BuildRequires: (php-composer(seld/phar-utils) >= 1.1 with php-composer(seld/phar-utils) < 2) +BuildRequires: (php-composer(psr/log) >= 1.1 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: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) @@ -74,8 +84,6 @@ BuildRequires: php-zip BuildRequires: %{_phpunit} # For autoloader BuildRequires: php-fedora-autoloader-devel -BuildRequires: php-seld-phar-utils >= 1.1 -BuildRequires: php-PsrLog >= 1.1 %endif # From composer.json, "require": { @@ -95,16 +103,17 @@ BuildRequires: php-PsrLog >= 1.1 # "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", # "react/promise": "^1.2 || ^2.7", # "composer/pcre": "^1.0" -Requires: php(language) >= 5.3.2 +Requires: php(language) >= 7.4 Requires: php-cli +%if %{with syslib} 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) >= 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) < 3) +Requires: (php-composer(seld/phar-utils) >= 1.1 with php-composer(seld/phar-utils) < 2) +Requires: (php-composer(psr/log) >= 1.1 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: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) @@ -112,6 +121,38 @@ Requires: %{symfony_prefix}-console >= %{symfony_min} Requires: %{symfony_prefix}-finder >= %{symfony_min} Requires: %{symfony_prefix}-process >= %{symfony_min} Requires: %{symfony_prefix}-filesystem >= %{symfony_min} +# For our autoloader +Requires: php-composer(fedora/autoloader) +%else +# System certificates +Requires: ca-certificates +# Bundled libraries +Provides: bundled(php-composer-ca-bundle) = 1.3.1 +Provides: bundled(php-composer-metadata-minifier) = 1.0.0 +Provides: bundled(php-composer-pcre) = 1.0.1 +Provides: bundled(php-composer-semver) = 3.2.7 +Provides: bundled(php-composer-spdx-licenses) = 1.5.6 +Provides: bundled(php-composer-xdebug-handler) = 2.0.4 +Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 +Provides: bundled(php-psr-container) = 1.1.2 +Provides: bundled(php-psr-log) = 1.1.4 +Provides: bundled(php-react-promise) = v2.8.0 +Provides: bundled(php-seld-jsonlint) = 1.8.3 +Provides: bundled(php-seld-phar-utils) = 1.2.0 +Provides: bundled(php-symfony-console) = v5.4.2 +Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 +Provides: bundled(php-symfony-filesystem) = v5.4.0 +Provides: bundled(php-symfony-finder) = v5.4.2 +Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.24.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.24.0 +Provides: bundled(php-symfony-polyfill-mbstring) = 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-process) = v5.4.2 +Provides: bundled(php-symfony-service-contracts) = v2.5.0 +Provides: bundled(php-symfony-string) = v5.4.2 +%endif # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", # "ext-zip": "Enabling the zip extension allows you to unzip archives", @@ -119,10 +160,6 @@ Requires: %{symfony_prefix}-filesystem >= %{symfony_min} Requires: php-openssl Requires: php-zip Requires: php-zlib -# For our autoloader -Requires: php-composer(fedora/autoloader) -Requires: php-seld-phar-utils >= 1.1 -Requires: php-PsrLog >= 1.1 # From phpcompatinfo for version 2.0.0 Requires: php-ctype Requires: php-curl @@ -170,6 +207,12 @@ if grep -r '\.\./res'; then exit 1 fi +rm src/bootstrap.php +rm src/Composer/vendor/composer/ca-bundle/res/cacert.pem + +%if %{with syslib} +rm -rf src/Composer/vendor + phpab --template fedora --output src/Composer/autoload.php src/Composer cat << 'EOF' | tee -a src/Composer/autoload.php @@ -201,8 +244,30 @@ require 'Composer/autoload.php'; \Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/'); EOF -rm src/bootstrap.php +%else +: symlink autoloader for library +ln -s vendor/autoload.php src/Composer/autoload.php +: fix layout +sed -e "s:/../..' . '/src/Composer::" -i src/Composer/vendor/composer/autoload_static.php + +: List bundled libraries and Licenses +php -r ' + $pkgs = file_get_contents("src/Composer/vendor/composer/installed.json"); + $pkgs = json_decode($pkgs, true); + if (!is_array($pkgs) || !isset($pkgs["packages"])) { + echo "cant decode json file\n"; + exit(3); + } + $lic = []; + foreach($pkgs["packages"] as $pkg) { + printf("Provides: bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); + $lic = array_merge($lic, $pkg["license"]); + } + sort($lic); + printf("\nLicense: %s\n\n", implode(" and ", array_unique($lic))); +' +%endif : fix reported version %if 0%{?gh_date} @@ -256,7 +321,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %check -%if %{with tests} +%if %{with tests} && %{with syslib} : Online tests rm tests/Composer/Test/Util/RemoteFilesystemTest.php @@ -304,6 +369,9 @@ exit $ret %changelog +* Tue Jan 25 2022 Remi Collet - 2.2.5-2 +- use system libraries on Fedora, bundled libraries on EL + * Sat Jan 22 2022 Remi Collet - 2.2.5-1 - update to 2.2.5 diff --git a/makesrc.sh b/makesrc.sh index 9615a91..1d89e2e 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -8,21 +8,29 @@ PREVER=$(sed -n '/^%global upstream_prever/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n" +if [ -f $NAME-$VERSION$PREVER-$SHORT.tgz ]; then + echo skip $NAME-$VERSION$PREVER-$SHORT.tgz already here +else + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n" -echo "Cloning..." -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + echo "Cloning..." + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd + echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || exit 1 + cp composer.json ../composer.json + composer config platform.php 7.4 + rm composer.lock + export COMPOSER_VENDOR_DIR=src/Composer/vendor + composer install --no-interaction --no-progress --no-dev --optimize-autoloader + cp src/Composer/vendor/composer/installed.json ../ + popd -echo "Archiving..." -tar czf $NAME-$VERSION$PREVER-$SHORT.tgz --exclude .git $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT + echo "Archiving..." + tar czf $NAME-$VERSION$PREVER-$SHORT.tgz --exclude .git $PROJECT-$COMMIT + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT +fi echo "Done." diff --git a/sources b/sources index b3069cc..febbfd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.5-22c41ef.tgz) = 5854ee3efca274c6c88e327244edec91c3e297db0921382a0cd30767d87db0407040245055b7b3484c6932afd4b97bbc99d25e87afa8ebb00173591c6948b7fb +SHA512 (composer-2.2.5-22c41ef.tgz) = dce37e84638863780975745e09771eaf473561eddd6557f8cd0a0de79e4b78dde6e92a7002287d4fb857d3178a6a17d142df1f9dd4d61dc0258af6cf49717205 From 47cab181a14a74891a135d94b441889e7c855466 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Jan 2022 11:24:48 +0100 Subject: [PATCH 054/126] add missing requires on php-dom --- composer.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index 72f5399..879f0e6 100644 --- a/composer.spec +++ b/composer.spec @@ -160,10 +160,11 @@ Provides: bundled(php-symfony-string) = v5.4.2 Requires: php-openssl Requires: php-zip Requires: php-zlib -# From phpcompatinfo for version 2.0.0 +# From phpcompatinfo for version 2.2.5 Requires: php-ctype Requires: php-curl Requires: php-date +Requires: php-dom Requires: php-filter Requires: php-hash Requires: php-iconv From 358d437f30581d8689f81fced48fcb993c88f097 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Feb 2022 10:02:33 +0100 Subject: [PATCH 055/126] v2.2.6 --- composer.spec | 32 +++++++++++++++++++------------- makesrc.sh | 2 +- sources | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/composer.spec b/composer.spec index 879f0e6..a753fa4 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 22c41ef275c7bb64fa28fb2c0871a39666832cb9 +%global gh_commit ce785a18c0fb472421e52d958bab339247cb0e82 %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.5 +%global upstream_version 2.2.6 #global upstream_prever RC1 #global upstream_lower rc1 @@ -38,7 +38,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP # composer and all dependencies are MIT @@ -58,7 +58,7 @@ Patch1: %{name}-noxdg.patch BuildArch: noarch # platform set in makesrc.sh -BuildRequires: php(language) >= 7.4 +BuildRequires: php(language) >= 7.2.5 BuildRequires: php-cli BuildRequires: php-json %if %{with tests} @@ -103,7 +103,7 @@ BuildRequires: php-fedora-autoloader-devel # "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", # "react/promise": "^1.2 || ^2.7", # "composer/pcre": "^1.0" -Requires: php(language) >= 7.4 +Requires: php(language) >= 7.2.5 Requires: php-cli %if %{with syslib} Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) @@ -130,28 +130,28 @@ Requires: ca-certificates Provides: bundled(php-composer-ca-bundle) = 1.3.1 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 1.0.1 -Provides: bundled(php-composer-semver) = 3.2.7 +Provides: bundled(php-composer-semver) = 3.2.9 Provides: bundled(php-composer-spdx-licenses) = 1.5.6 Provides: bundled(php-composer-xdebug-handler) = 2.0.4 Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 -Provides: bundled(php-psr-container) = 1.1.2 +Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-react-promise) = v2.8.0 Provides: bundled(php-seld-jsonlint) = 1.8.3 Provides: bundled(php-seld-phar-utils) = 1.2.0 -Provides: bundled(php-symfony-console) = v5.4.2 +Provides: bundled(php-symfony-console) = v5.4.3 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 -Provides: bundled(php-symfony-filesystem) = v5.4.0 -Provides: bundled(php-symfony-finder) = v5.4.2 +Provides: bundled(php-symfony-filesystem) = v5.4.3 +Provides: bundled(php-symfony-finder) = v5.4.3 Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.24.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.24.0 Provides: bundled(php-symfony-polyfill-mbstring) = 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-process) = v5.4.2 +Provides: bundled(php-symfony-process) = v5.4.3 Provides: bundled(php-symfony-service-contracts) = v2.5.0 -Provides: bundled(php-symfony-string) = v5.4.2 +Provides: bundled(php-symfony-string) = v5.4.3 %endif # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -332,7 +332,10 @@ rm -rf res : Run test suite export BUILDROOT=%{buildroot} -FILTER="--filter '^((?!(testIntegration)).)*$'" +# testSearchWithSpecialChars is online +# testCreateMap fails on 8.1 +# testOutputIgnoresFormatting use InstalledVersions +FILTER="--filter '^((?!(testIntegration|testSearchWithSpecialChars|testCreateMap|testOutputIgnoresFormatting)).)*$'" # Adapt for phunit9 find tests \ @@ -370,6 +373,9 @@ exit $ret %changelog +* Sat Feb 5 2022 Remi Collet - 2.2.6-1 +- update to 2.2.6 + * Tue Jan 25 2022 Remi Collet - 2.2.5-2 - use system libraries on Fedora, bundled libraries on EL diff --git a/makesrc.sh b/makesrc.sh index 1d89e2e..930ec0b 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -20,7 +20,7 @@ else pushd $PROJECT-$COMMIT git checkout $COMMIT || exit 1 cp composer.json ../composer.json - composer config platform.php 7.4 + composer config platform.php 7.2.5 rm composer.lock export COMPOSER_VENDOR_DIR=src/Composer/vendor composer install --no-interaction --no-progress --no-dev --optimize-autoloader diff --git a/sources b/sources index febbfd2..dc98f1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.5-22c41ef.tgz) = dce37e84638863780975745e09771eaf473561eddd6557f8cd0a0de79e4b78dde6e92a7002287d4fb857d3178a6a17d142df1f9dd4d61dc0258af6cf49717205 +SHA512 (composer-2.2.6-ce785a1.tgz) = e7fd81e9705686dae7f5f3b88a7b4ce3a571314505e7558e739d94432e04c893e20da5a2ee00d89a03e91c2899bdfd2271f615ed62f73297bf89b9a9617fab95 From 1d2985b4de91a85660d10599ff5fba277d478ef6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Feb 2022 12:29:07 +0100 Subject: [PATCH 056/126] v2.2.7 --- composer.spec | 22 ++++++++++++++-------- sources | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/composer.spec b/composer.spec index a753fa4..7deeea4 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit ce785a18c0fb472421e52d958bab339247cb0e82 +%global gh_commit 061d154dfdde157cbf453c4695e6af21c0e93903 %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.6 +%global upstream_version 2.2.7 #global upstream_prever RC1 #global upstream_lower rc1 @@ -66,7 +66,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) >= 2.0 with php-composer(composer/xdebug-handler) < 3) +BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 4) BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) BuildRequires: (php-composer(seld/phar-utils) >= 1.1 with php-composer(seld/phar-utils) < 2) BuildRequires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) @@ -92,7 +92,7 @@ BuildRequires: php-fedora-autoloader-devel # "composer/metadata-minifier": "^1.0", # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", -# "composer/xdebug-handler": "^2.0", +# "composer/xdebug-handler": "^2.0 || ^3.0", # "justinrainbow/json-schema": "^5.2.11", # "psr/log": "^1.0 || ^2.0" # "seld/jsonlint": "~1.4", @@ -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) >= 2.0 with php-composer(composer/xdebug-handler) < 3) +Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 4) Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) Requires: (php-composer(seld/phar-utils) >= 1.1 with php-composer(seld/phar-utils) < 2) Requires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) @@ -132,11 +132,11 @@ Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 1.0.1 Provides: bundled(php-composer-semver) = 3.2.9 Provides: bundled(php-composer-spdx-licenses) = 1.5.6 -Provides: bundled(php-composer-xdebug-handler) = 2.0.4 +Provides: bundled(php-composer-xdebug-handler) = 3.0.2 Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 -Provides: bundled(php-react-promise) = v2.8.0 +Provides: bundled(php-react-promise) = v2.9.0 Provides: bundled(php-seld-jsonlint) = 1.8.3 Provides: bundled(php-seld-phar-utils) = 1.2.0 Provides: bundled(php-symfony-console) = v5.4.3 @@ -218,7 +218,10 @@ 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 */ + [ /* before symfony which load composer */ + '%{_datadir}/php/Composer/XdebugHandler3/autoload.php', + '%{_datadir}/php/Composer/XdebugHandler2/autoload.php', + ], '%{symfony_path}/Component/Console/autoload.php', '%{symfony_path}/Component/Finder/autoload.php', '%{symfony_path}/Component/Process/autoload.php', @@ -373,6 +376,9 @@ exit $ret %changelog +* Fri Feb 25 2022 Remi Collet - 2.2.7-1 +- update to 2.2.7 + * Sat Feb 5 2022 Remi Collet - 2.2.6-1 - update to 2.2.6 diff --git a/sources b/sources index dc98f1f..94811f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.6-ce785a1.tgz) = e7fd81e9705686dae7f5f3b88a7b4ce3a571314505e7558e739d94432e04c893e20da5a2ee00d89a03e91c2899bdfd2271f615ed62f73297bf89b9a9617fab95 +SHA512 (composer-2.2.7-061d154.tgz) = faa7281e153ea21e9b93ce42efcce01e54cea1978dbfa56b65637ca8b64d811cdb8a110d863a5b1e2c824337d3dd7b5ea4ca943192015b18ebf99c3aa6c948d6 From e90af0dd160909edb436bd723ca1bba94a8c2c14 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Mar 2022 14:07:17 +0100 Subject: [PATCH 057/126] v2.2.8 (cherry picked from commit 6769264671ef9f4e93c3a193ab425161799553e1) --- composer.spec | 29 ++++++++++++++++------------- sources | 2 +- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/composer.spec b/composer.spec index 7deeea4..ff4293b 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 061d154dfdde157cbf453c4695e6af21c0e93903 +%global gh_commit 26a587345daa2772bbe2006f13cd9d7f92b242eb %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.7 +%global upstream_version 2.2.8 #global upstream_prever RC1 #global upstream_lower rc1 @@ -130,26 +130,26 @@ Requires: ca-certificates Provides: bundled(php-composer-ca-bundle) = 1.3.1 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 1.0.1 -Provides: bundled(php-composer-semver) = 3.2.9 +Provides: bundled(php-composer-semver) = 3.3.0 Provides: bundled(php-composer-spdx-licenses) = 1.5.6 -Provides: bundled(php-composer-xdebug-handler) = 3.0.2 +Provides: bundled(php-composer-xdebug-handler) = 3.0.3 Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-react-promise) = v2.9.0 Provides: bundled(php-seld-jsonlint) = 1.8.3 Provides: bundled(php-seld-phar-utils) = 1.2.0 -Provides: bundled(php-symfony-console) = v5.4.3 +Provides: bundled(php-symfony-console) = v5.4.5 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 -Provides: bundled(php-symfony-filesystem) = v5.4.3 +Provides: bundled(php-symfony-filesystem) = v5.4.6 Provides: bundled(php-symfony-finder) = v5.4.3 -Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.24.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.24.0 -Provides: bundled(php-symfony-polyfill-mbstring) = 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-process) = v5.4.3 +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.5 Provides: bundled(php-symfony-service-contracts) = v2.5.0 Provides: bundled(php-symfony-string) = v5.4.3 %endif @@ -376,6 +376,9 @@ exit $ret %changelog +* Tue Mar 15 2022 Remi Collet - 2.2.8-1 +- update to 2.2.8 + * Fri Feb 25 2022 Remi Collet - 2.2.7-1 - update to 2.2.7 diff --git a/sources b/sources index 94811f3..ff11b52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.7-061d154.tgz) = faa7281e153ea21e9b93ce42efcce01e54cea1978dbfa56b65637ca8b64d811cdb8a110d863a5b1e2c824337d3dd7b5ea4ca943192015b18ebf99c3aa6c948d6 +SHA512 (composer-2.2.8-26a5873.tgz) = ca2dda3c6c17c3b3706626f5411ed2f8205b632d7d9e26a89dc4788f13d9469294a7838bb9fd615013b352aeca48e3719ae4263ad42496ebc68b9034953307b5 From 26c47b0acf401dda4ebc9a80610592ae13602107 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Mar 2022 07:57:23 +0100 Subject: [PATCH 058/126] v2.2.9 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index ff4293b..9709295 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 26a587345daa2772bbe2006f13cd9d7f92b242eb +%global gh_commit 07eccf080ad63d55d95a7c9133506db7d9029264 %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.8 +%global upstream_version 2.2.9 #global upstream_prever RC1 #global upstream_lower rc1 @@ -376,6 +376,9 @@ exit $ret %changelog +* Wed Mar 16 2022 Remi Collet - 2.2.9-1 +- update to 2.2.9 + * Tue Mar 15 2022 Remi Collet - 2.2.8-1 - update to 2.2.8 diff --git a/sources b/sources index ff11b52..fc8b5f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.8-26a5873.tgz) = ca2dda3c6c17c3b3706626f5411ed2f8205b632d7d9e26a89dc4788f13d9469294a7838bb9fd615013b352aeca48e3719ae4263ad42496ebc68b9034953307b5 +SHA512 (composer-2.2.9-07eccf0.tgz) = e96749a5a77abd6176e8dfc3533c6865a7abe4efa20c51258b5a978151608b9619c9d8c6190a4b7aac23f9a3045b9809cbffe8836ce7325b1f1da3392cb22fc9 From 99e9ef55ce994bf9f3be6ba0f084860d098cf22c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Mar 2022 07:35:16 +0200 Subject: [PATCH 059/126] v2.2.10 --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index 9709295..22ba34b 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 07eccf080ad63d55d95a7c9133506db7d9029264 +%global gh_commit 18f748df692b6304b5baf077786c003c48e7f990 %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.9 +%global upstream_version 2.2.10 #global upstream_prever RC1 #global upstream_lower rc1 @@ -130,7 +130,7 @@ Requires: ca-certificates Provides: bundled(php-composer-ca-bundle) = 1.3.1 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 1.0.1 -Provides: bundled(php-composer-semver) = 3.3.0 +Provides: bundled(php-composer-semver) = 3.3.1 Provides: bundled(php-composer-spdx-licenses) = 1.5.6 Provides: bundled(php-composer-xdebug-handler) = 3.0.3 Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 @@ -376,6 +376,9 @@ exit $ret %changelog +* Wed Mar 30 2022 Remi Collet - 2.2.10-1 +- update to 2.2.10 + * Wed Mar 16 2022 Remi Collet - 2.2.9-1 - update to 2.2.9 diff --git a/sources b/sources index fc8b5f7..9cd962e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.9-07eccf0.tgz) = e96749a5a77abd6176e8dfc3533c6865a7abe4efa20c51258b5a978151608b9619c9d8c6190a4b7aac23f9a3045b9809cbffe8836ce7325b1f1da3392cb22fc9 +SHA512 (composer-2.2.10-18f748d.tgz) = 405b94c57ac4d4ee06269a952fd22bc7842bb6917c050987285f789332716d7e6dc84f644a5b85b4b6f6a6657329c28c6bffd012ad9f9314882c0983e29b30c5 From 10827d53755544678073d54195ca6d8db5ea1680 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Mar 2022 13:54:01 +0200 Subject: [PATCH 060/126] update to 2.3.0 always use bundled libraries as symfony/* 5.4 and composer/pcre 2 are not available --- composer-noxdg.patch | 10 ++-- composer-rpm.patch | 114 ++++++++++++++----------------------------- composer.spec | 68 +++++++++++++++----------- sources | 2 +- 4 files changed, 82 insertions(+), 112 deletions(-) diff --git a/composer-noxdg.patch b/composer-noxdg.patch index 607e449..73195e7 100644 --- a/composer-noxdg.patch +++ b/composer-noxdg.patch @@ -1,9 +1,9 @@ diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php ---- ./src/Composer/Factory.php.noxdg 2022-01-25 09:39:15.000000000 +0100 -+++ ./src/Composer/Factory.php 2022-01-25 09:50:21.374957261 +0100 -@@ -701,6 +701,10 @@ class Factory - */ - private static function useXdg() +--- ./src/Composer/Factory.php.noxdg 2022-03-16 09:51:30.398977729 +0100 ++++ ./src/Composer/Factory.php 2022-03-16 09:52:14.113841110 +0100 +@@ -665,6 +665,10 @@ class Factory + + private static function useXdg(): bool { + // As XDG is very patially implemted + // resulting in command/code in ~/.config diff --git a/composer-rpm.patch b/composer-rpm.patch index bdf807b..26ee894 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2022-01-25 09:39:15.000000000 +0100 -+++ ./bin/composer 2022-01-25 09:50:21.372957269 +0100 +--- ./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 !== ' } @@ -11,10 +11,10 @@ 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-01-25 09:39:15.000000000 +0100 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2022-01-25 09:50:21.373957265 +0100 -@@ -419,7 +419,7 @@ EOF; - $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform)); +--- ./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; + $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'); - $filesystem->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE'); @@ -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 2022-01-25 09:39:15.000000000 +0100 -+++ ./src/Composer/Compiler.php 2022-01-25 09:50:21.373957265 +0100 -@@ -125,7 +125,7 @@ class Compiler +--- ./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 +@@ -107,7 +107,7 @@ class Compiler // Add Composer resources $finder = new Finder(); $finder->files() @@ -35,9 +35,9 @@ 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-01-25 09:39:15.000000000 +0100 -+++ ./src/Composer/InstalledVersions.php 2022-01-25 09:50:21.373957265 +0100 -@@ -264,7 +264,7 @@ class InstalledVersions +--- ./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 +@@ -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, // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 @@ -46,7 +46,7 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio self::$installed = include __DIR__ . '/installed.php'; } else { self::$installed = array(); -@@ -337,7 +337,7 @@ class InstalledVersions +@@ -339,7 +339,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 @@ -56,82 +56,29 @@ 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-01-25 09:39:15.000000000 +0100 -+++ ./src/Composer/Json/JsonFile.php 2022-01-25 09:50:21.373957265 +0100 -@@ -35,7 +35,7 @@ class JsonFile - const JSON_PRETTY_PRINT = 128; - const JSON_UNESCAPED_UNICODE = 256; +--- ./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 + /** @deprecated Use \JSON_UNESCAPED_UNICODE */ + public const JSON_UNESCAPED_UNICODE = 256; -- const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json'; -+ const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; +- public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json'; ++ public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; /** @var string */ private $path; -@@ -197,7 +197,7 @@ class JsonFile +@@ -200,7 +200,7 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { $isComposerSchemaFile = true; -- $schemaFile = __DIR__ . self::COMPOSER_SCHEMA_PATH; +- $schemaFile = 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 2022-01-25 09:39:15.000000000 +0100 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2022-01-25 09:50:21.373957265 +0100 -@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas - private function check($json) - { - $validator = new Validator(); -- $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json')); -+ $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'; -+ $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f)); - - 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 2022-01-25 09:39:15.000000000 +0100 -+++ ./tests/Composer/Test/PolyfillTestCase.php 2022-01-25 09:50:21.373957265 +0100 -@@ -15,10 +15,35 @@ namespace Composer\Test { - use PHPUnit\Framework\Constraint\LogicalNot; - use PHPUnit\Framework\Constraint\StringContains; - -- if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) { -+ if (method_exists('PHPUnit\Framework\TestCase', 'assertFileDoesNotExist')) { - abstract class PolyfillTestCase extends TestCase - { - } -+ } else if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) { -+ abstract class PolyfillTestCase extends TestCase { -+ /** -+ * @param string $filename -+ * @param string $message -+ * -+ * @return void -+ */ -+ public static function assertFileDoesNotExist($filename, $message = '') -+ { -+ static::assertFileNotExists($filename, $message); -+ } -+ -+ /** -+ * @param string $pattern -+ * @param string $string -+ * @param string $message -+ * -+ * @return void -+ */ -+ public static function assertMatchesRegularExpression($pattern, $string, $message = '') -+ { -+ static::assertRegExp($pattern, $string, $message); -+ } -+ } - } else { - abstract class PolyfillTestCase extends TestCase - { 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 2022-01-25 09:50:57.595802751 +0100 -+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2022-01-25 09:51:36.038638770 +0100 +--- ./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 @@ -125,7 +125,7 @@ class CaBundle */ public static function getBundledCaBundlePath() @@ -141,3 +88,16 @@ 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 +@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas + private function check(string $json) + { + $validator = new Validator(); +- $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json')); ++ $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'; ++ $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f)); + + if (!$validator->isValid()) { + $errors = $validator->getErrors(); diff --git a/composer.spec b/composer.spec index 22ba34b..a458362 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%if 0%{?fedora} +%if 0 %bcond_without tests %bcond_without syslib %else @@ -18,21 +18,21 @@ %bcond_with syslib %endif -%global gh_commit 18f748df692b6304b5baf077786c003c48e7f990 +%global gh_commit 36dc875e1c6d5ce9411c78aae22b33ac24c86e13 %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 api_version 2.2.0 +%global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.2.10 -#global upstream_prever RC1 -#global upstream_lower rc1 +%global upstream_version 2.3.0 +#global upstream_prever RC2 +#global upstream_lower rc2 -%global symfony_prefix php-symfony4 -%global symfony_path %{_datadir}/php/Symfony4 -%global symfony_min 4.4 +%global symfony_prefix php-symfony5 +%global symfony_path %{_datadir}/php/Symfony5 +%global symfony_min 5.4.1 %global _phpunit %{_bindir}/phpunit9 @@ -66,13 +66,13 @@ 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) >= 2.0 with php-composer(composer/xdebug-handler) < 4) +BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0.2 with php-composer(composer/xdebug-handler) < 4) BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) -BuildRequires: (php-composer(seld/phar-utils) >= 1.1 with php-composer(seld/phar-utils) < 2) -BuildRequires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) +BuildRequires: (php-composer(seld/phar-utils) >= 1.2 with php-composer(seld/phar-utils) < 2) +BuildRequires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 4) 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: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) +BuildRequires: (php-composer(composer/pcre) >= 2 with php-composer(composer/pcre) < 4) BuildRequires: %{symfony_prefix}-console >= %{symfony_min} BuildRequires: %{symfony_prefix}-finder >= %{symfony_min} BuildRequires: %{symfony_prefix}-filesystem >= %{symfony_min} @@ -87,22 +87,24 @@ BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require": { -# "php": "^5.3.2 || ^7.0", +# "php": "^7.2.5 || ^8.0", # "composer/ca-bundle": "^1.0", # "composer/metadata-minifier": "^1.0", # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", -# "composer/xdebug-handler": "^2.0 || ^3.0", +# "composer/xdebug-handler": "^2.0.2 || ^3.0.3", # "justinrainbow/json-schema": "^5.2.11", -# "psr/log": "^1.0 || ^2.0" +# "psr/log": "^1.0 || ^2.0 || ^3.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 || ^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", -# "composer/pcre": "^1.0" +# "seld/phar-utils": "^1.2", +# "symfony/console": "^5.4.1 || ^6.0", +# "symfony/filesystem": "^5.4 || ^6.0", +# "symfony/finder": "^5.4 || ^6.0", +# "symfony/process": "^5.4 || ^6.0", +# "react/promise": "^2.8", +# "composer/pcre": "^2 || ^3" +# "symfony/polyfill-php73": "^1.24", +# "symfony/polyfill-php80": "^1.24" Requires: php(language) >= 7.2.5 Requires: php-cli %if %{with syslib} @@ -110,13 +112,13 @@ 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) >= 2.0 with php-composer(composer/xdebug-handler) < 4) +Requires: (php-composer(composer/xdebug-handler) >= 2.0.2 with php-composer(composer/xdebug-handler) < 4) Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) -Requires: (php-composer(seld/phar-utils) >= 1.1 with php-composer(seld/phar-utils) < 2) -Requires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) +Requires: (php-composer(seld/phar-utils) >= 1.2 with php-composer(seld/phar-utils) < 2) +Requires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 4) 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: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) +Requires: (php-composer(composer/pcre) >= 2 with php-composer(composer/pcre) < 4) Requires: %{symfony_prefix}-console >= %{symfony_min} Requires: %{symfony_prefix}-finder >= %{symfony_min} Requires: %{symfony_prefix}-process >= %{symfony_min} @@ -129,7 +131,7 @@ Requires: ca-certificates # Bundled libraries Provides: bundled(php-composer-ca-bundle) = 1.3.1 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 1.0.1 +Provides: bundled(php-composer-pcre) = 2.0.0 Provides: bundled(php-composer-semver) = 3.3.1 Provides: bundled(php-composer-spdx-licenses) = 1.5.6 Provides: bundled(php-composer-xdebug-handler) = 3.0.3 @@ -232,8 +234,11 @@ 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/Pcre/autoload.php', [ + '%{_datadir}/php/Composer/Pcre3/autoload.php', + '%{_datadir}/php/Composer/Pcre2/autoload.php', + ], [ + '%{_datadir}/php/Psr/Log3/autoload.php', '%{_datadir}/php/Psr/Log2/autoload.php', '%{_datadir}/php/Psr/Log/autoload.php', ], @@ -376,6 +381,11 @@ exit $ret %changelog +* Wed Mar 30 2022 Remi Collet - 2.3.0-1 +- update to 2.3.0 +- always use bundled libraries + as symfony/* 5.4 and composer/pcre 2 are not available + * Wed Mar 30 2022 Remi Collet - 2.2.10-1 - update to 2.2.10 diff --git a/sources b/sources index 9cd962e..33adfba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.10-18f748d.tgz) = 405b94c57ac4d4ee06269a952fd22bc7842bb6917c050987285f789332716d7e6dc84f644a5b85b4b6f6a6657329c28c6bffd012ad9f9314882c0983e29b30c5 +SHA512 (composer-2.3.0-36dc875.tgz) = da303468ed7c6bbf032289f6804480306a4ae0d3a41861bb83506b2c92b8d39c64cb5abd56c8134f047cc74348240696e0993cb12c2901c51d48569d20fca257 From aa563f58c745e850a94fb6778ba30982d7b086d9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 31 Mar 2022 07:50:37 +0200 Subject: [PATCH 061/126] v2.3.2 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index a458362..944335e 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 36dc875e1c6d5ce9411c78aae22b33ac24c86e13 +%global gh_commit c3777ea50f5ad561d4796b42fba4d180bb45cf77 %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.0 +%global upstream_version 2.3.2 #global upstream_prever RC2 #global upstream_lower rc2 @@ -381,6 +381,9 @@ exit $ret %changelog +* Thu Mar 31 2022 Remi Collet - 2.3.2-1 +- update to 2.3.2 + * Wed Mar 30 2022 Remi Collet - 2.3.0-1 - update to 2.3.0 - always use bundled libraries diff --git a/sources b/sources index 33adfba..28d0e86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.0-36dc875.tgz) = da303468ed7c6bbf032289f6804480306a4ae0d3a41861bb83506b2c92b8d39c64cb5abd56c8134f047cc74348240696e0993cb12c2901c51d48569d20fca257 +SHA512 (composer-2.3.2-c3777ea.tgz) = d86dfd652e4fe7f67763c0e8bdc927954081310813fa92094261afdf7fbd63f84a241a8a4def6c1e1fedaabd40638f4be34d960940904cf2a01c2dcf26315248 From eff5be53fb68eb005dcced158f8c87f0b858181a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Apr 2022 08:14:48 +0200 Subject: [PATCH 062/126] v2.3.3 --- composer.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer.spec b/composer.spec index 944335e..0496750 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit c3777ea50f5ad561d4796b42fba4d180bb45cf77 +%global gh_commit b0024890b8650e52d1a29822856b3c95aa393785 %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.2 +%global upstream_version 2.3.3 #global upstream_prever RC2 #global upstream_lower rc2 @@ -132,14 +132,14 @@ Requires: ca-certificates Provides: bundled(php-composer-ca-bundle) = 1.3.1 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 2.0.0 -Provides: bundled(php-composer-semver) = 3.3.1 +Provides: bundled(php-composer-semver) = 3.3.2 Provides: bundled(php-composer-spdx-licenses) = 1.5.6 Provides: bundled(php-composer-xdebug-handler) = 3.0.3 Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-react-promise) = v2.9.0 -Provides: bundled(php-seld-jsonlint) = 1.8.3 +Provides: bundled(php-seld-jsonlint) = 1.9.0 Provides: bundled(php-seld-phar-utils) = 1.2.0 Provides: bundled(php-symfony-console) = v5.4.5 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 @@ -381,6 +381,9 @@ exit $ret %changelog +* Sat Apr 2 2022 Remi Collet - 2.3.3-1 +- update to 2.3.3 + * Thu Mar 31 2022 Remi Collet - 2.3.2-1 - update to 2.3.2 diff --git a/sources b/sources index 28d0e86..50cfe3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.2-c3777ea.tgz) = d86dfd652e4fe7f67763c0e8bdc927954081310813fa92094261afdf7fbd63f84a241a8a4def6c1e1fedaabd40638f4be34d960940904cf2a01c2dcf26315248 +SHA512 (composer-2.3.3-b002489.tgz) = 2e4d88a6a8a7561847d9f81a1aa2cede467591250e50a1208502e2d708d5165432d3ab1cf4cd9a15f30f882092727d545fa8deaae97d079500c85ad1c70b2e07 From aaad9a1ed5d95d238d6134789041947ec7ef767a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Apr 2022 07:58:02 +0200 Subject: [PATCH 063/126] v2.3.4 --- composer.spec | 17 ++++++++++------- sources | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/composer.spec b/composer.spec index 0496750..e61d6ac 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit b0024890b8650e52d1a29822856b3c95aa393785 +%global gh_commit b7a041319947872c4352aa8139f4b4d6dea7130f %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.3 +%global upstream_version 2.3.4 #global upstream_prever RC2 #global upstream_lower rc2 @@ -141,9 +141,9 @@ 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.5 -Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 -Provides: bundled(php-symfony-filesystem) = v5.4.6 +Provides: bundled(php-symfony-console) = v5.4.7 +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-polyfill-ctype) = v1.25.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.25.0 @@ -151,8 +151,8 @@ 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.5 -Provides: bundled(php-symfony-service-contracts) = v2.5.0 +Provides: bundled(php-symfony-process) = v5.4.7 +Provides: bundled(php-symfony-service-contracts) = v2.5.1 Provides: bundled(php-symfony-string) = v5.4.3 %endif # From composer.json, suggest @@ -381,6 +381,9 @@ exit $ret %changelog +* Fri Apr 8 2022 Remi Collet - 2.3.4-1 +- update to 2.3.4 + * Sat Apr 2 2022 Remi Collet - 2.3.3-1 - update to 2.3.3 diff --git a/sources b/sources index 50cfe3d..120f05c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.3-b002489.tgz) = 2e4d88a6a8a7561847d9f81a1aa2cede467591250e50a1208502e2d708d5165432d3ab1cf4cd9a15f30f882092727d545fa8deaae97d079500c85ad1c70b2e07 +SHA512 (composer-2.3.4-b7a0413.tgz) = 8d9d68511f06c090f6a512d1efdf042c02b3ccb5431c2feb270735e29c80b39f2bb4bc88347eac1e75b2331ac13efaa99e06dffd7bc6949a209dddfaeb591ec1 From ac236cf433188d9d75b4f2a2ef85e3a6ca277c00 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 14 Apr 2022 07:24:37 +0200 Subject: [PATCH 064/126] v2.3.5 --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index e61d6ac..22a64f4 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit b7a041319947872c4352aa8139f4b4d6dea7130f +%global gh_commit 50c47b1f907cfcdb8f072b88164d22b527557ae1 %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.4 +%global upstream_version 2.3.5 #global upstream_prever RC2 #global upstream_lower rc2 @@ -135,7 +135,7 @@ 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-xdebug-handler) = 3.0.3 -Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 +Provides: bundled(php-justinrainbow-json-schema) = 5.2.12 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-react-promise) = v2.9.0 @@ -381,6 +381,9 @@ exit $ret %changelog +* Thu Apr 14 2022 Remi Collet - 2.3.5-1 +- update to 2.3.5 + * Fri Apr 8 2022 Remi Collet - 2.3.4-1 - update to 2.3.4 diff --git a/sources b/sources index 120f05c..121a896 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.4-b7a0413.tgz) = 8d9d68511f06c090f6a512d1efdf042c02b3ccb5431c2feb270735e29c80b39f2bb4bc88347eac1e75b2331ac13efaa99e06dffd7bc6949a209dddfaeb591ec1 +SHA512 (composer-2.3.5-50c47b1.tgz) = 9043ff987a122d7f820a7e18d00d09102253e8d9e056503df766e58382ee39ef2b016753f9ec9601f78202e8b6553e3b9117ddabbb1a83414972090704eb68f4 From 47a00de7039a50b759ad450170714b49d0fbbdae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Jun 2022 07:10:29 +0200 Subject: [PATCH 065/126] v2.3.6 --- composer.spec | 35 +++++++++++++++++++++-------------- sources | 2 +- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/composer.spec b/composer.spec index 22a64f4..093a47c 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 @@ -129,11 +129,12 @@ Requires: php-composer(fedora/autoloader) # System certificates Requires: ca-certificates # Bundled libraries -Provides: bundled(php-composer-ca-bundle) = 1.3.1 +# License MIT +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 @@ -141,19 +142,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", @@ -268,13 +269,16 @@ php -r ' echo "cant decode json file\n"; exit(3); } - $lic = []; + $res = []; foreach($pkgs["packages"] as $pkg) { - printf("Provides: bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); - $lic = array_merge($lic, $pkg["license"]); + $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"]); + } + foreach($res as $lic => $lib) { + sort($lib); + printf("# License %s\n%s\n", $lic, implode("\n", $lib)); } - sort($lic); - printf("\nLicense: %s\n\n", implode(" and ", array_unique($lic))); ' %endif @@ -381,6 +385,9 @@ exit $ret %changelog +* Thu Jun 2 2022 Remi Collet - 2.3.6-1 +- update to 2.3.6 + * Thu Apr 14 2022 Remi Collet - 2.3.5-1 - update to 2.3.5 diff --git a/sources b/sources index 121a896..9c604a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.5-50c47b1.tgz) = 9043ff987a122d7f820a7e18d00d09102253e8d9e056503df766e58382ee39ef2b016753f9ec9601f78202e8b6553e3b9117ddabbb1a83414972090704eb68f4 +SHA512 (composer-2.3.6-0f43aa1.tgz) = 79f3cb8b0b67efce643e2e4c6d452d6e39892463e7808e7cb756a51a26263b818b57b0938b6881d706928fbb65dbaa7b3bada58a314f8bc96715a547084c2b46 From 2f15f97b4402fa2d1ac969d8bda1f31e62cbcc22 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Jun 2022 07:14:47 +0200 Subject: [PATCH 066/126] refresh patch --- composer-rpm.patch | 48 +++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 18 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) { From d6eab73de5f824170a7735465b3b37b9ba3406b5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 7 Jun 2022 07:00:41 +0200 Subject: [PATCH 067/126] v2.3.7 --- composer.spec | 19 +++++++++++-------- sources | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/composer.spec b/composer.spec index 093a47c..1ca8a03 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 0f43aa1652c447a6bc7c9217ec133313b1d32e72 +%global gh_commit 10cd375cf85dede2ff417ceab517ef9a0dc55407 %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.6 +%global upstream_version 2.3.7 #global upstream_prever RC2 #global upstream_lower rc2 @@ -146,12 +146,12 @@ Provides: bundled(php-symfony-console) = v5.4.9 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.1 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-polyfill-ctype) = v1.26.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.26.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 Provides: bundled(php-symfony-process) = v5.4.8 Provides: bundled(php-symfony-service-contracts) = v2.5.1 Provides: bundled(php-symfony-string) = v5.4.9 @@ -385,6 +385,9 @@ exit $ret %changelog +* Tue Jun 7 2022 Remi Collet - 2.3.7-1 +- update to 2.3.7 + * Thu Jun 2 2022 Remi Collet - 2.3.6-1 - update to 2.3.6 diff --git a/sources b/sources index 9c604a3..9162311 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.6-0f43aa1.tgz) = 79f3cb8b0b67efce643e2e4c6d452d6e39892463e7808e7cb756a51a26263b818b57b0938b6881d706928fbb65dbaa7b3bada58a314f8bc96715a547084c2b46 +SHA512 (composer-2.3.7-10cd375.tgz) = 7b260d2d54c02c421d3e229128f4004a9a06fb43b5c3ec7251aa77618575192a3b471e84b80777cd6a6111936ad115ea25a3c0018c4f59c0c0c03c316b8ac5bb From 6a0116f61bb2118dce9cb15c802ad088d77aa8ee Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Jul 2022 14:05:08 +0200 Subject: [PATCH 068/126] update to 2.3.8 add bash completion file (for upcoming 2.4) --- composer-bash-completion | 81 ++++++++++++++++++++++++++++++++++++++++ composer.spec | 23 +++++++++--- sources | 2 +- 3 files changed, 99 insertions(+), 7 deletions(-) create mode 100644 composer-bash-completion diff --git a/composer-bash-completion b/composer-bash-completion new file mode 100644 index 0000000..f24f512 --- /dev/null +++ b/composer-bash-completion @@ -0,0 +1,81 @@ +# This file is part of the Symfony package. +# +# (c) Fabien Potencier +# +# For the full copyright and license information, please view +# https://symfony.com/doc/current/contributing/code/license.html + +_sf_composer() { + # Use newline as only separator to allow space in completion values + IFS=$'\n' + local sf_cmd="${COMP_WORDS[0]}" + + # for an alias, get the real script behind it + if [[ $(type -t $sf_cmd) == "alias" ]]; then + sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/") + fi + + if [ ! -f "$sf_cmd" ]; then + return 1 + fi + + local cur prev words cword + _get_comp_words_by_ref -n := cur prev words cword + + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.8") + for w in ${words[@]}; do + w=$(printf -- '%b' "$w") + # remove quotes from typed values + quote="${w:0:1}" + if [ "$quote" == \' ]; then + w="${w%\'}" + w="${w#\'}" + elif [ "$quote" == \" ]; then + w="${w%\"}" + w="${w#\"}" + fi + # empty values are ignored + if [ ! -z "$w" ]; then + completecmd+=("-i$w") + fi + done + + local sfcomplete + if sfcomplete=$(${completecmd[@]} 2>&1); then + local quote suggestions + quote=${cur:0:1} + + # Use single quotes by default if suggestions contains backslash (FQCN) + if [ "$quote" == '' ] && [[ "$sfcomplete" =~ \\ ]]; then + quote=\' + fi + + if [ "$quote" == \' ]; then + # single quotes: no additional escaping (does not accept ' in values) + suggestions=$(for s in $sfcomplete; do printf $'%q%q%q\n' "$quote" "$s" "$quote"; done) + elif [ "$quote" == \" ]; then + # double quotes: double escaping for \ $ ` " + suggestions=$(for s in $sfcomplete; do + s=${s//\\/\\\\} + s=${s//\$/\\\$} + s=${s//\`/\\\`} + s=${s//\"/\\\"} + printf $'%q%q%q\n' "$quote" "$s" "$quote"; + done) + else + # no quotes: double escaping + suggestions=$(for s in $sfcomplete; do printf $'%q\n' $(printf '%q' "$s"); done) + fi + COMPREPLY=($(IFS=$'\n' compgen -W "$suggestions" -- $(printf -- "%q" "$cur"))) + __ltrim_colon_completions "$cur" + else + if [[ "$sfcomplete" != *"Command \"_complete\" is not defined."* ]]; then + >&2 echo + >&2 echo $sfcomplete + fi + + return 1 + fi +} + +complete -F _sf_composer composer diff --git a/composer.spec b/composer.spec index 1ca8a03..a100a10 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 10cd375cf85dede2ff417ceab517ef9a0dc55407 +%global gh_commit f69e63262dadd02b3b6edade339c7badda2939c2 %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.7 +%global upstream_version 2.3.8 #global upstream_prever RC2 #global upstream_lower rc2 @@ -35,6 +35,9 @@ %global symfony_min 5.4.1 %global _phpunit %{_bindir}/phpunit9 +%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) +%global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) + Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} @@ -46,6 +49,7 @@ License: MIT URL: https://getcomposer.org/ Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz # Profile scripts +Source1: %{name}-bash-completion Source3: %{name}.sh Source4: %{name}.csh # Get a git snapshot to retrieve the test suite @@ -61,6 +65,7 @@ BuildArch: noarch BuildRequires: php(language) >= 7.2.5 BuildRequires: php-cli BuildRequires: php-json +BuildRequires: pkgconfig(bash-completion) %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) @@ -142,8 +147,8 @@ 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.9 -Provides: bundled(php-symfony-deprecation-contracts) = v2.5.1 +Provides: bundled(php-symfony-console) = v5.4.10 +Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 Provides: bundled(php-symfony-filesystem) = v5.4.9 Provides: bundled(php-symfony-finder) = v5.4.8 Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 @@ -153,8 +158,8 @@ Provides: bundled(php-symfony-polyfill-mbstring) = v1.26.0 Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 Provides: bundled(php-symfony-process) = v5.4.8 -Provides: bundled(php-symfony-service-contracts) = v2.5.1 -Provides: bundled(php-symfony-string) = v5.4.9 +Provides: bundled(php-symfony-service-contracts) = v2.5.2 +Provides: bundled(php-symfony-string) = v5.4.10 %endif # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -315,6 +320,7 @@ if (version_compare(Composer::RUNTIME_API_VERSION, "%{run_version}")) { %install : Profile scripts +install -Dpm 644 %{SOURCE1} %{buildroot}%{bashcompdir}/%{name} mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/ @@ -382,9 +388,14 @@ exit $ret %{_bindir}/%{name} %{_datadir}/php/Composer %{_datadir}/%{name} +%{bashcomproot} %changelog +* Fri Jul 1 2022 Remi Collet - 2.3.8-1 +- update to 2.3.8 +- add bash completion file (for upcoming 2.4) + * Tue Jun 7 2022 Remi Collet - 2.3.7-1 - update to 2.3.7 diff --git a/sources b/sources index 9162311..bcadacc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.7-10cd375.tgz) = 7b260d2d54c02c421d3e229128f4004a9a06fb43b5c3ec7251aa77618575192a3b471e84b80777cd6a6111936ad115ea25a3c0018c4f59c0c0c03c316b8ac5bb +SHA512 (composer-2.3.8-f69e632.tgz) = 1a06aecceb68863b283fd2d8cb9f0e85702c491b0ac7719ef36f4b12a7040c4f92506d2414f6ff7a38d14120f7ff06ae871d57676623ba86f20d9b377f4dd828 From c3d8b5a6ffe6b54b5507705344963668efa1859b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Jul 2022 17:47:15 +0200 Subject: [PATCH 069/126] v2.3.9 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index f24f512..e534faf 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -22,7 +22,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.8") + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.9") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index a100a10..58cebcb 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit f69e63262dadd02b3b6edade339c7badda2939c2 +%global gh_commit 015f524c9969255a29cdea8890cbd4fec240ee47 %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.8 +%global upstream_version 2.3.9 #global upstream_prever RC2 #global upstream_lower rc2 @@ -392,6 +392,9 @@ exit $ret %changelog +* Tue Jul 5 2022 Remi Collet - 2.3.9-1 +- update to 2.3.9 + * Fri Jul 1 2022 Remi Collet - 2.3.8-1 - update to 2.3.8 - add bash completion file (for upcoming 2.4) diff --git a/sources b/sources index bcadacc..1cd526d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.8-f69e632.tgz) = 1a06aecceb68863b283fd2d8cb9f0e85702c491b0ac7719ef36f4b12a7040c4f92506d2414f6ff7a38d14120f7ff06ae871d57676623ba86f20d9b377f4dd828 +SHA512 (composer-2.3.9-015f524.tgz) = ecbbdf518326c512ceef1649374ab99b609e461a1dee140474615d4efd523bb77d0eed0b52af22bc666356a8c399e2350d015a31ebe8fb6ab7271bce40fe7c16 From 8e2a752dada81fff679a2eade745330f6cbf1c6c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Jul 2022 08:06:21 +0200 Subject: [PATCH 070/126] v2.3.10 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index e534faf..5d484cc 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -22,7 +22,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.9") + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.10") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 58cebcb..b252516 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 015f524c9969255a29cdea8890cbd4fec240ee47 +%global gh_commit ebac357c0a41359f3981098729042ed6dedc97ba %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.9 +%global upstream_version 2.3.10 #global upstream_prever RC2 #global upstream_lower rc2 @@ -392,6 +392,9 @@ exit $ret %changelog +* Thu Jul 14 2022 Remi Collet - 2.3.10-1 +- update to 2.3.10 + * Tue Jul 5 2022 Remi Collet - 2.3.9-1 - update to 2.3.9 diff --git a/sources b/sources index 1cd526d..038e012 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.9-015f524.tgz) = ecbbdf518326c512ceef1649374ab99b609e461a1dee140474615d4efd523bb77d0eed0b52af22bc666356a8c399e2350d015a31ebe8fb6ab7271bce40fe7c16 +SHA512 (composer-2.3.10-ebac357.tgz) = 22302bfb5bb03f87567eda1fcfe906b049d43ff43862472405d13f6af472b1452834d09cb944753b740950c2d98911e6af72bb7b771c048a26cdb165b0c73659 From 14a0ac923c2c0928b48e79f943d1cb3d233bbab4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:27:32 +0000 Subject: [PATCH 071/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- composer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index b252516..ffdfbd6 100644 --- a/composer.spec +++ b/composer.spec @@ -41,7 +41,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP # composer and all dependencies are MIT @@ -392,6 +392,9 @@ exit $ret %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 2.3.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jul 14 2022 Remi Collet - 2.3.10-1 - update to 2.3.10 From 6384f21cf8f25ed9b1a5e4c4fa94ab63bd03b2fa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 16 Aug 2022 16:56:14 +0200 Subject: [PATCH 072/126] v2.4.0 --- composer-bash-completion | 6 ++++-- composer.spec | 27 ++++++++++++++++----------- sources | 2 +- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 5d484cc..713cb2f 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -13,16 +13,18 @@ _sf_composer() { # for an alias, get the real script behind it if [[ $(type -t $sf_cmd) == "alias" ]]; then sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/") + else + sf_cmd=$(type -p $sf_cmd) fi - if [ ! -f "$sf_cmd" ]; then + if [ ! -x "$sf_cmd" ]; then return 1 fi local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.10") + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.0") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index ffdfbd6..44a1cd5 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit ebac357c0a41359f3981098729042ed6dedc97ba +%global gh_commit 026d6de6ea2c913974a7756661a3faac135cb36e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -26,9 +26,9 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.3.10 -#global upstream_prever RC2 -#global upstream_lower rc2 +%global upstream_version 2.4.0 +#global upstream_prever RC1 +#global upstream_lower rc1 %global symfony_prefix php-symfony5 %global symfony_path %{_datadir}/php/Symfony5 @@ -41,7 +41,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP # composer and all dependencies are MIT @@ -135,7 +135,8 @@ Requires: php-composer(fedora/autoloader) Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.3.2 +Provides: bundled(php-composer-ca-bundle) = 1.3.3 +Provides: bundled(php-composer-class-map-generator) = 1.0.0 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 @@ -147,19 +148,20 @@ 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.10 +Provides: bundled(php-seld-signal-handler) = 2.0.1 +Provides: bundled(php-symfony-console) = v5.4.11 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.9 -Provides: bundled(php-symfony-finder) = v5.4.8 +Provides: bundled(php-symfony-filesystem) = v5.4.11 +Provides: bundled(php-symfony-finder) = v5.4.11 Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0 Provides: bundled(php-symfony-polyfill-mbstring) = v1.26.0 Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 -Provides: bundled(php-symfony-process) = v5.4.8 +Provides: bundled(php-symfony-process) = v5.4.11 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.10 +Provides: bundled(php-symfony-string) = v5.4.11 %endif # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -392,6 +394,9 @@ exit $ret %changelog +* Tue Aug 16 2022 Remi Collet - 2.4.0-1 +- update to 2.4.0 + * Wed Jul 20 2022 Fedora Release Engineering - 2.3.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 038e012..b2cfab4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.10-ebac357.tgz) = 22302bfb5bb03f87567eda1fcfe906b049d43ff43862472405d13f6af472b1452834d09cb944753b740950c2d98911e6af72bb7b771c048a26cdb165b0c73659 +SHA512 (composer-2.4.0-026d6de.tgz) = 211f756843980a5935f03c544086a3045f323c983dfd7aaa2630f0c4c6db8d60de60de6f928a97d360a83c82f62afcfbc7ea13aaf44a673f0bb186b007e44529 From fc3013e4b46f39bd31c7d26a99a7700681e94573 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Sep 2022 10:31:49 +0200 Subject: [PATCH 073/126] v2.4.1 --- composer-bash-completion | 2 +- composer.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 713cb2f..4aed20f 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -24,7 +24,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.0") + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.1") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 44a1cd5..87ecfe6 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 026d6de6ea2c913974a7756661a3faac135cb36e +%global gh_commit 777d542e3af65f8e7a66a4d98ce7a697da339414 %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.4.0 +%global upstream_version 2.4.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -149,9 +149,9 @@ 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-seld-signal-handler) = 2.0.1 -Provides: bundled(php-symfony-console) = v5.4.11 +Provides: bundled(php-symfony-console) = v5.4.12 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.11 +Provides: bundled(php-symfony-filesystem) = v5.4.12 Provides: bundled(php-symfony-finder) = v5.4.11 Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 @@ -161,7 +161,7 @@ Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 Provides: bundled(php-symfony-process) = v5.4.11 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.11 +Provides: bundled(php-symfony-string) = v5.4.12 %endif # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -394,6 +394,9 @@ exit $ret %changelog +* Mon Aug 29 2022 Remi Collet - 2.4.1-1 +- update to 2.4.1 + * Tue Aug 16 2022 Remi Collet - 2.4.0-1 - update to 2.4.0 diff --git a/sources b/sources index b2cfab4..2502211 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.4.0-026d6de.tgz) = 211f756843980a5935f03c544086a3045f323c983dfd7aaa2630f0c4c6db8d60de60de6f928a97d360a83c82f62afcfbc7ea13aaf44a673f0bb186b007e44529 +SHA512 (composer-2.4.1-777d542.tgz) = 64b3f4d729af225004351c9a5cbb4c763f127b25af7e5b7961bd2db1051b1656bef3f42c3f9d359d030d674a8de908b78b98230a3ada9820c8c6794bfdc90b85 From a234b22f2d347aca63eaae88699b202048a78cea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Sep 2022 10:32:36 +0200 Subject: [PATCH 074/126] refresh patch for 2.4.1 --- composer-rpm.patch | 48 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/composer-rpm.patch b/composer-rpm.patch index 5cfb149..224503a 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2022-06-02 06:47:42.000000000 +0200 -+++ ./bin/composer 2022-06-02 06:49:45.037192985 +0200 +--- ./bin/composer.rpm 2022-08-29 07:36:37.000000000 +0200 ++++ ./bin/composer 2022-08-29 07:36:45.053967617 +0200 @@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) { } @@ -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-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; +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2022-08-29 07:36:45.053967617 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2022-08-29 07:38:03.936134475 +0200 +@@ -431,7 +431,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'); @@ -21,11 +21,11 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo + $filesystem->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE'); if ($this->runScripts) { - $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array( + $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, [], [ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ---- ./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 +--- ./src/Composer/Compiler.php.rpm 2022-08-29 07:36:37.000000000 +0200 ++++ ./src/Composer/Compiler.php 2022-08-29 07:36:45.053967617 +0200 +@@ -106,7 +106,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/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php ---- ./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 +--- ./src/Composer/InstalledVersions.php.rpm 2022-08-29 07:36:37.000000000 +0200 ++++ ./src/Composer/InstalledVersions.php 2022-08-29 07:36:45.053967617 +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,8 +56,8 @@ 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-06-02 06:47:42.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2022-06-02 06:49:45.037192985 +0200 +--- ./src/Composer/Json/JsonFile.php.rpm 2022-08-29 07:36:37.000000000 +0200 ++++ ./src/Composer/Json/JsonFile.php 2022-08-29 07:36:45.053967617 +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; -@@ -219,7 +219,7 @@ class JsonFile +@@ -216,7 +216,7 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { $isComposerSchemaFile = true; @@ -77,9 +77,9 @@ 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 +--- ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm 2022-08-29 07:36:37.000000000 +0200 ++++ ./src/Composer/PHPStan/ConfigReturnTypeExtension.php 2022-08-29 07:36:45.054967614 +0200 +@@ -39,7 +39,7 @@ final class ConfigReturnTypeExtension im public function __construct() { @@ -89,8 +89,8 @@ diff -up ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm ./src/Composer * @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 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 +--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm 2022-07-20 09:14:26.000000000 +0200 ++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2022-08-29 07:36:45.054967614 +0200 @@ -125,7 +125,7 @@ class CaBundle */ public static function getBundledCaBundlePath() @@ -101,15 +101,15 @@ 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-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 +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2022-08-29 07:36:45.054967614 +0200 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2022-08-29 07:39:34.814922582 +0200 +@@ -96,7 +96,8 @@ class ComposerSchemaTest extends TestCas private function check(string $json) { $validator = new Validator(); -- $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json')); +- $validator->check(json_decode($json), (object) ['$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json']); + $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'; -+ $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f)); ++ $validator->check(json_decode($json), (object) ['$ref' => 'file://' . $f]); if (!$validator->isValid()) { $errors = $validator->getErrors(); From cb8a0525a5d61d772e49be21d3617d9e2d1ee85c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 Sep 2022 08:00:55 +0200 Subject: [PATCH 075/126] v2.4.2 --- composer-bash-completion | 2 +- composer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 4aed20f..d103438 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -24,7 +24,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.1") + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.2") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 87ecfe6..c96f904 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 777d542e3af65f8e7a66a4d98ce7a697da339414 +%global gh_commit 7d887621e69a0311eb50aed4a16f7044b2b385b9 %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.4.1 +%global upstream_version 2.4.2 #global upstream_prever RC1 #global upstream_lower rc1 @@ -147,7 +147,7 @@ Provides: bundled(php-psr-container) = 1.1.1 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-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.1 Provides: bundled(php-symfony-console) = v5.4.12 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 @@ -394,6 +394,9 @@ exit $ret %changelog +* Thu Sep 15 2022 Remi Collet - 2.4.2-1 +- update to 2.4.2 + * Mon Aug 29 2022 Remi Collet - 2.4.1-1 - update to 2.4.1 diff --git a/sources b/sources index 2502211..064adc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.4.1-777d542.tgz) = 64b3f4d729af225004351c9a5cbb4c763f127b25af7e5b7961bd2db1051b1656bef3f42c3f9d359d030d674a8de908b78b98230a3ada9820c8c6794bfdc90b85 +SHA512 (composer-2.4.2-7d88762.tgz) = 6fd59eb380a00621ca90052a46205bf20f0ad8b916721fb3806c6f2e84c073e77a7f7c29bc8c51ae81d042da9bd55db03fbd057665c7e93f0d66fa0e5e02fbf2 From a8d6f101ec4f4b811094600a8897d05aa962e418 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 Oct 2022 09:58:30 +0200 Subject: [PATCH 076/126] v2.4.3 --- composer.spec | 163 ++++---------------------------------------------- sources | 2 +- 2 files changed, 11 insertions(+), 154 deletions(-) diff --git a/composer.spec b/composer.spec index c96f904..3414455 100644 --- a/composer.spec +++ b/composer.spec @@ -10,15 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%if 0 -%bcond_without tests -%bcond_without syslib -%else -%bcond_with tests -%bcond_with syslib -%endif - -%global gh_commit 7d887621e69a0311eb50aed4a16f7044b2b385b9 +%global gh_commit b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -26,14 +18,10 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.4.2 +%global upstream_version 2.4.3 #global upstream_prever RC1 #global upstream_lower rc1 -%global symfony_prefix php-symfony5 -%global symfony_path %{_datadir}/php/Symfony5 -%global symfony_min 5.4.1 - %global _phpunit %{_bindir}/phpunit9 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) @@ -66,30 +54,6 @@ BuildRequires: php(language) >= 7.2.5 BuildRequires: php-cli BuildRequires: php-json BuildRequires: pkgconfig(bash-completion) -%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) -BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) -BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0.2 with php-composer(composer/xdebug-handler) < 4) -BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) -BuildRequires: (php-composer(seld/phar-utils) >= 1.2 with php-composer(seld/phar-utils) < 2) -BuildRequires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 4) -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: (php-composer(composer/pcre) >= 2 with php-composer(composer/pcre) < 4) -BuildRequires: %{symfony_prefix}-console >= %{symfony_min} -BuildRequires: %{symfony_prefix}-finder >= %{symfony_min} -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 || ^6.0", -# "phpspec/prophecy": "^1.10" -BuildRequires: %{_phpunit} -# For autoloader -BuildRequires: php-fedora-autoloader-devel -%endif # From composer.json, "require": { # "php": "^7.2.5 || ^8.0", @@ -112,30 +76,11 @@ BuildRequires: php-fedora-autoloader-devel # "symfony/polyfill-php80": "^1.24" Requires: php(language) >= 7.2.5 Requires: php-cli -%if %{with syslib} -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) >= 2.0.2 with php-composer(composer/xdebug-handler) < 4) -Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) -Requires: (php-composer(seld/phar-utils) >= 1.2 with php-composer(seld/phar-utils) < 2) -Requires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 4) -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: (php-composer(composer/pcre) >= 2 with php-composer(composer/pcre) < 4) -Requires: %{symfony_prefix}-console >= %{symfony_min} -Requires: %{symfony_prefix}-finder >= %{symfony_min} -Requires: %{symfony_prefix}-process >= %{symfony_min} -Requires: %{symfony_prefix}-filesystem >= %{symfony_min} -# For our autoloader -Requires: php-composer(fedora/autoloader) -%else # System certificates Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.3.3 +Provides: bundled(php-composer-ca-bundle) = 1.3.4 Provides: bundled(php-composer-class-map-generator) = 1.0.0 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 2.0.0 @@ -149,9 +94,9 @@ Provides: bundled(php-react-promise) = v2.9.0 Provides: bundled(php-seld-jsonlint) = 1.9.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.1 -Provides: bundled(php-symfony-console) = v5.4.12 +Provides: bundled(php-symfony-console) = v5.4.14 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.12 +Provides: bundled(php-symfony-filesystem) = v5.4.13 Provides: bundled(php-symfony-finder) = v5.4.11 Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 @@ -161,8 +106,8 @@ Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 Provides: bundled(php-symfony-process) = v5.4.11 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.12 -%endif +Provides: bundled(php-symfony-string) = v5.4.14 + # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", # "ext-zip": "Enabling the zip extension allows you to unzip archives", @@ -221,47 +166,6 @@ fi rm src/bootstrap.php rm src/Composer/vendor/composer/ca-bundle/res/cacert.pem -%if %{with syslib} -rm -rf src/Composer/vendor - -phpab --template fedora --output src/Composer/autoload.php src/Composer -cat << 'EOF' | tee -a src/Composer/autoload.php - -\Fedora\Autoloader\Dependencies::required([ - [ /* before symfony which load composer */ - '%{_datadir}/php/Composer/XdebugHandler3/autoload.php', - '%{_datadir}/php/Composer/XdebugHandler2/autoload.php', - ], - '%{symfony_path}/Component/Console/autoload.php', - '%{symfony_path}/Component/Finder/autoload.php', - '%{symfony_path}/Component/Process/autoload.php', - '%{symfony_path}/Component/Filesystem/autoload.php', - '%{_datadir}/php/Seld/JsonLint/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/Pcre3/autoload.php', - '%{_datadir}/php/Composer/Pcre2/autoload.php', - ], [ - '%{_datadir}/php/Psr/Log3/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', -]); -EOF - -cat << 'EOF' | tee tests/bootstrap.php - - 2.4.3-1 +- update to 2.4.3 + * Thu Sep 15 2022 Remi Collet - 2.4.2-1 - update to 2.4.2 diff --git a/sources b/sources index 064adc0..ca9254f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.4.2-7d88762.tgz) = 6fd59eb380a00621ca90052a46205bf20f0ad8b916721fb3806c6f2e84c073e77a7f7c29bc8c51ae81d042da9bd55db03fbd057665c7e93f0d66fa0e5e02fbf2 +SHA512 (composer-2.4.3-b34c0e9.tgz) = ce99508c2a534f3ef7c64c65308860b0c368ea8dcba7ad1f9e973783920280dda8a72923298e08e5f4b099d91c7e950d38acf2e3ef6989e659daf6dbd25fc211 From c35955528a4a498eeff121bab5d452d0b700aca8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 28 Oct 2022 07:45:42 +0200 Subject: [PATCH 077/126] v2.4.4 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index d103438..dba4a5c 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -24,7 +24,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.2") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.4.4") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 3414455..e836076 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4 +%global gh_commit e8d9087229bcdbc5867594d3098091412f1130cf %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.4.3 +%global upstream_version 2.4.4 #global upstream_prever RC1 #global upstream_lower rc1 @@ -248,6 +248,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Fri Oct 28 2022 Remi Collet - 2.4.4-1 +- update to 2.4.4 + * Sat Oct 15 2022 Remi Collet - 2.4.3-1 - update to 2.4.3 diff --git a/sources b/sources index ca9254f..523ef13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.4.3-b34c0e9.tgz) = ce99508c2a534f3ef7c64c65308860b0c368ea8dcba7ad1f9e973783920280dda8a72923298e08e5f4b099d91c7e950d38acf2e3ef6989e659daf6dbd25fc211 +SHA512 (composer-2.4.4-e8d9087.tgz) = 145ba3501d5f335b9f571f5320f92143258fcd11272882077be4496bcdcd60939d1585336c1fbab3d156157e0db3d5f34b5cd519d928ae27fa78089d7889fd3a From 0c41f6ede594dc194a304702011d30a70238af90 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Dec 2022 13:46:32 +0100 Subject: [PATCH 078/126] v2.5..0 --- composer-bash-completion | 9 +++++---- composer.spec | 28 ++++++++++++++++------------ sources | 2 +- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index dba4a5c..64aa6bb 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -11,20 +11,21 @@ _sf_composer() { local sf_cmd="${COMP_WORDS[0]}" # for an alias, get the real script behind it - if [[ $(type -t $sf_cmd) == "alias" ]]; then + sf_cmd_type=$(type -t $sf_cmd) + if [[ $sf_cmd_type == "alias" ]]; then sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/") - else + elif [[ $sf_cmd_type == "file" ]]; then sf_cmd=$(type -p $sf_cmd) fi - if [ ! -x "$sf_cmd" ]; then + if [[ $sf_cmd_type != "function" && ! -x $sf_cmd ]]; then return 1 fi local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.4.4") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.0") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index e836076..9188380 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit e8d9087229bcdbc5867594d3098091412f1130cf +%global gh_commit 09ef0e3acbb377f28927fa6a527c251da713ebac %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.4.4 +%global upstream_version 2.5.0 #global upstream_prever RC1 #global upstream_lower rc1 @@ -32,7 +32,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} Release: 1%{?dist} Summary: Dependency Manager for PHP -# composer and all dependencies are MIT +# SPDX: composer and all dependencies are MIT License: MIT URL: https://getcomposer.org/ Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz @@ -83,7 +83,7 @@ Requires: ca-certificates Provides: bundled(php-composer-ca-bundle) = 1.3.4 Provides: bundled(php-composer-class-map-generator) = 1.0.0 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 2.0.0 +Provides: bundled(php-composer-pcre) = 2.1.0 Provides: bundled(php-composer-semver) = 3.3.2 Provides: bundled(php-composer-spdx-licenses) = 1.5.7 Provides: bundled(php-composer-xdebug-handler) = 3.0.3 @@ -94,19 +94,20 @@ Provides: bundled(php-react-promise) = v2.9.0 Provides: bundled(php-seld-jsonlint) = 1.9.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.1 -Provides: bundled(php-symfony-console) = v5.4.14 +Provides: bundled(php-symfony-console) = v5.4.16 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 Provides: bundled(php-symfony-filesystem) = v5.4.13 Provides: bundled(php-symfony-finder) = v5.4.11 -Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.26.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 +Provides: bundled(php-symfony-polyfill-ctype) = v1.27.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.27.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.27.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.27.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.27.0 Provides: bundled(php-symfony-process) = v5.4.11 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.14 +Provides: bundled(php-symfony-string) = v5.4.15 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -248,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Tue Dec 20 2022 Remi Collet - 2.5.0-1 +- update to 2.5.0 + * Fri Oct 28 2022 Remi Collet - 2.4.4-1 - update to 2.4.4 diff --git a/sources b/sources index 523ef13..0d0cd44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.4.4-e8d9087.tgz) = 145ba3501d5f335b9f571f5320f92143258fcd11272882077be4496bcdcd60939d1585336c1fbab3d156157e0db3d5f34b5cd519d928ae27fa78089d7889fd3a +SHA512 (composer-2.5.0-09ef0e3.tgz) = 19ab32ab92ce2fbed7a7b26cc22db0ab9fb082243077a65250e24cfd8a6c2b0b74d2ff241ead598dcb245b7aa670901db30750c5cb7ff379f055efc5b639d31e From 36824f75ab5d7e3d6360cfe253ec94a8eb1cf1c6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 Dec 2022 16:25:10 +0100 Subject: [PATCH 079/126] v2.5.1 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 64aa6bb..76b1486 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.0") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.1") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 9188380..708303f 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 09ef0e3acbb377f28927fa6a527c251da713ebac +%global gh_commit 923278ad13e1621946eb76ab2882655d2cc396a4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.5.0 +%global upstream_version 2.5.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Thu Dec 22 2022 Remi Collet - 2.5.1-1 +- update to 2.5.1 + * Tue Dec 20 2022 Remi Collet - 2.5.0-1 - update to 2.5.0 diff --git a/sources b/sources index 0d0cd44..cb9b58d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.5.0-09ef0e3.tgz) = 19ab32ab92ce2fbed7a7b26cc22db0ab9fb082243077a65250e24cfd8a6c2b0b74d2ff241ead598dcb245b7aa670901db30750c5cb7ff379f055efc5b639d31e +SHA512 (composer-2.5.1-923278a.tgz) = 3e8a54ea96982ec6e3ae8afdabc60b88abae05e96561536e444ef5b75aac543284cad90458ae78e4d6e0dbc129fde4b345533db1823b27f5404021dd62cb865b From 0617a5ee92a1768a3d8496372ca15894288ca24c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:23:16 +0000 Subject: [PATCH 080/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- composer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index 708303f..aee3d47 100644 --- a/composer.spec +++ b/composer.spec @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 22 2022 Remi Collet - 2.5.1-1 - update to 2.5.1 From 0bf323a92a10b5747beef382d522ffa503ce5033 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Feb 2023 07:27:17 +0100 Subject: [PATCH 081/126] v2.5.2 --- composer-bash-completion | 2 +- composer.spec | 25 ++++++++++++++----------- sources | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 76b1486..53e0f7e 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.1") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.2") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index aee3d47..be18cae 100644 --- a/composer.spec +++ b/composer.spec @@ -1,7 +1,7 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2015-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 923278ad13e1621946eb76ab2882655d2cc396a4 +%global gh_commit c76c013c555160410af47c03a0e173518e3f5796 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.5.1 +%global upstream_version 2.5.2 #global upstream_prever RC1 #global upstream_lower rc1 @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -80,7 +80,7 @@ Requires: php-cli Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.3.4 +Provides: bundled(php-composer-ca-bundle) = 1.3.5 Provides: bundled(php-composer-class-map-generator) = 1.0.0 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 2.1.0 @@ -94,10 +94,10 @@ Provides: bundled(php-react-promise) = v2.9.0 Provides: bundled(php-seld-jsonlint) = 1.9.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.1 -Provides: bundled(php-symfony-console) = v5.4.16 +Provides: bundled(php-symfony-console) = v5.4.19 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.13 -Provides: bundled(php-symfony-finder) = v5.4.11 +Provides: bundled(php-symfony-filesystem) = v5.4.19 +Provides: bundled(php-symfony-finder) = v5.4.19 Provides: bundled(php-symfony-polyfill-ctype) = v1.27.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0 @@ -105,9 +105,9 @@ Provides: bundled(php-symfony-polyfill-mbstring) = v1.27.0 Provides: bundled(php-symfony-polyfill-php73) = v1.27.0 Provides: bundled(php-symfony-polyfill-php80) = v1.27.0 Provides: bundled(php-symfony-polyfill-php81) = v1.27.0 -Provides: bundled(php-symfony-process) = v5.4.11 +Provides: bundled(php-symfony-process) = v5.4.19 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.15 +Provides: bundled(php-symfony-string) = v5.4.19 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Mon Feb 6 2023 Remi Collet - 2.5.2-1 +- update to 2.5.2 + * Thu Jan 19 2023 Fedora Release Engineering - 2.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index cb9b58d..0b8f49f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.5.1-923278a.tgz) = 3e8a54ea96982ec6e3ae8afdabc60b88abae05e96561536e444ef5b75aac543284cad90458ae78e4d6e0dbc129fde4b345533db1823b27f5404021dd62cb865b +SHA512 (composer-2.5.2-c76c013.tgz) = a478945f39e427beb01f297f03cefc4edf1f181d9a31a77235e6611f4637a2ad405ec0ab17919c6d946af0684e0a4a4e0f2570fd8ac3cef2a79066eb22f46b40 From de254c8f264e6e2ed0f034965a566e0ea27f9d5a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Feb 2023 14:41:24 +0100 Subject: [PATCH 082/126] v2.5.3 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 53e0f7e..938a1a6 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.2") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.3") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index be18cae..cd4b507 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit c76c013c555160410af47c03a0e173518e3f5796 +%global gh_commit 607a4c04006ce1d2b6fdfd5467bae3d7ad9ce5ab %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.5.2 +%global upstream_version 2.5.3 #global upstream_prever RC1 #global upstream_lower rc1 @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Fri Feb 10 2023 Remi Collet - 2.5.3-1 +- update to 2.5.3 + * Mon Feb 6 2023 Remi Collet - 2.5.2-1 - update to 2.5.2 diff --git a/sources b/sources index 0b8f49f..9459591 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.5.2-c76c013.tgz) = a478945f39e427beb01f297f03cefc4edf1f181d9a31a77235e6611f4637a2ad405ec0ab17919c6d946af0684e0a4a4e0f2570fd8ac3cef2a79066eb22f46b40 +SHA512 (composer-2.5.3-607a4c0.tgz) = 87aff958245b8e267591a6c8784a8bda51e579da83d4e2036f5a896bff4ed10eb6e30984161c73eea266d1c4e1d13ca94120370a6302b53d21acf0d3d46673fe From ad2f2d8ca14882f231052369bdc4187a6086c12f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Feb 2023 14:34:20 +0100 Subject: [PATCH 083/126] v2.5.4 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 938a1a6..b44f7f2 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.3") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.4") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index cd4b507..e9d0f92 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 607a4c04006ce1d2b6fdfd5467bae3d7ad9ce5ab +%global gh_commit 6b67eeea4d72051c369ccdbfb2423a56e2ab51a9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.5.3 +%global upstream_version 2.5.4 #global upstream_prever RC1 #global upstream_lower rc1 @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Wed Feb 15 2023 Remi Collet - 2.5.4-1 +- update to 2.5.4 + * Fri Feb 10 2023 Remi Collet - 2.5.3-1 - update to 2.5.3 diff --git a/sources b/sources index 9459591..a4b0a90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.5.3-607a4c0.tgz) = 87aff958245b8e267591a6c8784a8bda51e579da83d4e2036f5a896bff4ed10eb6e30984161c73eea266d1c4e1d13ca94120370a6302b53d21acf0d3d46673fe +SHA512 (composer-2.5.4-6b67eee.tgz) = aad853f67a48402832d4bdba768255f6ea8fcff08a1c35d298306b393aed63d5de68e8a763a876964da0658587940ce722c2b1fb85896250b3ecb2e9e1353e5d From ec74b09b608bbdfed4d7aaf27e2256059da5e919 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Mar 2023 16:01:05 +0100 Subject: [PATCH 084/126] v2.5.5 --- composer-bash-completion | 2 +- composer-rpm.patch | 63 ++++++++++++---------------------------- composer.spec | 17 ++++++----- sources | 2 +- 4 files changed, 31 insertions(+), 53 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index b44f7f2..c7e5ec9 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.4") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.5") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer-rpm.patch b/composer-rpm.patch index 224503a..85536c9 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2022-08-29 07:36:37.000000000 +0200 -+++ ./bin/composer 2022-08-29 07:36:45.053967617 +0200 +--- ./bin/composer.rpm 2023-03-21 15:42:18.000000000 +0100 ++++ ./bin/composer 2023-03-21 15:53:50.082632518 +0100 @@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) { } @@ -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 2022-08-29 07:36:45.053967617 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2022-08-29 07:38:03.936134475 +0200 +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2023-03-21 15:42:18.000000000 +0100 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2023-03-21 15:53:50.082632518 +0100 @@ -431,7 +431,7 @@ EOF; $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $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, [], [ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ---- ./src/Composer/Compiler.php.rpm 2022-08-29 07:36:37.000000000 +0200 -+++ ./src/Composer/Compiler.php 2022-08-29 07:36:45.053967617 +0200 -@@ -106,7 +106,7 @@ class Compiler +--- ./src/Composer/Compiler.php.rpm 2023-03-21 15:42:18.000000000 +0100 ++++ ./src/Composer/Compiler.php 2023-03-21 15:53:50.082632518 +0100 +@@ -105,7 +105,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/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php ---- ./src/Composer/InstalledVersions.php.rpm 2022-08-29 07:36:37.000000000 +0200 -+++ ./src/Composer/InstalledVersions.php 2022-08-29 07:36:45.053967617 +0200 +--- ./src/Composer/InstalledVersions.php.rpm 2023-03-21 15:42:18.000000000 +0100 ++++ ./src/Composer/InstalledVersions.php 2023-03-21 15:55:07.748460545 +0100 @@ -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, @@ -46,19 +46,19 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio self::$installed = include __DIR__ . '/installed.php'; } else { self::$installed = array(); -@@ -339,7 +339,7 @@ class InstalledVersions +@@ -341,7 +341,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(); + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = require __DIR__ . '/installed.php'; + self::$installed = $required; diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2022-08-29 07:36:37.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2022-08-29 07:36:45.053967617 +0200 -@@ -39,7 +39,7 @@ class JsonFile +--- ./src/Composer/Json/JsonFile.php.rpm 2023-03-21 15:42:18.000000000 +0100 ++++ ./src/Composer/Json/JsonFile.php 2023-03-21 15:53:50.082632518 +0100 +@@ -40,7 +40,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; -@@ -216,7 +216,7 @@ class JsonFile +@@ -223,7 +223,7 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { $isComposerSchemaFile = true; @@ -76,21 +76,9 @@ 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-08-29 07:36:37.000000000 +0200 -+++ ./src/Composer/PHPStan/ConfigReturnTypeExtension.php 2022-08-29 07:36:45.054967614 +0200 -@@ -39,7 +39,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 2022-07-20 09:14:26.000000000 +0200 -+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2022-08-29 07:36:45.054967614 +0200 +--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm 2023-01-11 09:27:00.000000000 +0100 ++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2023-03-21 15:53:50.083632516 +0100 @@ -125,7 +125,7 @@ class CaBundle */ public static function getBundledCaBundlePath() @@ -100,16 +88,3 @@ 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-08-29 07:36:45.054967614 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2022-08-29 07:39:34.814922582 +0200 -@@ -96,7 +96,8 @@ class ComposerSchemaTest extends TestCas - private function check(string $json) - { - $validator = new Validator(); -- $validator->check(json_decode($json), (object) ['$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json']); -+ $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'; -+ $validator->check(json_decode($json), (object) ['$ref' => 'file://' . $f]); - - if (!$validator->isValid()) { - $errors = $validator->getErrors(); diff --git a/composer.spec b/composer.spec index e9d0f92..34ef5ce 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 6b67eeea4d72051c369ccdbfb2423a56e2ab51a9 +%global gh_commit c7cffaad16a60636a776017eac5bd8cd0095c32f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.5.4 +%global upstream_version 2.5.5 #global upstream_prever RC1 #global upstream_lower rc1 @@ -94,10 +94,10 @@ Provides: bundled(php-react-promise) = v2.9.0 Provides: bundled(php-seld-jsonlint) = 1.9.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.1 -Provides: bundled(php-symfony-console) = v5.4.19 +Provides: bundled(php-symfony-console) = v5.4.21 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.19 -Provides: bundled(php-symfony-finder) = v5.4.19 +Provides: bundled(php-symfony-filesystem) = v5.4.21 +Provides: bundled(php-symfony-finder) = v5.4.21 Provides: bundled(php-symfony-polyfill-ctype) = v1.27.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0 @@ -105,9 +105,9 @@ Provides: bundled(php-symfony-polyfill-mbstring) = v1.27.0 Provides: bundled(php-symfony-polyfill-php73) = v1.27.0 Provides: bundled(php-symfony-polyfill-php80) = v1.27.0 Provides: bundled(php-symfony-polyfill-php81) = v1.27.0 -Provides: bundled(php-symfony-process) = v5.4.19 +Provides: bundled(php-symfony-process) = v5.4.21 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.19 +Provides: bundled(php-symfony-string) = v5.4.21 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Tue Mar 21 2023 Remi Collet - 2.5.5-1 +- update to 2.5.5 + * Wed Feb 15 2023 Remi Collet - 2.5.4-1 - update to 2.5.4 diff --git a/sources b/sources index a4b0a90..c649148 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.5.4-6b67eee.tgz) = aad853f67a48402832d4bdba768255f6ea8fcff08a1c35d298306b393aed63d5de68e8a763a876964da0658587940ce722c2b1fb85896250b3ecb2e9e1353e5d +SHA512 (composer-2.5.5-c7cffaa.tgz) = 0b0bfc68bc39b74dc3031cd9d24403fb958adb3e311cf0152c16b80c4cfac28de008d2fcca985213d0e6b7979e7decc0f2ea59e98293d7f33fa224ed364f4476 From 928b46e1be37e4334158e7208264ae5852919c5b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 May 2023 11:02:27 +0200 Subject: [PATCH 085/126] v2.5.6 --- composer-bash-completion | 2 +- composer.spec | 24 +++++++++++++----------- sources | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index c7e5ec9..c088bc4 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.5") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.6") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 34ef5ce..ea2dadd 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit c7cffaad16a60636a776017eac5bd8cd0095c32f +%global gh_commit f7c05db8b0a66d046203faf3c187e319cd211fae %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.5.5 +%global upstream_version 2.5.6 #global upstream_prever RC1 #global upstream_lower rc1 @@ -80,7 +80,6 @@ Requires: php-cli Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.3.5 Provides: bundled(php-composer-class-map-generator) = 1.0.0 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 2.1.0 @@ -90,13 +89,13 @@ 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 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-react-promise) = v2.10.0 +Provides: bundled(php-seld-jsonlint) = 1.10.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.1 -Provides: bundled(php-symfony-console) = v5.4.21 +Provides: bundled(php-symfony-console) = v5.4.23 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.21 +Provides: bundled(php-symfony-filesystem) = v5.4.23 Provides: bundled(php-symfony-finder) = v5.4.21 Provides: bundled(php-symfony-polyfill-ctype) = v1.27.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0 @@ -105,9 +104,9 @@ Provides: bundled(php-symfony-polyfill-mbstring) = v1.27.0 Provides: bundled(php-symfony-polyfill-php73) = v1.27.0 Provides: bundled(php-symfony-polyfill-php80) = v1.27.0 Provides: bundled(php-symfony-polyfill-php81) = v1.27.0 -Provides: bundled(php-symfony-process) = v5.4.21 +Provides: bundled(php-symfony-process) = v5.4.23 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.21 +Provides: bundled(php-symfony-string) = v5.4.22 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -155,8 +154,8 @@ Documentation: https://getcomposer.org/doc/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .rpm -%patch1 -p1 -b .noxdg +%patch -P0 -p1 -b .rpm +%patch -P1 -p1 -b .noxdg find . \( -name \*.rpm -o -name \*noxdg \) -delete -print if grep -r '\.\./res'; then @@ -249,6 +248,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Wed May 24 2023 Remi Collet - 2.5.6-1 +- update to 2.5.6 + * Tue Mar 21 2023 Remi Collet - 2.5.5-1 - update to 2.5.5 diff --git a/sources b/sources index c649148..c8ac9dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.5.5-c7cffaa.tgz) = 0b0bfc68bc39b74dc3031cd9d24403fb958adb3e311cf0152c16b80c4cfac28de008d2fcca985213d0e6b7979e7decc0f2ea59e98293d7f33fa224ed364f4476 +SHA512 (composer-2.5.6-f7c05db.tgz) = 301a537674886186073057dbf75ff6900f0c152e249002ea72f2a94b4f85512e523f85c8de6b373abeb71a0d1f848c8371799ca42223e4924ee6f958ccc5cfd1 From 553ae0c0f39a9822a8a0c8f947cb8038eb9e6906 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 May 2023 16:08:49 +0200 Subject: [PATCH 086/126] v2.5.7 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index c088bc4..43ed18f 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.6") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.7") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index ea2dadd..5f44e07 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit f7c05db8b0a66d046203faf3c187e319cd211fae +%global gh_commit d477018d3f2ebd76dede3d3988a0b1a7add4d81e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.5.6 +%global upstream_version 2.5.7 #global upstream_prever RC1 #global upstream_lower rc1 @@ -248,6 +248,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Wed May 24 2023 Remi Collet - 2.5.7-1 +- update to 2.5.7 + * Wed May 24 2023 Remi Collet - 2.5.6-1 - update to 2.5.6 diff --git a/sources b/sources index c8ac9dd..6928d0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.5.6-f7c05db.tgz) = 301a537674886186073057dbf75ff6900f0c152e249002ea72f2a94b4f85512e523f85c8de6b373abeb71a0d1f848c8371799ca42223e4924ee6f958ccc5cfd1 +SHA512 (composer-2.5.7-d477018.tgz) = 37b3078f0ca30b395a69114015c7745ad4e3d7cab5098100cbc84a6cbd1737a1defa2380bfcc4adaea8c6934958c0425e154f12597f0b308572fe06f0b362cd6 From e66ada18fdfa7e076b207acd9b1b27c1a77ea101 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Jun 2023 07:23:10 +0200 Subject: [PATCH 087/126] v2.5.8 --- composer-bash-completion | 2 +- composer.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 43ed18f..b059ebf 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.7") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.8") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 5f44e07..5310972 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit d477018d3f2ebd76dede3d3988a0b1a7add4d81e +%global gh_commit 4c516146167d1392c8b9b269bb7c24115d262164 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.5.7 +%global upstream_version 2.5.8 #global upstream_prever RC1 #global upstream_lower rc1 @@ -80,6 +80,7 @@ Requires: php-cli Requires: ca-certificates # Bundled libraries # License MIT +Provides: bundled(php-composer-ca-bundle) = 1.3.6 Provides: bundled(php-composer-class-map-generator) = 1.0.0 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 2.1.0 @@ -93,7 +94,7 @@ Provides: bundled(php-react-promise) = v2.10.0 Provides: bundled(php-seld-jsonlint) = 1.10.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.1 -Provides: bundled(php-symfony-console) = v5.4.23 +Provides: bundled(php-symfony-console) = v5.4.24 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 Provides: bundled(php-symfony-filesystem) = v5.4.23 Provides: bundled(php-symfony-finder) = v5.4.21 @@ -104,7 +105,7 @@ Provides: bundled(php-symfony-polyfill-mbstring) = v1.27.0 Provides: bundled(php-symfony-polyfill-php73) = v1.27.0 Provides: bundled(php-symfony-polyfill-php80) = v1.27.0 Provides: bundled(php-symfony-polyfill-php81) = v1.27.0 -Provides: bundled(php-symfony-process) = v5.4.23 +Provides: bundled(php-symfony-process) = v5.4.24 Provides: bundled(php-symfony-service-contracts) = v2.5.2 Provides: bundled(php-symfony-string) = v5.4.22 @@ -248,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Sat Jun 10 2023 Remi Collet - 2.5.8-1 +- update to 2.5.8 + * Wed May 24 2023 Remi Collet - 2.5.7-1 - update to 2.5.7 diff --git a/sources b/sources index 6928d0c..b6bf9f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.5.7-d477018.tgz) = 37b3078f0ca30b395a69114015c7745ad4e3d7cab5098100cbc84a6cbd1737a1defa2380bfcc4adaea8c6934958c0425e154f12597f0b308572fe06f0b362cd6 +SHA512 (composer-2.5.8-4c51614.tgz) = 9d93281902e6d859fa61ed72d66d9d6a4aca15fc5e1b7d6a4a0a1fac635268e6834ee6d164a7934af75dc9034b4df1b90bf62b54c12055bd140cd9dc9dee16d3 From ab06d8691a3303ac3d5bf3c32905e98b312ece34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:14:47 +0000 Subject: [PATCH 088/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- composer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index 5310972..1e68084 100644 --- a/composer.spec +++ b/composer.spec @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.5.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jun 10 2023 Remi Collet - 2.5.8-1 - update to 2.5.8 From bf124da26947171a543ceacc7d4d3bf7be624efb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Sep 2023 11:14:45 +0200 Subject: [PATCH 089/126] v2.6.0 --- composer-bash-completion | 2 +- composer-rpm.patch | 32 +++++++++++++++--------------- composer.spec | 43 +++++++++++++++++++++------------------- sources | 2 +- 4 files changed, 41 insertions(+), 38 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index b059ebf..a3fbb2a 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.8") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.0") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer-rpm.patch b/composer-rpm.patch index 85536c9..162dcdd 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2023-03-21 15:42:18.000000000 +0100 -+++ ./bin/composer 2023-03-21 15:53:50.082632518 +0100 +--- ./bin/composer.rpm 2023-09-01 11:05:16.000000000 +0200 ++++ ./bin/composer 2023-09-01 11:05:28.156309389 +0200 @@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) { } @@ -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 2023-03-21 15:42:18.000000000 +0100 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2023-03-21 15:53:50.082632518 +0100 -@@ -431,7 +431,7 @@ EOF; +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2023-09-01 11:05:16.000000000 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2023-09-01 11:05:28.156309389 +0200 +@@ -448,7 +448,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, [], [ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ---- ./src/Composer/Compiler.php.rpm 2023-03-21 15:42:18.000000000 +0100 -+++ ./src/Composer/Compiler.php 2023-03-21 15:53:50.082632518 +0100 +--- ./src/Composer/Compiler.php.rpm 2023-09-01 11:05:16.000000000 +0200 ++++ ./src/Composer/Compiler.php 2023-09-01 11:05:28.156309389 +0200 @@ -105,7 +105,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 2023-03-21 15:42:18.000000000 +0100 -+++ ./src/Composer/InstalledVersions.php 2023-03-21 15:55:07.748460545 +0100 +--- ./src/Composer/InstalledVersions.php.rpm 2023-09-01 11:05:16.000000000 +0200 ++++ ./src/Composer/InstalledVersions.php 2023-09-01 11:05:28.156309389 +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,8 +56,8 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio $required = require __DIR__ . '/installed.php'; self::$installed = $required; diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2023-03-21 15:42:18.000000000 +0100 -+++ ./src/Composer/Json/JsonFile.php 2023-03-21 15:53:50.082632518 +0100 +--- ./src/Composer/Json/JsonFile.php.rpm 2023-09-01 11:05:16.000000000 +0200 ++++ ./src/Composer/Json/JsonFile.php 2023-09-01 11:06:16.767233012 +0200 @@ -40,7 +40,7 @@ class JsonFile /** @deprecated Use \JSON_UNESCAPED_UNICODE */ public const JSON_UNESCAPED_UNICODE = 256; @@ -65,9 +65,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php - public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json'; + public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; - /** @var string */ - private $path; -@@ -223,7 +223,7 @@ class JsonFile + public const INDENT_DEFAULT = ' '; + +@@ -229,7 +229,7 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { $isComposerSchemaFile = true; @@ -77,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 ./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 2023-01-11 09:27:00.000000000 +0100 -+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2023-03-21 15:53:50.083632516 +0100 +--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm 2023-08-30 11:31:38.000000000 +0200 ++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2023-09-01 11:05:28.156309389 +0200 @@ -125,7 +125,7 @@ class CaBundle */ public static function getBundledCaBundlePath() diff --git a/composer.spec b/composer.spec index 1e68084..aa302c1 100644 --- a/composer.spec +++ b/composer.spec @@ -10,15 +10,15 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 4c516146167d1392c8b9b269bb7c24115d262164 +%global gh_commit ea4222fad9d38d8969fc85c9801e4af2171f0f5d %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 api_version 2.3.0 +%global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.5.8 +%global upstream_version 2.6.0 #global upstream_prever RC1 #global upstream_lower rc1 @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -80,34 +80,34 @@ Requires: php-cli Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.3.6 -Provides: bundled(php-composer-class-map-generator) = 1.0.0 +Provides: bundled(php-composer-ca-bundle) = 1.3.7 +Provides: bundled(php-composer-class-map-generator) = 1.1.0 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 2.1.0 -Provides: bundled(php-composer-semver) = 3.3.2 +Provides: bundled(php-composer-semver) = 3.4.0 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 Provides: bundled(php-psr-log) = 1.1.4 -Provides: bundled(php-react-promise) = v2.10.0 +Provides: bundled(php-react-promise) = v3.0.0 Provides: bundled(php-seld-jsonlint) = 1.10.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.1 -Provides: bundled(php-symfony-console) = v5.4.24 +Provides: bundled(php-symfony-console) = v5.4.28 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.23 -Provides: bundled(php-symfony-finder) = v5.4.21 -Provides: bundled(php-symfony-polyfill-ctype) = v1.27.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.27.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.27.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.27.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.27.0 -Provides: bundled(php-symfony-process) = v5.4.24 +Provides: bundled(php-symfony-filesystem) = v5.4.25 +Provides: bundled(php-symfony-finder) = v5.4.27 +Provides: bundled(php-symfony-polyfill-ctype) = v1.28.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.28.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.28.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.28.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.28.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.28.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.28.0 +Provides: bundled(php-symfony-process) = v5.4.28 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.22 +Provides: bundled(php-symfony-string) = v5.4.26 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Fri Sep 1 2023 Remi Collet - 2.6.0-1 +- update to 2.6.0 + * Wed Jul 19 2023 Fedora Release Engineering - 2.5.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index b6bf9f6..de98b2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.5.8-4c51614.tgz) = 9d93281902e6d859fa61ed72d66d9d6a4aca15fc5e1b7d6a4a0a1fac635268e6834ee6d164a7934af75dc9034b4df1b90bf62b54c12055bd140cd9dc9dee16d3 +SHA512 (composer-2.6.0-ea4222f.tgz) = a53eff955a548cfd18d3f598c5941190105b893fc34add7ca7e0d36b260d013859303feca6bd9f9ff003d15f8cf6b574a4a5feb80d059f48ce4b084a281d2a98 From d61d8841f8b4810dbdec2f6d10de95839113d98a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Sep 2023 15:27:04 +0200 Subject: [PATCH 090/126] v2.6.1 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index a3fbb2a..79c7474 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.0") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.1") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index aa302c1..ec9314a 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit ea4222fad9d38d8969fc85c9801e4af2171f0f5d +%global gh_commit ee851d6b6bb4bf2e0fbfb22b22b44727cded6f29 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.6.0 +%global upstream_version 2.6.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Fri Sep 1 2023 Remi Collet - 2.6.1-1 +- update to 2.6.1 + * Fri Sep 1 2023 Remi Collet - 2.6.0-1 - update to 2.6.0 diff --git a/sources b/sources index de98b2d..ef950cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.6.0-ea4222f.tgz) = a53eff955a548cfd18d3f598c5941190105b893fc34add7ca7e0d36b260d013859303feca6bd9f9ff003d15f8cf6b574a4a5feb80d059f48ce4b084a281d2a98 +SHA512 (composer-2.6.1-ee851d6.tgz) = b42385f90ccd6bc7657aac909c63f671dc195eba3394d3b8011f982ebe2854b7244c62c6183494d2e09dea45ec6cc75f71e9414c80b6ffd380bc4ee29c9b5b56 From bbab13e27781fd3a7a086ea1ed89ba2c56a57787 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Sep 2023 06:52:00 +0200 Subject: [PATCH 091/126] v2.6.2 --- composer-bash-completion | 2 +- composer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 79c7474..c75682d 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.1") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.2") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index ec9314a..bdae7ca 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit ee851d6b6bb4bf2e0fbfb22b22b44727cded6f29 +%global gh_commit 623e5e1de055e65bc6c3c61b8348dc4662d75e2b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.6.1 +%global upstream_version 2.6.2 #global upstream_prever RC1 #global upstream_lower rc1 @@ -93,7 +93,7 @@ Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-react-promise) = v3.0.0 Provides: bundled(php-seld-jsonlint) = 1.10.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 -Provides: bundled(php-seld-signal-handler) = 2.0.1 +Provides: bundled(php-seld-signal-handler) = 2.0.2 Provides: bundled(php-symfony-console) = v5.4.28 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 Provides: bundled(php-symfony-filesystem) = v5.4.25 @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Mon Sep 4 2023 Remi Collet - 2.6.2-1 +- update to 2.6.2 + * Fri Sep 1 2023 Remi Collet - 2.6.1-1 - update to 2.6.1 diff --git a/sources b/sources index ef950cf..3ff75aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.6.1-ee851d6.tgz) = b42385f90ccd6bc7657aac909c63f671dc195eba3394d3b8011f982ebe2854b7244c62c6183494d2e09dea45ec6cc75f71e9414c80b6ffd380bc4ee29c9b5b56 +SHA512 (composer-2.6.2-623e5e1.tgz) = 8eebd9f7f3db92824591389b0945378484c75b02de226f9871b0512e0c1e4160b3bbb7bf461d0b402d268c392f79e8317304b3eab27b1e4a9aea905c41643227 From d10a9845d4ce9b56ce9cca0ee9930bc6cfbca3c1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 15 Sep 2023 13:13:06 +0200 Subject: [PATCH 092/126] v2.6.3 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index c75682d..1ea6ff2 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.2") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.3") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index bdae7ca..f3ad22b 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 623e5e1de055e65bc6c3c61b8348dc4662d75e2b +%global gh_commit ff477832e6d838a736556d4a39a3b80f4412abfd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.6.2 +%global upstream_version 2.6.3 #global upstream_prever RC1 #global upstream_lower rc1 @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Fri Sep 15 2023 Remi Collet - 2.6.3-1 +- update to 2.6.3 + * Mon Sep 4 2023 Remi Collet - 2.6.2-1 - update to 2.6.2 diff --git a/sources b/sources index 3ff75aa..1c7f767 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.6.2-623e5e1.tgz) = 8eebd9f7f3db92824591389b0945378484c75b02de226f9871b0512e0c1e4160b3bbb7bf461d0b402d268c392f79e8317304b3eab27b1e4a9aea905c41643227 +SHA512 (composer-2.6.3-ff47783.tgz) = 445ad60bf5b9c9b1c5979cedf460da31f8cd9b3f00994fc83e8285b92ae009ccb89deb5b3cd325bd55dd608c0a5135146686ea7f77b0a8c2a61b9f098ad8379e From 49525f29c8c99319479680718c0d71cd296ebd3d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 29 Sep 2023 14:23:00 +0200 Subject: [PATCH 093/126] v2.6.4 --- composer-bash-completion | 2 +- composer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 1ea6ff2..5da62d0 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.3") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.4") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index f3ad22b..856d55e 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit ff477832e6d838a736556d4a39a3b80f4412abfd +%global gh_commit d75d17c16a863438027d1d96401cddcd6aa5bb60 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.6.3 +%global upstream_version 2.6.4 #global upstream_prever RC1 #global upstream_lower rc1 @@ -87,7 +87,7 @@ Provides: bundled(php-composer-pcre) = 2.1.0 Provides: bundled(php-composer-semver) = 3.4.0 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-justinrainbow-json-schema) = v5.2.13 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-react-promise) = v3.0.0 @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Fri Sep 29 2023 Remi Collet - 2.6.4-1 +- update to 2.6.4 + * Fri Sep 15 2023 Remi Collet - 2.6.3-1 - update to 2.6.3 diff --git a/sources b/sources index 1c7f767..f974a72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.6.3-ff47783.tgz) = 445ad60bf5b9c9b1c5979cedf460da31f8cd9b3f00994fc83e8285b92ae009ccb89deb5b3cd325bd55dd608c0a5135146686ea7f77b0a8c2a61b9f098ad8379e +SHA512 (composer-2.6.4-d75d17c.tgz) = 2a8115400d9eebdf1cfb9db12397e9ac2dc729b9fd107785e33304cf2052eb7ca55f596f45f3f8ff3025204d3276eff9910a3f009c5988f230fd514a2b2759c0 From c2d8866cfc0a1d7e6824afc53165a9353abaa3a2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 6 Oct 2023 10:32:40 +0200 Subject: [PATCH 094/126] v2.6.5 --- composer-bash-completion | 2 +- composer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 5da62d0..0f414c4 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.4") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.5") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 856d55e..b1fee2b 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit d75d17c16a863438027d1d96401cddcd6aa5bb60 +%global gh_commit 4b0fe89db9e65b1e64df633a992e70a7a215ab33 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.6.4 +%global upstream_version 2.6.5 #global upstream_prever RC1 #global upstream_lower rc1 @@ -107,7 +107,7 @@ Provides: bundled(php-symfony-polyfill-php80) = v1.28.0 Provides: bundled(php-symfony-polyfill-php81) = v1.28.0 Provides: bundled(php-symfony-process) = v5.4.28 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.26 +Provides: bundled(php-symfony-string) = v5.4.29 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Fri Oct 6 2023 Remi Collet - 2.6.5-1 +- update to 2.6.5 + * Fri Sep 29 2023 Remi Collet - 2.6.4-1 - update to 2.6.4 diff --git a/sources b/sources index f974a72..37b25bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.6.4-d75d17c.tgz) = 2a8115400d9eebdf1cfb9db12397e9ac2dc729b9fd107785e33304cf2052eb7ca55f596f45f3f8ff3025204d3276eff9910a3f009c5988f230fd514a2b2759c0 +SHA512 (composer-2.6.5-4b0fe89.tgz) = 143a0f10237c23ebf869d3dcdcdbb60ad484846ef668ecb7d5e8dd1b17a34745470b45f82ab5f17165370882c7c3787244052876854e07a6c03b7a36a12a99ba From 85f376e77bbb6f9fe940f5390e4bd1e22a7c5c2f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Dec 2023 07:01:30 +0100 Subject: [PATCH 095/126] v2.6.6 --- composer-bash-completion | 2 +- composer.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 0f414c4..d0d01b7 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.5") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.6") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index b1fee2b..88dff81 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 4b0fe89db9e65b1e64df633a992e70a7a215ab33 +%global gh_commit 683557bd2466072777309d039534bb1332d0dda5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.6.5 +%global upstream_version 2.6.6 #global upstream_prever RC1 #global upstream_lower rc1 @@ -83,18 +83,18 @@ Requires: ca-certificates Provides: bundled(php-composer-ca-bundle) = 1.3.7 Provides: bundled(php-composer-class-map-generator) = 1.1.0 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 2.1.0 +Provides: bundled(php-composer-pcre) = 2.1.1 Provides: bundled(php-composer-semver) = 3.4.0 -Provides: bundled(php-composer-spdx-licenses) = 1.5.7 +Provides: bundled(php-composer-spdx-licenses) = 1.5.8 Provides: bundled(php-composer-xdebug-handler) = 3.0.3 Provides: bundled(php-justinrainbow-json-schema) = v5.2.13 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 -Provides: bundled(php-react-promise) = v3.0.0 +Provides: bundled(php-react-promise) = v3.1.0 Provides: bundled(php-seld-jsonlint) = 1.10.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v5.4.28 +Provides: bundled(php-symfony-console) = v5.4.32 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 Provides: bundled(php-symfony-filesystem) = v5.4.25 Provides: bundled(php-symfony-finder) = v5.4.27 @@ -107,7 +107,7 @@ Provides: bundled(php-symfony-polyfill-php80) = v1.28.0 Provides: bundled(php-symfony-polyfill-php81) = v1.28.0 Provides: bundled(php-symfony-process) = v5.4.28 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.29 +Provides: bundled(php-symfony-string) = v5.4.32 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Sat Dec 9 2023 Remi Collet - 2.6.6-1 +- update to 2.6.6 + * Fri Oct 6 2023 Remi Collet - 2.6.5-1 - update to 2.6.5 diff --git a/sources b/sources index 37b25bc..7e0757a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.6.5-4b0fe89.tgz) = 143a0f10237c23ebf869d3dcdcdbb60ad484846ef668ecb7d5e8dd1b17a34745470b45f82ab5f17165370882c7c3787244052876854e07a6c03b7a36a12a99ba +SHA512 (composer-2.6.6-683557b.tgz) = 2794151763356a7b2c11a3f864a4aa892e7f486ffabbf75aaab886237e95594e52e1a4a4769bfb7689e458f83bd0d86c02eea1c437841fda2674020f1b30830e From 27fb294380b237be2690e104cc8b8fe4eb045c76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:03:28 +0000 Subject: [PATCH 096/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- composer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index 88dff81..577f4ed 100644 --- a/composer.spec +++ b/composer.spec @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Dec 9 2023 Remi Collet - 2.6.6-1 - update to 2.6.6 From b57846573b218ce7dfd715b4d39bdfa689bf8794 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 07:54:04 +0000 Subject: [PATCH 097/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- composer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index 577f4ed..f1f99a9 100644 --- a/composer.spec +++ b/composer.spec @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.6.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a3accb113902526e67586e06fb9268f350e1e484 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Feb 2024 10:33:30 +0100 Subject: [PATCH 098/126] v2.7.1 --- composer-bash-completion | 2 +- composer.spec | 37 ++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index d0d01b7..d9af6f6 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.6") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.1") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index f1f99a9..047f15a 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 683557bd2466072777309d039534bb1332d0dda5 +%global gh_commit aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.6.6 +%global upstream_version 2.7.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -80,7 +80,7 @@ Requires: php-cli Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.3.7 +Provides: bundled(php-composer-ca-bundle) = 1.4.0 Provides: bundled(php-composer-class-map-generator) = 1.1.0 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 2.1.1 @@ -91,23 +91,23 @@ Provides: bundled(php-justinrainbow-json-schema) = v5.2.13 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-react-promise) = v3.1.0 -Provides: bundled(php-seld-jsonlint) = 1.10.0 +Provides: bundled(php-seld-jsonlint) = 1.10.2 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v5.4.32 +Provides: bundled(php-symfony-console) = v5.4.35 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.25 -Provides: bundled(php-symfony-finder) = v5.4.27 -Provides: bundled(php-symfony-polyfill-ctype) = v1.28.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.28.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.28.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.28.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.28.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.28.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.28.0 -Provides: bundled(php-symfony-process) = v5.4.28 +Provides: bundled(php-symfony-filesystem) = v5.4.35 +Provides: bundled(php-symfony-finder) = v5.4.35 +Provides: bundled(php-symfony-polyfill-ctype) = v1.29.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.29.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.29.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.29.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.29.0 +Provides: bundled(php-symfony-process) = v5.4.35 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.32 +Provides: bundled(php-symfony-string) = v5.4.35 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Sat Feb 10 2024 Remi Collet - 2.7.1-1 +- update to 2.7.1 + * Wed Jan 24 2024 Fedora Release Engineering - 2.6.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 7e0757a..14804b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.6.6-683557b.tgz) = 2794151763356a7b2c11a3f864a4aa892e7f486ffabbf75aaab886237e95594e52e1a4a4769bfb7689e458f83bd0d86c02eea1c437841fda2674020f1b30830e +SHA512 (composer-2.7.1-aaf6ed5.tgz) = 727b1d212b56563d559286847be97d20bb021e44e4c5b7e812a6a41216ba1228ee16c1b1ce51250c7248262e9bfe9b2f276f172cee2fd2ba7a8c8045d0345863 From 289c869f722bf392b618e774de9e99468c45ed74 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Mar 2024 07:20:15 +0100 Subject: [PATCH 099/126] v2.7.2 --- composer-bash-completion | 2 +- composer.spec | 19 +++++++++++-------- sources | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index d9af6f6..7b1d166 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.1") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.2") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 047f15a..41a20d7 100644 --- a/composer.spec +++ b/composer.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2023 Remi Collet +# Copyright (c) 2015-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc +%global gh_commit b826edb791571ab1eaf281eb1bd6e181a1192adc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.7.1 +%global upstream_version 2.7.2 #global upstream_prever RC1 #global upstream_lower rc1 @@ -80,10 +80,10 @@ Requires: php-cli Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.4.0 +Provides: bundled(php-composer-ca-bundle) = 1.4.1 Provides: bundled(php-composer-class-map-generator) = 1.1.0 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 2.1.1 +Provides: bundled(php-composer-pcre) = 2.1.2 Provides: bundled(php-composer-semver) = 3.4.0 Provides: bundled(php-composer-spdx-licenses) = 1.5.8 Provides: bundled(php-composer-xdebug-handler) = 3.0.3 @@ -94,7 +94,7 @@ Provides: bundled(php-react-promise) = v3.1.0 Provides: bundled(php-seld-jsonlint) = 1.10.2 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v5.4.35 +Provides: bundled(php-symfony-console) = v5.4.36 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 Provides: bundled(php-symfony-filesystem) = v5.4.35 Provides: bundled(php-symfony-finder) = v5.4.35 @@ -105,9 +105,9 @@ Provides: bundled(php-symfony-polyfill-mbstring) = v1.29.0 Provides: bundled(php-symfony-polyfill-php73) = v1.29.0 Provides: bundled(php-symfony-polyfill-php80) = v1.29.0 Provides: bundled(php-symfony-polyfill-php81) = v1.29.0 -Provides: bundled(php-symfony-process) = v5.4.35 +Provides: bundled(php-symfony-process) = v5.4.36 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.35 +Provides: bundled(php-symfony-string) = v5.4.36 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Tue Mar 12 2024 Remi Collet - 2.7.2-1 +- update to 2.7.2 + * Sat Feb 10 2024 Remi Collet - 2.7.1-1 - update to 2.7.1 diff --git a/sources b/sources index 14804b8..b32c9b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.7.1-aaf6ed5.tgz) = 727b1d212b56563d559286847be97d20bb021e44e4c5b7e812a6a41216ba1228ee16c1b1ce51250c7248262e9bfe9b2f276f172cee2fd2ba7a8c8045d0345863 +SHA512 (composer-2.7.2-b826edb.tgz) = 87b616e1c30e863162d0ce6ad1835b0040b373ebccf2125829cde1babec69511ca51d727f8f376fe5a6802115881c6bcc1b63c9a6325c17279973ba41576c87d From 704a77856ce1c36ed3294d0854b323caae93dda1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 23 Apr 2024 07:48:18 +0200 Subject: [PATCH 100/126] v2.7.4 --- composer-bash-completion | 2 +- composer-noxdg.patch | 8 ++++---- composer.spec | 21 ++++++++++++--------- sources | 2 +- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 7b1d166..d57fa7c 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.2") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.4") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer-noxdg.patch b/composer-noxdg.patch index 73195e7..8971527 100644 --- a/composer-noxdg.patch +++ b/composer-noxdg.patch @@ -1,7 +1,7 @@ diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php ---- ./src/Composer/Factory.php.noxdg 2022-03-16 09:51:30.398977729 +0100 -+++ ./src/Composer/Factory.php 2022-03-16 09:52:14.113841110 +0100 -@@ -665,6 +665,10 @@ class Factory +--- ./src/Composer/Factory.php.noxdg 2024-04-20 12:34:54.442117723 +0200 ++++ ./src/Composer/Factory.php 2024-04-20 12:35:39.497640757 +0200 +@@ -680,6 +680,10 @@ class Factory private static function useXdg(): bool { @@ -10,5 +10,5 @@ diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php + return false; + foreach (array_keys($_SERVER) as $key) { - if (strpos($key, 'XDG_') === 0) { + if (strpos((string) $key, 'XDG_') === 0) { return true; diff --git a/composer.spec b/composer.spec index 41a20d7..2c9e4c5 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit b826edb791571ab1eaf281eb1bd6e181a1192adc +%global gh_commit a625e50598e12171d3f60b1149eb530690c43474 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.7.2 +%global upstream_version 2.7.4 #global upstream_prever RC1 #global upstream_lower rc1 @@ -80,13 +80,13 @@ Requires: php-cli Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.4.1 -Provides: bundled(php-composer-class-map-generator) = 1.1.0 +Provides: bundled(php-composer-ca-bundle) = 1.5.0 +Provides: bundled(php-composer-class-map-generator) = 1.1.1 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 2.1.2 +Provides: bundled(php-composer-pcre) = 2.1.3 Provides: bundled(php-composer-semver) = 3.4.0 Provides: bundled(php-composer-spdx-licenses) = 1.5.8 -Provides: bundled(php-composer-xdebug-handler) = 3.0.3 +Provides: bundled(php-composer-xdebug-handler) = 3.0.4 Provides: bundled(php-justinrainbow-json-schema) = v5.2.13 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 @@ -95,8 +95,8 @@ Provides: bundled(php-seld-jsonlint) = 1.10.2 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.2 Provides: bundled(php-symfony-console) = v5.4.36 -Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.35 +Provides: bundled(php-symfony-deprecation-contracts) = v2.5.3 +Provides: bundled(php-symfony-filesystem) = v5.4.38 Provides: bundled(php-symfony-finder) = v5.4.35 Provides: bundled(php-symfony-polyfill-ctype) = v1.29.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0 @@ -106,7 +106,7 @@ Provides: bundled(php-symfony-polyfill-php73) = v1.29.0 Provides: bundled(php-symfony-polyfill-php80) = v1.29.0 Provides: bundled(php-symfony-polyfill-php81) = v1.29.0 Provides: bundled(php-symfony-process) = v5.4.36 -Provides: bundled(php-symfony-service-contracts) = v2.5.2 +Provides: bundled(php-symfony-service-contracts) = v2.5.3 Provides: bundled(php-symfony-string) = v5.4.36 # From composer.json, suggest @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Tue Apr 23 2024 Remi Collet - 2.7.4-1 +- update to 2.7.4 + * Tue Mar 12 2024 Remi Collet - 2.7.2-1 - update to 2.7.2 diff --git a/sources b/sources index b32c9b5..f70aa09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.7.2-b826edb.tgz) = 87b616e1c30e863162d0ce6ad1835b0040b373ebccf2125829cde1babec69511ca51d727f8f376fe5a6802115881c6bcc1b63c9a6325c17279973ba41576c87d +SHA512 (composer-2.7.4-a625e50.tgz) = e3b5f8ec2fe90bb9ce3009043759a8717d4a74bfad7fd919497f76212e538932c2bba1d4653efb58e610f39be64266dc2cd7671ae9e9192c972bb40c9c6e3533 From 474ee51ec25413b22c5db4ff40eb6307c8d99470 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 May 2024 11:20:35 +0200 Subject: [PATCH 101/126] v2.7.6 --- composer-bash-completion | 2 +- composer.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index d57fa7c..c94bcf5 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.4") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.6") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 2c9e4c5..1eac3a3 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a625e50598e12171d3f60b1149eb530690c43474 +%global gh_commit fabd995783b633829fd4280e272284b39b6ae702 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.7.4 +%global upstream_version 2.7.6 #global upstream_prever RC1 #global upstream_lower rc1 @@ -94,10 +94,10 @@ Provides: bundled(php-react-promise) = v3.1.0 Provides: bundled(php-seld-jsonlint) = 1.10.2 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v5.4.36 +Provides: bundled(php-symfony-console) = v5.4.39 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.3 -Provides: bundled(php-symfony-filesystem) = v5.4.38 -Provides: bundled(php-symfony-finder) = v5.4.35 +Provides: bundled(php-symfony-filesystem) = v5.4.39 +Provides: bundled(php-symfony-finder) = v5.4.39 Provides: bundled(php-symfony-polyfill-ctype) = v1.29.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0 @@ -105,9 +105,9 @@ Provides: bundled(php-symfony-polyfill-mbstring) = v1.29.0 Provides: bundled(php-symfony-polyfill-php73) = v1.29.0 Provides: bundled(php-symfony-polyfill-php80) = v1.29.0 Provides: bundled(php-symfony-polyfill-php81) = v1.29.0 -Provides: bundled(php-symfony-process) = v5.4.36 +Provides: bundled(php-symfony-process) = v5.4.39 Provides: bundled(php-symfony-service-contracts) = v2.5.3 -Provides: bundled(php-symfony-string) = v5.4.36 +Provides: bundled(php-symfony-string) = v5.4.39 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Sun May 5 2024 Remi Collet - 2.7.6-1 +- update to 2.7.6 + * Tue Apr 23 2024 Remi Collet - 2.7.4-1 - update to 2.7.4 diff --git a/sources b/sources index f70aa09..dc72436 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.7.4-a625e50.tgz) = e3b5f8ec2fe90bb9ce3009043759a8717d4a74bfad7fd919497f76212e538932c2bba1d4653efb58e610f39be64266dc2cd7671ae9e9192c972bb40c9c6e3533 +SHA512 (composer-2.7.6-fabd995.tgz) = 76d6c85c504febcb0f1f965eef62f4348b1b1342c6a6178606a7bd7d64715da65cc5713f1dc5d6b00a6411d5a6f87d02793e472c215b94b786720d5befc37076 From eb34bf364c70d189b709e6a3d44cd8ad961bad8f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Jun 2024 07:19:34 +0200 Subject: [PATCH 102/126] v2.7.7 --- composer-bash-completion | 2 +- composer.spec | 23 +++++++++++++---------- sources | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index c94bcf5..a6f955b 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.6") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.7") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 1eac3a3..520d77f 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit fabd995783b633829fd4280e272284b39b6ae702 +%global gh_commit 291942978f39435cf904d33739f98d7d4eca7b23 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.7.6 +%global upstream_version 2.7.7 #global upstream_prever RC1 #global upstream_lower rc1 @@ -81,23 +81,23 @@ Requires: ca-certificates # Bundled libraries # License MIT Provides: bundled(php-composer-ca-bundle) = 1.5.0 -Provides: bundled(php-composer-class-map-generator) = 1.1.1 +Provides: bundled(php-composer-class-map-generator) = 1.3.3 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 2.1.3 Provides: bundled(php-composer-semver) = 3.4.0 Provides: bundled(php-composer-spdx-licenses) = 1.5.8 -Provides: bundled(php-composer-xdebug-handler) = 3.0.4 +Provides: bundled(php-composer-xdebug-handler) = 3.0.5 Provides: bundled(php-justinrainbow-json-schema) = v5.2.13 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 -Provides: bundled(php-react-promise) = v3.1.0 +Provides: bundled(php-react-promise) = v3.2.0 Provides: bundled(php-seld-jsonlint) = 1.10.2 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v5.4.39 +Provides: bundled(php-symfony-console) = v5.4.40 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.3 -Provides: bundled(php-symfony-filesystem) = v5.4.39 -Provides: bundled(php-symfony-finder) = v5.4.39 +Provides: bundled(php-symfony-filesystem) = v5.4.40 +Provides: bundled(php-symfony-finder) = v5.4.40 Provides: bundled(php-symfony-polyfill-ctype) = v1.29.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0 @@ -105,9 +105,9 @@ Provides: bundled(php-symfony-polyfill-mbstring) = v1.29.0 Provides: bundled(php-symfony-polyfill-php73) = v1.29.0 Provides: bundled(php-symfony-polyfill-php80) = v1.29.0 Provides: bundled(php-symfony-polyfill-php81) = v1.29.0 -Provides: bundled(php-symfony-process) = v5.4.39 +Provides: bundled(php-symfony-process) = v5.4.40 Provides: bundled(php-symfony-service-contracts) = v2.5.3 -Provides: bundled(php-symfony-string) = v5.4.39 +Provides: bundled(php-symfony-string) = v5.4.40 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Tue Jun 11 2024 Remi Collet - 2.7.7-1 +- update to 2.7.7 + * Sun May 5 2024 Remi Collet - 2.7.6-1 - update to 2.7.6 diff --git a/sources b/sources index dc72436..907a3bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.7.6-fabd995.tgz) = 76d6c85c504febcb0f1f965eef62f4348b1b1342c6a6178606a7bd7d64715da65cc5713f1dc5d6b00a6411d5a6f87d02793e472c215b94b786720d5befc37076 +SHA512 (composer-2.7.7-2919429.tgz) = b97271282087727de2206153275cb3a23b07dd8361ca11adebbf67f9fa000fba8acf7ace4a2847d9e88352f10cc2afb7fa7c23d9a2265a469e0b874b8a1d2bbc From a7efa75c3991899a519b504ec99800a739103631 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 19:51:47 +0000 Subject: [PATCH 103/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- composer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index 520d77f..d92c820 100644 --- a/composer.spec +++ b/composer.spec @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.7.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jun 11 2024 Remi Collet - 2.7.7-1 - update to 2.7.7 From 885c8fe38431de72b46f3ace211c8e044bf7ab19 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Aug 2024 12:20:21 +0200 Subject: [PATCH 104/126] v2.7.8 --- composer-bash-completion | 2 +- composer.spec | 43 +++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index a6f955b..2cb48d7 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.7") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.8") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index d92c820..5a7efb6 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 291942978f39435cf904d33739f98d7d4eca7b23 +%global gh_commit a2edd4e4414c17008ab585e0c62574fdb644ebfc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.7.7 +%global upstream_version 2.7.8 #global upstream_prever RC1 #global upstream_lower rc1 @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -80,34 +80,34 @@ Requires: php-cli Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.5.0 -Provides: bundled(php-composer-class-map-generator) = 1.3.3 +Provides: bundled(php-composer-ca-bundle) = 1.5.1 +Provides: bundled(php-composer-class-map-generator) = 1.3.4 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 2.1.3 -Provides: bundled(php-composer-semver) = 3.4.0 +Provides: bundled(php-composer-pcre) = 2.3.0 +Provides: bundled(php-composer-semver) = 3.4.2 Provides: bundled(php-composer-spdx-licenses) = 1.5.8 Provides: bundled(php-composer-xdebug-handler) = 3.0.5 -Provides: bundled(php-justinrainbow-json-schema) = v5.2.13 +Provides: bundled(php-justinrainbow-json-schema) = 5.3.0 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-react-promise) = v3.2.0 -Provides: bundled(php-seld-jsonlint) = 1.10.2 +Provides: bundled(php-seld-jsonlint) = 1.11.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v5.4.40 +Provides: bundled(php-symfony-console) = v5.4.42 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.3 -Provides: bundled(php-symfony-filesystem) = v5.4.40 -Provides: bundled(php-symfony-finder) = v5.4.40 -Provides: bundled(php-symfony-polyfill-ctype) = v1.29.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.29.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.29.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.29.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.29.0 +Provides: bundled(php-symfony-filesystem) = v5.4.41 +Provides: bundled(php-symfony-finder) = v5.4.42 +Provides: bundled(php-symfony-polyfill-ctype) = v1.30.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.30.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.30.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.30.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.30.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.30.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.30.0 Provides: bundled(php-symfony-process) = v5.4.40 Provides: bundled(php-symfony-service-contracts) = v2.5.3 -Provides: bundled(php-symfony-string) = v5.4.40 +Provides: bundled(php-symfony-string) = v5.4.42 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Fri Aug 23 2024 Remi Collet - 2.7.8-1 +- update to 2.7.8 + * Wed Jul 17 2024 Fedora Release Engineering - 2.7.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 907a3bf..f22a25d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.7.7-2919429.tgz) = b97271282087727de2206153275cb3a23b07dd8361ca11adebbf67f9fa000fba8acf7ace4a2847d9e88352f10cc2afb7fa7c23d9a2265a469e0b874b8a1d2bbc +SHA512 (composer-2.7.8-a2edd4e.tgz) = 4b59ac968406aa3f98eddf5525fe560269e012c406ac32dd80ae9bcf8b983073c999661e785b407ebcfb27c7f59cd6fa4048ab2ba5f3b98813347ce898467380 From f78e81fd0be49919f8ebe3d1018994679cb2bbd0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 4 Sep 2024 15:36:03 +0200 Subject: [PATCH 105/126] v2.7.9 --- composer-bash-completion | 4 ++-- composer.spec | 16 +++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 2cb48d7..1397e05 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -7,7 +7,7 @@ _sf_composer() { # Use newline as only separator to allow space in completion values - IFS=$'\n' + local IFS=$'\n' local sf_cmd="${COMP_WORDS[0]}" # for an alias, get the real script behind it @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.8") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.9") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 5a7efb6..f37cc73 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a2edd4e4414c17008ab585e0c62574fdb644ebfc +%global gh_commit e30ccdd665828ae66eb1be78f056e39e1d5f55ab %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.7.8 +%global upstream_version 2.7.9 #global upstream_prever RC1 #global upstream_lower rc1 @@ -83,7 +83,7 @@ Requires: ca-certificates Provides: bundled(php-composer-ca-bundle) = 1.5.1 Provides: bundled(php-composer-class-map-generator) = 1.3.4 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 2.3.0 +Provides: bundled(php-composer-pcre) = 2.3.1 Provides: bundled(php-composer-semver) = 3.4.2 Provides: bundled(php-composer-spdx-licenses) = 1.5.8 Provides: bundled(php-composer-xdebug-handler) = 3.0.5 @@ -94,10 +94,10 @@ Provides: bundled(php-react-promise) = v3.2.0 Provides: bundled(php-seld-jsonlint) = 1.11.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v5.4.42 +Provides: bundled(php-symfony-console) = v5.4.43 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.3 Provides: bundled(php-symfony-filesystem) = v5.4.41 -Provides: bundled(php-symfony-finder) = v5.4.42 +Provides: bundled(php-symfony-finder) = v5.4.43 Provides: bundled(php-symfony-polyfill-ctype) = v1.30.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.30.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.30.0 @@ -107,7 +107,7 @@ Provides: bundled(php-symfony-polyfill-php80) = v1.30.0 Provides: bundled(php-symfony-polyfill-php81) = v1.30.0 Provides: bundled(php-symfony-process) = v5.4.40 Provides: bundled(php-symfony-service-contracts) = v2.5.3 -Provides: bundled(php-symfony-string) = v5.4.42 +Provides: bundled(php-symfony-string) = v5.4.43 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -237,7 +237,6 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md doc %doc composer.json @@ -249,6 +248,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Wed Sep 4 2024 Remi Collet - 2.7.9-1 +- update to 2.7.9 + * Fri Aug 23 2024 Remi Collet - 2.7.8-1 - update to 2.7.8 diff --git a/sources b/sources index f22a25d..1779ac2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.7.8-a2edd4e.tgz) = 4b59ac968406aa3f98eddf5525fe560269e012c406ac32dd80ae9bcf8b983073c999661e785b407ebcfb27c7f59cd6fa4048ab2ba5f3b98813347ce898467380 +SHA512 (composer-2.7.9-e30ccdd.tgz) = 9be1fdbb76c3cae21ebc1dbbca8b90ac8a99fb749100439994aa8affb07d2f07a39b37c75791b3e455828f940f188d83bb12ee7282cdad6e83e0ff6d4805f8a5 From 9487f51293a9920cd2dc8f79d2f597732c07fe50 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Oct 2024 07:45:43 +0200 Subject: [PATCH 106/126] v2.8.0 --- composer-bash-completion | 2 +- composer-rpm.patch | 46 ++++++++++++++++++++++----------------- composer.spec | 47 +++++++++++++++++++++++++--------------- sources | 2 +- 4 files changed, 57 insertions(+), 40 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 1397e05..0e546e7 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.9") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.0") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer-rpm.patch b/composer-rpm.patch index 162dcdd..52ed07b 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,7 +1,7 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2023-09-01 11:05:16.000000000 +0200 -+++ ./bin/composer 2023-09-01 11:05:28.156309389 +0200 -@@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) { +--- ./bin/composer.rpm 2024-10-03 07:10:57.000000000 +0200 ++++ ./bin/composer 2024-10-03 07:11:10.751092365 +0200 +@@ -16,7 +16,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 2023-09-01 11:05:16.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2023-09-01 11:05:28.156309389 +0200 -@@ -448,7 +448,7 @@ EOF; +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2024-10-03 07:10:57.000000000 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2024-10-03 07:11:10.752092401 +0200 +@@ -458,7 +458,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, [], [ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ---- ./src/Composer/Compiler.php.rpm 2023-09-01 11:05:16.000000000 +0200 -+++ ./src/Composer/Compiler.php 2023-09-01 11:05:28.156309389 +0200 +--- ./src/Composer/Compiler.php.rpm 2024-10-03 07:10:57.000000000 +0200 ++++ ./src/Composer/Compiler.php 2024-10-03 07:11:10.752092401 +0200 @@ -105,7 +105,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 2023-09-01 11:05:16.000000000 +0200 -+++ ./src/Composer/InstalledVersions.php 2023-09-01 11:05:28.156309389 +0200 +--- ./src/Composer/InstalledVersions.php.rpm 2024-10-03 07:10:57.000000000 +0200 ++++ ./src/Composer/InstalledVersions.php 2024-10-03 07:11:10.752092401 +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,29 +56,35 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio $required = require __DIR__ . '/installed.php'; self::$installed = $required; diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2023-09-01 11:05:16.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2023-09-01 11:06:16.767233012 +0200 -@@ -40,7 +40,7 @@ class JsonFile +--- ./src/Composer/Json/JsonFile.php.rpm 2024-10-03 07:11:10.752092401 +0200 ++++ ./src/Composer/Json/JsonFile.php 2024-10-03 07:14:54.219192080 +0200 +@@ -41,8 +41,8 @@ class JsonFile /** @deprecated Use \JSON_UNESCAPED_UNICODE */ public const JSON_UNESCAPED_UNICODE = 256; - public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json'; +- public const LOCK_SCHEMA_PATH = __DIR__ . '/../../../res/composer-lock-schema.json'; + public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; ++ public const LOCK_SCHEMA_PATH = '/usr/share/composer/res/composer-lock-schema.json'; public const INDENT_DEFAULT = ' '; -@@ -229,7 +229,7 @@ class JsonFile +@@ -231,10 +231,10 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { - $isComposerSchemaFile = true; -- $schemaFile = self::COMPOSER_SCHEMA_PATH; -+ $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH; + if ($schema === self::LOCK_SCHEMA) { +- $schemaFile = self::LOCK_SCHEMA_PATH; ++ $schemaFile = (getenv('BUILDROOT')?:'') . self::LOCK_SCHEMA_PATH; + } else { + $isComposerSchemaFile = true; +- $schemaFile = 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 ./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 2023-08-30 11:31:38.000000000 +0200 -+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2023-09-01 11:05:28.156309389 +0200 +--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm 2024-09-25 09:49:53.000000000 +0200 ++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2024-10-03 07:11:10.752092401 +0200 @@ -125,7 +125,7 @@ class CaBundle */ public static function getBundledCaBundlePath() diff --git a/composer.spec b/composer.spec index f37cc73..7d5b870 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit e30ccdd665828ae66eb1be78f056e39e1d5f55ab +%global gh_commit d5e75c21ceeb6829918a75ed63b56c576b4a6261 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.7.9 +%global upstream_version 2.8.0 #global upstream_prever RC1 #global upstream_lower rc1 @@ -80,11 +80,11 @@ Requires: php-cli Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.5.1 +Provides: bundled(php-composer-ca-bundle) = 1.5.2 Provides: bundled(php-composer-class-map-generator) = 1.3.4 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 2.3.1 -Provides: bundled(php-composer-semver) = 3.4.2 +Provides: bundled(php-composer-semver) = 3.4.3 Provides: bundled(php-composer-spdx-licenses) = 1.5.8 Provides: bundled(php-composer-xdebug-handler) = 3.0.5 Provides: bundled(php-justinrainbow-json-schema) = 5.3.0 @@ -94,20 +94,20 @@ Provides: bundled(php-react-promise) = v3.2.0 Provides: bundled(php-seld-jsonlint) = 1.11.0 Provides: bundled(php-seld-phar-utils) = 1.2.1 Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v5.4.43 +Provides: bundled(php-symfony-console) = v5.4.44 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.3 -Provides: bundled(php-symfony-filesystem) = v5.4.41 +Provides: bundled(php-symfony-filesystem) = v5.4.44 Provides: bundled(php-symfony-finder) = v5.4.43 -Provides: bundled(php-symfony-polyfill-ctype) = v1.30.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.30.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.30.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.30.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.30.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.30.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.30.0 -Provides: bundled(php-symfony-process) = v5.4.40 +Provides: bundled(php-symfony-polyfill-ctype) = v1.31.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.31.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.31.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.31.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.31.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.31.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.31.0 +Provides: bundled(php-symfony-process) = v5.4.44 Provides: bundled(php-symfony-service-contracts) = v2.5.3 -Provides: bundled(php-symfony-string) = v5.4.43 +Provides: bundled(php-symfony-string) = v5.4.44 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -230,14 +230,22 @@ mkdir -p %{buildroot}%{_datadir}/%{name} cp -pr res %{buildroot}%{_datadir}/%{name}/res cp -p LICENSE %{buildroot}%{_datadir}/%{name}/LICENSE -ln -sf %{_datadir}/%{name}/LICENSE LICENSE - : Command install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} +: Licenses +ln -sf ../../%{name}/LICENSE LICENSE +cd src/Composer/vendor +for lic in */*/LICENSE +do dir=$(dirname $lic) + own=$(dirname $dir) + prj=$(basename $dir) + ln -sf ../../php/Composer/vendor/$own/$prj/LICENSE ../../../$own-$prj-LICENSE +done + %files -%license LICENSE +%license *LICENSE %doc *.md doc %doc composer.json %config(noreplace) %{_sysconfdir}/profile.d/%{name}.* @@ -248,6 +256,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Thu Oct 3 2024 Remi Collet - 2.8.0-1 +- update to 2.8.0 + * Wed Sep 4 2024 Remi Collet - 2.7.9-1 - update to 2.7.9 diff --git a/sources b/sources index 1779ac2..9f01048 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.7.9-e30ccdd.tgz) = 9be1fdbb76c3cae21ebc1dbbca8b90ac8a99fb749100439994aa8affb07d2f07a39b37c75791b3e455828f940f188d83bb12ee7282cdad6e83e0ff6d4805f8a5 +SHA512 (composer-2.8.0-d5e75c2.tgz) = 59df7a77432bee12d45dfe56ea46cd800aa6c48de5044a7d2edfe1c7b75f1b62cee86151a132f7ed54aa33db30dc68b612436bee51c86f986c8dcc02e1a09eca From 8e0c415524d256fd08703313087e8c92a46b4251 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Oct 2024 14:43:22 +0200 Subject: [PATCH 107/126] v2.8.1 --- composer-bash-completion | 2 +- composer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 0e546e7..68f0ea2 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.0") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.1") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 7d5b870..ee53d8b 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit d5e75c21ceeb6829918a75ed63b56c576b4a6261 +%global gh_commit e52b8672276cf436670cdd6bd5de4353740e83b2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.8.0 +%global upstream_version 2.8.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -81,7 +81,7 @@ Requires: ca-certificates # Bundled libraries # License MIT Provides: bundled(php-composer-ca-bundle) = 1.5.2 -Provides: bundled(php-composer-class-map-generator) = 1.3.4 +Provides: bundled(php-composer-class-map-generator) = 1.4.0 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 2.3.1 Provides: bundled(php-composer-semver) = 3.4.3 @@ -256,6 +256,9 @@ done %changelog +* Fri Oct 4 2024 Remi Collet - 2.8.1-1 +- update to 2.8.1 + * Thu Oct 3 2024 Remi Collet - 2.8.0-1 - update to 2.8.0 diff --git a/sources b/sources index 9f01048..082f406 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.0-d5e75c2.tgz) = 59df7a77432bee12d45dfe56ea46cd800aa6c48de5044a7d2edfe1c7b75f1b62cee86151a132f7ed54aa33db30dc68b612436bee51c86f986c8dcc02e1a09eca +SHA512 (composer-2.8.1-e52b867.tgz) = 78f6f6406d7dac11cccc55458a3cd8ddd383e9b1e399562ff716c0e9cc75d76260a294fb032cf0d7f906c04746dd95c80f228abdf6eb9b20f3c2d7f9cd7988a2 From d4fcde52daef0cc5558fd40e1bc8103c0e4e5faf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Oct 2024 07:37:38 +0100 Subject: [PATCH 108/126] v2.8.2 --- composer-bash-completion | 2 +- composer.spec | 80 ++++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 47 insertions(+), 37 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 68f0ea2..7a9b48d 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.1") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.2") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index ee53d8b..a019ef0 100644 --- a/composer.spec +++ b/composer.spec @@ -7,10 +7,10 @@ # Please, preserve the changelog entries # -# For compatibility with SCL -%undefine __brp_mangle_shebangs -%global gh_commit e52b8672276cf436670cdd6bd5de4353740e83b2 +%bcond_with generators + +%global gh_commit 6e543d03187c882ea1c6ba43add2467754427803 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.8.1 +%global upstream_version 2.8.2 #global upstream_prever RC1 #global upstream_lower rc1 @@ -40,7 +40,7 @@ Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short} Source1: %{name}-bash-completion Source3: %{name}.sh Source4: %{name}.csh -# Get a git snapshot to retrieve the test suite +# Create a git snapshot with dependencies Source5: makesrc.sh # Use our autoloader, resources path, fix for tests @@ -54,6 +54,9 @@ BuildRequires: php(language) >= 7.2.5 BuildRequires: php-cli BuildRequires: php-json BuildRequires: pkgconfig(bash-completion) +%if %{with generators} +BuildRequires: composer-generators +%endif # From composer.json, "require": { # "php": "^7.2.5 || ^8.0", @@ -78,36 +81,6 @@ Requires: php(language) >= 7.2.5 Requires: php-cli # System certificates Requires: ca-certificates -# Bundled libraries -# License MIT -Provides: bundled(php-composer-ca-bundle) = 1.5.2 -Provides: bundled(php-composer-class-map-generator) = 1.4.0 -Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 2.3.1 -Provides: bundled(php-composer-semver) = 3.4.3 -Provides: bundled(php-composer-spdx-licenses) = 1.5.8 -Provides: bundled(php-composer-xdebug-handler) = 3.0.5 -Provides: bundled(php-justinrainbow-json-schema) = 5.3.0 -Provides: bundled(php-psr-container) = 1.1.1 -Provides: bundled(php-psr-log) = 1.1.4 -Provides: bundled(php-react-promise) = v3.2.0 -Provides: bundled(php-seld-jsonlint) = 1.11.0 -Provides: bundled(php-seld-phar-utils) = 1.2.1 -Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v5.4.44 -Provides: bundled(php-symfony-deprecation-contracts) = v2.5.3 -Provides: bundled(php-symfony-filesystem) = v5.4.44 -Provides: bundled(php-symfony-finder) = v5.4.43 -Provides: bundled(php-symfony-polyfill-ctype) = v1.31.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.31.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.31.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.31.0 -Provides: bundled(php-symfony-process) = v5.4.44 -Provides: bundled(php-symfony-service-contracts) = v2.5.3 -Provides: bundled(php-symfony-string) = v5.4.44 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -138,8 +111,40 @@ Requires: php-tokenizer Requires: php-xsl Requires: php-zlib +# Bundled libraries +%if %{without generators} +# License MIT +Provides: bundled(php-composer-ca-bundle) = 1.5.2 +Provides: bundled(php-composer-class-map-generator) = 1.4.0 +Provides: bundled(php-composer-metadata-minifier) = 1.0.0 +Provides: bundled(php-composer-pcre) = 2.3.1 +Provides: bundled(php-composer-semver) = 3.4.3 +Provides: bundled(php-composer-spdx-licenses) = 1.5.8 +Provides: bundled(php-composer-xdebug-handler) = 3.0.5 +Provides: bundled(php-justinrainbow-json-schema) = 5.3.0 +Provides: bundled(php-psr-container) = 1.1.1 +Provides: bundled(php-psr-log) = 1.1.4 +Provides: bundled(php-react-promise) = v3.2.0 +Provides: bundled(php-seld-jsonlint) = 1.11.0 +Provides: bundled(php-seld-phar-utils) = 1.2.1 +Provides: bundled(php-seld-signal-handler) = 2.0.2 +Provides: bundled(php-symfony-console) = v5.4.45 +Provides: bundled(php-symfony-deprecation-contracts) = v2.5.3 +Provides: bundled(php-symfony-filesystem) = v5.4.45 +Provides: bundled(php-symfony-finder) = v5.4.45 +Provides: bundled(php-symfony-polyfill-ctype) = v1.31.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.31.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.31.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.31.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.31.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.31.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.31.0 +Provides: bundled(php-symfony-process) = v5.4.45 +Provides: bundled(php-symfony-service-contracts) = v2.5.3 +Provides: bundled(php-symfony-string) = v5.4.45 # Composer library Provides: php-composer(composer/composer) = %{version} +%endif # Special internal for Plugin API Provides: php-composer(composer-plugin-api) = %{api_version} Provides: php-composer(composer-runtime-api) = %{run_version} @@ -173,6 +178,7 @@ ln -s vendor/autoload.php src/Composer/autoload.php : fix layout sed -e "s:/../..' . '/src/Composer::" -i src/Composer/vendor/composer/autoload_static.php +%if %{without generators} : List bundled libraries and Licenses php -r ' $pkgs = file_get_contents("src/Composer/vendor/composer/installed.json"); @@ -192,6 +198,7 @@ php -r ' printf("# License %s\n%s\n", $lic, implode("\n", $lib)); } ' +%endif : fix reported version sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \ @@ -256,6 +263,9 @@ done %changelog +* Wed Oct 30 2024 Remi Collet - 2.8.2-1 +- update to 2.8.2 + * Fri Oct 4 2024 Remi Collet - 2.8.1-1 - update to 2.8.1 diff --git a/sources b/sources index 082f406..8da6004 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.1-e52b867.tgz) = 78f6f6406d7dac11cccc55458a3cd8ddd383e9b1e399562ff716c0e9cc75d76260a294fb032cf0d7f906c04746dd95c80f228abdf6eb9b20f3c2d7f9cd7988a2 +SHA512 (composer-2.8.2-6e543d0.tgz) = 01da8edd05e0886bd289657722001d5aa3456ee2a56e4fd54a2a7e129d47d7b4543f272a984258df7599cc9da713f4d39c4fce64dc0b2de3c7a360fb6e294c49 From 4f7bdd0f218897cfd2ebae87d70e66de8b8f8d16 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Oct 2024 08:07:41 +0100 Subject: [PATCH 109/126] fix diagnose command --- composer.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index a019ef0..6f85e80 100644 --- a/composer.spec +++ b/composer.spec @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -176,7 +176,10 @@ rm src/Composer/vendor/composer/ca-bundle/res/cacert.pem ln -s vendor/autoload.php src/Composer/autoload.php : fix layout -sed -e "s:/../..' . '/src/Composer::" -i src/Composer/vendor/composer/autoload_static.php +sed -e "s:/../..' . '/src/Composer::" \ + -i src/Composer/vendor/composer/autoload_static.php +sed -e "s:../../vendor:vendor:" \ + -i src/Composer/Command/DiagnoseCommand.php src/Composer/Compiler.php %if %{without generators} : List bundled libraries and Licenses @@ -263,8 +266,9 @@ done %changelog -* Wed Oct 30 2024 Remi Collet - 2.8.2-1 +* Wed Oct 30 2024 Remi Collet - 2.8.2-2 - update to 2.8.2 +- fix diagnose command * Fri Oct 4 2024 Remi Collet - 2.8.1-1 - update to 2.8.1 From c90124e643b7f928bf2c68144c93f0f39ad87790 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Oct 2024 10:25:09 +0100 Subject: [PATCH 110/126] keep upstream layout for simplicity --- composer-noxdg.patch | 4 +-- composer-rpm.patch | 59 +++-------------------------------------- composer.spec | 62 +++++++++++++++++++++++--------------------- makesrc.sh | 7 ++--- 4 files changed, 42 insertions(+), 90 deletions(-) diff --git a/composer-noxdg.patch b/composer-noxdg.patch index 8971527..2927848 100644 --- a/composer-noxdg.patch +++ b/composer-noxdg.patch @@ -1,11 +1,11 @@ diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php --- ./src/Composer/Factory.php.noxdg 2024-04-20 12:34:54.442117723 +0200 +++ ./src/Composer/Factory.php 2024-04-20 12:35:39.497640757 +0200 -@@ -680,6 +680,10 @@ class Factory +@@ -702,6 +702,10 @@ class Factory private static function useXdg(): bool { -+ // As XDG is very patially implemted ++ // As XDG is very partially implemented + // resulting in command/code in ~/.config + return false; + diff --git a/composer-rpm.patch b/composer-rpm.patch index 52ed07b..fdc97ac 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -6,34 +6,10 @@ diff -up ./bin/composer.rpm ./bin/composer setlocale(LC_ALL, 'C'); -require __DIR__.'/../src/bootstrap.php'; -+require '/usr/share/php/Composer/autoload.php'; ++require '/usr/share/composer/src/bootstrap.php'; 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 2024-10-03 07:10:57.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2024-10-03 07:11:10.752092401 +0200 -@@ -458,7 +458,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'); -- $filesystem->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE'); -+ $filesystem->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE'); - - if ($this->runScripts) { - $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, [], [ -diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ---- ./src/Composer/Compiler.php.rpm 2024-10-03 07:10:57.000000000 +0200 -+++ ./src/Composer/Compiler.php 2024-10-03 07:11:10.752092401 +0200 -@@ -105,7 +105,7 @@ class Compiler - // Add Composer resources - $finder = new Finder(); - $finder->files() -- ->in(__DIR__.'/../../res') -+ ->in((getenv('BUILDROOT')?:'') . '/usr/share/composer/res') - ->sort($finderSort) - ; - foreach ($finder as $file) { diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php --- ./src/Composer/InstalledVersions.php.rpm 2024-10-03 07:10:57.000000000 +0200 +++ ./src/Composer/InstalledVersions.php 2024-10-03 07:11:10.752092401 +0200 @@ -55,36 +31,9 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ $required = require __DIR__ . '/installed.php'; self::$installed = $required; -diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2024-10-03 07:11:10.752092401 +0200 -+++ ./src/Composer/Json/JsonFile.php 2024-10-03 07:14:54.219192080 +0200 -@@ -41,8 +41,8 @@ class JsonFile - /** @deprecated Use \JSON_UNESCAPED_UNICODE */ - public const JSON_UNESCAPED_UNICODE = 256; - -- public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json'; -- public const LOCK_SCHEMA_PATH = __DIR__ . '/../../../res/composer-lock-schema.json'; -+ public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; -+ public const LOCK_SCHEMA_PATH = '/usr/share/composer/res/composer-lock-schema.json'; - - public const INDENT_DEFAULT = ' '; - -@@ -231,10 +231,10 @@ class JsonFile - $isComposerSchemaFile = false; - if (null === $schemaFile) { - if ($schema === self::LOCK_SCHEMA) { -- $schemaFile = self::LOCK_SCHEMA_PATH; -+ $schemaFile = (getenv('BUILDROOT')?:'') . self::LOCK_SCHEMA_PATH; - } else { - $isComposerSchemaFile = true; -- $schemaFile = self::COMPOSER_SCHEMA_PATH; -+ $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH; - } - } - -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 2024-09-25 09:49:53.000000000 +0200 -+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2024-10-03 07:11:10.752092401 +0200 +diff -up ./vendor/composer/ca-bundle/src/CaBundle.php.rpm ./vendor/composer/ca-bundle/src/CaBundle.php +--- ./vendor/composer/ca-bundle/src/CaBundle.php.rpm 2024-09-25 09:49:53.000000000 +0200 ++++ ./vendor/composer/ca-bundle/src/CaBundle.php 2024-10-03 07:11:10.752092401 +0200 @@ -125,7 +125,7 @@ class CaBundle */ public static function getBundledCaBundlePath() diff --git a/composer.spec b/composer.spec index 6f85e80..8323ea9 100644 --- a/composer.spec +++ b/composer.spec @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -164,27 +164,12 @@ Documentation: https://getcomposer.org/doc/ %patch -P1 -p1 -b .noxdg find . \( -name \*.rpm -o -name \*noxdg \) -delete -print -if grep -r '\.\./res'; then - : Patch need to fixed - exit 1 -fi - -rm src/bootstrap.php -rm src/Composer/vendor/composer/ca-bundle/res/cacert.pem - -: symlink autoloader for library -ln -s vendor/autoload.php src/Composer/autoload.php - -: fix layout -sed -e "s:/../..' . '/src/Composer::" \ - -i src/Composer/vendor/composer/autoload_static.php -sed -e "s:../../vendor:vendor:" \ - -i src/Composer/Command/DiagnoseCommand.php src/Composer/Compiler.php +rm vendor/composer/ca-bundle/res/cacert.pem %if %{without generators} : List bundled libraries and Licenses php -r ' - $pkgs = file_get_contents("src/Composer/vendor/composer/installed.json"); + $pkgs = file_get_contents("vendor/composer/installed.json"); $pkgs = json_decode($pkgs, true); if (!is_array($pkgs) || !isset($pkgs["packages"])) { echo "cant decode json file\n"; @@ -210,7 +195,7 @@ sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \ : check Plugin API version php -r ' namespace Composer; -include "src/Composer/autoload.php"; +include "src/bootstrap.php"; if (version_compare(Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) { printf("Plugin API version is %s, expected %s\n", Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}"); exit(1); @@ -222,7 +207,7 @@ if (version_compare(Composer::RUNTIME_API_VERSION, "%{run_version}")) { %build -# Nothing +: Nothing to build %install @@ -231,32 +216,46 @@ install -Dpm 644 %{SOURCE1} %{buildroot}%{bashcompdir}/%{name} mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/ -: Library -mkdir -p %{buildroot}%{_datadir}/php -cp -pr src/* %{buildroot}%{_datadir}/php +: Library autoloader for compatibility +mkdir -p %{buildroot}%{_datadir}/php/Composer +ln -s ../../composer/vendor/autoload.php %{buildroot}%{_datadir}/php/Composer/autoload.php -: Resources -mkdir -p %{buildroot}%{_datadir}/%{name} -cp -pr res %{buildroot}%{_datadir}/%{name}/res -cp -p LICENSE %{buildroot}%{_datadir}/%{name}/LICENSE +: Sources +mkdir -p %{buildroot}%{_datadir}/%{name} +cp -pr src res vendor LICENSE\ + %{buildroot}%{_datadir}/%{name}/ : Command install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} : Licenses ln -sf ../../%{name}/LICENSE LICENSE -cd src/Composer/vendor +cd vendor for lic in */*/LICENSE do dir=$(dirname $lic) own=$(dirname $dir) prj=$(basename $dir) - ln -sf ../../php/Composer/vendor/$own/$prj/LICENSE ../../../$own-$prj-LICENSE + ln -sf ../../composer/vendor/$own/$prj/LICENSE ../$own-$prj-LICENSE done +%check +: Check autoloader +php -r ' + include "%{buildroot}%{_datadir}/%{name}/src/bootstrap.php"; + exit (class_exists("Composer\\Composer") ? 0 : 1); +' +: Check compatibility autoloader +php -r ' + include "%{buildroot}%{_datadir}/php/Composer/autoload.php"; + exit (class_exists("Composer\\Composer") ? 0 : 2); +' + + %files %license *LICENSE -%doc *.md doc +%doc *.md +%doc doc %doc composer.json %config(noreplace) %{_sysconfdir}/profile.d/%{name}.* %{_bindir}/%{name} @@ -266,6 +265,9 @@ done %changelog +* Wed Oct 30 2024 Remi Collet - 2.8.2-3 +- keep upstream layout for simplicity + * Wed Oct 30 2024 Remi Collet - 2.8.2-2 - update to 2.8.2 - fix diagnose command diff --git a/makesrc.sh b/makesrc.sh index 930ec0b..dc25efb 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -8,7 +8,7 @@ PREVER=$(sed -n '/^%global upstream_prever/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} -if [ -f $NAME-$VERSION$PREVER-$SHORT.tgz ]; then +if [ -f $NAME-$VERSION$PREVER-$SHORT.tgz -a "$1" != "-f" ]; then echo skip $NAME-$VERSION$PREVER-$SHORT.tgz already here else echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n" @@ -22,9 +22,10 @@ else cp composer.json ../composer.json composer config platform.php 7.2.5 rm composer.lock - export COMPOSER_VENDOR_DIR=src/Composer/vendor composer install --no-interaction --no-progress --no-dev --optimize-autoloader - cp src/Composer/vendor/composer/installed.json ../ + cp vendor/composer/installed.json ../ + # bash completion + bin/composer completion bash >../composer-bash-completion popd echo "Archiving..." From 8114a124b14b2ee2027a8e8ccd10b871f7e0322c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Oct 2024 10:39:11 +0100 Subject: [PATCH 111/126] refresh sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 8da6004..5a85c94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.2-6e543d0.tgz) = 01da8edd05e0886bd289657722001d5aa3456ee2a56e4fd54a2a7e129d47d7b4543f272a984258df7599cc9da713f4d39c4fce64dc0b2de3c7a360fb6e294c49 +SHA512 (composer-2.8.2-6e543d0.tgz) = 442fb529026909f6be6ccd2a179d6c5ff8cfa5915e3e9c4029a56348dd65bf09d87d1fd384b91aa1ab6d76f406c2b89d5fdec76bad04ae93e52f962af94da117 From b626a00179f5007034c841596aa00582521d074d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Nov 2024 09:36:01 +0100 Subject: [PATCH 112/126] v2.8.3 --- composer.spec | 67 +++++++++++++++++++++++++++------------------------ sources | 2 +- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/composer.spec b/composer.spec index 8323ea9..4ebdb5b 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ %bcond_with generators -%global gh_commit 6e543d03187c882ea1c6ba43add2467754427803 +%global gh_commit 2a7c71266b2545a3bed9f4860734081963f6e688 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.8.2 +%global upstream_version 2.8.3 #global upstream_prever RC1 #global upstream_lower rc1 @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -114,34 +114,34 @@ Requires: php-zlib # Bundled libraries %if %{without generators} # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.5.2 -Provides: bundled(php-composer-class-map-generator) = 1.4.0 -Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 2.3.1 -Provides: bundled(php-composer-semver) = 3.4.3 -Provides: bundled(php-composer-spdx-licenses) = 1.5.8 -Provides: bundled(php-composer-xdebug-handler) = 3.0.5 -Provides: bundled(php-justinrainbow-json-schema) = 5.3.0 -Provides: bundled(php-psr-container) = 1.1.1 -Provides: bundled(php-psr-log) = 1.1.4 -Provides: bundled(php-react-promise) = v3.2.0 -Provides: bundled(php-seld-jsonlint) = 1.11.0 -Provides: bundled(php-seld-phar-utils) = 1.2.1 -Provides: bundled(php-seld-signal-handler) = 2.0.2 -Provides: bundled(php-symfony-console) = v5.4.45 -Provides: bundled(php-symfony-deprecation-contracts) = v2.5.3 -Provides: bundled(php-symfony-filesystem) = v5.4.45 -Provides: bundled(php-symfony-finder) = v5.4.45 -Provides: bundled(php-symfony-polyfill-ctype) = v1.31.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.31.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.31.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.31.0 -Provides: bundled(php-symfony-polyfill-php81) = v1.31.0 -Provides: bundled(php-symfony-process) = v5.4.45 -Provides: bundled(php-symfony-service-contracts) = v2.5.3 -Provides: bundled(php-symfony-string) = v5.4.45 +Provides: bundled(php-composer(composer/ca-bundle)) = 1.5.3 +Provides: bundled(php-composer(composer/class-map-generator)) = 1.4.0 +Provides: bundled(php-composer(composer/metadata-minifier)) = 1.0.0 +Provides: bundled(php-composer(composer/pcre)) = 2.3.2 +Provides: bundled(php-composer(composer/semver)) = 3.4.3 +Provides: bundled(php-composer(composer/spdx-licenses)) = 1.5.8 +Provides: bundled(php-composer(composer/xdebug-handler)) = 3.0.5 +Provides: bundled(php-composer(justinrainbow/json-schema)) = 5.3.0 +Provides: bundled(php-composer(psr/container)) = 1.1.1 +Provides: bundled(php-composer(psr/log)) = 1.1.4 +Provides: bundled(php-composer(react/promise)) = v3.2.0 +Provides: bundled(php-composer(seld/jsonlint)) = 1.11.0 +Provides: bundled(php-composer(seld/phar-utils)) = 1.2.1 +Provides: bundled(php-composer(seld/signal-handler)) = 2.0.2 +Provides: bundled(php-composer(symfony/console)) = v5.4.47 +Provides: bundled(php-composer(symfony/deprecation-contracts)) = v2.5.3 +Provides: bundled(php-composer(symfony/filesystem)) = v5.4.45 +Provides: bundled(php-composer(symfony/finder)) = v5.4.45 +Provides: bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php73)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php80)) = v1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php81)) = v1.31.0 +Provides: bundled(php-composer(symfony/process)) = v5.4.47 +Provides: bundled(php-composer(symfony/service-contracts)) = v2.5.3 +Provides: bundled(php-composer(symfony/string)) = v5.4.47 # Composer library Provides: php-composer(composer/composer) = %{version} %endif @@ -179,7 +179,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-composer(%s)) = %s", $pkg["name"], $pkg["version"]); } foreach($res as $lic => $lib) { sort($lib); @@ -265,6 +265,9 @@ php -r ' %changelog +* Mon Nov 18 2024 Remi Collet - 2.8.3-1 +- update to 2.8.3 + * Wed Oct 30 2024 Remi Collet - 2.8.2-3 - keep upstream layout for simplicity diff --git a/sources b/sources index 5a85c94..ec9255c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.2-6e543d0.tgz) = 442fb529026909f6be6ccd2a179d6c5ff8cfa5915e3e9c4029a56348dd65bf09d87d1fd384b91aa1ab6d76f406c2b89d5fdec76bad04ae93e52f962af94da117 +SHA512 (composer-2.8.3-2a7c712.tgz) = 3fa1687527d531cb83f1f269825ca8d213f59990532542f08021f6bcdb6d56539ac874810e609f541f12e19c26541a44c98f9d39a3757056f2f1c80a4356159e From 1a4995644a7cc8a40def8cac91a009d6ee0487aa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Dec 2024 13:59:01 +0100 Subject: [PATCH 113/126] update to 2.8.4 re-license spec file to CECILL-2.1 --- composer-bash-completion | 2 +- composer.spec | 22 +++++++++++++--------- sources | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 7a9b48d..8aa8c87 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.2") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.4") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 4ebdb5b..be27ce7 100644 --- a/composer.spec +++ b/composer.spec @@ -1,8 +1,8 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2024 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -10,7 +10,7 @@ %bcond_with generators -%global gh_commit 2a7c71266b2545a3bed9f4860734081963f6e688 +%global gh_commit 112e37d1dca22b3fdb81cf3524ab4994f47fdb8c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.8.3 +%global upstream_version 2.8.4 #global upstream_prever RC1 #global upstream_lower rc1 @@ -114,8 +114,8 @@ Requires: php-zlib # Bundled libraries %if %{without generators} # License MIT -Provides: bundled(php-composer(composer/ca-bundle)) = 1.5.3 -Provides: bundled(php-composer(composer/class-map-generator)) = 1.4.0 +Provides: bundled(php-composer(composer/ca-bundle)) = 1.5.4 +Provides: bundled(php-composer(composer/class-map-generator)) = 1.5.0 Provides: bundled(php-composer(composer/metadata-minifier)) = 1.0.0 Provides: bundled(php-composer(composer/pcre)) = 2.3.2 Provides: bundled(php-composer(composer/semver)) = 3.4.3 @@ -129,7 +129,7 @@ Provides: bundled(php-composer(seld/jsonlint)) = 1.11.0 Provides: bundled(php-composer(seld/phar-utils)) = 1.2.1 Provides: bundled(php-composer(seld/signal-handler)) = 2.0.2 Provides: bundled(php-composer(symfony/console)) = v5.4.47 -Provides: bundled(php-composer(symfony/deprecation-contracts)) = v2.5.3 +Provides: bundled(php-composer(symfony/deprecation-contracts)) = v2.5.4 Provides: bundled(php-composer(symfony/filesystem)) = v5.4.45 Provides: bundled(php-composer(symfony/finder)) = v5.4.45 Provides: bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0 @@ -140,7 +140,7 @@ Provides: bundled(php-composer(symfony/polyfill-php73)) = v1.31.0 Provides: bundled(php-composer(symfony/polyfill-php80)) = v1.31.0 Provides: bundled(php-composer(symfony/polyfill-php81)) = v1.31.0 Provides: bundled(php-composer(symfony/process)) = v5.4.47 -Provides: bundled(php-composer(symfony/service-contracts)) = v2.5.3 +Provides: bundled(php-composer(symfony/service-contracts)) = v2.5.4 Provides: bundled(php-composer(symfony/string)) = v5.4.47 # Composer library Provides: php-composer(composer/composer) = %{version} @@ -265,6 +265,10 @@ php -r ' %changelog +* Wed Dec 11 2024 Remi Collet - 2.8.4-1 +- update to 2.8.4 +- re-license spec file to CECILL-2.1 + * Mon Nov 18 2024 Remi Collet - 2.8.3-1 - update to 2.8.3 diff --git a/sources b/sources index ec9255c..dbce972 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.3-2a7c712.tgz) = 3fa1687527d531cb83f1f269825ca8d213f59990532542f08021f6bcdb6d56539ac874810e609f541f12e19c26541a44c98f9d39a3757056f2f1c80a4356159e +SHA512 (composer-2.8.4-112e37d.tgz) = 3c5331460a31d3e3c52f6248063bcca85e0d0aeb5c581f0892f1ed63fd4610553e52be5e3dd802c0bf594b59c4d02aa356c16c5df14067e51420deb0951c47a3 From f771771690eb676302119da8273c9db4e9028579 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:22:03 +0000 Subject: [PATCH 114/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- composer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index be27ce7..b9a302c 100644 --- a/composer.spec +++ b/composer.spec @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -265,6 +265,9 @@ php -r ' %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Dec 11 2024 Remi Collet - 2.8.4-1 - update to 2.8.4 - re-license spec file to CECILL-2.1 From 37b5f986cca66b20aa3172845f7edca03e6c6c59 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Jan 2025 16:11:24 +0100 Subject: [PATCH 115/126] v2.8.5 --- composer-bash-completion | 2 +- composer.spec | 45 +++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 8aa8c87..cea3084 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.4") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.5") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index b9a302c..3eb7827 100644 --- a/composer.spec +++ b/composer.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for composer # -# SPDX-FileCopyrightText: Copyright 2024 Remi Collet +# SPDX-FileCopyrightText: Copyright 2015-2025 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # @@ -10,7 +10,7 @@ %bcond_with generators -%global gh_commit 112e37d1dca22b3fdb81cf3524ab4994f47fdb8c +%global gh_commit ae208dc1e182bd45d99fcecb956501da212454a1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.8.4 +%global upstream_version 2.8.5 #global upstream_prever RC1 #global upstream_lower rc1 @@ -29,7 +29,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -114,7 +114,7 @@ Requires: php-zlib # Bundled libraries %if %{without generators} # License MIT -Provides: bundled(php-composer(composer/ca-bundle)) = 1.5.4 +Provides: bundled(php-composer(composer/ca-bundle)) = 1.5.5 Provides: bundled(php-composer(composer/class-map-generator)) = 1.5.0 Provides: bundled(php-composer(composer/metadata-minifier)) = 1.0.0 Provides: bundled(php-composer(composer/pcre)) = 2.3.2 @@ -124,24 +124,24 @@ Provides: bundled(php-composer(composer/xdebug-handler)) = 3.0.5 Provides: bundled(php-composer(justinrainbow/json-schema)) = 5.3.0 Provides: bundled(php-composer(psr/container)) = 1.1.1 Provides: bundled(php-composer(psr/log)) = 1.1.4 -Provides: bundled(php-composer(react/promise)) = v3.2.0 +Provides: bundled(php-composer(react/promise)) = 3.2.0 Provides: bundled(php-composer(seld/jsonlint)) = 1.11.0 Provides: bundled(php-composer(seld/phar-utils)) = 1.2.1 Provides: bundled(php-composer(seld/signal-handler)) = 2.0.2 -Provides: bundled(php-composer(symfony/console)) = v5.4.47 -Provides: bundled(php-composer(symfony/deprecation-contracts)) = v2.5.4 -Provides: bundled(php-composer(symfony/filesystem)) = v5.4.45 -Provides: bundled(php-composer(symfony/finder)) = v5.4.45 -Provides: bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php73)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php80)) = v1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php81)) = v1.31.0 -Provides: bundled(php-composer(symfony/process)) = v5.4.47 -Provides: bundled(php-composer(symfony/service-contracts)) = v2.5.4 -Provides: bundled(php-composer(symfony/string)) = v5.4.47 +Provides: bundled(php-composer(symfony/console)) = 5.4.47 +Provides: bundled(php-composer(symfony/deprecation-contracts)) = 2.5.4 +Provides: bundled(php-composer(symfony/filesystem)) = 5.4.45 +Provides: bundled(php-composer(symfony/finder)) = 5.4.45 +Provides: bundled(php-composer(symfony/polyfill-ctype)) = 1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.31.0 +Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.31.0 +Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php73)) = 1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.31.0 +Provides: bundled(php-composer(symfony/polyfill-php81)) = 1.31.0 +Provides: bundled(php-composer(symfony/process)) = 5.4.47 +Provides: bundled(php-composer(symfony/service-contracts)) = 2.5.4 +Provides: bundled(php-composer(symfony/string)) = 5.4.47 # Composer library Provides: php-composer(composer/composer) = %{version} %endif @@ -179,7 +179,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-composer(%s)) = %s", $pkg["name"], $pkg["version"]); + $res[$lic][] = sprintf("Provides: bundled(php-composer(%s)) = %s", $pkg["name"], trim($pkg["version"], "v")); } foreach($res as $lic => $lib) { sort($lib); @@ -265,6 +265,9 @@ php -r ' %changelog +* Tue Jan 21 2025 Remi Collet - 2.8.5-1 +- update to 2.8.5 + * Thu Jan 16 2025 Fedora Release Engineering - 2.8.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index dbce972..22e1949 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.4-112e37d.tgz) = 3c5331460a31d3e3c52f6248063bcca85e0d0aeb5c581f0892f1ed63fd4610553e52be5e3dd802c0bf594b59c4d02aa356c16c5df14067e51420deb0951c47a3 +SHA512 (composer-2.8.5-ae208dc.tgz) = 9ebeefcc814dccfa44419609d00f8e01b71749e5f2195b788d6d2489bd77f2372e9f72bfbca4a2b6ea9ea2aa20319a164d2377aa1c00bc0b4b8804c398c45dcd From ae6d3b3084d75ccf8d76a915634d82697836c5de Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Feb 2025 15:38:39 +0100 Subject: [PATCH 116/126] v2.8.6 --- composer-bash-completion | 2 +- composer.spec | 67 +++------------------------------------- sources | 2 +- 3 files changed, 7 insertions(+), 64 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index cea3084..462f753 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.5") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.6") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 3eb7827..035eb9c 100644 --- a/composer.spec +++ b/composer.spec @@ -8,9 +8,7 @@ # -%bcond_with generators - -%global gh_commit ae208dc1e182bd45d99fcecb956501da212454a1 +%global gh_commit 937c775a644bd7d2c3dfbb352747488463a6e673 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -18,7 +16,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.8.5 +%global upstream_version 2.8.6 #global upstream_prever RC1 #global upstream_lower rc1 @@ -54,9 +52,7 @@ BuildRequires: php(language) >= 7.2.5 BuildRequires: php-cli BuildRequires: php-json BuildRequires: pkgconfig(bash-completion) -%if %{with generators} BuildRequires: composer-generators -%endif # From composer.json, "require": { # "php": "^7.2.5 || ^8.0", @@ -111,40 +107,6 @@ Requires: php-tokenizer Requires: php-xsl Requires: php-zlib -# Bundled libraries -%if %{without generators} -# License MIT -Provides: bundled(php-composer(composer/ca-bundle)) = 1.5.5 -Provides: bundled(php-composer(composer/class-map-generator)) = 1.5.0 -Provides: bundled(php-composer(composer/metadata-minifier)) = 1.0.0 -Provides: bundled(php-composer(composer/pcre)) = 2.3.2 -Provides: bundled(php-composer(composer/semver)) = 3.4.3 -Provides: bundled(php-composer(composer/spdx-licenses)) = 1.5.8 -Provides: bundled(php-composer(composer/xdebug-handler)) = 3.0.5 -Provides: bundled(php-composer(justinrainbow/json-schema)) = 5.3.0 -Provides: bundled(php-composer(psr/container)) = 1.1.1 -Provides: bundled(php-composer(psr/log)) = 1.1.4 -Provides: bundled(php-composer(react/promise)) = 3.2.0 -Provides: bundled(php-composer(seld/jsonlint)) = 1.11.0 -Provides: bundled(php-composer(seld/phar-utils)) = 1.2.1 -Provides: bundled(php-composer(seld/signal-handler)) = 2.0.2 -Provides: bundled(php-composer(symfony/console)) = 5.4.47 -Provides: bundled(php-composer(symfony/deprecation-contracts)) = 2.5.4 -Provides: bundled(php-composer(symfony/filesystem)) = 5.4.45 -Provides: bundled(php-composer(symfony/finder)) = 5.4.45 -Provides: bundled(php-composer(symfony/polyfill-ctype)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-mbstring)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php73)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php80)) = 1.31.0 -Provides: bundled(php-composer(symfony/polyfill-php81)) = 1.31.0 -Provides: bundled(php-composer(symfony/process)) = 5.4.47 -Provides: bundled(php-composer(symfony/service-contracts)) = 2.5.4 -Provides: bundled(php-composer(symfony/string)) = 5.4.47 -# Composer library -Provides: php-composer(composer/composer) = %{version} -%endif # Special internal for Plugin API Provides: php-composer(composer-plugin-api) = %{api_version} Provides: php-composer(composer-runtime-api) = %{run_version} @@ -166,28 +128,6 @@ find . \( -name \*.rpm -o -name \*noxdg \) -delete -print rm vendor/composer/ca-bundle/res/cacert.pem -%if %{without generators} -: List bundled libraries and Licenses -php -r ' - $pkgs = file_get_contents("vendor/composer/installed.json"); - $pkgs = json_decode($pkgs, true); - if (!is_array($pkgs) || !isset($pkgs["packages"])) { - echo "cant decode json file\n"; - exit(3); - } - $res = []; - foreach($pkgs["packages"] as $pkg) { - $lic = implode(" and ", $pkg["license"]); - if (!isset($res[$lic])) $res[$lic] = []; - $res[$lic][] = sprintf("Provides: bundled(php-composer(%s)) = %s", $pkg["name"], trim($pkg["version"], "v")); - } - foreach($res as $lic => $lib) { - sort($lib); - printf("# License %s\n%s\n", $lic, implode("\n", $lib)); - } -' -%endif - : fix reported version sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \ -i src/Composer/Composer.php @@ -265,6 +205,9 @@ php -r ' %changelog +* Tue Feb 25 2025 Remi Collet - 2.8.6-1 +- update to 2.8.6 + * Tue Jan 21 2025 Remi Collet - 2.8.5-1 - update to 2.8.5 diff --git a/sources b/sources index 22e1949..19b321c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.5-ae208dc.tgz) = 9ebeefcc814dccfa44419609d00f8e01b71749e5f2195b788d6d2489bd77f2372e9f72bfbca4a2b6ea9ea2aa20319a164d2377aa1c00bc0b4b8804c398c45dcd +SHA512 (composer-2.8.6-937c775.tgz) = 29da35ab956ca9a9d5cfd019eda52f0bcb0bf638ee244ed5c46d8de9465557350a54d30f89d62a9d2e0e9e0d0619cda9f46e101b0774871fa4c066d5cc89aa63 From a6ca5074a589b67a228ec0e47afe562adaf8231c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Apr 2025 08:51:31 +0200 Subject: [PATCH 117/126] v2.8.8 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 462f753..f31bc3a 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.6") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.8") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 035eb9c..38c263a 100644 --- a/composer.spec +++ b/composer.spec @@ -8,7 +8,7 @@ # -%global gh_commit 937c775a644bd7d2c3dfbb352747488463a6e673 +%global gh_commit 85ff84d6c5260ba21740a7c5c9a111890805d6e7 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.8.6 +%global upstream_version 2.8.8 #global upstream_prever RC1 #global upstream_lower rc1 @@ -205,6 +205,9 @@ php -r ' %changelog +* Sat Apr 5 2025 Remi Collet - 2.8.8-1 +- update to 2.8.8 + * Tue Feb 25 2025 Remi Collet - 2.8.6-1 - update to 2.8.6 diff --git a/sources b/sources index 19b321c..d87700d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.6-937c775.tgz) = 29da35ab956ca9a9d5cfd019eda52f0bcb0bf638ee244ed5c46d8de9465557350a54d30f89d62a9d2e0e9e0d0619cda9f46e101b0774871fa4c066d5cc89aa63 +SHA512 (composer-2.8.8-85ff84d.tgz) = c6615d03b7ce75265aa2d4069a5d3cbf163503c67aa57dcf1409c49f9ddff91690ce4f939f3ec46c5a31e396424859b46a052c3d3b799676498320e728b5eeb5 From 37302d9faf98badd8a872f4487365fab89e66f76 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 13 May 2025 14:32:44 +0200 Subject: [PATCH 118/126] v2.8.9 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index f31bc3a..4ca8915 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.8") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.9") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 38c263a..625ab98 100644 --- a/composer.spec +++ b/composer.spec @@ -8,7 +8,7 @@ # -%global gh_commit 85ff84d6c5260ba21740a7c5c9a111890805d6e7 +%global gh_commit b4e6bff2db7ce756ddb77ecee958a0f41f42bd9d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.8.8 +%global upstream_version 2.8.9 #global upstream_prever RC1 #global upstream_lower rc1 @@ -205,6 +205,9 @@ php -r ' %changelog +* Tue May 13 2025 Remi Collet - 2.8.9-1 +- update to 2.8.9 + * Sat Apr 5 2025 Remi Collet - 2.8.8-1 - update to 2.8.8 diff --git a/sources b/sources index d87700d..1c62e2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.8-85ff84d.tgz) = c6615d03b7ce75265aa2d4069a5d3cbf163503c67aa57dcf1409c49f9ddff91690ce4f939f3ec46c5a31e396424859b46a052c3d3b799676498320e728b5eeb5 +SHA512 (composer-2.8.9-b4e6bff.tgz) = ca74545d85272d608df910fbd6a74a3ae16816c19113f6b5430808afae73baf1eddf887b1251a71c2e527af342ffc9ec1dfdc66db42a6b629bed1149bec99f0c From ef7a24ed26838ca0a34e0f53294b8d32487ce350 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Jul 2025 07:56:05 +0200 Subject: [PATCH 119/126] v2.8.10 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 4ca8915..a14f0a3 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.9") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.10") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 625ab98..622d561 100644 --- a/composer.spec +++ b/composer.spec @@ -8,7 +8,7 @@ # -%global gh_commit b4e6bff2db7ce756ddb77ecee958a0f41f42bd9d +%global gh_commit 53834f587d7ab2527eb237459d7b94d1fb9d4c5a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.8.9 +%global upstream_version 2.8.10 #global upstream_prever RC1 #global upstream_lower rc1 @@ -205,6 +205,9 @@ php -r ' %changelog +* Fri Jul 11 2025 Remi Collet - 2.8.10-1 +- update to 2.8.10 + * Tue May 13 2025 Remi Collet - 2.8.9-1 - update to 2.8.9 diff --git a/sources b/sources index 1c62e2f..d1b23eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.9-b4e6bff.tgz) = ca74545d85272d608df910fbd6a74a3ae16816c19113f6b5430808afae73baf1eddf887b1251a71c2e527af342ffc9ec1dfdc66db42a6b629bed1149bec99f0c +SHA512 (composer-2.8.10-53834f5.tgz) = 34a7a8816b3f8a54a2cab804d3af612ada3291fe69abd948113151de578c3eb1c052b6552cc1d18ec7a9c88a2ed26f3c24af53d93c4111e09c8309b2cbeef3c8 From 7d19c34bd1a8fa9b1cae4aa2a61379265d90d5ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:35:43 +0000 Subject: [PATCH 120/126] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- composer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index 622d561..e0c9881 100644 --- a/composer.spec +++ b/composer.spec @@ -27,7 +27,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -205,6 +205,9 @@ php -r ' %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.8.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 11 2025 Remi Collet - 2.8.10-1 - update to 2.8.10 From 34d2866a0e75784380120fe914ce84881c91ecac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Aug 2025 09:37:54 +0200 Subject: [PATCH 121/126] v2.8.11 --- composer-bash-completion | 2 +- composer-rpm.patch | 2 +- composer.spec | 11 +++++++---- sources | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index a14f0a3..81e4525 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.10") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.11") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer-rpm.patch b/composer-rpm.patch index fdc97ac..7323225 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -39,7 +39,7 @@ diff -up ./vendor/composer/ca-bundle/src/CaBundle.php.rpm ./vendor/composer/ca-b public static function getBundledCaBundlePath() { - $caBundleFile = __DIR__.'/../res/cacert.pem'; -+ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always ++ $caBundleFile = '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem'; // System CA, always // cURL does not understand 'phar://' paths // see https://github.com/composer/ca-bundle/issues/10 diff --git a/composer.spec b/composer.spec index e0c9881..1da5833 100644 --- a/composer.spec +++ b/composer.spec @@ -8,7 +8,7 @@ # -%global gh_commit 53834f587d7ab2527eb237459d7b94d1fb9d4c5a +%global gh_commit 00e1a3396eea67033775c4a49c772376f45acd73 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.8.10 +%global upstream_version 2.8.11 #global upstream_prever RC1 #global upstream_lower rc1 @@ -27,7 +27,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT @@ -76,7 +76,7 @@ BuildRequires: composer-generators Requires: php(language) >= 7.2.5 Requires: php-cli # System certificates -Requires: ca-certificates +Requires: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -205,6 +205,9 @@ php -r ' %changelog +* Wed Aug 27 2025 Remi Collet - 2.8.11-1 +- update to 2.8.11 + * Wed Jul 23 2025 Fedora Release Engineering - 2.8.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index d1b23eb..b91ef32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.10-53834f5.tgz) = 34a7a8816b3f8a54a2cab804d3af612ada3291fe69abd948113151de578c3eb1c052b6552cc1d18ec7a9c88a2ed26f3c24af53d93c4111e09c8309b2cbeef3c8 +SHA512 (composer-2.8.11-00e1a33.tgz) = 401398f5fd9bdd8b3b75228781c503363e6988c6f7289d6e39fd91cb83e6527fd38aeea2ce3909fede3132ee22ff9c711d97d43c337aa1b0d7d6f0c7e98643cc From fbfc4285f46d39295627a679e3f30cee0904ad56 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Sep 2025 14:09:46 +0200 Subject: [PATCH 122/126] v2.8.12 (cherry picked from commit b02ea19394b55ae7f75ab9714c1df9de3a99e193) --- composer-bash-completion | 2 +- composer.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 81e4525..6e27771 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.11") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.12") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 1da5833..f50cfa4 100644 --- a/composer.spec +++ b/composer.spec @@ -8,7 +8,7 @@ # -%global gh_commit 00e1a3396eea67033775c4a49c772376f45acd73 +%global gh_commit 3e38919bc9a2c3c026f2151b5e56d04084ce8f0b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ %global api_version 2.6.0 %global run_version 2.2.2 -%global upstream_version 2.8.11 +%global upstream_version 2.8.12 #global upstream_prever RC1 #global upstream_lower rc1 @@ -111,6 +111,10 @@ Requires: php-zlib Provides: php-composer(composer-plugin-api) = %{api_version} Provides: php-composer(composer-runtime-api) = %{run_version} +# PEAR is now deprecated +# composer is designed to replace it +Supplements: php-pear + %description Composer helps you declare, manage and install dependencies of PHP projects, @@ -205,6 +209,9 @@ php -r ' %changelog +* Fri Sep 19 2025 Remi Collet - 2.8.12-1 +- update to 2.8.12 + * Wed Aug 27 2025 Remi Collet - 2.8.11-1 - update to 2.8.11 diff --git a/sources b/sources index b91ef32..726b6e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.11-00e1a33.tgz) = 401398f5fd9bdd8b3b75228781c503363e6988c6f7289d6e39fd91cb83e6527fd38aeea2ce3909fede3132ee22ff9c711d97d43c337aa1b0d7d6f0c7e98643cc +SHA512 (composer-2.8.12-3e38919.tgz) = a059574c12c74002ca1bc330e19355a8deb3fc94253c158e47b899dbb9fddefc888fed043950e8afcce1c8e688fac7789ed81855a214931fc12557b98eafe3ae From 2a4898a61e9c738d44fac9dc922c1a5e7698f596 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Nov 2025 11:41:12 +0100 Subject: [PATCH 123/126] v2.9.0 --- composer-bash-completion | 2 +- composer.spec | 50 +++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 6e27771..907f4b8 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.12") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.0") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index f50cfa4..c4825d6 100644 --- a/composer.spec +++ b/composer.spec @@ -8,15 +8,15 @@ # -%global gh_commit 3e38919bc9a2c3c026f2151b5e56d04084ce8f0b +%global gh_commit 5b236f4fb611083885d18031a9e503e1cdb6a3f6 %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 api_version 2.6.0 +%global api_version 2.9.0 %global run_version 2.2.2 -%global upstream_version 2.8.12 +%global upstream_version 2.9.0 #global upstream_prever RC1 #global upstream_lower rc1 @@ -56,45 +56,50 @@ BuildRequires: composer-generators # From composer.json, "require": { # "php": "^7.2.5 || ^8.0", -# "composer/ca-bundle": "^1.0", +# "ext-json": "*", +# "composer/ca-bundle": "^1.5", +# "composer/class-map-generator": "^1.4.0", # "composer/metadata-minifier": "^1.0", -# "composer/semver": "^3.0", -# "composer/spdx-licenses": "^1.2", +# "composer/semver": "^3.3", +# "composer/spdx-licenses": "^1.5.7", # "composer/xdebug-handler": "^2.0.2 || ^3.0.3", -# "justinrainbow/json-schema": "^5.2.11", -# "psr/log": "^1.0 || ^2.0 || ^3.0" -# "seld/jsonlint": "~1.4", +# "justinrainbow/json-schema": "^6.5.1", +# "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/filesystem": "^5.4 || ^6.0", -# "symfony/finder": "^5.4 || ^6.0", -# "symfony/process": "^5.4 || ^6.0", -# "react/promise": "^2.8", -# "composer/pcre": "^2 || ^3" +# "symfony/console": "^5.4.47 || ^6.4.25 || ^7.1.10 || ^8.0", +# "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.1.10 || ^8.0", +# "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.1.10 || ^8.0", +# "symfony/process": "^5.4.47 || ^6.4.25 || ^7.1.10 || ^8.0", +# "react/promise": "^3.3", +# "composer/pcre": "^2.3 || ^3.3", # "symfony/polyfill-php73": "^1.24", -# "symfony/polyfill-php80": "^1.24" +# "symfony/polyfill-php80": "^1.24", +# "symfony/polyfill-php81": "^1.24", +# "seld/signal-handler": "^2.0" Requires: php(language) >= 7.2.5 +Requires: php-json Requires: php-cli # System certificates Requires: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem # From composer.json, suggest -# "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", -# "ext-zip": "Enabling the zip extension allows you to unzip archives", -# "ext-zlib": "Allow gzip compression of HTTP requests" +# "ext-curl": "Provides HTTP support (will fallback to PHP streams if missing)", +# "ext-openssl": "Enables access to repositories and packages over HTTPS", +# "ext-zip": "Allows direct extraction of ZIP archives (unzip/7z binaries will be used instead if available)", +# "ext-zlib": "Enables gzip for HTTP requests" +Requires: php-curl Requires: php-openssl Requires: php-zip Requires: php-zlib # From phpcompatinfo for version 2.2.5 Requires: php-ctype -Requires: php-curl Requires: php-date Requires: php-dom Requires: php-filter Requires: php-hash Requires: php-iconv Requires: php-intl -Requires: php-json Requires: php-libxml Requires: php-mbstring Requires: php-pcntl @@ -209,6 +214,9 @@ php -r ' %changelog +* Thu Nov 13 2025 Remi Collet - 2.9.0-1 +- update to 2.9.0 + * Fri Sep 19 2025 Remi Collet - 2.8.12-1 - update to 2.8.12 diff --git a/sources b/sources index 726b6e3..4f59e05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.8.12-3e38919.tgz) = a059574c12c74002ca1bc330e19355a8deb3fc94253c158e47b899dbb9fddefc888fed043950e8afcce1c8e688fac7789ed81855a214931fc12557b98eafe3ae +SHA512 (composer-2.9.0-5b236f4.tgz) = 75cd4847907372561a533c8be354c2bfe334939d2909c7ae586bb99a549e91dfbe9324c46515631bfa4c1729fafd77d56844db1e74390627f060f0738071889f From 60a8676c9b5d352f636482155b15759ee826307b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 14 Nov 2025 08:15:32 +0100 Subject: [PATCH 124/126] v2.9.1 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 907f4b8..f5283f5 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.0") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.1") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index c4825d6..2183f7e 100644 --- a/composer.spec +++ b/composer.spec @@ -8,7 +8,7 @@ # -%global gh_commit 5b236f4fb611083885d18031a9e503e1cdb6a3f6 +%global gh_commit 35cb6d47d03b0cae52dc12d686f941365b20f08b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ %global api_version 2.9.0 %global run_version 2.2.2 -%global upstream_version 2.9.0 +%global upstream_version 2.9.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -214,6 +214,9 @@ php -r ' %changelog +* Thu Nov 13 2025 Remi Collet - 2.9.1-1 +- update to 2.9.1 + * Thu Nov 13 2025 Remi Collet - 2.9.0-1 - update to 2.9.0 diff --git a/sources b/sources index 4f59e05..ccf80dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.9.0-5b236f4.tgz) = 75cd4847907372561a533c8be354c2bfe334939d2909c7ae586bb99a549e91dfbe9324c46515631bfa4c1729fafd77d56844db1e74390627f060f0738071889f +SHA512 (composer-2.9.1-35cb6d4.tgz) = f61bd99ea61a7748ba6b5607b88c734006d2be906552e0e94c74c74071b3f5078cc2e8cf619e227d90c1dd3a9ee2e89ba525024239fa160a6cdbbc4494441b36 From 3c30fb4380ef3c52c595a2c1bd8940f3783c9e98 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 20 Nov 2025 02:15:49 +0100 Subject: [PATCH 125/126] v2.9.2 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index f5283f5..4fd810b 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.1") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.2") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 2183f7e..a1c9c09 100644 --- a/composer.spec +++ b/composer.spec @@ -8,7 +8,7 @@ # -%global gh_commit 35cb6d47d03b0cae52dc12d686f941365b20f08b +%global gh_commit 8d5358f147c63a3a681b002076deff8c90e0b19d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ %global api_version 2.9.0 %global run_version 2.2.2 -%global upstream_version 2.9.1 +%global upstream_version 2.9.2 #global upstream_prever RC1 #global upstream_lower rc1 @@ -214,6 +214,9 @@ php -r ' %changelog +* Thu Nov 20 2025 Remi Collet - 2.9.2-1 +- update to 2.9.2 + * Thu Nov 13 2025 Remi Collet - 2.9.1-1 - update to 2.9.1 diff --git a/sources b/sources index ccf80dc..b2b73d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.9.1-35cb6d4.tgz) = f61bd99ea61a7748ba6b5607b88c734006d2be906552e0e94c74c74071b3f5078cc2e8cf619e227d90c1dd3a9ee2e89ba525024239fa160a6cdbbc4494441b36 +SHA512 (composer-2.9.2-8d5358f.tgz) = 22b61191ebef87c12ab9791e94055a522ea31e0bc4723db1572ea07b3ab30b90f17786511f8a798df07ff4b0719b1a1409cb2ce8da76a14b77bf65c84273f93d From 37be2c86fa224089736cb0de23b30bc85df20471 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Jan 2026 10:16:59 +0100 Subject: [PATCH 126/126] v2.9.3 --- composer-bash-completion | 2 +- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 4fd810b..0b6447f 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.2") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.3") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index a1c9c09..f6de2ad 100644 --- a/composer.spec +++ b/composer.spec @@ -8,7 +8,7 @@ # -%global gh_commit 8d5358f147c63a3a681b002076deff8c90e0b19d +%global gh_commit fb3bee27676fd852a8a11ebbb1de19b4dada5aba %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ %global api_version 2.9.0 %global run_version 2.2.2 -%global upstream_version 2.9.2 +%global upstream_version 2.9.3 #global upstream_prever RC1 #global upstream_lower rc1 @@ -214,6 +214,9 @@ php -r ' %changelog +* Wed Dec 31 2025 Remi Collet - 2.9.3-1 +- update to 2.9.3 + * Thu Nov 20 2025 Remi Collet - 2.9.2-1 - update to 2.9.2 diff --git a/sources b/sources index b2b73d5..05fc8e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.9.2-8d5358f.tgz) = 22b61191ebef87c12ab9791e94055a522ea31e0bc4723db1572ea07b3ab30b90f17786511f8a798df07ff4b0719b1a1409cb2ce8da76a14b77bf65c84273f93d +SHA512 (composer-2.9.3-fb3bee2.tgz) = b8f9a7bc73a7b765f113a22308e2b4b35c14ebfadadc57047a37f210be4099a49abc72c85c5c9ce200baa3e63ad0c1a97da744277ca1da948b419af40379658c