diff options
Diffstat (limited to 'composer-rpm.patch')
| -rw-r--r-- | composer-rpm.patch | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch index 162dcdd..52ed07b 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,7 +1,7 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2023-09-01 11:05:16.000000000 +0200 -+++ ./bin/composer 2023-09-01 11:05:28.156309389 +0200 -@@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) { +--- ./bin/composer.rpm 2024-10-03 07:10:57.000000000 +0200 ++++ ./bin/composer 2024-10-03 07:11:10.751092365 +0200 +@@ -16,7 +16,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 2023-09-01 11:05:16.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2023-09-01 11:05:28.156309389 +0200 -@@ -448,7 +448,7 @@ EOF; +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2024-10-03 07:10:57.000000000 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2024-10-03 07:11:10.752092401 +0200 +@@ -458,7 +458,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, [], [ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ---- ./src/Composer/Compiler.php.rpm 2023-09-01 11:05:16.000000000 +0200 -+++ ./src/Composer/Compiler.php 2023-09-01 11:05:28.156309389 +0200 +--- ./src/Composer/Compiler.php.rpm 2024-10-03 07:10:57.000000000 +0200 ++++ ./src/Composer/Compiler.php 2024-10-03 07:11:10.752092401 +0200 @@ -105,7 +105,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 2023-09-01 11:05:16.000000000 +0200 -+++ ./src/Composer/InstalledVersions.php 2023-09-01 11:05:28.156309389 +0200 +--- ./src/Composer/InstalledVersions.php.rpm 2024-10-03 07:10:57.000000000 +0200 ++++ ./src/Composer/InstalledVersions.php 2024-10-03 07:11:10.752092401 +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,29 +56,35 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio $required = require __DIR__ . '/installed.php'; self::$installed = $required; diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2023-09-01 11:05:16.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2023-09-01 11:06:16.767233012 +0200 -@@ -40,7 +40,7 @@ class JsonFile +--- ./src/Composer/Json/JsonFile.php.rpm 2024-10-03 07:11:10.752092401 +0200 ++++ ./src/Composer/Json/JsonFile.php 2024-10-03 07:14:54.219192080 +0200 +@@ -41,8 +41,8 @@ class JsonFile /** @deprecated Use \JSON_UNESCAPED_UNICODE */ public const JSON_UNESCAPED_UNICODE = 256; - public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json'; +- public const LOCK_SCHEMA_PATH = __DIR__ . '/../../../res/composer-lock-schema.json'; + public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; ++ public const LOCK_SCHEMA_PATH = '/usr/share/composer/res/composer-lock-schema.json'; public const INDENT_DEFAULT = ' '; -@@ -229,7 +229,7 @@ class JsonFile +@@ -231,10 +231,10 @@ class JsonFile $isComposerSchemaFile = false; if (null === $schemaFile) { - $isComposerSchemaFile = true; -- $schemaFile = self::COMPOSER_SCHEMA_PATH; -+ $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH; + if ($schema === self::LOCK_SCHEMA) { +- $schemaFile = self::LOCK_SCHEMA_PATH; ++ $schemaFile = (getenv('BUILDROOT')?:'') . self::LOCK_SCHEMA_PATH; + } else { + $isComposerSchemaFile = true; +- $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 ./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 2023-08-30 11:31:38.000000000 +0200 -+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2023-09-01 11:05:28.156309389 +0200 +--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm 2024-09-25 09:49:53.000000000 +0200 ++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2024-10-03 07:11:10.752092401 +0200 @@ -125,7 +125,7 @@ class CaBundle */ public static function getBundledCaBundlePath() |