diff options
Diffstat (limited to 'phpMyAdmin-certs.patch')
| -rw-r--r-- | phpMyAdmin-certs.patch | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/phpMyAdmin-certs.patch b/phpMyAdmin-certs.patch index 9601ab9..15cacac 100644 --- a/phpMyAdmin-certs.patch +++ b/phpMyAdmin-certs.patch @@ -1,18 +1,12 @@ -diff -up ./libraries/classes/Utils/HttpRequest.php.rpm ./libraries/classes/Utils/HttpRequest.php ---- ./libraries/classes/Utils/HttpRequest.php.rpm 2019-09-12 15:57:49.955739598 +0200 -+++ ./libraries/classes/Utils/HttpRequest.php 2019-09-12 15:58:00.262698588 +0200 -@@ -141,12 +141,12 @@ class HttpRequest - * - * See https://letsencrypt.org/certificates/ - */ -- $certsDir = ROOT_PATH . 'libraries/certs/'; -+ $certsDir = '/etc/pki/tls/'; - /* See code below for logic */ - if ($ssl == CURLOPT_CAPATH) { - $curlStatus &= curl_setopt($curlHandle, CURLOPT_CAPATH, $certsDir); - } elseif ($ssl == CURLOPT_CAINFO) { -- $curlStatus &= curl_setopt($curlHandle, CURLOPT_CAINFO, $certsDir . 'cacert.pem'); -+ $curlStatus &= curl_setopt($curlHandle, CURLOPT_CAINFO, $certsDir . 'cert.pem'); - } +diff -up ./vendor/composer/ca-bundle/src/CaBundle.php.rpm ./vendor/composer/ca-bundle/src/CaBundle.php +--- ./vendor/composer/ca-bundle/src/CaBundle.php.rpm 2022-01-24 15:53:57.460789560 +0100 ++++ ./vendor/composer/ca-bundle/src/CaBundle.php 2022-01-24 15:55:26.021390384 +0100 +@@ -125,7 +125,7 @@ class CaBundle + */ + public static function getBundledCaBundlePath() + { +- $caBundleFile = __DIR__.'/../res/cacert.pem'; ++ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always - $curlStatus &= curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true); + // cURL does not understand 'phar://' paths + // see https://github.com/composer/ca-bundle/issues/10 |