From 1a972597d2baf59baacbd52454cd35016378fb37 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 16 Aug 2022 16:56:14 +0200 Subject: [PATCH 01/11] v2.4.0 (cherry picked from commit 6384f21cf8f25ed9b1a5e4c4fa94ab63bd03b2fa) --- composer-bash-completion | 6 ++++-- composer.spec | 25 +++++++++++++++---------- sources | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 5d484cc..713cb2f 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -13,16 +13,18 @@ _sf_composer() { # for an alias, get the real script behind it if [[ $(type -t $sf_cmd) == "alias" ]]; then sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/") + else + sf_cmd=$(type -p $sf_cmd) fi - if [ ! -f "$sf_cmd" ]; then + if [ ! -x "$sf_cmd" ]; then return 1 fi local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.10") + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.0") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index b252516..638e14b 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit ebac357c0a41359f3981098729042ed6dedc97ba +%global gh_commit 026d6de6ea2c913974a7756661a3faac135cb36e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -26,9 +26,9 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.3.10 -#global upstream_prever RC2 -#global upstream_lower rc2 +%global upstream_version 2.4.0 +#global upstream_prever RC1 +#global upstream_lower rc1 %global symfony_prefix php-symfony5 %global symfony_path %{_datadir}/php/Symfony5 @@ -135,7 +135,8 @@ Requires: php-composer(fedora/autoloader) Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.3.2 +Provides: bundled(php-composer-ca-bundle) = 1.3.3 +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.0.0 Provides: bundled(php-composer-semver) = 3.3.2 @@ -147,19 +148,20 @@ 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-seld-phar-utils) = 1.2.0 -Provides: bundled(php-symfony-console) = v5.4.10 +Provides: bundled(php-seld-signal-handler) = 2.0.1 +Provides: bundled(php-symfony-console) = v5.4.11 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.9 -Provides: bundled(php-symfony-finder) = v5.4.8 +Provides: bundled(php-symfony-filesystem) = v5.4.11 +Provides: bundled(php-symfony-finder) = v5.4.11 Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0 Provides: bundled(php-symfony-polyfill-mbstring) = v1.26.0 Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 -Provides: bundled(php-symfony-process) = v5.4.8 +Provides: bundled(php-symfony-process) = v5.4.11 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.10 +Provides: bundled(php-symfony-string) = v5.4.11 %endif # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -392,6 +394,9 @@ exit $ret %changelog +* Tue Aug 16 2022 Remi Collet - 2.4.0-1 +- update to 2.4.0 + * Thu Jul 14 2022 Remi Collet - 2.3.10-1 - update to 2.3.10 diff --git a/sources b/sources index 038e012..b2cfab4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.10-ebac357.tgz) = 22302bfb5bb03f87567eda1fcfe906b049d43ff43862472405d13f6af472b1452834d09cb944753b740950c2d98911e6af72bb7b771c048a26cdb165b0c73659 +SHA512 (composer-2.4.0-026d6de.tgz) = 211f756843980a5935f03c544086a3045f323c983dfd7aaa2630f0c4c6db8d60de60de6f928a97d360a83c82f62afcfbc7ea13aaf44a673f0bb186b007e44529 From 03d8b2ff22baabbf3775e0ff9d0e347cf285dd52 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Sep 2022 10:31:49 +0200 Subject: [PATCH 02/11] v2.4.1 (cherry picked from commit fc3013e4b46f39bd31c7d26a99a7700681e94573) (cherry picked from commit a234b22f2d347aca63eaae88699b202048a78cea) --- composer-bash-completion | 2 +- composer-rpm.patch | 48 ++++++++++++++++++++-------------------- composer.spec | 13 ++++++----- sources | 2 +- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index 713cb2f..4aed20f 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -24,7 +24,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.0") + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.1") 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 5cfb149..224503a 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2022-06-02 06:47:42.000000000 +0200 -+++ ./bin/composer 2022-06-02 06:49:45.037192985 +0200 +--- ./bin/composer.rpm 2022-08-29 07:36:37.000000000 +0200 ++++ ./bin/composer 2022-08-29 07:36:45.053967617 +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 2022-06-02 06:47:42.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2022-06-02 06:49:45.037192985 +0200 -@@ -425,7 +425,7 @@ EOF; +--- ./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 +@@ -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)); $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); @@ -21,11 +21,11 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo + $filesystem->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE'); if ($this->runScripts) { - $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array( + $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-06-02 06:47:42.000000000 +0200 -+++ ./src/Composer/Compiler.php 2022-06-02 06:49:45.037192985 +0200 -@@ -107,7 +107,7 @@ class Compiler +--- ./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 // 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-06-02 06:47:42.000000000 +0200 -+++ ./src/Composer/InstalledVersions.php 2022-06-02 06:49:45.037192985 +0200 +--- ./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 @@ -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 } else { self::$installed = array(); diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2022-06-02 06:47:42.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2022-06-02 06:49:45.037192985 +0200 +--- ./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 /** @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; -@@ -219,7 +219,7 @@ class JsonFile +@@ -216,7 +216,7 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { $isComposerSchemaFile = true; @@ -77,9 +77,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-06-02 06:50:28.987916014 +0200 -+++ ./src/Composer/PHPStan/ConfigReturnTypeExtension.php 2022-06-02 06:51:05.429709332 +0200 -@@ -30,7 +30,7 @@ final class ConfigReturnTypeExtension im +--- ./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() { @@ -89,8 +89,8 @@ diff -up ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm ./src/Composer * @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-05-24 13:56:16.000000000 +0200 -+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2022-06-02 06:49:45.037192985 +0200 +--- ./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 @@ -125,7 +125,7 @@ class CaBundle */ public static function getBundledCaBundlePath() @@ -101,15 +101,15 @@ 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-06-02 06:47:42.000000000 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2022-06-02 06:49:45.037192985 +0200 -@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas +--- ./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) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json')); +- $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) array('$ref' => 'file://' . $f)); ++ $validator->check(json_decode($json), (object) ['$ref' => 'file://' . $f]); if (!$validator->isValid()) { $errors = $validator->getErrors(); diff --git a/composer.spec b/composer.spec index 638e14b..3a484e4 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 026d6de6ea2c913974a7756661a3faac135cb36e +%global gh_commit 777d542e3af65f8e7a66a4d98ce7a697da339414 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -26,7 +26,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.4.0 +%global upstream_version 2.4.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -149,9 +149,9 @@ Provides: bundled(php-react-promise) = v2.9.0 Provides: bundled(php-seld-jsonlint) = 1.9.0 Provides: bundled(php-seld-phar-utils) = 1.2.0 Provides: bundled(php-seld-signal-handler) = 2.0.1 -Provides: bundled(php-symfony-console) = v5.4.11 +Provides: bundled(php-symfony-console) = v5.4.12 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.11 +Provides: bundled(php-symfony-filesystem) = v5.4.12 Provides: bundled(php-symfony-finder) = v5.4.11 Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 @@ -161,7 +161,7 @@ Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 Provides: bundled(php-symfony-process) = v5.4.11 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.11 +Provides: bundled(php-symfony-string) = v5.4.12 %endif # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -394,6 +394,9 @@ exit $ret %changelog +* Mon Aug 29 2022 Remi Collet - 2.4.1-1 +- update to 2.4.1 + * Tue Aug 16 2022 Remi Collet - 2.4.0-1 - update to 2.4.0 diff --git a/sources b/sources index b2cfab4..2502211 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.4.0-026d6de.tgz) = 211f756843980a5935f03c544086a3045f323c983dfd7aaa2630f0c4c6db8d60de60de6f928a97d360a83c82f62afcfbc7ea13aaf44a673f0bb186b007e44529 +SHA512 (composer-2.4.1-777d542.tgz) = 64b3f4d729af225004351c9a5cbb4c763f127b25af7e5b7961bd2db1051b1656bef3f42c3f9d359d030d674a8de908b78b98230a3ada9820c8c6794bfdc90b85 From 24b48b02f1d32afee15a4c3f15925084ecfc7418 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 Sep 2022 08:00:55 +0200 Subject: [PATCH 03/11] v2.4.2 (cherry picked from commit cb8a0525a5d61d772e49be21d3617d9e2d1ee85c) --- 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 4aed20f..d103438 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -24,7 +24,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.1") + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.2") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 3a484e4..35dfac7 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 777d542e3af65f8e7a66a4d98ce7a697da339414 +%global gh_commit 7d887621e69a0311eb50aed4a16f7044b2b385b9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -26,7 +26,7 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.4.1 +%global upstream_version 2.4.2 #global upstream_prever RC1 #global upstream_lower rc1 @@ -147,7 +147,7 @@ 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-seld-phar-utils) = 1.2.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.12 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 @@ -394,6 +394,9 @@ exit $ret %changelog +* Thu Sep 15 2022 Remi Collet - 2.4.2-1 +- update to 2.4.2 + * Mon Aug 29 2022 Remi Collet - 2.4.1-1 - update to 2.4.1 diff --git a/sources b/sources index 2502211..064adc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.4.1-777d542.tgz) = 64b3f4d729af225004351c9a5cbb4c763f127b25af7e5b7961bd2db1051b1656bef3f42c3f9d359d030d674a8de908b78b98230a3ada9820c8c6794bfdc90b85 +SHA512 (composer-2.4.2-7d88762.tgz) = 6fd59eb380a00621ca90052a46205bf20f0ad8b916721fb3806c6f2e84c073e77a7f7c29bc8c51ae81d042da9bd55db03fbd057665c7e93f0d66fa0e5e02fbf2 From b8606d70bcae0b723750ca0c1bbf6974b70e52a3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 Oct 2022 09:58:30 +0200 Subject: [PATCH 04/11] v2.4.3 (cherry picked from commit a8d6f101ec4f4b811094600a8897d05aa962e418) --- composer.spec | 163 ++++---------------------------------------------- sources | 2 +- 2 files changed, 11 insertions(+), 154 deletions(-) diff --git a/composer.spec b/composer.spec index 35dfac7..f6637a3 100644 --- a/composer.spec +++ b/composer.spec @@ -10,15 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%if 0 -%bcond_without tests -%bcond_without syslib -%else -%bcond_with tests -%bcond_with syslib -%endif - -%global gh_commit 7d887621e69a0311eb50aed4a16f7044b2b385b9 +%global gh_commit b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -26,14 +18,10 @@ %global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.4.2 +%global upstream_version 2.4.3 #global upstream_prever RC1 #global upstream_lower rc1 -%global symfony_prefix php-symfony5 -%global symfony_path %{_datadir}/php/Symfony5 -%global symfony_min 5.4.1 - %global _phpunit %{_bindir}/phpunit9 %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) @@ -66,30 +54,6 @@ BuildRequires: php(language) >= 7.2.5 BuildRequires: php-cli BuildRequires: php-json BuildRequires: pkgconfig(bash-completion) -%if %{with tests} -BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) -BuildRequires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) -BuildRequires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) -BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) -BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0.2 with php-composer(composer/xdebug-handler) < 4) -BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) -BuildRequires: (php-composer(seld/phar-utils) >= 1.2 with php-composer(seld/phar-utils) < 2) -BuildRequires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 4) -BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) -BuildRequires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) -BuildRequires: (php-composer(composer/pcre) >= 2 with php-composer(composer/pcre) < 4) -BuildRequires: %{symfony_prefix}-console >= %{symfony_min} -BuildRequires: %{symfony_prefix}-finder >= %{symfony_min} -BuildRequires: %{symfony_prefix}-filesystem >= %{symfony_min} -BuildRequires: %{symfony_prefix}-process >= %{symfony_min} -BuildRequires: php-zip -# From composer.json, "require-dev": { -# "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0", -# "phpspec/prophecy": "^1.10" -BuildRequires: %{_phpunit} -# For autoloader -BuildRequires: php-fedora-autoloader-devel -%endif # From composer.json, "require": { # "php": "^7.2.5 || ^8.0", @@ -112,30 +76,11 @@ BuildRequires: php-fedora-autoloader-devel # "symfony/polyfill-php80": "^1.24" Requires: php(language) >= 7.2.5 Requires: php-cli -%if %{with syslib} -Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) -Requires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) -Requires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) -Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) -Requires: (php-composer(composer/xdebug-handler) >= 2.0.2 with php-composer(composer/xdebug-handler) < 4) -Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) -Requires: (php-composer(seld/phar-utils) >= 1.2 with php-composer(seld/phar-utils) < 2) -Requires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 4) -Requires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) -Requires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) -Requires: (php-composer(composer/pcre) >= 2 with php-composer(composer/pcre) < 4) -Requires: %{symfony_prefix}-console >= %{symfony_min} -Requires: %{symfony_prefix}-finder >= %{symfony_min} -Requires: %{symfony_prefix}-process >= %{symfony_min} -Requires: %{symfony_prefix}-filesystem >= %{symfony_min} -# For our autoloader -Requires: php-composer(fedora/autoloader) -%else # System certificates Requires: ca-certificates # Bundled libraries # License MIT -Provides: bundled(php-composer-ca-bundle) = 1.3.3 +Provides: bundled(php-composer-ca-bundle) = 1.3.4 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.0.0 @@ -149,9 +94,9 @@ 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.12 +Provides: bundled(php-symfony-console) = v5.4.14 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 -Provides: bundled(php-symfony-filesystem) = v5.4.12 +Provides: bundled(php-symfony-filesystem) = v5.4.13 Provides: bundled(php-symfony-finder) = v5.4.11 Provides: bundled(php-symfony-polyfill-ctype) = v1.26.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 @@ -161,8 +106,8 @@ Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 Provides: bundled(php-symfony-process) = v5.4.11 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.12 -%endif +Provides: bundled(php-symfony-string) = v5.4.14 + # 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", @@ -221,47 +166,6 @@ fi rm src/bootstrap.php rm src/Composer/vendor/composer/ca-bundle/res/cacert.pem -%if %{with syslib} -rm -rf src/Composer/vendor - -phpab --template fedora --output src/Composer/autoload.php src/Composer -cat << 'EOF' | tee -a src/Composer/autoload.php - -\Fedora\Autoloader\Dependencies::required([ - [ /* before symfony which load composer */ - '%{_datadir}/php/Composer/XdebugHandler3/autoload.php', - '%{_datadir}/php/Composer/XdebugHandler2/autoload.php', - ], - '%{symfony_path}/Component/Console/autoload.php', - '%{symfony_path}/Component/Finder/autoload.php', - '%{symfony_path}/Component/Process/autoload.php', - '%{symfony_path}/Component/Filesystem/autoload.php', - '%{_datadir}/php/Seld/JsonLint/autoload.php', - '%{_datadir}/php/Seld/PharUtils/autoload.php', - '%{_datadir}/php/Composer/CaBundle/autoload.php', - '%{_datadir}/php/Composer/Spdx/autoload.php', - '%{_datadir}/php/Composer/MetadataMinifier/autoload.php', - '%{_datadir}/php/Composer/Semver3/autoload.php', - [ - '%{_datadir}/php/Composer/Pcre3/autoload.php', - '%{_datadir}/php/Composer/Pcre2/autoload.php', - ], [ - '%{_datadir}/php/Psr/Log3/autoload.php', - '%{_datadir}/php/Psr/Log2/autoload.php', - '%{_datadir}/php/Psr/Log/autoload.php', - ], - '%{_datadir}/php/JsonSchema5/autoload.php', - '%{_datadir}/php/React/Promise/autoload.php', -]); -EOF - -cat << 'EOF' | tee tests/bootstrap.php - - 2.4.3-1 +- update to 2.4.3 + * Thu Sep 15 2022 Remi Collet - 2.4.2-1 - update to 2.4.2 diff --git a/sources b/sources index 064adc0..ca9254f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.4.2-7d88762.tgz) = 6fd59eb380a00621ca90052a46205bf20f0ad8b916721fb3806c6f2e84c073e77a7f7c29bc8c51ae81d042da9bd55db03fbd057665c7e93f0d66fa0e5e02fbf2 +SHA512 (composer-2.4.3-b34c0e9.tgz) = ce99508c2a534f3ef7c64c65308860b0c368ea8dcba7ad1f9e973783920280dda8a72923298e08e5f4b099d91c7e950d38acf2e3ef6989e659daf6dbd25fc211 From 371ed88a9b74fd7cdcc26ceb2fc5738d22ae5cc2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 28 Oct 2022 07:45:42 +0200 Subject: [PATCH 05/11] v2.4.4 (cherry picked from commit c35955528a4a498eeff121bab5d452d0b700aca8) --- 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 d103438..dba4a5c 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -24,7 +24,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.2") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.4.4") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index f6637a3..cf270b8 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4 +%global gh_commit e8d9087229bcdbc5867594d3098091412f1130cf %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.4.3 +%global upstream_version 2.4.4 #global upstream_prever RC1 #global upstream_lower rc1 @@ -248,6 +248,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Fri Oct 28 2022 Remi Collet - 2.4.4-1 +- update to 2.4.4 + * Sat Oct 15 2022 Remi Collet - 2.4.3-1 - update to 2.4.3 diff --git a/sources b/sources index ca9254f..523ef13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.4.3-b34c0e9.tgz) = ce99508c2a534f3ef7c64c65308860b0c368ea8dcba7ad1f9e973783920280dda8a72923298e08e5f4b099d91c7e950d38acf2e3ef6989e659daf6dbd25fc211 +SHA512 (composer-2.4.4-e8d9087.tgz) = 145ba3501d5f335b9f571f5320f92143258fcd11272882077be4496bcdcd60939d1585336c1fbab3d156157e0db3d5f34b5cd519d928ae27fa78089d7889fd3a From 96ba06da7f4800efffee68354518ce3906b4949a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Dec 2022 13:46:32 +0100 Subject: [PATCH 06/11] v2.5..0 (cherry picked from commit 0c41f6ede594dc194a304702011d30a70238af90) --- composer-bash-completion | 9 +++++---- composer.spec | 28 ++++++++++++++++------------ sources | 2 +- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/composer-bash-completion b/composer-bash-completion index dba4a5c..64aa6bb 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -11,20 +11,21 @@ _sf_composer() { local sf_cmd="${COMP_WORDS[0]}" # for an alias, get the real script behind it - if [[ $(type -t $sf_cmd) == "alias" ]]; then + sf_cmd_type=$(type -t $sf_cmd) + if [[ $sf_cmd_type == "alias" ]]; then sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/") - else + elif [[ $sf_cmd_type == "file" ]]; then sf_cmd=$(type -p $sf_cmd) fi - if [ ! -x "$sf_cmd" ]; then + if [[ $sf_cmd_type != "function" && ! -x $sf_cmd ]]; then return 1 fi 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.4.4") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.0") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index cf270b8..6c1e614 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit e8d9087229bcdbc5867594d3098091412f1130cf +%global gh_commit 09ef0e3acbb377f28927fa6a527c251da713ebac %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.4.4 +%global upstream_version 2.5.0 #global upstream_prever RC1 #global upstream_lower rc1 @@ -32,7 +32,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} Release: 1%{?dist} Summary: Dependency Manager for PHP -# composer and all dependencies are MIT +# SPDX: composer and all dependencies are MIT License: MIT URL: https://getcomposer.org/ Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz @@ -83,7 +83,7 @@ Requires: ca-certificates Provides: bundled(php-composer-ca-bundle) = 1.3.4 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.0.0 +Provides: bundled(php-composer-pcre) = 2.1.0 Provides: bundled(php-composer-semver) = 3.3.2 Provides: bundled(php-composer-spdx-licenses) = 1.5.7 Provides: bundled(php-composer-xdebug-handler) = 3.0.3 @@ -94,19 +94,20 @@ 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.14 +Provides: bundled(php-symfony-console) = v5.4.16 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-polyfill-ctype) = v1.26.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.26.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.26.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.26.0 +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.11 Provides: bundled(php-symfony-service-contracts) = v2.5.2 -Provides: bundled(php-symfony-string) = v5.4.14 +Provides: bundled(php-symfony-string) = v5.4.15 # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -248,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Tue Dec 20 2022 Remi Collet - 2.5.0-1 +- update to 2.5.0 + * Fri Oct 28 2022 Remi Collet - 2.4.4-1 - update to 2.4.4 diff --git a/sources b/sources index 523ef13..0d0cd44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.4.4-e8d9087.tgz) = 145ba3501d5f335b9f571f5320f92143258fcd11272882077be4496bcdcd60939d1585336c1fbab3d156157e0db3d5f34b5cd519d928ae27fa78089d7889fd3a +SHA512 (composer-2.5.0-09ef0e3.tgz) = 19ab32ab92ce2fbed7a7b26cc22db0ab9fb082243077a65250e24cfd8a6c2b0b74d2ff241ead598dcb245b7aa670901db30750c5cb7ff379f055efc5b639d31e From ace294d9db579c9ac2ff9113f8a3dd2d4086e998 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 Dec 2022 16:25:10 +0100 Subject: [PATCH 07/11] v2.5.1 (cherry picked from commit 36824f75ab5d7e3d6360cfe253ec94a8eb1cf1c6) --- 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 64aa6bb..76b1486 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.0") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.1") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 6c1e614..98dc7ad 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 09ef0e3acbb377f28927fa6a527c251da713ebac +%global gh_commit 923278ad13e1621946eb76ab2882655d2cc396a4 %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.0 +%global upstream_version 2.5.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %changelog +* Thu Dec 22 2022 Remi Collet - 2.5.1-1 +- update to 2.5.1 + * Tue Dec 20 2022 Remi Collet - 2.5.0-1 - update to 2.5.0 diff --git a/sources b/sources index 0d0cd44..cb9b58d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.5.0-09ef0e3.tgz) = 19ab32ab92ce2fbed7a7b26cc22db0ab9fb082243077a65250e24cfd8a6c2b0b74d2ff241ead598dcb245b7aa670901db30750c5cb7ff379f055efc5b639d31e +SHA512 (composer-2.5.1-923278a.tgz) = 3e8a54ea96982ec6e3ae8afdabc60b88abae05e96561536e444ef5b75aac543284cad90458ae78e4d6e0dbc129fde4b345533db1823b27f5404021dd62cb865b From 2032eb022db9054db97a9c1d22d6dfd9edee20bb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Feb 2023 07:27:17 +0100 Subject: [PATCH 08/11] v2.5.2 (cherry picked from commit 0bf323a92a10b5747beef382d522ffa503ce5033) (cherry picked from commit 7aa5f3bf406efd538aaa1a8a239d275fa1cb22f8) --- 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 98dc7ad..d52412e 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 9138a914d66091a987c97d62634fb82adbed1124 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Feb 2023 14:41:24 +0100 Subject: [PATCH 09/11] v2.5.3 (cherry picked from commit de254c8f264e6e2ed0f034965a566e0ea27f9d5a) (cherry picked from commit 8d174bdc343953f0c9efdcb73847ad11e710cd83) --- 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 d52412e..1b9250e 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 41c0afa5a7363f3a3a023fc72405fd27621b2e81 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Feb 2023 14:34:20 +0100 Subject: [PATCH 10/11] 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 1b9250e..5b3319e 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 50685126ec58c7ae9cbd5074db3d5baa7bd7241e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Mar 2023 16:01:05 +0100 Subject: [PATCH 11/11] 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 5b3319e..698367b 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