Hello community,
here is the log from the commit of package phpMyAdmin for openSUSE:Factory
checked in at 2017-01-24 10:36:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old)
and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phpMyAdmin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2016-12-09
09:38:20.687456303 +0100
+++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes
2017-01-24 10:36:20.369380035 +0100
@@ -1,0 +2,8 @@
+Thu Jan 19 17:42:49 UTC 2017 - ec...@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
+
+-------------------------------------------------------------------
New:
----
phpMyAdmin-12757_sql_syntax_errror.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.NO4P06/_old 2017-01-24 10:36:21.425230056 +0100
+++ /var/tmp/diff_new_pack.NO4P06/_new 2017-01-24 10:36:21.429229488 +0100
@@ -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 @@
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 @@
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'
++++++ phpMyAdmin-12757_sql_syntax_errror.patch ++++++
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;
}
