From 1202c85cf8690aafde7c2d4666ddba5e1741f86f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Jan 2022 10:09:45 +0100 Subject: [PATCH 01/17] v2.2.5 (cherry picked from commit 20b248a36985e012a3f5764cf409fa304269937f) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 91a5503..7a6965b 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 b3b9da84ebe8705aed11a0d5b1a014059d5e659a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Jan 2022 11:05:08 +0100 Subject: [PATCH 02/17] 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) --- 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 7a6965b..3055832 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 1586f84b54645e5c75369bf0b0489b41ee82ec78 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Feb 2022 12:29:07 +0100 Subject: [PATCH 03/17] 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 3055832..b4b2ef4 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 2e10ba5846516b4f9a8f066ea1492f8339f5dcf9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Mar 2022 14:07:17 +0100 Subject: [PATCH 04/17] 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 b4b2ef4..87b2a67 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 6033cee4318c601e07d4460423510299c0b3f156 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Mar 2022 07:57:23 +0100 Subject: [PATCH 05/17] 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 87b2a67..5a3ac68 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 b45ab985a59f4ab0e23218a2d0243b84d89d9c11 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Mar 2022 07:35:16 +0200 Subject: [PATCH 06/17] 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 5a3ac68..28625ee 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 72bc774bfb0422c9330a88af0232af4394eb37ca Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Mar 2022 13:54:01 +0200 Subject: [PATCH 07/17] update to 2.3.0 always use bundled libraries as symfony/* 5.4 and composer/pcre 2 are not available (cherry picked from commit 10827d53755544678073d54195ca6d8db5ea1680) --- composer-noxdg.patch | 10 ++-- composer-rpm.patch | 114 ++++++++++++++----------------------------- composer.spec | 68 +++++++++++++++----------- sources | 2 +- 4 files changed, 82 insertions(+), 112 deletions(-) diff --git a/composer-noxdg.patch b/composer-noxdg.patch index 607e449..73195e7 100644 --- a/composer-noxdg.patch +++ b/composer-noxdg.patch @@ -1,9 +1,9 @@ diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php ---- ./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() +--- ./src/Composer/Factory.php.noxdg 2022-03-16 09:51:30.398977729 +0100 ++++ ./src/Composer/Factory.php 2022-03-16 09:52:14.113841110 +0100 +@@ -665,6 +665,10 @@ class Factory + + private static function useXdg(): bool { + // As XDG is very patially implemted + // resulting in command/code in ~/.config diff --git a/composer-rpm.patch b/composer-rpm.patch index bdf807b..26ee894 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2022-01-25 09:39:15.000000000 +0100 -+++ ./bin/composer 2022-01-25 09:50:21.372957269 +0100 +--- ./bin/composer.rpm 2022-03-16 09:47:01.000000000 +0100 ++++ ./bin/composer 2022-03-16 09:53:25.479618079 +0100 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== ' } @@ -11,10 +11,10 @@ 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-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)); +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2022-03-16 09:47:01.000000000 +0100 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2022-03-16 09:53:25.479618079 +0100 +@@ -418,7 +418,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'); - $filesystem->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE'); @@ -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 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 +--- ./src/Composer/Compiler.php.rpm 2022-03-16 09:47:01.000000000 +0100 ++++ ./src/Composer/Compiler.php 2022-03-16 09:53:25.480618076 +0100 +@@ -107,7 +107,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 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 +--- ./src/Composer/InstalledVersions.php.rpm 2022-03-16 09:47:01.000000000 +0100 ++++ ./src/Composer/InstalledVersions.php 2022-03-16 09:53:25.480618076 +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, // 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(); -@@ -337,7 +337,7 @@ class InstalledVersions +@@ -339,7 +339,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,82 +56,29 @@ 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-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; +--- ./src/Composer/Json/JsonFile.php.rpm 2022-03-16 09:54:28.547422853 +0100 ++++ ./src/Composer/Json/JsonFile.php 2022-03-16 09:56:07.126118722 +0100 +@@ -38,7 +38,7 @@ class JsonFile + /** @deprecated Use \JSON_UNESCAPED_UNICODE */ + public const JSON_UNESCAPED_UNICODE = 256; -- const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json'; -+ const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; +- public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json'; ++ public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; /** @var string */ private $path; -@@ -197,7 +197,7 @@ class JsonFile +@@ -200,7 +200,7 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { $isComposerSchemaFile = true; -- $schemaFile = __DIR__ . self::COMPOSER_SCHEMA_PATH; +- $schemaFile = self::COMPOSER_SCHEMA_PATH; + $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH; } // 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 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(); -- $validator->check(json_decode($json), (object) array('$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)); - - 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 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; - -- if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) { -+ if (method_exists('PHPUnit\Framework\TestCase', 'assertFileDoesNotExist')) { - abstract class PolyfillTestCase extends TestCase - { - } -+ } else if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) { -+ abstract class PolyfillTestCase extends TestCase { -+ /** -+ * @param string $filename -+ * @param string $message -+ * -+ * @return void -+ */ -+ public static function assertFileDoesNotExist($filename, $message = '') -+ { -+ static::assertFileNotExists($filename, $message); -+ } -+ -+ /** -+ * @param string $pattern -+ * @param string $string -+ * @param string $message -+ * -+ * @return void -+ */ -+ public static function assertMatchesRegularExpression($pattern, $string, $message = '') -+ { -+ static::assertRegExp($pattern, $string, $message); -+ } -+ } - } 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 +--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm 2021-10-28 22:44:15.000000000 +0200 ++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2022-03-16 09:53:25.480618076 +0100 @@ -125,7 +125,7 @@ class CaBundle */ public static function getBundledCaBundlePath() @@ -141,3 +88,16 @@ 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-03-16 09:47:01.000000000 +0100 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2022-03-16 09:53:25.480618076 +0100 +@@ -97,7 +97,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')); ++ $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'; ++ $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f)); + + if (!$validator->isValid()) { + $errors = $validator->getErrors(); diff --git a/composer.spec b/composer.spec index 28625ee..c2da14b 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%if 0%{?fedora} +%if 0 %bcond_without tests %bcond_without syslib %else @@ -18,21 +18,21 @@ %bcond_with syslib %endif -%global gh_commit 18f748df692b6304b5baf077786c003c48e7f990 +%global gh_commit 36dc875e1c6d5ce9411c78aae22b33ac24c86e13 %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 api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.2.10 -#global upstream_prever RC1 -#global upstream_lower rc1 +%global upstream_version 2.3.0 +#global upstream_prever RC2 +#global upstream_lower rc2 -%global symfony_prefix php-symfony4 -%global symfony_path %{_datadir}/php/Symfony4 -%global symfony_min 4.4 +%global symfony_prefix php-symfony5 +%global symfony_path %{_datadir}/php/Symfony5 +%global symfony_min 5.4.1 %global _phpunit %{_bindir}/phpunit9 @@ -66,13 +66,13 @@ 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) < 4) +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.1 with php-composer(seld/phar-utils) < 2) -BuildRequires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) +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) >= 1.0 with php-composer(composer/pcre) < 2) +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} @@ -87,22 +87,24 @@ BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require": { -# "php": "^5.3.2 || ^7.0", +# "php": "^7.2.5 || ^8.0", # "composer/ca-bundle": "^1.0", # "composer/metadata-minifier": "^1.0", # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", -# "composer/xdebug-handler": "^2.0 || ^3.0", +# "composer/xdebug-handler": "^2.0.2 || ^3.0.3", # "justinrainbow/json-schema": "^5.2.11", -# "psr/log": "^1.0 || ^2.0" +# "psr/log": "^1.0 || ^2.0 || ^3.0" # "seld/jsonlint": "~1.4", -# "seld/phar-utils": "^1.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", -# "react/promise": "^1.2 || ^2.7", -# "composer/pcre": "^1.0" +# "seld/phar-utils": "^1.2", +# "symfony/console": "^5.4.1 || ^6.0", +# "symfony/filesystem": "^5.4 || ^6.0", +# "symfony/finder": "^5.4 || ^6.0", +# "symfony/process": "^5.4 || ^6.0", +# "react/promise": "^2.8", +# "composer/pcre": "^2 || ^3" +# "symfony/polyfill-php73": "^1.24", +# "symfony/polyfill-php80": "^1.24" Requires: php(language) >= 7.2.5 Requires: php-cli %if %{with syslib} @@ -110,13 +112,13 @@ 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) < 4) +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.1 with php-composer(seld/phar-utils) < 2) -Requires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) +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) >= 1.0 with php-composer(composer/pcre) < 2) +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} @@ -129,7 +131,7 @@ 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-pcre) = 2.0.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 @@ -232,8 +234,11 @@ 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/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', ], @@ -376,6 +381,11 @@ exit $ret %changelog +* Wed Mar 30 2022 Remi Collet - 2.3.0-1 +- update to 2.3.0 +- always use bundled libraries + as symfony/* 5.4 and composer/pcre 2 are not available + * Wed Mar 30 2022 Remi Collet - 2.2.10-1 - update to 2.2.10 diff --git a/sources b/sources index 9cd962e..33adfba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.2.10-18f748d.tgz) = 405b94c57ac4d4ee06269a952fd22bc7842bb6917c050987285f789332716d7e6dc84f644a5b85b4b6f6a6657329c28c6bffd012ad9f9314882c0983e29b30c5 +SHA512 (composer-2.3.0-36dc875.tgz) = da303468ed7c6bbf032289f6804480306a4ae0d3a41861bb83506b2c92b8d39c64cb5abd56c8134f047cc74348240696e0993cb12c2901c51d48569d20fca257 From 0b0a4cad4ef81f566cfdf1d749e4da641418c757 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 31 Mar 2022 07:50:37 +0200 Subject: [PATCH 08/17] v2.3.2 (cherry picked from commit aa563f58c745e850a94fb6778ba30982d7b086d9) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index c2da14b..6f080e7 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 36dc875e1c6d5ce9411c78aae22b33ac24c86e13 +%global gh_commit c3777ea50f5ad561d4796b42fba4d180bb45cf77 %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.3.0 +%global upstream_version 2.3.2 #global upstream_prever RC2 #global upstream_lower rc2 @@ -381,6 +381,9 @@ exit $ret %changelog +* Thu Mar 31 2022 Remi Collet - 2.3.2-1 +- update to 2.3.2 + * Wed Mar 30 2022 Remi Collet - 2.3.0-1 - update to 2.3.0 - always use bundled libraries diff --git a/sources b/sources index 33adfba..28d0e86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.0-36dc875.tgz) = da303468ed7c6bbf032289f6804480306a4ae0d3a41861bb83506b2c92b8d39c64cb5abd56c8134f047cc74348240696e0993cb12c2901c51d48569d20fca257 +SHA512 (composer-2.3.2-c3777ea.tgz) = d86dfd652e4fe7f67763c0e8bdc927954081310813fa92094261afdf7fbd63f84a241a8a4def6c1e1fedaabd40638f4be34d960940904cf2a01c2dcf26315248 From 4c7592314274369b3081d5e35d946b08503e98dc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Apr 2022 08:14:48 +0200 Subject: [PATCH 09/17] v2.3.3 (cherry picked from commit eff5be53fb68eb005dcced158f8c87f0b858181a) --- composer.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/composer.spec b/composer.spec index 6f080e7..557d226 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit c3777ea50f5ad561d4796b42fba4d180bb45cf77 +%global gh_commit b0024890b8650e52d1a29822856b3c95aa393785 %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.3.2 +%global upstream_version 2.3.3 #global upstream_prever RC2 #global upstream_lower rc2 @@ -132,14 +132,14 @@ 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) = 2.0.0 -Provides: bundled(php-composer-semver) = 3.3.1 +Provides: bundled(php-composer-semver) = 3.3.2 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 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-jsonlint) = 1.9.0 Provides: bundled(php-seld-phar-utils) = 1.2.0 Provides: bundled(php-symfony-console) = v5.4.5 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 @@ -381,6 +381,9 @@ exit $ret %changelog +* Sat Apr 2 2022 Remi Collet - 2.3.3-1 +- update to 2.3.3 + * Thu Mar 31 2022 Remi Collet - 2.3.2-1 - update to 2.3.2 diff --git a/sources b/sources index 28d0e86..50cfe3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.2-c3777ea.tgz) = d86dfd652e4fe7f67763c0e8bdc927954081310813fa92094261afdf7fbd63f84a241a8a4def6c1e1fedaabd40638f4be34d960940904cf2a01c2dcf26315248 +SHA512 (composer-2.3.3-b002489.tgz) = 2e4d88a6a8a7561847d9f81a1aa2cede467591250e50a1208502e2d708d5165432d3ab1cf4cd9a15f30f882092727d545fa8deaae97d079500c85ad1c70b2e07 From 344b52bad6bdb4b1ed6f17783c4dafdf0e558a6d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Apr 2022 07:58:02 +0200 Subject: [PATCH 10/17] v2.3.4 (cherry picked from commit aaad9a1ed5d95d238d6134789041947ec7ef767a) --- composer.spec | 17 ++++++++++------- sources | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/composer.spec b/composer.spec index 557d226..d3d5582 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit b0024890b8650e52d1a29822856b3c95aa393785 +%global gh_commit b7a041319947872c4352aa8139f4b4d6dea7130f %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.3.3 +%global upstream_version 2.3.4 #global upstream_prever RC2 #global upstream_lower rc2 @@ -141,9 +141,9 @@ 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.5 -Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0 -Provides: bundled(php-symfony-filesystem) = v5.4.6 +Provides: bundled(php-symfony-console) = v5.4.7 +Provides: bundled(php-symfony-deprecation-contracts) = v2.5.1 +Provides: bundled(php-symfony-filesystem) = v5.4.7 Provides: bundled(php-symfony-finder) = v5.4.3 Provides: bundled(php-symfony-polyfill-ctype) = v1.25.0 Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.25.0 @@ -151,8 +151,8 @@ 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-process) = v5.4.7 +Provides: bundled(php-symfony-service-contracts) = v2.5.1 Provides: bundled(php-symfony-string) = v5.4.3 %endif # From composer.json, suggest @@ -381,6 +381,9 @@ exit $ret %changelog +* Fri Apr 8 2022 Remi Collet - 2.3.4-1 +- update to 2.3.4 + * Sat Apr 2 2022 Remi Collet - 2.3.3-1 - update to 2.3.3 diff --git a/sources b/sources index 50cfe3d..120f05c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.3-b002489.tgz) = 2e4d88a6a8a7561847d9f81a1aa2cede467591250e50a1208502e2d708d5165432d3ab1cf4cd9a15f30f882092727d545fa8deaae97d079500c85ad1c70b2e07 +SHA512 (composer-2.3.4-b7a0413.tgz) = 8d9d68511f06c090f6a512d1efdf042c02b3ccb5431c2feb270735e29c80b39f2bb4bc88347eac1e75b2331ac13efaa99e06dffd7bc6949a209dddfaeb591ec1 From 8ce47961b69caa39fb62b3a931e7721592e02887 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 14 Apr 2022 07:24:37 +0200 Subject: [PATCH 11/17] v2.3.5 (cherry picked from commit ac236cf433188d9d75b4f2a2ef85e3a6ca277c00) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index d3d5582..d0146ee 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit b7a041319947872c4352aa8139f4b4d6dea7130f +%global gh_commit 50c47b1f907cfcdb8f072b88164d22b527557ae1 %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.3.4 +%global upstream_version 2.3.5 #global upstream_prever RC2 #global upstream_lower rc2 @@ -135,7 +135,7 @@ Provides: bundled(php-composer-pcre) = 2.0.0 Provides: bundled(php-composer-semver) = 3.3.2 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 +Provides: bundled(php-justinrainbow-json-schema) = 5.2.12 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 Provides: bundled(php-react-promise) = v2.9.0 @@ -381,6 +381,9 @@ exit $ret %changelog +* Thu Apr 14 2022 Remi Collet - 2.3.5-1 +- update to 2.3.5 + * Fri Apr 8 2022 Remi Collet - 2.3.4-1 - update to 2.3.4 diff --git a/sources b/sources index 120f05c..121a896 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.4-b7a0413.tgz) = 8d9d68511f06c090f6a512d1efdf042c02b3ccb5431c2feb270735e29c80b39f2bb4bc88347eac1e75b2331ac13efaa99e06dffd7bc6949a209dddfaeb591ec1 +SHA512 (composer-2.3.5-50c47b1.tgz) = 9043ff987a122d7f820a7e18d00d09102253e8d9e056503df766e58382ee39ef2b016753f9ec9601f78202e8b6553e3b9117ddabbb1a83414972090704eb68f4 From 43626f55c72dca50e6c7fc73c7f0d7d5f00669ae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Jun 2022 07:10:29 +0200 Subject: [PATCH 12/17] v2.3.6 (cherry picked from commit 47a00de7039a50b759ad450170714b49d0fbbdae) --- composer.spec | 35 +++++++++++++++++++++-------------- sources | 2 +- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/composer.spec b/composer.spec index d0146ee..4d52c32 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 50c47b1f907cfcdb8f072b88164d22b527557ae1 +%global gh_commit 0f43aa1652c447a6bc7c9217ec133313b1d32e72 %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.3.5 +%global upstream_version 2.3.6 #global upstream_prever RC2 #global upstream_lower rc2 @@ -129,11 +129,12 @@ Requires: php-composer(fedora/autoloader) # System certificates Requires: ca-certificates # Bundled libraries -Provides: bundled(php-composer-ca-bundle) = 1.3.1 +# License MIT +Provides: bundled(php-composer-ca-bundle) = 1.3.2 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 -Provides: bundled(php-composer-spdx-licenses) = 1.5.6 +Provides: bundled(php-composer-spdx-licenses) = 1.5.7 Provides: bundled(php-composer-xdebug-handler) = 3.0.3 Provides: bundled(php-justinrainbow-json-schema) = 5.2.12 Provides: bundled(php-psr-container) = 1.1.1 @@ -141,19 +142,19 @@ 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.7 +Provides: bundled(php-symfony-console) = v5.4.9 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.1 -Provides: bundled(php-symfony-filesystem) = v5.4.7 -Provides: bundled(php-symfony-finder) = v5.4.3 +Provides: bundled(php-symfony-filesystem) = v5.4.9 +Provides: bundled(php-symfony-finder) = v5.4.8 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.7 +Provides: bundled(php-symfony-process) = v5.4.8 Provides: bundled(php-symfony-service-contracts) = v2.5.1 -Provides: bundled(php-symfony-string) = v5.4.3 +Provides: bundled(php-symfony-string) = v5.4.9 %endif # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -268,13 +269,16 @@ php -r ' echo "cant decode json file\n"; exit(3); } - $lic = []; + $res = []; foreach($pkgs["packages"] as $pkg) { - printf("Provides: bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); - $lic = array_merge($lic, $pkg["license"]); + $lic = implode(" and ", $pkg["license"]); + if (!isset($res[$lic])) $res[$lic] = []; + $res[$lic][] = sprintf("Provides: bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); + } + foreach($res as $lic => $lib) { + sort($lib); + printf("# License %s\n%s\n", $lic, implode("\n", $lib)); } - sort($lic); - printf("\nLicense: %s\n\n", implode(" and ", array_unique($lic))); ' %endif @@ -381,6 +385,9 @@ exit $ret %changelog +* Thu Jun 2 2022 Remi Collet - 2.3.6-1 +- update to 2.3.6 + * Thu Apr 14 2022 Remi Collet - 2.3.5-1 - update to 2.3.5 diff --git a/sources b/sources index 121a896..9c604a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.5-50c47b1.tgz) = 9043ff987a122d7f820a7e18d00d09102253e8d9e056503df766e58382ee39ef2b016753f9ec9601f78202e8b6553e3b9117ddabbb1a83414972090704eb68f4 +SHA512 (composer-2.3.6-0f43aa1.tgz) = 79f3cb8b0b67efce643e2e4c6d452d6e39892463e7808e7cb756a51a26263b818b57b0938b6881d706928fbb65dbaa7b3bada58a314f8bc96715a547084c2b46 From fbe5fb1315914474029f45cf128935276a52f63c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Jun 2022 07:14:47 +0200 Subject: [PATCH 13/17] refresh patch (cherry picked from commit 2f15f97b4402fa2d1ac969d8bda1f31e62cbcc22) --- composer-rpm.patch | 48 +++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/composer-rpm.patch b/composer-rpm.patch index 26ee894..5cfb149 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,7 +1,7 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2022-03-16 09:47:01.000000000 +0100 -+++ ./bin/composer 2022-03-16 09:53:25.479618079 +0100 -@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== ' +--- ./bin/composer.rpm 2022-06-02 06:47:42.000000000 +0200 ++++ ./bin/composer 2022-06-02 06:49:45.037192985 +0200 +@@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) { } setlocale(LC_ALL, 'C'); @@ -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-03-16 09:47:01.000000000 +0100 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2022-03-16 09:53:25.479618079 +0100 -@@ -418,7 +418,7 @@ EOF; +--- ./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; $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $checkPlatform)); $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); @@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo if ($this->runScripts) { $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array( diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ---- ./src/Composer/Compiler.php.rpm 2022-03-16 09:47:01.000000000 +0100 -+++ ./src/Composer/Compiler.php 2022-03-16 09:53:25.480618076 +0100 +--- ./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 // Add Composer resources $finder = new Finder(); @@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ; foreach ($finder as $file) { diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php ---- ./src/Composer/InstalledVersions.php.rpm 2022-03-16 09:47:01.000000000 +0100 -+++ ./src/Composer/InstalledVersions.php 2022-03-16 09:53:25.480618076 +0100 +--- ./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 @@ -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,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 2022-03-16 09:54:28.547422853 +0100 -+++ ./src/Composer/Json/JsonFile.php 2022-03-16 09:56:07.126118722 +0100 -@@ -38,7 +38,7 @@ class JsonFile +--- ./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 +@@ -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; -@@ -200,7 +200,7 @@ class JsonFile +@@ -219,7 +219,7 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { $isComposerSchemaFile = true; @@ -76,9 +76,21 @@ 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 + + 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 2021-10-28 22:44:15.000000000 +0200 -+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2022-03-16 09:53:25.480618076 +0100 +--- ./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 @@ -125,7 +125,7 @@ class CaBundle */ public static function getBundledCaBundlePath() @@ -89,8 +101,8 @@ 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-03-16 09:47:01.000000000 +0100 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2022-03-16 09:53:25.480618076 +0100 +--- ./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 private function check(string $json) { From e6b311b775389d3864099b5b7d2407d61e3f2ead Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 7 Jun 2022 07:00:41 +0200 Subject: [PATCH 14/17] v2.3.7 (cherry picked from commit d6eab73de5f824170a7735465b3b37b9ba3406b5) --- composer.spec | 19 +++++++++++-------- sources | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/composer.spec b/composer.spec index 4d52c32..b6e2fb1 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 0f43aa1652c447a6bc7c9217ec133313b1d32e72 +%global gh_commit 10cd375cf85dede2ff417ceab517ef9a0dc55407 %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.3.6 +%global upstream_version 2.3.7 #global upstream_prever RC2 #global upstream_lower rc2 @@ -146,12 +146,12 @@ Provides: bundled(php-symfony-console) = v5.4.9 Provides: bundled(php-symfony-deprecation-contracts) = v2.5.1 Provides: bundled(php-symfony-filesystem) = v5.4.9 Provides: bundled(php-symfony-finder) = v5.4.8 -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-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-service-contracts) = v2.5.1 Provides: bundled(php-symfony-string) = v5.4.9 @@ -385,6 +385,9 @@ exit $ret %changelog +* Tue Jun 7 2022 Remi Collet - 2.3.7-1 +- update to 2.3.7 + * Thu Jun 2 2022 Remi Collet - 2.3.6-1 - update to 2.3.6 diff --git a/sources b/sources index 9c604a3..9162311 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.6-0f43aa1.tgz) = 79f3cb8b0b67efce643e2e4c6d452d6e39892463e7808e7cb756a51a26263b818b57b0938b6881d706928fbb65dbaa7b3bada58a314f8bc96715a547084c2b46 +SHA512 (composer-2.3.7-10cd375.tgz) = 7b260d2d54c02c421d3e229128f4004a9a06fb43b5c3ec7251aa77618575192a3b471e84b80777cd6a6111936ad115ea25a3c0018c4f59c0c0c03c316b8ac5bb From 0135dd3f705f65880dbd48b943f69f0f4ee81038 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Jul 2022 14:05:08 +0200 Subject: [PATCH 15/17] update to 2.3.8 add bash completion file (for upcoming 2.4) (cherry picked from commit 6a0116f61bb2118dce9cb15c802ad088d77aa8ee) --- composer-bash-completion | 81 ++++++++++++++++++++++++++++++++++++++++ composer.spec | 23 +++++++++--- sources | 2 +- 3 files changed, 99 insertions(+), 7 deletions(-) create mode 100644 composer-bash-completion diff --git a/composer-bash-completion b/composer-bash-completion new file mode 100644 index 0000000..f24f512 --- /dev/null +++ b/composer-bash-completion @@ -0,0 +1,81 @@ +# This file is part of the Symfony package. +# +# (c) Fabien Potencier +# +# For the full copyright and license information, please view +# https://symfony.com/doc/current/contributing/code/license.html + +_sf_composer() { + # Use newline as only separator to allow space in completion values + IFS=$'\n' + local sf_cmd="${COMP_WORDS[0]}" + + # 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/") + fi + + if [ ! -f "$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.8") + for w in ${words[@]}; do + w=$(printf -- '%b' "$w") + # remove quotes from typed values + quote="${w:0:1}" + if [ "$quote" == \' ]; then + w="${w%\'}" + w="${w#\'}" + elif [ "$quote" == \" ]; then + w="${w%\"}" + w="${w#\"}" + fi + # empty values are ignored + if [ ! -z "$w" ]; then + completecmd+=("-i$w") + fi + done + + local sfcomplete + if sfcomplete=$(${completecmd[@]} 2>&1); then + local quote suggestions + quote=${cur:0:1} + + # Use single quotes by default if suggestions contains backslash (FQCN) + if [ "$quote" == '' ] && [[ "$sfcomplete" =~ \\ ]]; then + quote=\' + fi + + if [ "$quote" == \' ]; then + # single quotes: no additional escaping (does not accept ' in values) + suggestions=$(for s in $sfcomplete; do printf $'%q%q%q\n' "$quote" "$s" "$quote"; done) + elif [ "$quote" == \" ]; then + # double quotes: double escaping for \ $ ` " + suggestions=$(for s in $sfcomplete; do + s=${s//\\/\\\\} + s=${s//\$/\\\$} + s=${s//\`/\\\`} + s=${s//\"/\\\"} + printf $'%q%q%q\n' "$quote" "$s" "$quote"; + done) + else + # no quotes: double escaping + suggestions=$(for s in $sfcomplete; do printf $'%q\n' $(printf '%q' "$s"); done) + fi + COMPREPLY=($(IFS=$'\n' compgen -W "$suggestions" -- $(printf -- "%q" "$cur"))) + __ltrim_colon_completions "$cur" + else + if [[ "$sfcomplete" != *"Command \"_complete\" is not defined."* ]]; then + >&2 echo + >&2 echo $sfcomplete + fi + + return 1 + fi +} + +complete -F _sf_composer composer diff --git a/composer.spec b/composer.spec index b6e2fb1..9ffd821 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 10cd375cf85dede2ff417ceab517ef9a0dc55407 +%global gh_commit f69e63262dadd02b3b6edade339c7badda2939c2 %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.3.7 +%global upstream_version 2.3.8 #global upstream_prever RC2 #global upstream_lower rc2 @@ -35,6 +35,9 @@ %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) + Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} @@ -46,6 +49,7 @@ License: MIT URL: https://getcomposer.org/ Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz # Profile scripts +Source1: %{name}-bash-completion Source3: %{name}.sh Source4: %{name}.csh # Get a git snapshot to retrieve the test suite @@ -61,6 +65,7 @@ BuildArch: noarch 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) @@ -142,8 +147,8 @@ 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.9 -Provides: bundled(php-symfony-deprecation-contracts) = v2.5.1 +Provides: bundled(php-symfony-console) = v5.4.10 +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-polyfill-ctype) = v1.26.0 @@ -153,8 +158,8 @@ 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-service-contracts) = v2.5.1 -Provides: bundled(php-symfony-string) = v5.4.9 +Provides: bundled(php-symfony-service-contracts) = v2.5.2 +Provides: bundled(php-symfony-string) = v5.4.10 %endif # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -315,6 +320,7 @@ if (version_compare(Composer::RUNTIME_API_VERSION, "%{run_version}")) { %install : Profile scripts +install -Dpm 644 %{SOURCE1} %{buildroot}%{bashcompdir}/%{name} mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/ @@ -382,9 +388,14 @@ exit $ret %{_bindir}/%{name} %{_datadir}/php/Composer %{_datadir}/%{name} +%{bashcomproot} %changelog +* Fri Jul 1 2022 Remi Collet - 2.3.8-1 +- update to 2.3.8 +- add bash completion file (for upcoming 2.4) + * Tue Jun 7 2022 Remi Collet - 2.3.7-1 - update to 2.3.7 diff --git a/sources b/sources index 9162311..bcadacc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.7-10cd375.tgz) = 7b260d2d54c02c421d3e229128f4004a9a06fb43b5c3ec7251aa77618575192a3b471e84b80777cd6a6111936ad115ea25a3c0018c4f59c0c0c03c316b8ac5bb +SHA512 (composer-2.3.8-f69e632.tgz) = 1a06aecceb68863b283fd2d8cb9f0e85702c491b0ac7719ef36f4b12a7040c4f92506d2414f6ff7a38d14120f7ff06ae871d57676623ba86f20d9b377f4dd828 From be646e3049c281950966040b3aede5f91e6ddd46 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Jul 2022 17:47:15 +0200 Subject: [PATCH 16/17] v2.3.9 (cherry picked from commit c3d8b5a6ffe6b54b5507705344963668efa1859b) --- 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 f24f512..e534faf 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -22,7 +22,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.3.8") + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.9") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 9ffd821..44618e3 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit f69e63262dadd02b3b6edade339c7badda2939c2 +%global gh_commit 015f524c9969255a29cdea8890cbd4fec240ee47 %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.3.8 +%global upstream_version 2.3.9 #global upstream_prever RC2 #global upstream_lower rc2 @@ -392,6 +392,9 @@ exit $ret %changelog +* Tue Jul 5 2022 Remi Collet - 2.3.9-1 +- update to 2.3.9 + * Fri Jul 1 2022 Remi Collet - 2.3.8-1 - update to 2.3.8 - add bash completion file (for upcoming 2.4) diff --git a/sources b/sources index bcadacc..1cd526d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.8-f69e632.tgz) = 1a06aecceb68863b283fd2d8cb9f0e85702c491b0ac7719ef36f4b12a7040c4f92506d2414f6ff7a38d14120f7ff06ae871d57676623ba86f20d9b377f4dd828 +SHA512 (composer-2.3.9-015f524.tgz) = ecbbdf518326c512ceef1649374ab99b609e461a1dee140474615d4efd523bb77d0eed0b52af22bc666356a8c399e2350d015a31ebe8fb6ab7271bce40fe7c16 From 6726d9532cf16de3751e439142e03f5092f71859 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Jul 2022 08:06:21 +0200 Subject: [PATCH 17/17] v2.3.10 (cherry picked from commit 8e2a752dada81fff679a2eade745330f6cbf1c6c) --- 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 e534faf..5d484cc 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -22,7 +22,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.3.9") + local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.10") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.spec b/composer.spec index 44618e3..5370dcf 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit 015f524c9969255a29cdea8890cbd4fec240ee47 +%global gh_commit ebac357c0a41359f3981098729042ed6dedc97ba %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.3.9 +%global upstream_version 2.3.10 #global upstream_prever RC2 #global upstream_lower rc2 @@ -392,6 +392,9 @@ exit $ret %changelog +* Thu Jul 14 2022 Remi Collet - 2.3.10-1 +- update to 2.3.10 + * Tue Jul 5 2022 Remi Collet - 2.3.9-1 - update to 2.3.9 diff --git a/sources b/sources index 1cd526d..038e012 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-2.3.9-015f524.tgz) = ecbbdf518326c512ceef1649374ab99b609e461a1dee140474615d4efd523bb77d0eed0b52af22bc666356a8c399e2350d015a31ebe8fb6ab7271bce40fe7c16 +SHA512 (composer-2.3.10-ebac357.tgz) = 22302bfb5bb03f87567eda1fcfe906b049d43ff43862472405d13f6af472b1452834d09cb944753b740950c2d98911e6af72bb7b771c048a26cdb165b0c73659