From 0617a5ee92a1768a3d8496372ca15894288ca24c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:23:16 +0000 Subject: [PATCH 01/60] 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 02/60] 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 7aa5f3bf406efd538aaa1a8a239d275fa1cb22f8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Feb 2023 07:27:17 +0100 Subject: [PATCH 03/60] v2.5.2 (cherry picked from commit 0bf323a92a10b5747beef382d522ffa503ce5033) --- 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 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 708303f..3eb96a6 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 @@ -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 Dec 22 2022 Remi Collet - 2.5.1-1 - update to 2.5.1 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 04/60] 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 8d174bdc343953f0c9efdcb73847ad11e710cd83 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Feb 2023 14:41:24 +0100 Subject: [PATCH 05/60] v2.5.3 (cherry picked from commit de254c8f264e6e2ed0f034965a566e0ea27f9d5a) --- 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 3eb96a6..b9bf469 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 06/60] 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 d6ee9e482d6cdca46c04f9177b3edabcb7060d7a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Feb 2023 14:34:20 +0100 Subject: [PATCH 07/60] v2.5.4 (cherry picked from commit ad2f2d8ca14882f231052369bdc4187a6086c12f) --- 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 b9bf469..89e5d08 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 08/60] 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 94bbf008d82cc1435a8ee1efe35afcd5d8f0b442 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Mar 2023 16:01:05 +0100 Subject: [PATCH 09/60] v2.5.5 (cherry picked from commit ec74b09b608bbdfed4d7aaf27e2256059da5e919) --- 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 89e5d08..50f4a09 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 10/60] 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 6929b576758399a8e60737776372f25b560a50d2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 May 2023 11:02:27 +0200 Subject: [PATCH 11/60] v2.5.6 (cherry picked from commit 928b46e1be37e4334158e7208264ae5852919c5b) --- 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 50f4a09..c4da7ff 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 12/60] 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 6e938ea5cded748b77bb1f81913c3a5c04942eec Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 May 2023 16:08:49 +0200 Subject: [PATCH 13/60] v2.5.7 (cherry picked from commit 553ae0c0f39a9822a8a0c8f947cb8038eb9e6906) --- 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 c4da7ff..e5dc129 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 14/60] 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 7f2de95c1734dbae4dd4214d0f2c11bfe3ead325 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Jun 2023 07:23:10 +0200 Subject: [PATCH 15/60] v2.5.8 (cherry picked from commit e66ada18fdfa7e076b207acd9b1b27c1a77ea101) --- 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 e5dc129..18f5911 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 16/60] 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 17/60] 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 2c44949d38dca2266fa983ce31b6b0c345b00078 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Sep 2023 11:14:45 +0200 Subject: [PATCH 18/60] v2.6.0 (cherry picked from commit bf124da26947171a543ceacc7d4d3bf7be624efb) (cherry picked from commit f04fbd49ac35b8a3b3af8322d622d40c4c960b57) --- composer-bash-completion | 2 +- composer-rpm.patch | 32 +++++++++++++++---------------- composer.spec | 41 +++++++++++++++++++++------------------- sources | 2 +- 4 files changed, 40 insertions(+), 37 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 18f5911..d4b880a 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 @@ -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 + * Sat Jun 10 2023 Remi Collet - 2.5.8-1 - update to 2.5.8 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 19/60] 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 07b276c4bb0c0e091067b277a9b9711631cfe1e1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Sep 2023 15:27:04 +0200 Subject: [PATCH 20/60] v2.6.1 (cherry picked from commit d61d8841f8b4810dbdec2f6d10de95839113d98a) --- 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 d4b880a..aba93cd 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 21/60] 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 09b298282b1c0dbcf76cd8fe37264ea3a8b94637 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Sep 2023 06:52:00 +0200 Subject: [PATCH 22/60] v2.6.2 (cherry picked from commit bbab13e27781fd3a7a086ea1ed89ba2c56a57787) --- 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 aba93cd..553ad1a 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 23/60] 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 5653318cf8cf863b632e8ca7fb0f3eef7975de43 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 15 Sep 2023 13:13:06 +0200 Subject: [PATCH 24/60] v2.6.3 (cherry picked from commit d10a9845d4ce9b56ce9cca0ee9930bc6cfbca3c1) --- 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 553ad1a..e649602 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 25/60] 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 d9f85f089725143b42642bc52d6fcb8ebd31cb5e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 29 Sep 2023 14:23:00 +0200 Subject: [PATCH 26/60] v2.6.4 (cherry picked from commit 49525f29c8c99319479680718c0d71cd296ebd3d) --- 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 e649602..eebe641 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 27/60] 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 02b65158edb30b75cbb26d14b22cfcee15d36665 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 6 Oct 2023 10:32:40 +0200 Subject: [PATCH 28/60] v2.6.5 (cherry picked from commit c2d8866cfc0a1d7e6824afc53165a9353abaa3a2) --- 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 eebe641..050a057 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 29/60] 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 30/60] 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 31/60] 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 32/60] 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 33/60] 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 34/60] 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 35/60] 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 36/60] 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 37/60] 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 38/60] 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 39/60] 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 40/60] 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 41/60] 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 42/60] 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 43/60] 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 44/60] 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 45/60] 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 46/60] 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 47/60] 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 48/60] 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 49/60] 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 50/60] 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 51/60] 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 52/60] 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 53/60] 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 54/60] 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 55/60] 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 56/60] 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 57/60] 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 58/60] 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 59/60] 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 60/60] 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