Version bumps and remove security vulnerable versions, bug #465538

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

5 files changed, 14 insertions, 22 deletions

diff --git a/www-apps/owncloud/ChangeLog b/www-apps/owncloud/ChangeLog
index 68e15f9ba7df..6b0e79c094e8 100644
--- a/www-apps/owncloud/ChangeLog
+++ b/www-apps/owncloud/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/owncloud
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.31 2013/04/04 16:01:42 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.32 2013/04/11 19:01:42 voyageur Exp $
+
+*owncloud-5.0.4 (11 Apr 2013)
+*owncloud-4.5.9 (11 Apr 2013)
+*owncloud-4.0.14 (11 Apr 2013)
+
+  11 Apr 2013; Bernard Cafarelli <voyageur@gentoo.org> -owncloud-4.0.13.ebuild,
+  +owncloud-4.0.14.ebuild, -owncloud-4.5.8.ebuild, +owncloud-4.5.9.ebuild,
+  -owncloud-5.0.3-r1.ebuild, -files/owncloud-5.0.3-postgresql_update.patch,
+  +owncloud-5.0.4.ebuild:
+  Version bumps and remove security vulnerable versions, bug #465538
 
 *owncloud-5.0.3-r1 (04 Apr 2013)
 
diff --git a/www-apps/owncloud/files/owncloud-5.0.3-postgresql_update.patch b/www-apps/owncloud/files/owncloud-5.0.3-postgresql_update.patch
deleted file mode 100644
index e8855d846873..000000000000
--- a/www-apps/owncloud/files/owncloud-5.0.3-postgresql_update.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php
-index f114cf0..9556a26 100644
---- a/lib/files/cache/legacy.php
-+++ b/lib/files/cache/legacy.php
-@@ -97,7 +97,7 @@ function getEtag($path) {
- 			$relativePath = '';
- 		}
- 		if(is_null($query)){
--			$query = \OC_DB::prepare('SELECT `propertyvalue` FROM `*PREFIX*properties` WHERE `userid` = ? AND propertypath = ? AND propertyname = "{DAV:}getetag"');
-+			$query = \OC_DB::prepare('SELECT `propertyvalue` FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = \'{DAV:}getetag\'');
- 		}
- 		$result = $query->execute(array($user, '/' . $relativePath));
- 		if ($row = $result->fetchRow()) {
diff --git a/www-apps/owncloud/owncloud-4.0.13.ebuild b/www-apps/owncloud/owncloud-4.0.14.ebuild
index 7a6cc1af861e..826a2761e1ba 100644
--- a/www-apps/owncloud/owncloud-4.0.13.ebuild
+++ b/www-apps/owncloud/owncloud-4.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.0.13.ebuild,v 1.1 2013/03/14 08:57:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.0.14.ebuild,v 1.1 2013/04/11 19:01:42 voyageur Exp $
 
 EAPI=5
 
diff --git a/www-apps/owncloud/owncloud-4.5.8.ebuild b/www-apps/owncloud/owncloud-4.5.9.ebuild
index 15ee13870a7a..f3da37398d46 100644
--- a/www-apps/owncloud/owncloud-4.5.8.ebuild
+++ b/www-apps/owncloud/owncloud-4.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.5.8.ebuild,v 1.1 2013/03/14 08:57:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-4.5.9.ebuild,v 1.1 2013/04/11 19:01:42 voyageur Exp $
 
 EAPI=5
 
diff --git a/www-apps/owncloud/owncloud-5.0.3-r1.ebuild b/www-apps/owncloud/owncloud-5.0.4.ebuild
index 32f0e141139a..42a192069d9e 100644
--- a/www-apps/owncloud/owncloud-5.0.3-r1.ebuild
+++ b/www-apps/owncloud/owncloud-5.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-5.0.3-r1.ebuild,v 1.1 2013/04/04 16:01:42 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/owncloud-5.0.4.ebuild,v 1.1 2013/04/11 19:01:42 voyageur Exp $
 
 EAPI=5
 
@@ -29,11 +29,6 @@ pkg_setup() {
 	webapp_pkg_setup
 }
 
-src_prepare() {
-	# https://github.com/owncloud/core/issues/2666
-	epatch "${FILESDIR}"/${P}-postgresql_update.patch
-}
-
 src_install() {
 	webapp_src_preinst