From 7aa5f3bf406efd538aaa1a8a239d275fa1cb22f8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Feb 2023 07:27:17 +0100 Subject: [PATCH 01/13] 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 8d174bdc343953f0c9efdcb73847ad11e710cd83 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Feb 2023 14:41:24 +0100 Subject: [PATCH 02/13] 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 d6ee9e482d6cdca46c04f9177b3edabcb7060d7a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Feb 2023 14:34:20 +0100 Subject: [PATCH 03/13] 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 94bbf008d82cc1435a8ee1efe35afcd5d8f0b442 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Mar 2023 16:01:05 +0100 Subject: [PATCH 04/13] 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 6929b576758399a8e60737776372f25b560a50d2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 May 2023 11:02:27 +0200 Subject: [PATCH 05/13] 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 6e938ea5cded748b77bb1f81913c3a5c04942eec Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 May 2023 16:08:49 +0200 Subject: [PATCH 06/13] 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 7f2de95c1734dbae4dd4214d0f2c11bfe3ead325 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Jun 2023 07:23:10 +0200 Subject: [PATCH 07/13] 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 2c44949d38dca2266fa983ce31b6b0c345b00078 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Sep 2023 11:14:45 +0200 Subject: [PATCH 08/13] 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 07b276c4bb0c0e091067b277a9b9711631cfe1e1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Sep 2023 15:27:04 +0200 Subject: [PATCH 09/13] 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 09b298282b1c0dbcf76cd8fe37264ea3a8b94637 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Sep 2023 06:52:00 +0200 Subject: [PATCH 10/13] 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 5653318cf8cf863b632e8ca7fb0f3eef7975de43 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 15 Sep 2023 13:13:06 +0200 Subject: [PATCH 11/13] 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 d9f85f089725143b42642bc52d6fcb8ebd31cb5e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 29 Sep 2023 14:23:00 +0200 Subject: [PATCH 12/13] 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 02b65158edb30b75cbb26d14b22cfcee15d36665 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 6 Oct 2023 10:32:40 +0200 Subject: [PATCH 13/13] 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