pool/phpMyAdmin
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 451463 from home:ecsos:server

Browse Source 
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
This commit is contained in:
Eric Schirra 2017-01-19 18:02:28 +00:00 committed by Git OBS Bridge
parent c828aae0c4
commit 3c933362d4
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpMyAdmin-12757_sql_syntax_errror.patch Normal file
View File

@ -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;
}

8
phpMyAdmin.changes
View File

@ -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 Tue Dec 6 15:25:29 UTC 2016 - chris@computersalat.de

5
phpMyAdmin.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package phpMyAdmin # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -45,6 +45,8 @@ Source100: %{name}-rpmlintrc
Patch0: %{name}-config.patch Patch0: %{name}-config.patch
# Fix-SUSE: auto config for pma storage # Fix-SUSE: auto config for pma storage
Patch1: %{name}-pma.patch 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: apache2-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: xz BuildRequires: xz
@ -115,6 +117,7 @@ Currently phpMyAdmin can:
perl -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php perl -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php
%patch0 %patch0
%patch1 %patch1
%patch2 -p1
# rpmlint: fix incorrect-fsf-address # 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' 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'