diff options
Diffstat (limited to 'php-composer-ca-bundle-rpm.patch')
| -rw-r--r-- | php-composer-ca-bundle-rpm.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/php-composer-ca-bundle-rpm.patch b/php-composer-ca-bundle-rpm.patch index 7ae8760..9ff37d0 100644 --- a/php-composer-ca-bundle-rpm.patch +++ b/php-composer-ca-bundle-rpm.patch @@ -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); |