summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2013-04-04 16:01:43 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2013-04-04 16:01:43 +0000
commit53e2dd2c600f5e856c62944b7803133dedf36186 (patch)
tree23b2d5175b5d9b886832de9246c7a9c7d1bc47ee /www-apps/owncloud
parentVersion bump (diff)
downloadgentoo-2-53e2dd2c600f5e856c62944b7803133dedf36186.tar.gz
gentoo-2-53e2dd2c600f5e856c62944b7803133dedf36186.tar.bz2
gentoo-2-53e2dd2c600f5e856c62944b7803133dedf36186.zip
Revision bump to fix update with postgresql
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key C74525F2)
Diffstat (limited to 'www-apps/owncloud')
-rw-r--r--www-apps/owncloud/ChangeLog8
-rw-r--r--www-apps/owncloud/files/owncloud-5.0.3-postgresql_update.patch13
-rw-r--r--www-apps/owncloud/owncloud-5.0.3-r1.ebuild (renamed from www-apps/owncloud/owncloud-5.0.3.ebuild)7
3 files changed, 26 insertions, 2 deletions
diff --git a/www-apps/owncloud/ChangeLog b/www-apps/owncloud/ChangeLog
index 7bc89f2b8fbc..68e15f9ba7df 100644
--- a/www-apps/owncloud/ChangeLog
+++ b/www-apps/owncloud/ChangeLog
@@ -1,6 +1,12 @@
# 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.30 2013/04/03 13:14:03 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/owncloud/ChangeLog,v 1.31 2013/04/04 16:01:42 voyageur Exp $
+
+*owncloud-5.0.3-r1 (04 Apr 2013)
+
+ 04 Apr 2013; Bernard Cafarelli <voyageur@gentoo.org> -owncloud-5.0.3.ebuild,
+ +owncloud-5.0.3-r1.ebuild, +files/owncloud-5.0.3-postgresql_update.patch:
+ Revision bump to fix update with postgresql
*owncloud-5.0.3 (03 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
new file mode 100644
index 000000000000..e8855d846873
--- /dev/null
+++ b/www-apps/owncloud/files/owncloud-5.0.3-postgresql_update.patch
@@ -0,0 +1,13 @@
+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-5.0.3.ebuild b/www-apps/owncloud/owncloud-5.0.3-r1.ebuild
index 8275b55c5acd..32f0e141139a 100644
--- a/www-apps/owncloud/owncloud-5.0.3.ebuild
+++ b/www-apps/owncloud/owncloud-5.0.3-r1.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.ebuild,v 1.1 2013/04/03 13:14:03 voyageur Exp $
+# $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 $
EAPI=5
@@ -29,6 +29,11 @@ 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