From 7532a50ee66b2091e8bc98ba7870b14daa24e381 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 Jul 2021 15:42:04 +0200 Subject: [PATCH 01/21] update to 2.1.4 raise dependency on justinrainbow/json-schema 5.2.11 (cherry picked from commit 7c68b5d75caa4d75059aa3e56b09ea30f55983dc) --- composer.spec | 47 +++++++++++++---------------------------------- sources | 2 +- 2 files changed, 14 insertions(+), 35 deletions(-) diff --git a/composer.spec b/composer.spec index 3db1bc5..a2edc77 100644 --- a/composer.spec +++ b/composer.spec @@ -10,16 +10,17 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit fc5c4573aafce3a018eb7f1f8f91cea423970f2e +%bcond_without tests + +%global gh_commit 5701b38ec6c66dd143658e6aa18e1808d2d5dc4b %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 with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.3 +%global upstream_version 2.1.4 #global upstream_prever RC1 #global upstream_lower rc1 @@ -50,8 +51,7 @@ Patch1: %{name}-noxdg.patch BuildArch: noarch BuildRequires: php-cli -%if %{with_tests} -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +%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) @@ -60,20 +60,8 @@ BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-com BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-composer(justinrainbow/json-schema) < 6) +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) -%else -BuildRequires: php-composer-ca-bundle -BuildRequires: php-composer-metadata-minifier -BuildRequires: php-composer-semver3 -BuildRequires: php-composer-spdx-licenses >= 1.2 -BuildRequires: php-composer-xdebug-handler2 -BuildRequires: php-jsonlint >= 1.4 -BuildRequires: php-seld-phar-utils -BuildRequires: php-PsrLog -BuildRequires: php-justinrainbow-json-schema5 >= 5.2.10 -BuildRequires: php-react-promise >= 2.7 -%endif BuildRequires: %{symfony_prefix}-console >= %{symfony_min} BuildRequires: %{symfony_prefix}-finder >= %{symfony_min} BuildRequires: %{symfony_prefix}-filesystem >= %{symfony_min} @@ -96,7 +84,7 @@ BuildRequires: php-PsrLog >= 1.1 # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", # "composer/xdebug-handler": "^2.0", -# "justinrainbow/json-schema": "^5.2.10", +# "justinrainbow/json-schema": "^5.2.11", # "psr/log": "^1.0" # "seld/jsonlint": "~1.4", # "seld/phar-utils": "^1.0", @@ -107,7 +95,6 @@ BuildRequires: php-PsrLog >= 1.1 # "react/promise": "^1.2 || ^2.7" Requires: php(language) >= 5.3.2 Requires: php-cli -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 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) @@ -116,20 +103,8 @@ Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-com Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -Requires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-composer(justinrainbow/json-schema) < 6) +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) -%else -Requires: php-composer-ca-bundle -Requires: php-composer-metadata-minifier -Requires: php-composer-semver3 -Requires: php-composer-spdx-licenses >= 1.2 -Requires: php-composer-xdebug-handler2 -Requires: php-jsonlint >= 1.4 -Requires: php-seld-phar-utils -Requires: php-PsrLog -Requires: php-justinrainbow-json-schema5 >= 5.2.10 -Requires: php-react-promise >= 2.7 -%endif Requires: %{symfony_prefix}-console >= %{symfony_min} Requires: %{symfony_prefix}-finder >= %{symfony_min} Requires: %{symfony_prefix}-process >= %{symfony_min} @@ -274,7 +249,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %check -%if %{with_tests} +%if %{with tests} : Online tests rm tests/Composer/Test/Util/RemoteFilesystemTest.php @@ -322,6 +297,10 @@ exit $ret %changelog +* Thu Jul 22 2021 Remi Collet - 2.1.4-1 +- update to 2.1.4 +- raise dependency on justinrainbow/json-schema 5.2.11 + * Thu Jun 10 2021 Remi Collet - 2.1.3-1 - update to 2.1.3 diff --git a/sources b/sources index 0323d79..a9ae0fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.3-fc5c457.tgz) = e959d4e83a1b47d3f81e4ad9fded7b99bd43deb1ba1fc78d8f9819504813ca897a5a0a65cfe09b4f4f2eff7ba631b6d34a016a7fe5831747fd82b53818ec016b +SHA512 (composer-2.1.4-5701b38.tgz) = 4c1cbdc74a0d42e1dfecd7a303ef2eca82b2da477c6c3b45a49f11048f501732a3dabf41ad4d7cdcc35ebff0a976c381d617e8f019c19ea9a1e357e45b00c785 From ca72636bec6a327ac03b4e70985233a6a8af2f34 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Jul 2021 11:43:04 +0200 Subject: [PATCH 02/21] v2.1.5 (cherry picked from commit c13424a7bad7b2e856a762b871d4059bf3b923f6) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index a2edc77..ca39322 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 5701b38ec6c66dd143658e6aa18e1808d2d5dc4b +%global gh_commit ac679902e9f66b85a8f9d8c1c88180f609a8745d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.4 +%global upstream_version 2.1.5 #global upstream_prever RC1 #global upstream_lower rc1 @@ -297,6 +297,9 @@ exit $ret %changelog +* Fri Jul 23 2021 Remi Collet - 2.1.5-1 +- update to 2.1.5 + * Thu Jul 22 2021 Remi Collet - 2.1.4-1 - update to 2.1.4 - raise dependency on justinrainbow/json-schema 5.2.11 diff --git a/sources b/sources index a9ae0fa..d4f2600 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.4-5701b38.tgz) = 4c1cbdc74a0d42e1dfecd7a303ef2eca82b2da477c6c3b45a49f11048f501732a3dabf41ad4d7cdcc35ebff0a976c381d617e8f019c19ea9a1e357e45b00c785 +SHA512 (composer-2.1.5-ac67990.tgz) = fde3bea2f997748df264247fa7722f80b626b020cef8ab16fe3528567d4f6cbbbf5febf0ff5e1eda5b28e15f198c332862e855d900b679bd64cdec3afdd1ac39 From cfc50f3a57499ce998964d07db906aa2343358e4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Sep 2021 12:19:15 +0200 Subject: [PATCH 03/21] v2.1.6 (cherry picked from commit ab4babeb93e4ad202fe01b90a1e87d9af387cf33) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index ca39322..8176b22 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit ac679902e9f66b85a8f9d8c1c88180f609a8745d +%global gh_commit e5cac5f9d2354d08b67f1d21c664ae70d748c603 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.5 +%global upstream_version 2.1.6 #global upstream_prever RC1 #global upstream_lower rc1 @@ -297,6 +297,9 @@ exit $ret %changelog +* Mon Aug 23 2021 Remi Collet - 2.1.6-1 +- update to 2.1.6 + * Fri Jul 23 2021 Remi Collet - 2.1.5-1 - update to 2.1.5 diff --git a/sources b/sources index d4f2600..5d50acd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.5-ac67990.tgz) = fde3bea2f997748df264247fa7722f80b626b020cef8ab16fe3528567d4f6cbbbf5febf0ff5e1eda5b28e15f198c332862e855d900b679bd64cdec3afdd1ac39 +SHA512 (composer-2.1.6-e5cac5f.tgz) = 465bba1054853c951dabd618560b4a8ccf2ff39370d53b4b7d0c6682cbfba6298fc1d52f129436356802ef978c88ef885f8d4fa8437ce18221dbea82c7ca079a From 7d19fc198258e08ddb6fd0d31b323ccaea06b6bd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Sep 2021 15:51:25 +0200 Subject: [PATCH 04/21] v2.1.7 (cherry picked from commit 22d335b4c238877b9c66542b65294fd678959e35) --- composer-rpm.patch | 72 +++++++++++++++++++++++----------------------- composer.spec | 9 ++++-- sources | 2 +- 3 files changed, 43 insertions(+), 40 deletions(-) diff --git a/composer-rpm.patch b/composer-rpm.patch index d63b69b..cbb4b3c 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2021-06-04 09:21:49.000000000 +0200 -+++ ./bin/composer 2021-06-04 09:21:53.808648766 +0200 +--- ./bin/composer.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./bin/composer 2021-09-14 15:45:33.025118009 +0200 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== ' } @@ -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 2021-06-04 09:21:49.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2021-06-04 09:21:53.808648766 +0200 +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2021-09-14 15:45:33.025118009 +0200 @@ -395,7 +395,7 @@ EOF; $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $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, array(), array( diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ---- ./src/Composer/Compiler.php.rpm 2021-06-04 09:21:49.000000000 +0200 -+++ ./src/Composer/Compiler.php 2021-06-04 09:21:53.808648766 +0200 -@@ -100,7 +100,7 @@ class Compiler +--- ./src/Composer/Compiler.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./src/Composer/Compiler.php 2021-09-14 15:45:33.025118009 +0200 +@@ -118,7 +118,7 @@ class Compiler // Add Composer resources $finder = new Finder(); $finder->files() @@ -34,9 +34,30 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ->sort($finderSort) ; foreach ($finder as $file) { +diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php +--- ./src/Composer/InstalledVersions.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./src/Composer/InstalledVersions.php 2021-09-14 15:45:33.026118007 +0200 +@@ -251,7 +251,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 = include __DIR__ . '/installed.php'; + } else { + self::$installed = array(); +@@ -324,7 +324,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(); diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2021-06-04 09:21:49.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2021-06-04 09:23:51.867361526 +0200 +--- ./src/Composer/Json/JsonFile.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./src/Composer/Json/JsonFile.php 2021-09-14 15:46:22.434026477 +0200 @@ -34,7 +34,7 @@ class JsonFile const JSON_PRETTY_PRINT = 128; const JSON_UNESCAPED_UNICODE = 256; @@ -44,9 +65,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php - const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json'; + const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; + /** @var string */ private $path; - private $httpDownloader; -@@ -188,7 +188,7 @@ class JsonFile +@@ -191,7 +191,7 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { $isComposerSchemaFile = true; @@ -56,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 ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php ---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2021-06-04 09:21:49.000000000 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2021-06-04 09:21:53.808648766 +0200 +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2021-09-14 15:45:33.025118009 +0200 @@ -93,7 +93,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { @@ -69,8 +90,8 @@ diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/ if (!$validator->isValid()) { $errors = $validator->getErrors(); diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php ---- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2021-06-04 09:21:49.000000000 +0200 -+++ ./tests/Composer/Test/PolyfillTestCase.php 2021-06-04 09:21:53.808648766 +0200 +--- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2021-09-14 15:45:17.000000000 +0200 ++++ ./tests/Composer/Test/PolyfillTestCase.php 2021-09-14 15:45:33.026118007 +0200 @@ -15,10 +15,35 @@ namespace Composer\Test { use PHPUnit\Framework\Constraint\LogicalNot; use PHPUnit\Framework\Constraint\StringContains; @@ -108,24 +129,3 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po } else { abstract class PolyfillTestCase extends TestCase { ---- ./src/Composer/InstalledVersions.php.rpm 2021-06-07 08:18:59.326450774 +0200 -+++ ./src/Composer/InstalledVersions.php 2021-06-07 08:19:11.525413189 +0200 -@@ -251,7 +251,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 = include __DIR__ . '/installed.php'; - } else { - self::$installed = array(); -@@ -324,7 +324,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(); - diff --git a/composer.spec b/composer.spec index 8176b22..313e027 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit e5cac5f9d2354d08b67f1d21c664ae70d748c603 +%global gh_commit f381e45f0b83a602a315613e08fffe0d8f2288c8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.6 +%global upstream_version 2.1.7 #global upstream_prever RC1 #global upstream_lower rc1 @@ -272,7 +272,7 @@ find tests \ # testIntegration may hang on local build ret=0 -for cmd in php php73 php74 php80; do +for cmd in php php73 php74 php80 php81; do if which $cmd; then $cmd -d memory_limit=1G %{_phpunit} \ $FILTER \ @@ -297,6 +297,9 @@ exit $ret %changelog +* Tue Sep 14 2021 Remi Collet - 2.1.7-1 +- update to 2.1.7 + * Mon Aug 23 2021 Remi Collet - 2.1.6-1 - update to 2.1.6 diff --git a/sources b/sources index 5d50acd..fc16048 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.6-e5cac5f.tgz) = 465bba1054853c951dabd618560b4a8ccf2ff39370d53b4b7d0c6682cbfba6298fc1d52f129436356802ef978c88ef885f8d4fa8437ce18221dbea82c7ca079a +SHA512 (composer-2.1.7-f381e45.tgz) = 9c51231f619a6678f61efe3ed789d723eb315a391d8561f660f80e75eb22c7b47bbe6c6d74c6b91a17734fe973633f22fc7802f5ccbaebd6b1089fd29c5a65f0 From f9a9e576f41f55e500e089403e0357c6ae17cdb8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Sep 2021 15:25:51 +0200 Subject: [PATCH 05/21] v2.1.8 (cherry picked from commit 1bea4b046b75b24b1cda7b6663b9da0c646b3c5c) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 313e027..bd3681e 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit f381e45f0b83a602a315613e08fffe0d8f2288c8 +%global gh_commit 24d38e9686092de05214cafa187dc282a5d89497 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.7 +%global upstream_version 2.1.8 #global upstream_prever RC1 #global upstream_lower rc1 @@ -297,6 +297,9 @@ exit $ret %changelog +* Sat Sep 18 2021 Remi Collet - 2.1.8-1 +- update to 2.1.8 + * Tue Sep 14 2021 Remi Collet - 2.1.7-1 - update to 2.1.7 diff --git a/sources b/sources index fc16048..1616837 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.7-f381e45.tgz) = 9c51231f619a6678f61efe3ed789d723eb315a391d8561f660f80e75eb22c7b47bbe6c6d74c6b91a17734fe973633f22fc7802f5ccbaebd6b1089fd29c5a65f0 +SHA512 (composer-2.1.8-24d38e9.tgz) = 558ca00ad8ae77d3705397f2a5cfb4cf79550c82e8be37b15a04c60d138d52d433fd432321ca6288137a81e4d806681312e26c6d39291a6825e9cf4bcc08e793 From 193b764925795f00acbd7a0a5f9917659a9de701 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Oct 2021 10:28:52 +0200 Subject: [PATCH 06/21] v2.1.9 (cherry picked from commit bc9b5b34de0dddaeffebd4b8a6a937b68a778d0f) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index bd3681e..433c7bc 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 24d38e9686092de05214cafa187dc282a5d89497 +%global gh_commit e558c88f28d102d497adec4852802c0dc14c7077 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.8 +%global upstream_version 2.1.9 #global upstream_prever RC1 #global upstream_lower rc1 @@ -297,6 +297,9 @@ exit $ret %changelog +* Tue Oct 5 2021 Remi Collet - 2.1.9-1 +- update to 2.1.9 + * Sat Sep 18 2021 Remi Collet - 2.1.8-1 - update to 2.1.8 diff --git a/sources b/sources index 1616837..85e5bf8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.8-24d38e9.tgz) = 558ca00ad8ae77d3705397f2a5cfb4cf79550c82e8be37b15a04c60d138d52d433fd432321ca6288137a81e4d806681312e26c6d39291a6825e9cf4bcc08e793 +SHA512 (composer-2.1.9-e558c88.tgz) = 63daa157d4d2ea5c5d037df8ecaf06984ccb7d95a772b7a2edb4c197d44b9bbc692b77100f1cb07b0127509535deace4505943777e8ca7c61175f3d98510d762 From 19c7566a673c31fffdf8d5f48be2942afcc1986d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Nov 2021 08:42:03 +0100 Subject: [PATCH 07/21] update to 2.1.10 allow psr/log v2 (cherry picked from commit c1fca0e48e87077470cc11646acaeae243b97380) --- composer.spec | 19 +++++++++++++------ sources | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/composer.spec b/composer.spec index 433c7bc..96fa0f2 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit e558c88f28d102d497adec4852802c0dc14c7077 +%global gh_commit ea5f64d1a15c66942979b804c9fb3686be852ca0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.9 +%global upstream_version 2.1.10 #global upstream_prever RC1 #global upstream_lower rc1 @@ -59,7 +59,7 @@ BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-com BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) 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: %{symfony_prefix}-console >= %{symfony_min} @@ -85,7 +85,7 @@ BuildRequires: php-PsrLog >= 1.1 # "composer/spdx-licenses": "^1.2", # "composer/xdebug-handler": "^2.0", # "justinrainbow/json-schema": "^5.2.11", -# "psr/log": "^1.0" +# "psr/log": "^1.0 || ^2.0" # "seld/jsonlint": "~1.4", # "seld/phar-utils": "^1.0", # "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", @@ -102,7 +102,7 @@ Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-com Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) 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: %{symfony_prefix}-console >= %{symfony_min} @@ -182,7 +182,10 @@ cat << 'EOF' | tee -a src/Composer/autoload.php '%{_datadir}/php/Composer/Spdx/autoload.php', '%{_datadir}/php/Composer/MetadataMinifier/autoload.php', '%{_datadir}/php/Composer/Semver3/autoload.php', - '%{_datadir}/php/Psr/Log/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', ]); @@ -297,6 +300,10 @@ exit $ret %changelog +* Sat Oct 30 2021 Remi Collet - 2.1.10-1 +- update to 2.1.10 +- allow psr/log v2 + * Tue Oct 5 2021 Remi Collet - 2.1.9-1 - update to 2.1.9 diff --git a/sources b/sources index 85e5bf8..fe1d0c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.9-e558c88.tgz) = 63daa157d4d2ea5c5d037df8ecaf06984ccb7d95a772b7a2edb4c197d44b9bbc692b77100f1cb07b0127509535deace4505943777e8ca7c61175f3d98510d762 +SHA512 (composer-2.1.10-ea5f64d.tgz) = fa8f0665864037fd0908e80a47880822a988f939209875b1a5e5469b83a0231d9b1f0af29bde889788bfd0e78ffc54d7502e03980de40538190b95e339b39740 From 6a2468967c2aea7168d8c2d8bb7895b239d28167 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Nov 2021 13:42:03 +0100 Subject: [PATCH 08/21] v2.1.11 (cherry picked from commit b9eef84abedf437714b69a5d0e51986e944b658f) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 96fa0f2..584af33 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit ea5f64d1a15c66942979b804c9fb3686be852ca0 +%global gh_commit ddc81bb4718747cc93330ccf832e6be8a6c1d015 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.10 +%global upstream_version 2.1.11 #global upstream_prever RC1 #global upstream_lower rc1 @@ -300,6 +300,9 @@ exit $ret %changelog +* Tue Nov 2 2021 Remi Collet - 2.1.11-1 +- update to 2.1.11 + * Sat Oct 30 2021 Remi Collet - 2.1.10-1 - update to 2.1.10 - allow psr/log v2 diff --git a/sources b/sources index fe1d0c7..fcee2a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.10-ea5f64d.tgz) = fa8f0665864037fd0908e80a47880822a988f939209875b1a5e5469b83a0231d9b1f0af29bde889788bfd0e78ffc54d7502e03980de40538190b95e339b39740 +SHA512 (composer-2.1.11-ddc81bb.tgz) = 340fd1e1320f523e3df36a9318bc2728abc6695eafbe1cee70edf6b65c5f7fd4bd0ae1aa3419da8fa7fe04a7503e787d65a683955aef87975851bbcf84963b94 From ecbf182b91973bfa01bf17d84110e33f9904e525 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Nov 2021 08:37:46 +0100 Subject: [PATCH 09/21] v2.1.12 (cherry picked from commit 13c11c61de3d02bbb20288391c70b483988a8708) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 584af33..9235382 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit ddc81bb4718747cc93330ccf832e6be8a6c1d015 +%global gh_commit 6e3c2b122e0ec41a7e885fcaf19fa15e2e0819a0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.11 +%global upstream_version 2.1.12 #global upstream_prever RC1 #global upstream_lower rc1 @@ -300,6 +300,9 @@ exit $ret %changelog +* Tue Nov 9 2021 Remi Collet - 2.1.12-1 +- update to 2.1.12 + * Tue Nov 2 2021 Remi Collet - 2.1.11-1 - update to 2.1.11 diff --git a/sources b/sources index fcee2a7..d953e33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.11-ddc81bb.tgz) = 340fd1e1320f523e3df36a9318bc2728abc6695eafbe1cee70edf6b65c5f7fd4bd0ae1aa3419da8fa7fe04a7503e787d65a683955aef87975851bbcf84963b94 +SHA512 (composer-2.1.12-6e3c2b1.tgz) = 834e06a70deb4bed4887e6acf626de2a2b27f3cf42cc405dcdbe74cf25ab14750123dfd780243e3fec0920adc0ac96ed72517600f39134e3730f17dc7a7060b6 From da42f9080412e673164af7717b5527237779bd95 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 Nov 2021 11:43:39 +0100 Subject: [PATCH 10/21] v2.1.14 (cherry picked from commit 9b68f26232274d3ae1c4b3c00b701dfbefd2a643) --- composer.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer.spec b/composer.spec index 9235382..d7c4988 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 6e3c2b122e0ec41a7e885fcaf19fa15e2e0819a0 +%global gh_commit cd28fc05b0c9d3beaf58b57018725c4dc15a6446 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.12 +%global upstream_version 2.1.14 #global upstream_prever RC1 #global upstream_lower rc1 @@ -88,7 +88,7 @@ BuildRequires: php-PsrLog >= 1.1 # "psr/log": "^1.0 || ^2.0" # "seld/jsonlint": "~1.4", # "seld/phar-utils": "^1.0", -# "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", +# "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", # "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", # "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", # "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", @@ -275,7 +275,7 @@ find tests \ # testIntegration may hang on local build ret=0 -for cmd in php php73 php74 php80 php81; do +for cmd in php php74 php80 php81; do if which $cmd; then $cmd -d memory_limit=1G %{_phpunit} \ $FILTER \ @@ -300,6 +300,9 @@ exit $ret %changelog +* Tue Nov 30 2021 Remi Collet - 2.1.14-1 +- update to 2.1.14 + * Tue Nov 9 2021 Remi Collet - 2.1.12-1 - update to 2.1.12 diff --git a/sources b/sources index d953e33..2b196b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.12-6e3c2b1.tgz) = 834e06a70deb4bed4887e6acf626de2a2b27f3cf42cc405dcdbe74cf25ab14750123dfd780243e3fec0920adc0ac96ed72517600f39134e3730f17dc7a7060b6 +SHA512 (composer-2.1.14-cd28fc0.tgz) = 318a2642cdd4db84fd7888f5ac4e190d5c03c870a620e024135da5493090e5fc3066c147cfca62013b17e5c4ab15fc13ce72aeaffd2a443017b6ce710ffd0278 From 4a9303858b61b42fd360f34ae288824d1d3a7e25 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Dec 2021 11:56:15 +0100 Subject: [PATCH 11/21] update to 2.2.0 add dependency on composer/pcre (cherry picked from commit 0f53a95fd0ec35870ed1973c4ad68e5c0dbe774c) --- composer.spec | 18 +++++++++++++----- sources | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/composer.spec b/composer.spec index d7c4988..1e2a87c 100644 --- a/composer.spec +++ b/composer.spec @@ -12,15 +12,15 @@ %bcond_without tests -%global gh_commit cd28fc05b0c9d3beaf58b57018725c4dc15a6446 +%global gh_commit e174a4c4324f50a6f2de472aa1055c24a2fe2b2a %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.1.0 -%global run_version 2.1.0 +%global api_version 2.2.0 +%global run_version 2.2.0 -%global upstream_version 2.1.14 +%global upstream_version 2.2.0 #global upstream_prever RC1 #global upstream_lower rc1 @@ -62,6 +62,7 @@ BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-com BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) 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) >= 1.0 with php-composer(composer/pcre) < 2) BuildRequires: %{symfony_prefix}-console >= %{symfony_min} BuildRequires: %{symfony_prefix}-finder >= %{symfony_min} BuildRequires: %{symfony_prefix}-filesystem >= %{symfony_min} @@ -92,7 +93,8 @@ BuildRequires: php-PsrLog >= 1.1 # "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", # "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", # "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", -# "react/promise": "^1.2 || ^2.7" +# "react/promise": "^1.2 || ^2.7", +# "composer/pcre": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) @@ -105,6 +107,7 @@ Requires: (php-composer(seld/phar-utils) >= 1.0 with php-com Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) 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) >= 1.0 with php-composer(composer/pcre) < 2) Requires: %{symfony_prefix}-console >= %{symfony_min} Requires: %{symfony_prefix}-finder >= %{symfony_min} Requires: %{symfony_prefix}-process >= %{symfony_min} @@ -182,6 +185,7 @@ cat << 'EOF' | tee -a src/Composer/autoload.php '%{_datadir}/php/Composer/Spdx/autoload.php', '%{_datadir}/php/Composer/MetadataMinifier/autoload.php', '%{_datadir}/php/Composer/Semver3/autoload.php', + '%{_datadir}/php/Composer/Pcre/autoload.php', [ '%{_datadir}/php/Psr/Log2/autoload.php', '%{_datadir}/php/Psr/Log/autoload.php', @@ -300,6 +304,10 @@ exit $ret %changelog +* Wed Dec 22 2021 Remi Collet - 2.2.0-1 +- update to 2.2.0 +- add dependency on composer/pcre + * Tue Nov 30 2021 Remi Collet - 2.1.14-1 - update to 2.1.14 diff --git a/sources b/sources index 2b196b1..6ffe111 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.1.14-cd28fc0.tgz) = 318a2642cdd4db84fd7888f5ac4e190d5c03c870a620e024135da5493090e5fc3066c147cfca62013b17e5c4ab15fc13ce72aeaffd2a443017b6ce710ffd0278 +SHA512 (composer-2.2.0-e174a4c.tgz) = 55b7c49708ee6d7776fa1422bbbbc2001a3d69ab86e42ef2c9657c2a824aae2be5fb6e149d2f5af56de6831bf7c3cfc7109a43b165d3423ac2394243db1475f7 From 7d1afc4a099e84008c7d3a7ba61190e6fffaa7c6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Dec 2021 07:43:19 +0100 Subject: [PATCH 12/21] v2.2.1 (cherry picked from commit 4d4a8a1acc0e9c61da5631e2cac28285a1fba347) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 1e2a87c..ab252d3 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit e174a4c4324f50a6f2de472aa1055c24a2fe2b2a +%global gh_commit bbc265e16561ab8e0f5e7cac395ea72640251f0c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.2.0 %global run_version 2.2.0 -%global upstream_version 2.2.0 +%global upstream_version 2.2.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -304,6 +304,9 @@ exit $ret %changelog +* Thu Dec 23 2021 Remi Collet - 2.2.1-1 +- update to 2.2.1 + * Wed Dec 22 2021 Remi Collet - 2.2.0-1 - update to 2.2.0 - add dependency on composer/pcre diff --git a/sources b/sources index 6ffe111..5d80a7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.0-e174a4c.tgz) = 55b7c49708ee6d7776fa1422bbbbc2001a3d69ab86e42ef2c9657c2a824aae2be5fb6e149d2f5af56de6831bf7c3cfc7109a43b165d3423ac2394243db1475f7 +SHA512 (composer-2.2.1-bbc265e.tgz) = 0afb658d09f96fb3ccb73fcd8a60d9e0aaa2bf7decf6c3081e9c57be920e88d261eedda4cd1298df35c4e67c7932910ed7d29c79ca00ec1d63cb5ff1347550db From 03277a65f0d2488df5381aeacff96988f61bf638 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Jan 2022 08:10:35 +0100 Subject: [PATCH 13/21] v2.2.3 (cherry picked from commit 850346b461a05342b3d79b9f44fd145166a5bfce) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index ab252d3..6d4ac6a 100644 --- a/composer.spec +++ b/composer.spec @@ -12,15 +12,15 @@ %bcond_without tests -%global gh_commit bbc265e16561ab8e0f5e7cac395ea72640251f0c +%global gh_commit 3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a %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.2.0 -%global run_version 2.2.0 +%global run_version 2.2.2 -%global upstream_version 2.2.1 +%global upstream_version 2.2.3 #global upstream_prever RC1 #global upstream_lower rc1 @@ -304,6 +304,9 @@ exit $ret %changelog +* Sat Jan 1 2022 Remi Collet - 2.2.3-1 +- update to 2.2.3 + * Thu Dec 23 2021 Remi Collet - 2.2.1-1 - update to 2.2.1 diff --git a/sources b/sources index 5d80a7a..36d9283 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.1-bbc265e.tgz) = 0afb658d09f96fb3ccb73fcd8a60d9e0aaa2bf7decf6c3081e9c57be920e88d261eedda4cd1298df35c4e67c7932910ed7d29c79ca00ec1d63cb5ff1347550db +SHA512 (composer-2.2.3-3c92ba5.tgz) = 406bec56bea0150f6fb63d269f8beaf9f12733cdd50c547eeaedb34f5a2b500bffa10834ff85c9f6edd95f80cec8763e85fe9248fd891a18cfd1a99e8141501f From b31192398b53a81716f1bbdc78d883d0cd2f847f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Jan 2022 08:02:16 +0100 Subject: [PATCH 14/21] v2.2.4 (cherry picked from commit 889766206cdb64c7a8f4eff2b4ba0662bf507110) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index 6d4ac6a..80bcc07 100644 --- a/composer.spec +++ b/composer.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2021 Remi Collet +# Copyright (c) 2015-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a +%global gh_commit 8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.3 +%global upstream_version 2.2.4 #global upstream_prever RC1 #global upstream_lower rc1 @@ -304,6 +304,9 @@ exit $ret %changelog +* Sun Jan 9 2022 Remi Collet - 2.2.4-1 +- update to 2.2.4 + * Sat Jan 1 2022 Remi Collet - 2.2.3-1 - update to 2.2.3 diff --git a/sources b/sources index 36d9283..0c91968 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.3-3c92ba5.tgz) = 406bec56bea0150f6fb63d269f8beaf9f12733cdd50c547eeaedb34f5a2b500bffa10834ff85c9f6edd95f80cec8763e85fe9248fd891a18cfd1a99e8141501f +SHA512 (composer-2.2.4-8a5ad75.tgz) = 383c9bcfb39f772c8dfb316b798c383afa0ed899e081c5c03395b52bf3dc5263472719677dde65c412f9a8ca8bcfccacfc097a2465901d1671d232d496d8e868 From 7ae952fb2a4903cb247bd519bac97862b87d083f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Jan 2022 10:09:45 +0100 Subject: [PATCH 15/21] v2.2.5 (cherry picked from commit 20b248a36985e012a3f5764cf409fa304269937f) (cherry picked from commit 1202c85cf8690aafde7c2d4666ddba5e1741f86f) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 80bcc07..eebcf64 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f +%global gh_commit 22c41ef275c7bb64fa28fb2c0871a39666832cb9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.4 +%global upstream_version 2.2.5 #global upstream_prever RC1 #global upstream_lower rc1 @@ -304,6 +304,9 @@ exit $ret %changelog +* Sat Jan 22 2022 Remi Collet - 2.2.5-1 +- update to 2.2.5 + * Sun Jan 9 2022 Remi Collet - 2.2.4-1 - update to 2.2.4 diff --git a/sources b/sources index 0c91968..b3069cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.4-8a5ad75.tgz) = 383c9bcfb39f772c8dfb316b798c383afa0ed899e081c5c03395b52bf3dc5263472719677dde65c412f9a8ca8bcfccacfc097a2465901d1671d232d496d8e868 +SHA512 (composer-2.2.5-22c41ef.tgz) = 5854ee3efca274c6c88e327244edec91c3e297db0921382a0cd30767d87db0407040245055b7b3484c6932afd4b97bbc99d25e87afa8ebb00173591c6948b7fb From dd41225ec33aca96441d9f9beb5076ce7eb45120 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Jan 2022 11:05:08 +0100 Subject: [PATCH 16/21] use system libraries on Fedora, bundled libraries on EL (cherry picked from commit 01bbe4863e571beb02bd69170fef9dad54cf4f2e) add missing requires on php-dom (cherry picked from commit 47cab181a14a74891a135d94b441889e7c855466) v2.2.6 (cherry picked from commit 358d437f30581d8689f81fced48fcb993c88f097) (cherry picked from commit b3b9da84ebe8705aed11a0d5b1a014059d5e659a) --- composer-noxdg.patch | 6 +-- composer-rpm.patch | 54 +++++++++++++--------- composer.spec | 106 ++++++++++++++++++++++++++++++++++++------- makesrc.sh | 34 ++++++++------ sources | 2 +- 5 files changed, 147 insertions(+), 55 deletions(-) diff --git a/composer-noxdg.patch b/composer-noxdg.patch index fc6b127..607e449 100644 --- a/composer-noxdg.patch +++ b/composer-noxdg.patch @@ -1,7 +1,7 @@ diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php ---- ./src/Composer/Factory.php.noxdg 2021-05-31 15:37:50.548115679 +0200 -+++ ./src/Composer/Factory.php 2021-05-31 15:39:05.192882880 +0200 -@@ -653,6 +653,10 @@ class Factory +--- ./src/Composer/Factory.php.noxdg 2022-01-25 09:39:15.000000000 +0100 ++++ ./src/Composer/Factory.php 2022-01-25 09:50:21.374957261 +0100 +@@ -701,6 +701,10 @@ class Factory */ private static function useXdg() { diff --git a/composer-rpm.patch b/composer-rpm.patch index cbb4b3c..bdf807b 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2021-09-14 15:45:17.000000000 +0200 -+++ ./bin/composer 2021-09-14 15:45:33.025118009 +0200 +--- ./bin/composer.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./bin/composer 2022-01-25 09:50:21.372957269 +0100 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== ' } @@ -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 2021-09-14 15:45:17.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2021-09-14 15:45:33.025118009 +0200 -@@ -395,7 +395,7 @@ EOF; +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2022-01-25 09:50:21.373957265 +0100 +@@ -419,7 +419,7 @@ EOF; $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform)); $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); @@ -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, array(), array( diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ---- ./src/Composer/Compiler.php.rpm 2021-09-14 15:45:17.000000000 +0200 -+++ ./src/Composer/Compiler.php 2021-09-14 15:45:33.025118009 +0200 -@@ -118,7 +118,7 @@ class Compiler +--- ./src/Composer/Compiler.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./src/Composer/Compiler.php 2022-01-25 09:50:21.373957265 +0100 +@@ -125,7 +125,7 @@ class Compiler // Add Composer resources $finder = new Finder(); $finder->files() @@ -35,9 +35,9 @@ 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 2021-09-14 15:45:17.000000000 +0200 -+++ ./src/Composer/InstalledVersions.php 2021-09-14 15:45:33.026118007 +0200 -@@ -251,7 +251,7 @@ class InstalledVersions +--- ./src/Composer/InstalledVersions.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./src/Composer/InstalledVersions.php 2022-01-25 09:50:21.373957265 +0100 +@@ -264,7 +264,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 @@ -46,7 +46,7 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio self::$installed = include __DIR__ . '/installed.php'; } else { self::$installed = array(); -@@ -324,7 +324,7 @@ class InstalledVersions +@@ -337,7 +337,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 @@ -56,9 +56,9 @@ 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 2021-09-14 15:45:17.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2021-09-14 15:46:22.434026477 +0200 -@@ -34,7 +34,7 @@ class JsonFile +--- ./src/Composer/Json/JsonFile.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./src/Composer/Json/JsonFile.php 2022-01-25 09:50:21.373957265 +0100 +@@ -35,7 +35,7 @@ class JsonFile const JSON_PRETTY_PRINT = 128; 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; -@@ -191,7 +191,7 @@ class JsonFile +@@ -197,7 +197,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 ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php ---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2021-09-14 15:45:17.000000000 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2021-09-14 15:45:33.025118009 +0200 -@@ -93,7 +93,8 @@ class ComposerSchemaTest extends TestCas +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2022-01-25 09:50:21.373957265 +0100 +@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { $validator = new Validator(); @@ -90,8 +90,8 @@ diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/ if (!$validator->isValid()) { $errors = $validator->getErrors(); diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php ---- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2021-09-14 15:45:17.000000000 +0200 -+++ ./tests/Composer/Test/PolyfillTestCase.php 2021-09-14 15:45:33.026118007 +0200 +--- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2022-01-25 09:39:15.000000000 +0100 ++++ ./tests/Composer/Test/PolyfillTestCase.php 2022-01-25 09:50:21.373957265 +0100 @@ -15,10 +15,35 @@ namespace Composer\Test { use PHPUnit\Framework\Constraint\LogicalNot; use PHPUnit\Framework\Constraint\StringContains; @@ -129,3 +129,15 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po } else { abstract class PolyfillTestCase extends TestCase { +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-01-25 09:50:57.595802751 +0100 ++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2022-01-25 09:51:36.038638770 +0100 +@@ -125,7 +125,7 @@ class CaBundle + */ + public static function getBundledCaBundlePath() + { +- $caBundleFile = __DIR__.'/../res/cacert.pem'; ++ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always + + // cURL does not understand 'phar://' paths + // see https://github.com/composer/ca-bundle/issues/10 diff --git a/composer.spec b/composer.spec index eebcf64..8f442da 100644 --- a/composer.spec +++ b/composer.spec @@ -10,9 +10,15 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs +%if 0%{?fedora} %bcond_without tests +%bcond_without syslib +%else +%bcond_with tests +%bcond_with syslib +%endif -%global gh_commit 22c41ef275c7bb64fa28fb2c0871a39666832cb9 +%global gh_commit ce785a18c0fb472421e52d958bab339247cb0e82 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +26,7 @@ %global api_version 2.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.5 +%global upstream_version 2.2.6 #global upstream_prever RC1 #global upstream_lower rc1 @@ -35,6 +41,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} Release: 1%{?dist} Summary: Dependency Manager for PHP +# composer and all dependencies are MIT License: MIT URL: https://getcomposer.org/ Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz @@ -50,7 +57,10 @@ Patch0: %{name}-rpm.patch Patch1: %{name}-noxdg.patch BuildArch: noarch +# platform set in makesrc.sh +BuildRequires: php(language) >= 7.2.5 BuildRequires: php-cli +BuildRequires: php-json %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) @@ -58,8 +68,8 @@ BuildRequires: (php-composer(composer/semver) >= 3.0 with php-com BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) -BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) +BuildRequires: (php-composer(seld/phar-utils) >= 1.1 with php-composer(seld/phar-utils) < 2) +BuildRequires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) 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) >= 1.0 with php-composer(composer/pcre) < 2) @@ -74,8 +84,6 @@ BuildRequires: php-zip BuildRequires: %{_phpunit} # For autoloader BuildRequires: php-fedora-autoloader-devel -BuildRequires: php-seld-phar-utils >= 1.1 -BuildRequires: php-PsrLog >= 1.1 %endif # From composer.json, "require": { @@ -95,16 +103,17 @@ BuildRequires: php-PsrLog >= 1.1 # "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", # "react/promise": "^1.2 || ^2.7", # "composer/pcre": "^1.0" -Requires: php(language) >= 5.3.2 +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 with php-composer(composer/xdebug-handler) < 3) Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) -Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) +Requires: (php-composer(seld/phar-utils) >= 1.1 with php-composer(seld/phar-utils) < 2) +Requires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) 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) >= 1.0 with php-composer(composer/pcre) < 2) @@ -112,6 +121,38 @@ 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 +Provides: bundled(php-composer-ca-bundle) = 1.3.1 +Provides: bundled(php-composer-metadata-minifier) = 1.0.0 +Provides: bundled(php-composer-pcre) = 1.0.1 +Provides: bundled(php-composer-semver) = 3.2.9 +Provides: bundled(php-composer-spdx-licenses) = 1.5.6 +Provides: bundled(php-composer-xdebug-handler) = 2.0.4 +Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 +Provides: bundled(php-psr-container) = 1.1.1 +Provides: bundled(php-psr-log) = 1.1.4 +Provides: bundled(php-react-promise) = v2.8.0 +Provides: bundled(php-seld-jsonlint) = 1.8.3 +Provides: bundled(php-seld-phar-utils) = 1.2.0 +Provides: bundled(php-symfony-console) = v5.4.3 +Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 +Provides: bundled(php-symfony-filesystem) = v5.4.3 +Provides: bundled(php-symfony-finder) = v5.4.3 +Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.24.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.24.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.24.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.24.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.24.0 +Provides: bundled(php-symfony-process) = v5.4.3 +Provides: bundled(php-symfony-service-contracts) = v2.5.0 +Provides: bundled(php-symfony-string) = v5.4.3 +%endif # 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", @@ -119,14 +160,11 @@ Requires: %{symfony_prefix}-filesystem >= %{symfony_min} Requires: php-openssl Requires: php-zip Requires: php-zlib -# For our autoloader -Requires: php-composer(fedora/autoloader) -Requires: php-seld-phar-utils >= 1.1 -Requires: php-PsrLog >= 1.1 -# From phpcompatinfo for version 2.0.0 +# From phpcompatinfo for version 2.2.5 Requires: php-ctype Requires: php-curl Requires: php-date +Requires: php-dom Requires: php-filter Requires: php-hash Requires: php-iconv @@ -170,6 +208,12 @@ if grep -r '\.\./res'; then exit 1 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 @@ -201,8 +245,30 @@ require 'Composer/autoload.php'; \Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/'); EOF -rm src/bootstrap.php +%else +: symlink autoloader for library +ln -s vendor/autoload.php src/Composer/autoload.php +: fix layout +sed -e "s:/../..' . '/src/Composer::" -i src/Composer/vendor/composer/autoload_static.php + +: List bundled libraries and Licenses +php -r ' + $pkgs = file_get_contents("src/Composer/vendor/composer/installed.json"); + $pkgs = json_decode($pkgs, true); + if (!is_array($pkgs) || !isset($pkgs["packages"])) { + echo "cant decode json file\n"; + exit(3); + } + $lic = []; + foreach($pkgs["packages"] as $pkg) { + printf("Provides: bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); + $lic = array_merge($lic, $pkg["license"]); + } + sort($lic); + printf("\nLicense: %s\n\n", implode(" and ", array_unique($lic))); +' +%endif : fix reported version %if 0%{?gh_date} @@ -256,7 +322,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %check -%if %{with tests} +%if %{with tests} && %{with syslib} : Online tests rm tests/Composer/Test/Util/RemoteFilesystemTest.php @@ -266,7 +332,10 @@ rm -rf res : Run test suite export BUILDROOT=%{buildroot} -FILTER="--filter '^((?!(testIntegration)).)*$'" +# testSearchWithSpecialChars is online +# testCreateMap fails on 8.1 +# testOutputIgnoresFormatting use InstalledVersions +FILTER="--filter '^((?!(testIntegration|testSearchWithSpecialChars|testCreateMap|testOutputIgnoresFormatting)).)*$'" # Adapt for phunit9 find tests \ @@ -304,6 +373,9 @@ exit $ret %changelog +* Sat Feb 5 2022 Remi Collet - 2.2.6-1 +- update to 2.2.6 + * Sat Jan 22 2022 Remi Collet - 2.2.5-1 - update to 2.2.5 diff --git a/makesrc.sh b/makesrc.sh index 9615a91..930ec0b 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -8,21 +8,29 @@ PREVER=$(sed -n '/^%global upstream_prever/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n" +if [ -f $NAME-$VERSION$PREVER-$SHORT.tgz ]; then + echo skip $NAME-$VERSION$PREVER-$SHORT.tgz already here +else + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n" -echo "Cloning..." -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + echo "Cloning..." + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd + echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || exit 1 + cp composer.json ../composer.json + composer config platform.php 7.2.5 + rm composer.lock + export COMPOSER_VENDOR_DIR=src/Composer/vendor + composer install --no-interaction --no-progress --no-dev --optimize-autoloader + cp src/Composer/vendor/composer/installed.json ../ + popd -echo "Archiving..." -tar czf $NAME-$VERSION$PREVER-$SHORT.tgz --exclude .git $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT + echo "Archiving..." + tar czf $NAME-$VERSION$PREVER-$SHORT.tgz --exclude .git $PROJECT-$COMMIT + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT +fi echo "Done." diff --git a/sources b/sources index b3069cc..dc98f1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.5-22c41ef.tgz) = 5854ee3efca274c6c88e327244edec91c3e297db0921382a0cd30767d87db0407040245055b7b3484c6932afd4b97bbc99d25e87afa8ebb00173591c6948b7fb +SHA512 (composer-2.2.6-ce785a1.tgz) = e7fd81e9705686dae7f5f3b88a7b4ce3a571314505e7558e739d94432e04c893e20da5a2ee00d89a03e91c2899bdfd2271f615ed62f73297bf89b9a9617fab95 From d1051c1206511dd2e0c852bc92410849065c39f4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Feb 2022 12:29:07 +0100 Subject: [PATCH 17/21] v2.2.7 (cherry picked from commit 1d2985b4de91a85660d10599ff5fba277d478ef6) --- composer.spec | 22 ++++++++++++++-------- sources | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/composer.spec b/composer.spec index 8f442da..4682069 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit ce785a18c0fb472421e52d958bab339247cb0e82 +%global gh_commit 061d154dfdde157cbf453c4695e6af21c0e93903 %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.6 +%global upstream_version 2.2.7 #global upstream_prever RC1 #global upstream_lower rc1 @@ -66,7 +66,7 @@ BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-com 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 with php-composer(composer/xdebug-handler) < 3) +BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 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.1 with php-composer(seld/phar-utils) < 2) BuildRequires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) @@ -92,7 +92,7 @@ BuildRequires: php-fedora-autoloader-devel # "composer/metadata-minifier": "^1.0", # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", -# "composer/xdebug-handler": "^2.0", +# "composer/xdebug-handler": "^2.0 || ^3.0", # "justinrainbow/json-schema": "^5.2.11", # "psr/log": "^1.0 || ^2.0" # "seld/jsonlint": "~1.4", @@ -110,7 +110,7 @@ Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-com 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 with php-composer(composer/xdebug-handler) < 3) +Requires: (php-composer(composer/xdebug-handler) >= 2.0 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.1 with php-composer(seld/phar-utils) < 2) Requires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) @@ -132,11 +132,11 @@ Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 1.0.1 Provides: bundled(php-composer-semver) = 3.2.9 Provides: bundled(php-composer-spdx-licenses) = 1.5.6 -Provides: bundled(php-composer-xdebug-handler) = 2.0.4 +Provides: bundled(php-composer-xdebug-handler) = 3.0.2 Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 -Provides: bundled(php-react-promise) = v2.8.0 +Provides: bundled(php-react-promise) = v2.9.0 Provides: bundled(php-seld-jsonlint) = 1.8.3 Provides: bundled(php-seld-phar-utils) = 1.2.0 Provides: bundled(php-symfony-console) = v5.4.3 @@ -218,7 +218,10 @@ phpab --template fedora --output src/Composer/autoload.php src/Composer cat << 'EOF' | tee -a src/Composer/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/Composer/XdebugHandler2/autoload.php', /* before symfony which load composer */ + [ /* 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', @@ -373,6 +376,9 @@ exit $ret %changelog +* Fri Feb 25 2022 Remi Collet - 2.2.7-1 +- update to 2.2.7 + * Sat Feb 5 2022 Remi Collet - 2.2.6-1 - update to 2.2.6 diff --git a/sources b/sources index dc98f1f..94811f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.6-ce785a1.tgz) = e7fd81e9705686dae7f5f3b88a7b4ce3a571314505e7558e739d94432e04c893e20da5a2ee00d89a03e91c2899bdfd2271f615ed62f73297bf89b9a9617fab95 +SHA512 (composer-2.2.7-061d154.tgz) = faa7281e153ea21e9b93ce42efcce01e54cea1978dbfa56b65637ca8b64d811cdb8a110d863a5b1e2c824337d3dd7b5ea4ca943192015b18ebf99c3aa6c948d6 From a8cb7953775d8a182f0412af2fc7ed1be63caea0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Mar 2022 14:07:17 +0100 Subject: [PATCH 18/21] v2.2.8 (cherry picked from commit 6769264671ef9f4e93c3a193ab425161799553e1) --- composer.spec | 29 ++++++++++++++++------------- sources | 2 +- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/composer.spec b/composer.spec index 4682069..b97dbc2 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 061d154dfdde157cbf453c4695e6af21c0e93903 +%global gh_commit 26a587345daa2772bbe2006f13cd9d7f92b242eb %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.7 +%global upstream_version 2.2.8 #global upstream_prever RC1 #global upstream_lower rc1 @@ -130,26 +130,26 @@ Requires: ca-certificates Provides: bundled(php-composer-ca-bundle) = 1.3.1 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 1.0.1 -Provides: bundled(php-composer-semver) = 3.2.9 +Provides: bundled(php-composer-semver) = 3.3.0 Provides: bundled(php-composer-spdx-licenses) = 1.5.6 -Provides: bundled(php-composer-xdebug-handler) = 3.0.2 +Provides: bundled(php-composer-xdebug-handler) = 3.0.3 Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 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.8.3 Provides: bundled(php-seld-phar-utils) = 1.2.0 -Provides: bundled(php-symfony-console) = v5.4.3 +Provides: bundled(php-symfony-console) = v5.4.5 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 -Provides: bundled(php-symfony-filesystem) = v5.4.3 +Provides: bundled(php-symfony-filesystem) = v5.4.6 Provides: bundled(php-symfony-finder) = v5.4.3 -Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0 -Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.24.0 -Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.24.0 -Provides: bundled(php-symfony-polyfill-mbstring) = v1.24.0 -Provides: bundled(php-symfony-polyfill-php73) = v1.24.0 -Provides: bundled(php-symfony-polyfill-php80) = v1.24.0 -Provides: bundled(php-symfony-process) = v5.4.3 +Provides: bundled(php-symfony-polyfill-ctype) = v1.25.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.25.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.25.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.25.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.25.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.25.0 +Provides: bundled(php-symfony-process) = v5.4.5 Provides: bundled(php-symfony-service-contracts) = v2.5.0 Provides: bundled(php-symfony-string) = v5.4.3 %endif @@ -376,6 +376,9 @@ exit $ret %changelog +* Tue Mar 15 2022 Remi Collet - 2.2.8-1 +- update to 2.2.8 + * Fri Feb 25 2022 Remi Collet - 2.2.7-1 - update to 2.2.7 diff --git a/sources b/sources index 94811f3..ff11b52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.7-061d154.tgz) = faa7281e153ea21e9b93ce42efcce01e54cea1978dbfa56b65637ca8b64d811cdb8a110d863a5b1e2c824337d3dd7b5ea4ca943192015b18ebf99c3aa6c948d6 +SHA512 (composer-2.2.8-26a5873.tgz) = ca2dda3c6c17c3b3706626f5411ed2f8205b632d7d9e26a89dc4788f13d9469294a7838bb9fd615013b352aeca48e3719ae4263ad42496ebc68b9034953307b5 From 61ddcc665e50902d084a6060a555ef15b9d5e710 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Mar 2022 07:57:23 +0100 Subject: [PATCH 19/21] v2.2.9 (cherry picked from commit 26c47b0acf401dda4ebc9a80610592ae13602107) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index b97dbc2..198744f 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 26a587345daa2772bbe2006f13cd9d7f92b242eb +%global gh_commit 07eccf080ad63d55d95a7c9133506db7d9029264 %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.8 +%global upstream_version 2.2.9 #global upstream_prever RC1 #global upstream_lower rc1 @@ -376,6 +376,9 @@ exit $ret %changelog +* Wed Mar 16 2022 Remi Collet - 2.2.9-1 +- update to 2.2.9 + * Tue Mar 15 2022 Remi Collet - 2.2.8-1 - update to 2.2.8 diff --git a/sources b/sources index ff11b52..fc8b5f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.8-26a5873.tgz) = ca2dda3c6c17c3b3706626f5411ed2f8205b632d7d9e26a89dc4788f13d9469294a7838bb9fd615013b352aeca48e3719ae4263ad42496ebc68b9034953307b5 +SHA512 (composer-2.2.9-07eccf0.tgz) = e96749a5a77abd6176e8dfc3533c6865a7abe4efa20c51258b5a978151608b9619c9d8c6190a4b7aac23f9a3045b9809cbffe8836ce7325b1f1da3392cb22fc9 From b62dca78b23eb296258f516d6dd2aead65880466 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Mar 2022 07:35:16 +0200 Subject: [PATCH 20/21] v2.2.10 (cherry picked from commit 99e9ef55ce994bf9f3be6ba0f084860d098cf22c) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index 198744f..af318ac 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 07eccf080ad63d55d95a7c9133506db7d9029264 +%global gh_commit 18f748df692b6304b5baf077786c003c48e7f990 %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.9 +%global upstream_version 2.2.10 #global upstream_prever RC1 #global upstream_lower rc1 @@ -130,7 +130,7 @@ Requires: ca-certificates Provides: bundled(php-composer-ca-bundle) = 1.3.1 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 1.0.1 -Provides: bundled(php-composer-semver) = 3.3.0 +Provides: bundled(php-composer-semver) = 3.3.1 Provides: bundled(php-composer-spdx-licenses) = 1.5.6 Provides: bundled(php-composer-xdebug-handler) = 3.0.3 Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 @@ -376,6 +376,9 @@ exit $ret %changelog +* Wed Mar 30 2022 Remi Collet - 2.2.10-1 +- update to 2.2.10 + * Wed Mar 16 2022 Remi Collet - 2.2.9-1 - update to 2.2.9 diff --git a/sources b/sources index fc8b5f7..9cd962e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.9-07eccf0.tgz) = e96749a5a77abd6176e8dfc3533c6865a7abe4efa20c51258b5a978151608b9619c9d8c6190a4b7aac23f9a3045b9809cbffe8836ce7325b1f1da3392cb22fc9 +SHA512 (composer-2.2.10-18f748d.tgz) = 405b94c57ac4d4ee06269a952fd22bc7842bb6917c050987285f789332716d7e6dc84f644a5b85b4b6f6a6657329c28c6bffd012ad9f9314882c0983e29b30c5 From 7be73d2f7f63500bde00b585d2bf090a1d295f5f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 14 Apr 2022 07:18:39 +0200 Subject: [PATCH 21/21] v2.2.12 --- composer.spec | 17 ++++++++++------- sources | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/composer.spec b/composer.spec index af318ac..15a3a12 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 18f748df692b6304b5baf077786c003c48e7f990 +%global gh_commit ba61e768b410736efe61df01b61f1ec44f51474f %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.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.10 +%global upstream_version 2.2.12 #global upstream_prever RC1 #global upstream_lower rc1 @@ -203,11 +203,6 @@ Documentation: https://getcomposer.org/doc/ %patch1 -p1 -b .noxdg find . \( -name \*.rpm -o -name \*noxdg \) -delete -print -if grep -r '\.\./res'; then - : Patch need to fixed - exit 1 -fi - rm src/bootstrap.php rm src/Composer/vendor/composer/ca-bundle/res/cacert.pem @@ -273,6 +268,11 @@ php -r ' ' %endif +if grep -r '\.\./res'; then + : Patch need to fixed + exit 1 +fi + : fix reported version %if 0%{?gh_date} DATE=%{gh_date} @@ -376,6 +376,9 @@ exit $ret %changelog +* Thu Apr 14 2022 Remi Collet - 2.2.12-1 +- update to 2.2.12 + * Wed Mar 30 2022 Remi Collet - 2.2.10-1 - update to 2.2.10 diff --git a/sources b/sources index 9cd962e..20eba6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.10-18f748d.tgz) = 405b94c57ac4d4ee06269a952fd22bc7842bb6917c050987285f789332716d7e6dc84f644a5b85b4b6f6a6657329c28c6bffd012ad9f9314882c0983e29b30c5 +SHA512 (composer-2.2.12-ba61e76.tgz) = eb47b368b43633a6e52684d7c6b7961cd571ad0edf8edc5585acc95891cb6958992d9dec6c88ab947ce95f8597139f76ab58ee8b401d2bf9af7511d2aabfc24a