update to 2.1.1

2 files changed, 23 insertions, 20 deletions

diff --git a/composer-rpm.patch b/composer-rpm.patch
index 130d62d..bbf0feb 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2020-12-04 08:01:03.000000000 +0100
-+++ ./bin/composer	2020-12-04 08:07:35.946138601 +0100
+--- ./bin/composer.rpm	2021-06-04 09:21:49.000000000 +0200
++++ ./bin/composer	2021-06-04 09:21:53.808648766 +0200
 @@ -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	2020-12-04 08:01:03.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2020-12-04 08:07:35.946138601 +0100
-@@ -373,7 +373,7 @@ EOF;
+--- ./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
+@@ -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));
  
          $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	2020-12-04 08:01:03.000000000 +0100
-+++ ./src/Composer/Compiler.php	2020-12-04 08:07:35.946138601 +0100
-@@ -98,7 +98,7 @@ class Compiler
+--- ./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
          // Add Composer resources
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
          ;
          foreach ($finder as $file) {
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2020-12-04 08:01:03.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2020-12-04 08:07:35.946138601 +0100
+--- ./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
 @@ -34,7 +34,7 @@ class JsonFile
      const JSON_PRETTY_PRINT = 128;
      const JSON_UNESCAPED_UNICODE = 256;
@@ -46,19 +46,19 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
      private $path;
      private $httpDownloader;
-@@ -179,7 +179,7 @@ class JsonFile
-         }
- 
+@@ -188,7 +188,7 @@ class JsonFile
+         $isComposerSchemaFile = false;
          if (null === $schemaFile) {
+             $isComposerSchemaFile = true;
 -            $schemaFile = __DIR__ . 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	2020-12-04 08:01:03.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2020-12-04 08:07:35.947138597 +0100
-@@ -113,7 +113,8 @@ class ComposerSchemaTest extends TestCas
+--- ./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
+@@ -93,7 +93,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
          $validator = new Validator();
@@ -69,8 +69,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	2020-12-04 08:07:35.947138597 +0100
-+++ ./tests/Composer/Test/PolyfillTestCase.php	2020-12-04 08:09:14.344707638 +0100
+--- ./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
 @@ -15,10 +15,35 @@ namespace Composer\Test {
      use PHPUnit\Framework\Constraint\LogicalNot;
      use PHPUnit\Framework\Constraint\StringContains;
diff --git a/composer.spec b/composer.spec
index a30e0c5..854049a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    59bb0df323c75308e6a72c6c9bc7dc8cc577f1ca
+%global gh_commit    e338749d4e6cc97e1136c210ce0212d4a59e3a58
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -19,7 +19,7 @@
 %global api_version  2.1.0
 %global run_version  2.1.0
 
-%global upstream_version 2.1.0
+%global upstream_version 2.1.1
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -330,6 +330,9 @@ exit $ret
 
 
 %changelog
+* Fri Jun  4 2021 Remi Collet <remi@remirepo.net> - 2.1.1-1
+- update to 2.1.1
+
 * Thu Jun  3 2021 Remi Collet <remi@remirepo.net> - 2.1.0-1
 - update to 2.1.0