v4.7.2

3 files changed, 48 insertions, 6 deletions

diff --git a/composer.json b/composer.json
index 572247d..b6d09b1 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
         "ext-xml": "*",
         "ext-pcre": "*",
         "ext-json": "*",
-        "phpmyadmin/sql-parser": "^4.1.2",
+        "phpmyadmin/sql-parser": "^4.1.7",
         "phpmyadmin/motranslator": "^3.0",
         "phpmyadmin/shapefile": "^2.0",
         "tecnickcom/tcpdf": "^6.2",
@@ -56,7 +56,6 @@
         "tecnickcom/tcpdf": "For PDF support"
     },
     "require-dev": {
-        "satooshi/php-coveralls": "^1.0",
         "phpunit/phpunit": "~4.1",
         "codacy/coverage": "dev-master",
         "phpunit/phpunit-selenium": "~1.2",
diff --git a/phpMyAdmin-certs.patch b/phpMyAdmin-certs.patch
new file mode 100644
index 0000000..31ca029
--- /dev/null
+++ b/phpMyAdmin-certs.patch
@@ -0,0 +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
+          *
+          * See https://letsencrypt.org/certificates/
+          */
+-        $certs_dir = dirname(__file__) . '/certs/';
++        $certs_dir = '/etc/pki/tls/';
+         /* See code below for logic */
+         if ($ssl == CURLOPT_CAPATH) {
+             $curl_status &= curl_setopt($curl_handle, CURLOPT_CAPATH, $certs_dir);
+         } 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');
+         }
+ 
+         $curl_status &= curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER,true);
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 40c9435..2f646a9 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -22,13 +22,13 @@
 %endif
 
 Name: phpMyAdmin
-Version: 4.7.1
+Version: 4.7.2
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
 Group: Applications/Internet
-# MIT (js/jquery/, js/codemirror/),
-# BSD (libraries/plugins/auth/recaptcha/),
+# MIT (js/jquery/, js/jqplot, js/codemirror/, js/tracekit/)
+# BSD (js/openlayers/)
 # GPLv2+ (the rest)
 License: GPLv2+ and MIT and BSD
 URL: https://www.phpmyadmin.net/
@@ -37,6 +37,9 @@ Source1: https://files.phpmyadmin.net/%{name}/%{version}%{?prever:-%prever}/%{na
 Source2: phpMyAdmin.htaccess
 Source3: phpMyAdmin.nginx
 
+# Redirect to system certificates
+Patch0:  phpMyAdmin-certs.patch
+
 BuildArch: noarch
 
 Requires(post): coreutils sed
@@ -70,7 +73,7 @@ Requires:  php-xml
 Requires:  php-pcre
 Requires:  php-json
 Requires:  php-composer(phpmyadmin/sql-parser)   <  5
-Requires:  php-composer(phpmyadmin/sql-parser)   >= 4.1.2
+Requires:  php-composer(phpmyadmin/sql-parser)   >= 4.1.7
 Requires:  php-composer(phpmyadmin/motranslator) <  4
 Requires:  php-composer(phpmyadmin/motranslator) >= 3.0
 Requires:  php-composer(phpmyadmin/shapefile)    <  3
@@ -113,6 +116,15 @@ Requires:  php-session
 Requires:  php-simplexml
 Requires:  php-spl
 Requires:  php-xmlwriter
+# System certificates
+Requires:  ca-certificates
+
+# Bundled JS library
+Provides:  bundled(js-codemirror)
+Provides:  bundled(js-jqplot) = 1.0.9
+Provides:  bundled(js-jquery) = 3.1.1
+Provides:  bundled(js-openlayers)
+Provides:  bundled(js-tracekit)
 
 Provides:  php-composer(phpmyadmin/phpmyadmin) = %{version}
 Provides:  phpmyadmin = %{version}-%{release}
@@ -130,6 +142,7 @@ is available in 50 languages
 
 %prep
 %setup -qn phpMyAdmin-%{version}%{?prever:-%prever}-all-languages
+%patch0 -p1
 
 # Minimal configuration file
 sed -e "/'extension'/s@'mysql'@'mysqli'@"  \
@@ -194,6 +207,13 @@ rm -f %{buildroot}/%{_datadir}/%{name}/setup/frames/.htaccess
 rm -rf %{buildroot}/%{_datadir}/%{name}/contrib
 rm     %{buildroot}/%{_datadir}/%{name}/composer.*
 
+# JS libraries sources
+rm -r %{buildroot}%{_datadir}/%{name}/js/jquery/src
+rm -r %{buildroot}%{_datadir}/%{name}/js/openlayers/src
+
+# Bundled certificates
+rm -r %{buildroot}%{_datadir}/%{name}/libraries/certs
+
 # documentation
 rm -rf    %{buildroot}%{_datadir}/%{name}/examples/
 rm -rf    %{buildroot}%{_datadir}/%{name}/doc/
@@ -240,6 +260,11 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
 
 
 %changelog
+* Fri Jun 30 2017 Remi Collet <remi@remirepo.net> 4.7.2-1
+- update to 4.7.2 (2017-06-29, regular maintenance release)
+- raise dependency on phpmyadmin/sql-parser version 4.1.7
+- allow use system certificates
+
 * Sat May 27 2017 Remi Collet <remi@remirepo.net> 4.7.1-1
 - update to 4.7.1 (2017-05-26, regular maintenance release)