From 3a32a5d173da46008ff8ada3e13cc9dff808e8f7d79781dfaca86bcf4a1a35d5 Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Mon, 29 Jul 2013 20:47:38 +0000
Subject: [PATCH] Accepting request 184885 from home:ecsos

update to 4.0.4.2

OBS-URL: https://build.opensuse.org/request/show/184885
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=67
---
 phpMyAdmin-4.0.4.1-all-languages.tar.bz2 |  3 ---
 phpMyAdmin-4.0.4.2-all-languages.tar.bz2 |  3 +++
 phpMyAdmin.changes                       | 14 ++++++++++++++
 phpMyAdmin.spec                          |  4 ++--
 4 files changed, 19 insertions(+), 5 deletions(-)
 delete mode 100644 phpMyAdmin-4.0.4.1-all-languages.tar.bz2
 create mode 100644 phpMyAdmin-4.0.4.2-all-languages.tar.bz2

diff --git a/phpMyAdmin-4.0.4.1-all-languages.tar.bz2 b/phpMyAdmin-4.0.4.1-all-languages.tar.bz2
deleted file mode 100644
index faefffc..0000000
--- a/phpMyAdmin-4.0.4.1-all-languages.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd4f5c8084f9378657a02bb9ec3396db365f98b2a0f7b1a3930d7a116502ea8c
-size 5987530
diff --git a/phpMyAdmin-4.0.4.2-all-languages.tar.bz2 b/phpMyAdmin-4.0.4.2-all-languages.tar.bz2
new file mode 100644
index 0000000..9ff5654
--- /dev/null
+++ b/phpMyAdmin-4.0.4.2-all-languages.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aadbe787db33c6da6abfddfd8b16b4adbb2beb204558db88970347f3b8f699e9
+size 5768927
diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes
index caf32ac..0edc79a 100644
--- a/phpMyAdmin.changes
+++ b/phpMyAdmin.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Jul 29 20:20:03 UTC 2013 - ecsos@schirra.net
+
+- update to 4.0.4.2 (2013-07-28)
+  - [security] Fix stored XSS in Server status monitor, see PMASA-2013-9
+  - [security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9
+  - [security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2013-9
+  - [security] Fix full path disclosure, see PMASA-2013-12
+  - [security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-15
+  - [security] Fix control user SQL injection in schema_export.php, see PMASA-2013-15
+  - [security] Fix self-XSS in schema export, see PMASA-2013-14
+  - [security] Fix unencoded json object, see PMASA-2013-11
+  - [security] Fix stored XSS in link transformation plugin, see PMASA-2013-13
+
 -------------------------------------------------------------------
 Wed Jul  3 21:40:23 UTC 2013 - obs@ladisch.de
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 070c227..4250640 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.0.4.1
+Version:        4.0.4.2
 Release:        0
 Url:            http://www.phpMyAdmin.net
 Source0:        %{name}-%{version}-all-languages.tar.bz2
@@ -105,7 +105,7 @@ find . -type d -exec chmod 755 {} \;
 find . -type f -exec chmod 644 {} \;
 find . -type f -name '*.orig' -exec rm {} \;
 #rm lang/*.sh
-%{__rm} libraries/.htaccess
+#%%{__rm} libraries/.htaccess
 
 %build