From 188bd62ad82250fa4402680789ef697327530507 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Jan 2025 16:11:24 +0100 Subject: [PATCH 1/7] v2.8.5 (cherry picked from commit 37b5f986cca66b20aa3172845f7edca03e6c6c59) --- 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 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 be27ce7..07aa6a0 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 @@ -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 + * Wed Dec 11 2024 Remi Collet - 2.8.4-1 - update to 2.8.4 - re-license spec file to CECILL-2.1 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 20ff913663687d86a2a3f45ac93e02ec3faaa98c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Feb 2025 15:38:39 +0100 Subject: [PATCH 2/7] v2.8.6 (cherry picked from commit ae6d3b3084d75ccf8d76a915634d82697836c5de) --- 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 07aa6a0..b0dea39 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 60603df3459ee024d8aee6f62bb5b2d6111fce19 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Apr 2025 08:51:31 +0200 Subject: [PATCH 3/7] v2.8.8 (cherry picked from commit a6ca5074a589b67a228ec0e47afe562adaf8231c) --- 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 b0dea39..6d0df30 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 d9f3971fa8931b2b7324d35f410cb6d05b54b8c3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 13 May 2025 14:32:44 +0200 Subject: [PATCH 4/7] v2.8.9 (cherry picked from commit 37302d9faf98badd8a872f4487365fab89e66f76) --- 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 6d0df30..09f2c8f 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 64f7104e3a8f54ce13c72c1874a56dc0112be08f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Jul 2025 07:56:05 +0200 Subject: [PATCH 5/7] v2.8.10 (cherry picked from commit ef7a24ed26838ca0a34e0f53294b8d32487ce350) --- 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 09f2c8f..5191554 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 630615efc35ba0b491cc76698c698f9f1df3bbed Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Aug 2025 09:37:54 +0200 Subject: [PATCH 6/7] v2.8.11 (cherry picked from commit 34d2866a0e75784380120fe914ce84881c91ecac) (cherry picked from commit e47b4f0159dd2208ae0576a35a198349a616c0a8) --- 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 5191554..9124ae4 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 d7bb77cef6bbdd6504f754a622f1996b66198b10 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Sep 2025 14:09:46 +0200 Subject: [PATCH 7/7] 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 9124ae4..28cc2b3 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