From e47b4f0159dd2208ae0576a35a198349a616c0a8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Aug 2025 09:37:54 +0200 Subject: [PATCH 1/6] v2.8.11 (cherry picked from commit 34d2866a0e75784380120fe914ce84881c91ecac) --- composer-bash-completion | 2 +- composer-rpm.patch | 2 +- composer.spec | 9 ++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 6 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 622d561..22ceb92 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 @@ -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 + * Fri Jul 11 2025 Remi Collet - 2.8.10-1 - update to 2.8.10 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 8030d45bfef9e2b904b17bc3d7a4870701c24e61 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Sep 2025 14:09:46 +0200 Subject: [PATCH 2/6] 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 22ceb92..a599575 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 e1534ba4268bf045d4d8f039b4999aaa9ec34eaa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Nov 2025 11:41:12 +0100 Subject: [PATCH 3/6] v2.9.0 (cherry picked from commit 2a4898a61e9c738d44fac9dc922c1a5e7698f596) --- 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 a599575..b83c618 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 2b71897af660e964560d0277fcae05976a299368 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 14 Nov 2025 08:15:32 +0100 Subject: [PATCH 4/6] v2.9.1 (cherry picked from commit 60a8676c9b5d352f636482155b15759ee826307b) --- 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 b83c618..1d41569 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 d7ef8abda636519d362b4c68699ef88ea0b9de92 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 20 Nov 2025 02:15:49 +0100 Subject: [PATCH 5/6] v2.9.2 (cherry picked from commit 3c30fb4380ef3c52c595a2c1bd8940f3783c9e98) --- 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 1d41569..880cd02 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 f4ac9c6587e98155aa8af5da9c997eda163e41d8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Jan 2026 10:16:59 +0100 Subject: [PATCH 6/6] v2.9.3 (cherry picked from commit 37be2c86fa224089736cb0de23b30bc85df20471) --- 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 880cd02..ebdd69b 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