From 210b7d6822a465f6284604448b13c733e8c4f203862a38bad48512553019d1d3 Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Thu, 26 Jun 2014 20:18:19 +0000
Subject: [PATCH] Accepting request 238826 from home:ecsos

update to 4.2.5

OBS-URL: https://build.opensuse.org/request/show/238826
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=125
---
 phpMyAdmin-4.2.4-all-languages.tar.bz2 |  3 ---
 phpMyAdmin-4.2.5-all-languages.tar.bz2 |  3 +++
 phpMyAdmin.changes                     | 11 +++++++++++
 phpMyAdmin.spec                        |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)
 delete mode 100644 phpMyAdmin-4.2.4-all-languages.tar.bz2
 create mode 100644 phpMyAdmin-4.2.5-all-languages.tar.bz2

diff --git a/phpMyAdmin-4.2.4-all-languages.tar.bz2 b/phpMyAdmin-4.2.4-all-languages.tar.bz2
deleted file mode 100644
index 401a98c..0000000
--- a/phpMyAdmin-4.2.4-all-languages.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3e9d4df3e48aaaf1b7c5e599d3e255eafdf4f28d6c65b56f77104d722f3d3b1
-size 6913138
diff --git a/phpMyAdmin-4.2.5-all-languages.tar.bz2 b/phpMyAdmin-4.2.5-all-languages.tar.bz2
new file mode 100644
index 0000000..219c008
--- /dev/null
+++ b/phpMyAdmin-4.2.5-all-languages.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f69445fb43bd41ff4e2ca91cbd18f03d606ae80597bf2a162e954c4b017c70e
+size 6934176
diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index d2e10bc..2292f6b 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jun 26 19:34:06 UTC 2014 - ecsos@schirra.net
+
+- update to 4.2.5 (2014-06-26)
+  - sf#4467 shell_exec() has been disabled for security reasons
+  - sf#4470 Error while submitting empty query
+  - sf#4463 Fatal error: Class 'PMA_DatabaseInterface' not found
+  - sf#4469 Fixed cookie based login for installations without mcrypt
+  - sf#4473 incorrect result count when having clause is used
+  - mcrypt: remove the requirement (64-bit) and the related warning
+
 -------------------------------------------------------------------
 Sat Jun 21 07:20:18 UTC 2014 - ecsos@schirra.net
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index a3f31f8..90b12cc 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -34,7 +34,7 @@ Name:           phpMyAdmin
 Summary:        Administration of MySQL over the web
 License:        GPL-2.0+
 Group:          Productivity/Networking/Web/Frontends
-Version:        4.2.4
+Version:        4.2.5
 Release:        0
 Url:            http://www.phpMyAdmin.net
 Source0:        http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-languages.tar.bz2