summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-06-03 08:38:52 +0200
committerRemi Collet <remi@remirepo.net>2021-06-03 08:38:52 +0200
commit2cd370aabcf647c1b34cdd15244882eed71348b0 (patch)
tree49b199c8ebc6f94f7821ab20f28e2fb3800de66c
parent20d88c6908557b0f060c93afff4034c10a8a5730 (diff)
update to 2.1.0-RC1
-rw-r--r--composer-sym4.patch41
-rw-r--r--composer.json2
-rw-r--r--composer.spec17
3 files changed, 11 insertions, 49 deletions
diff --git a/composer-sym4.patch b/composer-sym4.patch
deleted file mode 100644
index f91ed86..0000000
--- a/composer-sym4.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Adapted for v2.0.8 from
-
-From 2cb9630320370109a733b214049b6c2028712307 Mon Sep 17 00:00:00 2001
-From: Jordi Boggiano <j.boggiano@seld.be>
-Date: Tue, 26 Jan 2021 15:54:21 +0100
-Subject: [PATCH] Fix $_SERVER var not being updated when using putenv, refs
- b80038804ff791a9d4608d737ad937b6033b0bae and fixes #9372
-
-
-diff -up ./src/Composer/EventDispatcher/EventDispatcher.php.old ./src/Composer/EventDispatcher/EventDispatcher.php
---- ./src/Composer/EventDispatcher/EventDispatcher.php.old 2021-01-26 16:53:39.118387399 +0100
-+++ ./src/Composer/EventDispatcher/EventDispatcher.php 2021-01-26 16:54:45.679025338 +0100
-@@ -243,6 +243,8 @@ class EventDispatcher
-
- if (strpos($exec, '@putenv ') === 0) {
- putenv(substr($exec, 8));
-+ list($var, $value) = explode('=', substr($exec, 8), 2);
-+ $_SERVER[$var] = $value;
-
- continue;
- }
-diff -up ./src/Composer/Util/Git.php.old ./src/Composer/Util/Git.php
---- ./src/Composer/Util/Git.php.old 2021-01-26 16:53:11.000000000 +0100
-+++ ./src/Composer/Util/Git.php 2021-01-26 16:53:39.118387399 +0100
-@@ -354,7 +354,7 @@ class Git
- // added in git 1.7.1, prevents prompting the user for username/password
- if (getenv('GIT_ASKPASS') !== 'echo') {
- putenv('GIT_ASKPASS=echo');
-- unset($_SERVER['GIT_ASKPASS']);
-+ $_SERVER['GIT_ASKPASS'] = 'echo';
- }
-
- // clean up rogue git env vars in case this is running in a git hook
-@@ -370,6 +370,7 @@ class Git
- // Run processes with predictable LANGUAGE
- if (getenv('LANGUAGE') !== 'C') {
- putenv('LANGUAGE=C');
-+ $_SERVER['LANGUAGE'] = 'C';
- }
-
- // clean up env for OSX, see https://github.com/composer/composer/issues/2146#issuecomment-35478940
diff --git a/composer.json b/composer.json
index 2734e96..7705678 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev"
+ "dev-master": "2.1-dev"
}
},
"autoload": {
diff --git a/composer.spec b/composer.spec
index 1352c44..0208a3c 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,18 +10,18 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 92b2ccbef65292ba9f2004271ef47c7231e2eed5
+%global gh_commit a89b8dc6a61ceadab7b9295cd36249d515cd9ed2
%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 with_tests %{?_without_tests:0}%{!?_without_tests:1}
-%global api_version 2.0.0
-%global run_version 2.0.0
+%global api_version 2.1.0
+%global run_version 2.1.0
-%global upstream_version 2.0.14
-#global upstream_prever RC2
-#global upstream_lower rc2
+%global upstream_version 2.1.0
+%global upstream_prever RC1
+%global upstream_lower rc1
# remirepo:1
%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
@@ -39,7 +39,7 @@
Name: composer
Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Dependency Manager for PHP
License: MIT
@@ -330,6 +330,9 @@ exit $ret
%changelog
+* Thu Jun 3 2021 Remi Collet <remi@remirepo.net> - 2.1.0~RC1-1
+- update to 2.1.0-RC1
+
* Mon May 31 2021 Remi Collet <remi@remirepo.net> - 2.0.14-2
- disable XDG directories usage, see #1955455