Compare commits
7 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f96d66f14 | ||
|
|
c9a9059f33 | ||
|
|
56323e65c0 | ||
|
|
32565913ca | ||
|
|
80904d8aad | ||
|
|
fda2d0b2a7 | ||
|
|
f04fbd49ac |
4 changed files with 62 additions and 41 deletions
|
|
@ -25,7 +25,7 @@ _sf_composer() {
|
|||
local cur prev words cword
|
||||
_get_comp_words_by_ref -n := cur prev words cword
|
||||
|
||||
local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.8")
|
||||
local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.6")
|
||||
for w in ${words[@]}; do
|
||||
w=$(printf -- '%b' "$w")
|
||||
# remove quotes from typed values
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -up ./bin/composer.rpm ./bin/composer
|
||||
--- ./bin/composer.rpm 2023-03-21 15:42:18.000000000 +0100
|
||||
+++ ./bin/composer 2023-03-21 15:53:50.082632518 +0100
|
||||
--- ./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) {
|
||||
}
|
||||
|
||||
|
|
@ -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-03-21 15:42:18.000000000 +0100
|
||||
+++ ./src/Composer/Autoload/AutoloadGenerator.php 2023-03-21 15:53:50.082632518 +0100
|
||||
@@ -431,7 +431,7 @@ EOF;
|
||||
--- ./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;
|
||||
$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-03-21 15:42:18.000000000 +0100
|
||||
+++ ./src/Composer/Compiler.php 2023-03-21 15:53:50.082632518 +0100
|
||||
--- ./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
|
||||
@@ -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-03-21 15:42:18.000000000 +0100
|
||||
+++ ./src/Composer/InstalledVersions.php 2023-03-21 15:55:07.748460545 +0100
|
||||
--- ./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
|
||||
@@ -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,8 +56,8 @@ 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-03-21 15:42:18.000000000 +0100
|
||||
+++ ./src/Composer/Json/JsonFile.php 2023-03-21 15:53:50.082632518 +0100
|
||||
--- ./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
|
||||
/** @deprecated Use \JSON_UNESCAPED_UNICODE */
|
||||
public const JSON_UNESCAPED_UNICODE = 256;
|
||||
|
|
@ -65,9 +65,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
|
|||
- 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;
|
||||
@@ -223,7 +223,7 @@ class JsonFile
|
||||
public const INDENT_DEFAULT = ' ';
|
||||
|
||||
@@ -229,7 +229,7 @@ class JsonFile
|
||||
$isComposerSchemaFile = false;
|
||||
if (null === $schemaFile) {
|
||||
$isComposerSchemaFile = true;
|
||||
|
|
@ -77,8 +77,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
|
|||
|
||||
// Prepend with file:// only when not using a special schema already (e.g. in the phar)
|
||||
diff -up ./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-01-11 09:27:00.000000000 +0100
|
||||
+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php 2023-03-21 15:53:50.083632516 +0100
|
||||
--- ./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
|
||||
@@ -125,7 +125,7 @@ class CaBundle
|
||||
*/
|
||||
public static function getBundledCaBundlePath()
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@
|
|||
# For compatibility with SCL
|
||||
%undefine __brp_mangle_shebangs
|
||||
|
||||
%global gh_commit 4c516146167d1392c8b9b269bb7c24115d262164
|
||||
%global gh_commit 683557bd2466072777309d039534bb1332d0dda5
|
||||
%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.3.0
|
||||
%global api_version 2.6.0
|
||||
%global run_version 2.2.2
|
||||
|
||||
%global upstream_version 2.5.8
|
||||
%global upstream_version 2.6.6
|
||||
#global upstream_prever RC1
|
||||
#global upstream_lower rc1
|
||||
|
||||
|
|
@ -80,34 +80,34 @@ Requires: php-cli
|
|||
Requires: ca-certificates
|
||||
# Bundled libraries
|
||||
# License MIT
|
||||
Provides: bundled(php-composer-ca-bundle) = 1.3.6
|
||||
Provides: bundled(php-composer-class-map-generator) = 1.0.0
|
||||
Provides: bundled(php-composer-ca-bundle) = 1.3.7
|
||||
Provides: bundled(php-composer-class-map-generator) = 1.1.0
|
||||
Provides: bundled(php-composer-metadata-minifier) = 1.0.0
|
||||
Provides: bundled(php-composer-pcre) = 2.1.0
|
||||
Provides: bundled(php-composer-semver) = 3.3.2
|
||||
Provides: bundled(php-composer-spdx-licenses) = 1.5.7
|
||||
Provides: bundled(php-composer-pcre) = 2.1.1
|
||||
Provides: bundled(php-composer-semver) = 3.4.0
|
||||
Provides: bundled(php-composer-spdx-licenses) = 1.5.8
|
||||
Provides: bundled(php-composer-xdebug-handler) = 3.0.3
|
||||
Provides: bundled(php-justinrainbow-json-schema) = 5.2.12
|
||||
Provides: bundled(php-justinrainbow-json-schema) = v5.2.13
|
||||
Provides: bundled(php-psr-container) = 1.1.1
|
||||
Provides: bundled(php-psr-log) = 1.1.4
|
||||
Provides: bundled(php-react-promise) = v2.10.0
|
||||
Provides: bundled(php-react-promise) = v3.1.0
|
||||
Provides: bundled(php-seld-jsonlint) = 1.10.0
|
||||
Provides: bundled(php-seld-phar-utils) = 1.2.1
|
||||
Provides: bundled(php-seld-signal-handler) = 2.0.1
|
||||
Provides: bundled(php-symfony-console) = v5.4.24
|
||||
Provides: bundled(php-seld-signal-handler) = 2.0.2
|
||||
Provides: bundled(php-symfony-console) = v5.4.32
|
||||
Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2
|
||||
Provides: bundled(php-symfony-filesystem) = v5.4.23
|
||||
Provides: bundled(php-symfony-finder) = v5.4.21
|
||||
Provides: bundled(php-symfony-polyfill-ctype) = v1.27.0
|
||||
Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0
|
||||
Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0
|
||||
Provides: bundled(php-symfony-polyfill-mbstring) = v1.27.0
|
||||
Provides: bundled(php-symfony-polyfill-php73) = v1.27.0
|
||||
Provides: bundled(php-symfony-polyfill-php80) = v1.27.0
|
||||
Provides: bundled(php-symfony-polyfill-php81) = v1.27.0
|
||||
Provides: bundled(php-symfony-process) = v5.4.24
|
||||
Provides: bundled(php-symfony-filesystem) = v5.4.25
|
||||
Provides: bundled(php-symfony-finder) = v5.4.27
|
||||
Provides: bundled(php-symfony-polyfill-ctype) = v1.28.0
|
||||
Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.28.0
|
||||
Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.28.0
|
||||
Provides: bundled(php-symfony-polyfill-mbstring) = v1.28.0
|
||||
Provides: bundled(php-symfony-polyfill-php73) = v1.28.0
|
||||
Provides: bundled(php-symfony-polyfill-php80) = v1.28.0
|
||||
Provides: bundled(php-symfony-polyfill-php81) = v1.28.0
|
||||
Provides: bundled(php-symfony-process) = v5.4.28
|
||||
Provides: bundled(php-symfony-service-contracts) = v2.5.2
|
||||
Provides: bundled(php-symfony-string) = v5.4.22
|
||||
Provides: bundled(php-symfony-string) = v5.4.32
|
||||
|
||||
# From composer.json, suggest
|
||||
# "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
|
||||
|
|
@ -249,6 +249,27 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
|
|||
|
||||
|
||||
%changelog
|
||||
* Sat Dec 9 2023 Remi Collet <remi@remirepo.net> - 2.6.6-1
|
||||
- update to 2.6.6
|
||||
|
||||
* Fri Oct 6 2023 Remi Collet <remi@remirepo.net> - 2.6.5-1
|
||||
- update to 2.6.5
|
||||
|
||||
* Fri Sep 29 2023 Remi Collet <remi@remirepo.net> - 2.6.4-1
|
||||
- update to 2.6.4
|
||||
|
||||
* Fri Sep 15 2023 Remi Collet <remi@remirepo.net> - 2.6.3-1
|
||||
- update to 2.6.3
|
||||
|
||||
* Mon Sep 4 2023 Remi Collet <remi@remirepo.net> - 2.6.2-1
|
||||
- update to 2.6.2
|
||||
|
||||
* Fri Sep 1 2023 Remi Collet <remi@remirepo.net> - 2.6.1-1
|
||||
- update to 2.6.1
|
||||
|
||||
* Fri Sep 1 2023 Remi Collet <remi@remirepo.net> - 2.6.0-1
|
||||
- update to 2.6.0
|
||||
|
||||
* Sat Jun 10 2023 Remi Collet <remi@remirepo.net> - 2.5.8-1
|
||||
- update to 2.5.8
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (composer-2.5.8-4c51614.tgz) = 9d93281902e6d859fa61ed72d66d9d6a4aca15fc5e1b7d6a4a0a1fac635268e6834ee6d164a7934af75dc9034b4df1b90bf62b54c12055bd140cd9dc9dee16d3
|
||||
SHA512 (composer-2.6.6-683557b.tgz) = 2794151763356a7b2c11a3f864a4aa892e7f486ffabbf75aaab886237e95594e52e1a4a4769bfb7689e458f83bd0d86c02eea1c437841fda2674020f1b30830e
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue