diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2013-04-05 06:33:31 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2013-04-05 06:33:52 +0000 |
| commit | bf2ebb75afaa1717a1c5007d3696aecd6efa46ad (patch) | |
| tree | ec017ecdaaeeb51b22a3a13ad010aa1ee268b291 /main/owncloud | |
| parent | 40aa77fd2204a843ffeac68734ec839dc91d6cce (diff) | |
| download | aports-bf2ebb75afaa1717a1c5007d3696aecd6efa46ad.tar.bz2 aports-bf2ebb75afaa1717a1c5007d3696aecd6efa46ad.tar.xz | |
main/owncloud: fix upgrade to 5.0.3 with pgsql as backend
Diffstat (limited to 'main/owncloud')
| -rw-r--r-- | main/owncloud/APKBUILD | 14 | ||||
| -rw-r--r-- | main/owncloud/owncloud-pgsql-upgrade-5.0.3.patch | 25 |
2 files changed, 34 insertions, 5 deletions
diff --git a/main/owncloud/APKBUILD b/main/owncloud/APKBUILD index 53ff68fe20..4ecabbd626 100644 --- a/main/owncloud/APKBUILD +++ b/main/owncloud/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=owncloud pkgver=5.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="Your own WebDAV-based cloud service" url="http://owncloud.org" arch="noarch" @@ -16,13 +16,14 @@ subpackages="$pkgname-pgsql $pkgname-sqlite $pkgname-mysql replaces="$pkgname-plugins" source="http://download.owncloud.org/community/$pkgname-$pkgver.tar.bz2 owncloud.config.php + owncloud-pgsql-upgrade-5.0.3.patch " _builddir="$srcdir"/$pkgname prepare() { cd "$_builddir" - return 0 + patch -p1 < ../owncloud-pgsql-upgrade-5.0.3.patch } build() { @@ -87,8 +88,11 @@ videoviewer() { md5sums="354e0d6ad98ea544aacada809df4b815 owncloud-5.0.3.tar.bz2 -48258b2f750ad85d3e1b1bc6d396a661 owncloud.config.php" +48258b2f750ad85d3e1b1bc6d396a661 owncloud.config.php +a66e0d8e2aa59ee92d985494daba98fc owncloud-pgsql-upgrade-5.0.3.patch" sha256sums="edcfad4a82906e53b08f61c91180a1bac81412661d78045d7ec668fb63cc9ffc owncloud-5.0.3.tar.bz2 -14b81dd22cf5ebe2e8c9b9c939adb4246f7967d37510816d0018cb222a6b1c4d owncloud.config.php" +14b81dd22cf5ebe2e8c9b9c939adb4246f7967d37510816d0018cb222a6b1c4d owncloud.config.php +9ab33f7e2ef8d8b0f500c7353fb94e7220979ebe7fee62a8dc86cc92682b1d7a owncloud-pgsql-upgrade-5.0.3.patch" sha512sums="f8168b2ba43609bca1f58fa8034396a81de03dc1d3838e4a1ebf79faf605d87a747189e639ca734d0ca89d626ae962c32d3ee853a4ffe0e5a9b195ac7f1a6ed3 owncloud-5.0.3.tar.bz2 -37995eb694b1d9aba88b1eafddd8b1d3697ed0cd13a5486684eca27df675f82bf177226833bdcc81f0067843b255598d946dd48e02d134f0e97f774c0c90214b owncloud.config.php" +37995eb694b1d9aba88b1eafddd8b1d3697ed0cd13a5486684eca27df675f82bf177226833bdcc81f0067843b255598d946dd48e02d134f0e97f774c0c90214b owncloud.config.php +bb2d9894989f585fe866ef2a6e04d32d4307e29fc2e5b1ca7a4e6781704bb3588486bb8e4b22246b20190020726ed3e4ae64764897cde3880de6228be49105f3 owncloud-pgsql-upgrade-5.0.3.patch" diff --git a/main/owncloud/owncloud-pgsql-upgrade-5.0.3.patch b/main/owncloud/owncloud-pgsql-upgrade-5.0.3.patch new file mode 100644 index 0000000000..35421133b3 --- /dev/null +++ b/main/owncloud/owncloud-pgsql-upgrade-5.0.3.patch @@ -0,0 +1,25 @@ +From e75406e7120271ebfecf2260b95040509dfcf168 Mon Sep 17 00:00:00 2001 +From: Arthur Schiwon <blizzz@owncloud.com> +Date: Wed, 3 Apr 2013 13:04:38 +0200 +Subject: [PATCH] PostreSQL compatibility, fixes #2666 + +--- + lib/files/cache/legacy.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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()) { +-- +1.8.1.5 + |