diff options
| author | Remi Collet <remi@remirepo.net> | 2018-03-01 15:35:50 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-03-01 15:35:50 +0100 |
| commit | 07d9d9269d4fc0ac7ba88c75945b49da4b7c9e80 (patch) | |
| tree | 8f12fbf669c5cfb16526403974c51b22ac189031 /phpMyAdmin-certs.patch | |
| parent | 97d906a652e9e4ad48c6c7a2c4b8de270d2b9d4c (diff) | |
update to 4.8.0-alpha1
add dependency on psr/container
add dependency on twig/twig
add dependency on twig/extensions
add dependency on symfony/expression-language
add optional dependency on bacon/bacon-qr-code
dependency on tecnickcom/tcpdf is now optional
Diffstat (limited to 'phpMyAdmin-certs.patch')
| -rw-r--r-- | phpMyAdmin-certs.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/phpMyAdmin-certs.patch b/phpMyAdmin-certs.patch index 31ca029..709f9d9 100644 --- a/phpMyAdmin-certs.patch +++ b/phpMyAdmin-certs.patch @@ -1,18 +1,18 @@ -diff -up ./libraries/Util.php.rpm ./libraries/Util.php ---- ./libraries/Util.php.rpm 2017-06-30 07:17:37.000000000 +0200 -+++ ./libraries/Util.php 2017-06-30 07:18:14.000000000 +0200 -@@ -4782,12 +4782,12 @@ class Util +diff -up ./libraries/classes/Utils/HttpRequest.php.rpm ./libraries/classes/Utils/HttpRequest.php +--- ./libraries/classes/Utils/HttpRequest.php.rpm 2018-03-01 15:05:29.388126314 +0100 ++++ ./libraries/classes/Utils/HttpRequest.php 2018-03-01 15:06:51.922563502 +0100 +@@ -139,12 +139,12 @@ class HttpRequest * * See https://letsencrypt.org/certificates/ */ -- $certs_dir = dirname(__file__) . '/certs/'; -+ $certs_dir = '/etc/pki/tls/'; +- $certsDir = dirname(__file__) . '/../../certs/'; ++ $certsDir = '/etc/pki/tls/'; /* See code below for logic */ if ($ssl == CURLOPT_CAPATH) { - $curl_status &= curl_setopt($curl_handle, CURLOPT_CAPATH, $certs_dir); + $curlStatus &= curl_setopt($curlHandle, CURLOPT_CAPATH, $certsDir); } elseif ($ssl == CURLOPT_CAINFO) { -- $curl_status &= curl_setopt($curl_handle, CURLOPT_CAINFO, $certs_dir . 'cacert.pem'); -+ $curl_status &= curl_setopt($curl_handle, CURLOPT_CAINFO, $certs_dir . 'cert.pem'); +- $curlStatus &= curl_setopt($curlHandle, CURLOPT_CAINFO, $certsDir . 'cacert.pem'); ++ $curlStatus &= curl_setopt($curlHandle, CURLOPT_CAINFO, $certsDir . 'cert.pem'); } - $curl_status &= curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER,true); + $curlStatus &= curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true); |