From 704a77856ce1c36ed3294d0854b323caae93dda1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Apr 23 2024 05:48:18 +0000 Subject: v2.7.4 --- 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