use system libraries on Fedora, bundled libraries on EL

1 files changed, 33 insertions, 21 deletions

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