rpms/php-composer-ca-bundle
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

v1.3.1

Browse source 
(cherry picked from commit 1b544ef7cc)
This commit is contained in:
Remi Collet 2021-11-02 08:21:07 +01:00
commit 0d3299d284
4 changed files with 28 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

25
.gitignore vendored
View file

@ -1,18 +1,7 @@
/php-composer-ca-bundle-1.0.2-a2995e5.tgz
/php-composer-ca-bundle-1.0.3-5df9ed0.tgz
/php-composer-ca-bundle-1.0.4-ec21a59.tgz
/php-composer-ca-bundle-1.0.5-b698f6e.tgz
/php-composer-ca-bundle-1.0.6-a795611.tgz
/php-composer-ca-bundle-1.0.7-b17e615.tgz
/php-composer-ca-bundle-1.0.8-9dd73a0.tgz
/php-composer-ca-bundle-1.0.9-36344ae.tgz
/php-composer-ca-bundle-1.1.0-943b2c4.tgz
/php-composer-ca-bundle-1.1.1-d2c0a83.tgz
/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
/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
clog
/php-composer-ca-bundle-1.2.8-8a7ecad.tgz
/php-composer-ca-bundle-1.2.9-78a0e28.tgz
/php-composer-ca-bundle-1.2.10-9fdb22c.tgz
/php-composer-ca-bundle-1.2.11-0b072d5.tgz
/php-composer-ca-bundle-1.3.0-6793336.tgz
/php-composer-ca-bundle-1.3.1-4c67918.tgz

22
php-composer-ca-bundle-rpm.patch
View file

@ -1,7 +1,7 @@
diff -up src/CaBundle.php.rpm src/CaBundle.php
--- src/CaBundle.php.rpm 2017-11-30 07:12:46.773928987 +0100
+++ src/CaBundle.php 2017-11-30 07:15:28.549820032 +0100
@@ -130,7 +130,7 @@ class CaBundle
diff -up ./src/CaBundle.php.rpm ./src/CaBundle.php
--- ./src/CaBundle.php.rpm 2021-01-12 13:54:38.000000000 +0100
+++ ./src/CaBundle.php 2021-01-12 13:55:35.957422992 +0100
@@ -125,7 +125,7 @@ class CaBundle
*/
public static function getBundledCaBundlePath()
{
@ -10,15 +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
diff -up ./tests/CaBundleTest.php.rpm ./tests/CaBundleTest.php
--- ./tests/CaBundleTest.php.rpm 2021-01-12 13:55:35.957422992 +0100
+++ ./tests/CaBundleTest.php 2021-01-12 13:56:54.872069486 +0100
@@ -124,7 +124,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__ . '/../'));
$oldValue = ini_get('open_basedir') ?: '';
- ini_set('open_basedir', dirname(__DIR__));
+ ini_set('open_basedir', '/usr/share/php:' . dirname(__DIR__));
$certFilePath = CaBundle::getSystemCaRootBundlePath();
$validResult = CaBundle::validateCaFile($certFilePath, null);
$this->assertTrue($validResult);

12
php-composer-ca-bundle.spec
View file

@ -6,7 +6,10 @@
#
# Please, preserve the changelog entries
#
%global gh_commit 95c63ab2117a72f48f5a55da9740a3273d45b7fd
%bcond_without tests
%global gh_commit 4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner composer
%global gh_project ca-bundle
@ -14,7 +17,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-composer-ca-bundle
Version: 1.2.7
Version: 1.3.1
Release: 1%{?dist}
Summary: Lets you find a path to the system CA
@ -38,7 +41,7 @@ BuildRequires: php-cli
# "psr/log": "^1.0",
# "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0"
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: phpunit6
BuildRequires: phpunit8
%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) < 6)
@ -143,6 +146,9 @@ exit $ret
%changelog
* Sat Oct 30 2021 Remi Collet <remi@remirepo.net> - 1.3.1-1
- update to 1.3.1
* Wed Apr 8 2020 Remi Collet <remi@remirepo.net> - 1.2.7-1
- update to 1.2.7

2
sources
View file

@ -1 +1 @@
SHA512 (php-composer-ca-bundle-1.2.7-95c63ab.tgz) = 13d6de73d3a9370e8b5b478b1ab7dbfafc29ef2f2d1a0e705d74cdf6af3f979288805b0a98136db84c8131c993bf3baca91d875cb0d0c5a6181d548ee48ac3a9
SHA512 (php-composer-ca-bundle-1.3.1-4c67918.tgz) = d4e66c86d08b2f02d43e4b7a268852be5dd69de8c42558d63159dedc5b038825941db0f50ad804017ea631166cd8f6d6a963fdd1344a47396594ad6747587062