From 3c933362d40e96e664ac9086738fa2263ef188fd7cd51b6ccf4618b60d012b20 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Thu, 19 Jan 2017 18:02:28 +0000 Subject: [PATCH] Accepting request 451463 from home:ecsos:server Add Patch phpMyAdmin-12757_sql_syntax_errror.patch to fix gh#12757 SQL syntax errror on MariaDB < 10.0.2 in check for mysql password check plugin. OBS-URL: https://build.opensuse.org/request/show/451463 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=274 --- phpMyAdmin-12757_sql_syntax_errror.patch | 12 ++++++++++++ phpMyAdmin.changes | 8 ++++++++ phpMyAdmin.spec | 5 ++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 phpMyAdmin-12757_sql_syntax_errror.patch diff --git a/phpMyAdmin-12757_sql_syntax_errror.patch b/phpMyAdmin-12757_sql_syntax_errror.patch new file mode 100644 index 0000000..c5ca07e --- /dev/null +++ b/phpMyAdmin-12757_sql_syntax_errror.patch @@ -0,0 +1,12 @@ +diff -Pdpru phpMyAdmin-4.6.5.2-all-languages.orig/libraries/server_privileges.lib.php phpMyAdmin-4.6.5.2-all-languages/libraries/server_privileges.lib.php +--- phpMyAdmin-4.6.5.2-all-languages.orig/libraries/server_privileges.lib.php 2016-12-05 23:36:28.000000000 +0100 ++++ phpMyAdmin-4.6.5.2-all-languages/libraries/server_privileges.lib.php 2017-01-19 18:37:00.016646510 +0100 +@@ -5237,7 +5237,7 @@ function PMA_getHashedPassword($password + */ + function PMA_checkIfMariaDBPwdCheckPluginActive() + { +- if (Util::getServerType() !== 'MariaDB') { ++ if (!(Util::getServerType() == 'MariaDB' && PMA_MYSQL_INT_VERSION >= 100002)) { + return false; + } + diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index 74e85e8..5b964ad 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jan 19 17:42:49 UTC 2017 - ecsos@opensuse.org + +- Add Patch phpMyAdmin-12757_sql_syntax_errror.patch to fix + gh#12757 SQL syntax errror on MariaDB < 10.0.2 in check for mysql + password check plugin. + Will be fixed in 4.6.6 + ------------------------------------------------------------------- Tue Dec 6 15:25:29 UTC 2016 - chris@computersalat.de diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index a3685e1..8a3a9bd 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -1,7 +1,7 @@ # # spec file for package phpMyAdmin # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,6 +45,8 @@ Source100: %{name}-rpmlintrc Patch0: %{name}-config.patch # Fix-SUSE: auto config for pma storage Patch1: %{name}-pma.patch +# Fix-SUSE: Fix #12757 SQL syntax errror on MariaDB < 10.0.2 in check for mysql password check plugin +Patch2: %{name}-12757_sql_syntax_errror.patch BuildRequires: apache2-devel BuildRequires: python-devel BuildRequires: xz @@ -115,6 +117,7 @@ Currently phpMyAdmin can: perl -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php %patch0 %patch1 +%patch2 -p1 # rpmlint: fix incorrect-fsf-address find . -type f | xargs sed -i -e 's:59 Temple Place\, Suite 330\, Boston\, MA 02111-1307 USA:51 Franklin Street\, Fifth Floor\, Boston\, MA 02110-1301 USA:g'