From bd5409fba461b33a9677c09779686cfb42fa1b836cb8bc3d801bb92aa04eebe6 Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Fri, 18 Jul 2014 17:43:37 +0000
Subject: [PATCH] Accepting request 241548 from home:ecsos

update to 4.2.6

OBS-URL: https://build.opensuse.org/request/show/241548
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=128
---
 phpMyAdmin-4.2.5-all-languages.tar.bz2 |  3 ---
 phpMyAdmin-4.2.6-all-languages.tar.bz2 |  3 +++
 phpMyAdmin.changes                     | 27 ++++++++++++++++++++++++++
 phpMyAdmin.spec                        |  4 ++--
 4 files changed, 32 insertions(+), 5 deletions(-)
 delete mode 100644 phpMyAdmin-4.2.5-all-languages.tar.bz2
 create mode 100644 phpMyAdmin-4.2.6-all-languages.tar.bz2

diff --git a/phpMyAdmin-4.2.5-all-languages.tar.bz2 b/phpMyAdmin-4.2.5-all-languages.tar.bz2
deleted file mode 100644
index 219c008..0000000
--- a/phpMyAdmin-4.2.5-all-languages.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f69445fb43bd41ff4e2ca91cbd18f03d606ae80597bf2a162e954c4b017c70e
-size 6934176
diff --git a/phpMyAdmin-4.2.6-all-languages.tar.bz2 b/phpMyAdmin-4.2.6-all-languages.tar.bz2
new file mode 100644
index 0000000..932154e
--- /dev/null
+++ b/phpMyAdmin-4.2.6-all-languages.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4626b1beab89fd57ca865b68efa4f4f65b2d3b9e70c532e8ed00800a48be31b4
+size 6690475
diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index 2292f6b..5d32d64 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Fri Jul 18 17:24:08 UTC 2014 - ecsos@schirra.net
+
+- update to 4.2.6 (2014-07-17)
+  - sf#4471 Undefined index warning with referenced column.
+  - bug #4027 $cfg['MaxExactCount'] is ignored when BROWSING is 
+    back
+  - sf#4482 Multi Column sorting (improved user experience)
+  - sf#4478 Server validation does not work while in setup/mysqli
+  - sf Undefined variable when grid editing a foreign key column
+  - sf#4481 mult_submits.inc.php Undefined variable Error
+  - sf#4485 Sorting breaks the copy column feature
+  - sf#4440 Javascript error when renaming table
+  - sf#4483 'New window' link (selflink) disappears, causing 
+    Javascript error
+  - sf#4489 Incorrect detection of privileges for routine 
+    creation
+  - sf#4459 First few characters of database name aren't 
+    clickable when expanded
+  - sf#4486 [security] XSS injection due to unescaped table 
+    comment
+  - sf#4488 [security] XSS injection due to unescaped table name 
+    (triggers)
+  - sf#4492 [security] XSS in AJAX confirmation messages
+  - sf#4491 [security] Missing validation for accessing User 
+    groups feature
+
 -------------------------------------------------------------------
 Thu Jun 26 19:34:06 UTC 2014 - ecsos@schirra.net
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index c2febe2..ef50ed5 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -34,12 +34,12 @@ Name:           phpMyAdmin
 Summary:        Administration of MySQL over the web
 License:        GPL-2.0+
 Group:          Productivity/Networking/Web/Frontends
-Version:        4.2.5
+Version:        4.2.6
 Release:        0
 Url:            http://www.phpMyAdmin.net
 Source0:        http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-languages.tar.bz2
 Source1:        %{name}.http
-Source100:		%{name}-rpmlintrc
+Source100:      %{name}-rpmlintrc
 Patch0:         %{name}-config.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build