From b01533972582394da3234df16a1887f7a6c7f098 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Aug 2019 14:40:15 +0200 Subject: [PATCH 1/3] v1.2.3 (cherry picked from commit 2a16bf5ae25c6996e7b40bc6746c534dac82b366) --- .gitignore | 1 + php-composer-ca-bundle-rpm.patch | 12 ++++++++++++ php-composer-ca-bundle.spec | 19 +++++++++++-------- sources | 2 +- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9b03e0b..177416f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /php-composer-ca-bundle-1.1.2-46afded.tgz /php-composer-ca-bundle-1.1.3-8afa52c.tgz /php-composer-ca-bundle-1.1.4-558f321.tgz +/php-composer-ca-bundle-1.2.3-f26a67e.tgz diff --git a/php-composer-ca-bundle-rpm.patch b/php-composer-ca-bundle-rpm.patch index 54f656d..7ae8760 100644 --- a/php-composer-ca-bundle-rpm.patch +++ b/php-composer-ca-bundle-rpm.patch @@ -10,3 +10,15 @@ diff -up src/CaBundle.php.rpm src/CaBundle.php // cURL does not understand 'phar://' paths // see https://github.com/composer/ca-bundle/issues/10 +diff -up tests/CaBundleTest.php.rpm tests/CaBundleTest.php +--- tests/CaBundleTest.php.rpm 2019-08-01 11:14:21.577672699 +0200 ++++ tests/CaBundleTest.php 2019-08-01 11:14:31.322744408 +0200 +@@ -104,7 +104,7 @@ class CaBundleTest extends TestCase + public function testOpenBaseDir() + { + $oldValue = ini_get('open_basedir'); +- ini_set('open_basedir', realpath(__DIR__ . '/../')); ++ ini_set('open_basedir', '/usr/share/php:' . realpath(__DIR__ . '/../')); + $certFilePath = CaBundle::getSystemCaRootBundlePath(); + $validResult = CaBundle::validateCaFile($certFilePath, null); + $this->assertTrue($validResult); diff --git a/php-composer-ca-bundle.spec b/php-composer-ca-bundle.spec index 9e9d454..c9a602e 100644 --- a/php-composer-ca-bundle.spec +++ b/php-composer-ca-bundle.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 558f321c52faeb4828c03e7dc0cfe39a09e09a2d +%global gh_commit f26a67e397be0e5c00d7c52ec7b5010098e15ce5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner composer %global gh_project ca-bundle @@ -14,8 +14,8 @@ %global with_tests 0%{!?_without_tests:1} Name: php-composer-ca-bundle -Version: 1.1.4 -Release: 2%{?dist} +Version: 1.2.3 +Release: 1%{?dist} Summary: Lets you find a path to the system CA License: MIT @@ -34,12 +34,12 @@ BuildRequires: php-openssl BuildRequires: php-pcre BuildRequires: php-cli # From composer.json, "require": { -# "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5", +# "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", # "psr/log": "^1.0", # "symfony/process": "^2.5 || ^3.0 || ^4.0" %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: phpunit6 -%global phpunit %{_bindir}/phpunit6 +%global phpunit %{_bindir}/phpunit8 BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) BuildRequires: (php-composer(symfony/process) >= 2.5 with php-composer(symfony/process) < 5) %else @@ -57,7 +57,7 @@ BuildRequires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt # From composer.json, "require": { # "ext-openssl": "*", # "ext-pcre": "*", -# "php": "^5.3.2 || ^7.0" +# "php": "^5.3.2 || ^7.0 || ^8.0" Requires: php(language) >= 5.3.2 Requires: php-openssl Requires: php-pcre @@ -120,10 +120,10 @@ require_once '%{buildroot}%{php_home}/Composer/CaBundle/autoload.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72 php73; do +for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" "php71 %{_bindir}/phpunit7" php72 php73 php74; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 + $1 ${2:-%{_bindir}/phpunit8} --verbose || ret=1 fi done exit $ret @@ -142,6 +142,9 @@ exit $ret %changelog +* Sat Aug 3 2019 Remi Collet - 1.2.3-1 +- update to 1.2.3 + * Sat Feb 02 2019 Fedora Release Engineering - 1.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index b3f1e03..ea1c002 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-composer-ca-bundle-1.1.4-558f321.tgz) = 6192f3940105930bc6876f1b212684d47185816dcc328cf96c7d43cca68dfafad6a2c02fdea2c70334a571e690469d1f6a964096c68772512ed8639fbdde44f1 +SHA512 (php-composer-ca-bundle-1.2.3-f26a67e.tgz) = 39da8b9fa1605b64a14c553b6310147954f46b38985ab9ff908cd7171c2d6b633253083fefeb0d5fe50dcc7f13176c47004b21d2c44bf1ede6fa63b541248cb7 From 9711b9a24ed0634e6e145462c508789ede1d73f3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Jan 2020 09:45:31 +0100 Subject: [PATCH 2/3] v1.2.6 (cherry picked from commit 64fdb9f5da2e878ec93b5ddb5d42a0594af12e1a) (cherry picked from commit 3cf9e41caf9219db3903fdcf53c4a26cc95e0ab6) --- .gitignore | 3 +++ php-composer-ca-bundle.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 177416f..72fbd38 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /php-composer-ca-bundle-1.1.3-8afa52c.tgz /php-composer-ca-bundle-1.1.4-558f321.tgz /php-composer-ca-bundle-1.2.3-f26a67e.tgz +/php-composer-ca-bundle-1.2.4-10bb965.tgz +/php-composer-ca-bundle-1.2.5-62e8fc2.tgz +/php-composer-ca-bundle-1.2.6-47fe531.tgz diff --git a/php-composer-ca-bundle.spec b/php-composer-ca-bundle.spec index c9a602e..4f8e72e 100644 --- a/php-composer-ca-bundle.spec +++ b/php-composer-ca-bundle.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit f26a67e397be0e5c00d7c52ec7b5010098e15ce5 +%global gh_commit 47fe531de31fca4a1b997f87308e7d7804348f7e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner composer %global gh_project ca-bundle @@ -14,7 +14,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-composer-ca-bundle -Version: 1.2.3 +Version: 1.2.6 Release: 1%{?dist} Summary: Lets you find a path to the system CA @@ -36,12 +36,12 @@ BuildRequires: php-cli # From composer.json, "require": { # "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", # "psr/log": "^1.0", -# "symfony/process": "^2.5 || ^3.0 || ^4.0" +# "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: phpunit6 %global phpunit %{_bindir}/phpunit8 BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(symfony/process) >= 2.5 with php-composer(symfony/process) < 5) +BuildRequires: (php-composer(symfony/process) >= 2.5 with php-composer(symfony/process) < 6) %else BuildRequires: phpunit %global phpunit %{_bindir}/phpunit @@ -111,6 +111,7 @@ cat << 'EOF' | tee vendor/autoload.php require_once '%{buildroot}%{php_home}/Composer/CaBundle/autoload.php'; \Fedora\Autoloader\Dependencies::required(array( array( + '%{php_home}/Symfony5/Component/Process/autoload.php', '%{php_home}/Symfony4/Component/Process/autoload.php', '%{php_home}/Symfony3/Component/Process/autoload.php', '%{php_home}/Symfony/Component/Process/autoload.php', @@ -142,6 +143,9 @@ exit $ret %changelog +* Tue Jan 14 2020 Remi Collet - 1.2.6-1 +- update to 1.2.6 + * Sat Aug 3 2019 Remi Collet - 1.2.3-1 - update to 1.2.3 diff --git a/sources b/sources index ea1c002..be50ef4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-composer-ca-bundle-1.2.3-f26a67e.tgz) = 39da8b9fa1605b64a14c553b6310147954f46b38985ab9ff908cd7171c2d6b633253083fefeb0d5fe50dcc7f13176c47004b21d2c44bf1ede6fa63b541248cb7 +SHA512 (php-composer-ca-bundle-1.2.6-47fe531.tgz) = 3e371796558a812ad38c26dea59ac881bd539495143d342f8a6a7139443d5d43d171b11cc364c0c2fd694617ad293056526421afc19d7277de91f7ff30a4d520 From 49bdfa6270b5221eea3960e591c9c2eaa7b947b7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Apr 2020 10:52:56 +0200 Subject: [PATCH 3/3] v1.2.7 (cherry picked from commit 89778a7db15a055f255131e6dc1a066af17e28e5) (cherry picked from commit 8cb2feca9a36fc093db728f64ab5dd0c172a4741) --- .gitignore | 1 + php-composer-ca-bundle.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 72fbd38..6418f8b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /php-composer-ca-bundle-1.2.4-10bb965.tgz /php-composer-ca-bundle-1.2.5-62e8fc2.tgz /php-composer-ca-bundle-1.2.6-47fe531.tgz +/php-composer-ca-bundle-1.2.7-95c63ab.tgz diff --git a/php-composer-ca-bundle.spec b/php-composer-ca-bundle.spec index 4f8e72e..9e8fe0b 100644 --- a/php-composer-ca-bundle.spec +++ b/php-composer-ca-bundle.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 47fe531de31fca4a1b997f87308e7d7804348f7e +%global gh_commit 95c63ab2117a72f48f5a55da9740a3273d45b7fd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner composer %global gh_project ca-bundle @@ -14,7 +14,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-composer-ca-bundle -Version: 1.2.6 +Version: 1.2.7 Release: 1%{?dist} Summary: Lets you find a path to the system CA @@ -143,6 +143,9 @@ exit $ret %changelog +* Wed Apr 8 2020 Remi Collet - 1.2.7-1 +- update to 1.2.7 + * Tue Jan 14 2020 Remi Collet - 1.2.6-1 - update to 1.2.6 diff --git a/sources b/sources index be50ef4..1524e67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-composer-ca-bundle-1.2.6-47fe531.tgz) = 3e371796558a812ad38c26dea59ac881bd539495143d342f8a6a7139443d5d43d171b11cc364c0c2fd694617ad293056526421afc19d7277de91f7ff30a4d520 +SHA512 (php-composer-ca-bundle-1.2.7-95c63ab.tgz) = 13d6de73d3a9370e8b5b478b1ab7dbfafc29ef2f2d1a0e705d74cdf6af3f979288805b0a98136db84c8131c993bf3baca91d875cb0d0c5a6181d548ee48ac3a9