From ed66452e66b052e10b6056d2aa4ffca58f30efb2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 12 Sep 2019 16:49:00 +0200 Subject: - update to 5.0.0alpha1 - raise dependency on PHP 7.1.3 - raise dependency on phpmyadmin/sql-parser 5.0 - raise dependency on twig 2.1 - add dependency on pragmarx/google2fa-qrcode - drop dependency on pragmarx/google2fa and bacon/bacon-qr-code - drop dependency on psr/container --- phpMyAdmin-certs.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'phpMyAdmin-certs.patch') diff --git a/phpMyAdmin-certs.patch b/phpMyAdmin-certs.patch index 709f9d9..9601ab9 100644 --- a/phpMyAdmin-certs.patch +++ b/phpMyAdmin-certs.patch @@ -1,11 +1,11 @@ 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 +--- ./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 = dirname(__file__) . '/../../certs/'; +- $certsDir = ROOT_PATH . 'libraries/certs/'; + $certsDir = '/etc/pki/tls/'; /* See code below for logic */ if ($ssl == CURLOPT_CAPATH) { -- cgit