From ebae33689ca3ba41b094cf38f820c6c89f9da458d47fbdc484401bd6f635d622 Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Thu, 29 Mar 2012 15:13:15 +0000
Subject: [PATCH] Accepting request 111890 from home:computersalat:devel:php

update to 5.0.4, fix for bnc#754694 (CVE-2012-1600)

OBS-URL: https://build.opensuse.org/request/show/111890
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpPgAdmin?expand=0&rev=14
---
 phpPgAdmin-5.0.3.tar.bz2 |  3 ---
 phpPgAdmin-5.0.4.tar.bz2 |  3 +++
 phpPgAdmin.changes       | 21 +++++++++++++++++++++
 phpPgAdmin.spec          | 10 +++++-----
 4 files changed, 29 insertions(+), 8 deletions(-)
 delete mode 100644 phpPgAdmin-5.0.3.tar.bz2
 create mode 100644 phpPgAdmin-5.0.4.tar.bz2

diff --git a/phpPgAdmin-5.0.3.tar.bz2 b/phpPgAdmin-5.0.3.tar.bz2
deleted file mode 100644
index 2cd02d2..0000000
--- a/phpPgAdmin-5.0.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:13827e51b6c635ae81cfdeaad6a027dc3c17165bc929a5f8d4c702bb05ff84c9
-size 779305
diff --git a/phpPgAdmin-5.0.4.tar.bz2 b/phpPgAdmin-5.0.4.tar.bz2
new file mode 100644
index 0000000..de589f5
--- /dev/null
+++ b/phpPgAdmin-5.0.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd4b16008c9b5b2b8b9f20708e51e77690d910a7b3d85f9f66386c79994a4349
+size 778547
diff --git a/phpPgAdmin.changes b/phpPgAdmin.changes
index e4160d1..d0d3345 100644
--- a/phpPgAdmin.changes
+++ b/phpPgAdmin.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Mar 29 10:59:18 UTC 2012 - chris@computersalat.de
+
+- update to 5.0.4
+  - Released: 22th March 2012
+  - Bug fixes.
+    * Fix #3468882 "UPDATE single row with varchar key: empty where
+      clause", reported by "Dirk Kraemer"
+    * Fix XSS in function.php, reported by Mateusz Goik
+    * Fix bug where renaming a tablespace was leading to an error
+    * Fix a bug where clicking to "Show all schemas" on schema
+      privilege page leads back to the latest tab used in database level
+    * Fix a bug when executing a query from the history
+    * Fix bad confirmation message when droping an autovacuum table setup
+    * Fix bug #3429633 '"Back" link from "Browse" leads to error'
+    * Fix a PHP warning when Slony conf parameters are not set
+    * Show cancel/kill actions in process page only if role is a superuser
+    * Some more small code cleanup and fixes.
+- fix for bnc#754694 (CVE-2012-1600)
+  * https://bugzilla.novell.com/show_bug.cgi?id=754694
+
 -------------------------------------------------------------------
 Thu Oct 20 18:36:19 UTC 2011 - chris@computersalat.de
 
diff --git a/phpPgAdmin.spec b/phpPgAdmin.spec
index ae48ad3..0cc4277 100644
--- a/phpPgAdmin.spec
+++ b/phpPgAdmin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package phpPgAdmin
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           phpPgAdmin
 
 %define apxs %{_sbindir}/apxs2
@@ -26,10 +25,10 @@ Name:           phpPgAdmin
 %define ppa_config %{_sysconfdir}/%{name}/config.inc.php
 
 Summary:        Administration of PostgreSQL over the web
-Version:        5.0.3
-Release:        1
 License:        GPL-2.0+
 Group:          Productivity/Databases/Tools
+Version:        5.0.4
+Release:        0
 Url:            http://phppgadmin.sourceforge.net
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}.http
@@ -37,7 +36,8 @@ Patch0:         %{name}-4.2.3-config.inc.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  apache2-devel
-Requires:       mod_php_any php-pgsql
+Requires:       mod_php_any
+Requires:       php-pgsql
 
 %description
 phpPgAdmin is a web-based administration tool for PostgreSQL. It is