From 55d99901c143416c6ea61f930946ced617919910 Mon Sep 17 00:00:00 2001
From: Leonardo Arena <rnalrd@alpinelinux.org>
Date: Fri, 10 Jul 2015 13:15:58 +0000
Subject: main/owncloud: upgrade tasks app, fix apps permissions, install
 .htaccess file

---
 main/owncloud/APKBUILD | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'main/owncloud')

diff --git a/main/owncloud/APKBUILD b/main/owncloud/APKBUILD
index 0f677effe7..503d4c53fd 100644
--- a/main/owncloud/APKBUILD
+++ b/main/owncloud/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname="owncloud"
 pkgver="8.1.0"
-pkgrel=1
+pkgrel=2
 _contactsver="$pkgver"
 _calendarver="$pkgver"
-_tasksver="0.6"
+_tasksver="0.7.1"
 _documentsver="$pkgver"
 _pdfviewerver="$pkgver"
 _texteditorver="$pkgver"
@@ -15,8 +15,8 @@ pkgdesc="Your own WebDAV-based cloud service"
 url="http://owncloud.org"
 arch="noarch"
 license="AGPL"
-depends="php php-ctype php-dom php-gd php-iconv php-json php-xml php-zlib
-	php-zip"
+depends="php php-ctype php-curl php-dom php-gd php-iconv php-json php-xml
+	php-zlib php-zip"
 depends_dev=
 makedepends="$depends_dev"
 install=
@@ -34,7 +34,7 @@ source="https://download.owncloud.org/community/$pkgname-$pkgver.tar.bz2
 	$pkgname-mozilla_sync-$_mozillasyncver.tar.gz::https://github.com/owncloud/mozilla_sync/archive/v$_mozillasyncver.tar.gz
 	$pkgname-music-$_musicver.zip::https://github.com/owncloud/music/releases/download/v$_musicver/music.zip
 	$pkgname-pdfviewer-$_pdfviewerver.tar.gz::https://github.com/owncloud/files_pdfviewer/archive/v$_pdfviewerver.tar.gz
-	$pkgname-tasks-$_tasksver.tar.gz::https://github.com/owncloud/tasks/releases/download/v$_tasksver/tasks.tar.gz
+	$pkgname-tasks-$_tasksver.tar.gz::https://github.com/owncloud/tasks/archive/v$_tasksver.tar.gz
 	owncloud.config.php
 	owncloud-6-always-return-true-isSetLocaleWorking.patch
 	"
@@ -72,6 +72,7 @@ package() {
 	mv * "$pkgdir"${_ocwwwdir} || return 1
 	ln -s $_occonfdir "$pkgdir"${_ocwwwdir}/config || return 1
 	install -m660 ../owncloud.config.php "$pkgdir"${_occonfdir}/config.php
+	install -m664 .htaccess "$pkgdir"${_ocwwwdir}/.htaccess
 	for dir in \
 	 "$pkgdir"${_occonfdir} \
 	 "$pkgdir"${_ocdatadir} \
@@ -117,6 +118,8 @@ _mv_app() {
 	elif [ "$1" = "src" ]; then
 		mv "$srcdir"/$2 "$subpkgdir"${_ocappsdir}
 	fi
+	chown -R :www-data "$subpkgdir"${_ocappsdir} || return 1
+	chmod 770 "$subpkgdir"${_ocappsdir} || return 1
 }
 
 contacts() {
@@ -188,7 +191,7 @@ tasks() {
 	arch="noarch"
 	pkgdesc="ownCloud tasks"
 	depends="owncloud"
-	_mv_app src tasks
+	_mv_app src tasks-$_tasksver
 }
 
 texteditor() {
@@ -213,7 +216,7 @@ ed1ccfe77c92c82eac618ebdb7a38c90  owncloud-calendar-8.1.0.tar.gz
 e98fdb10ff4139b4259e2a183a88975a  owncloud-mozilla_sync-1.4.tar.gz
 7e12f595a2f367b2c3fb117747a340d3  owncloud-music-0.3.5.zip
 b095523ab1aa01a094d7dd449bcbd11d  owncloud-pdfviewer-8.1.0.tar.gz
-ce1cac0448434a83f678b1a95c92a648  owncloud-tasks-0.6.tar.gz
+5368a5a4a610f98b6ef1f49248431b8b  owncloud-tasks-0.7.1.tar.gz
 7d29c52fb9cea2537b56a534a8385f19  owncloud.config.php
 f497dbf3a67d14fc9049ca680673c805  owncloud-6-always-return-true-isSetLocaleWorking.patch"
 sha256sums="3d308d3b3d7083ca9fbfdde461ccd4bb66b7fb36f922ade5e6baf1b03bf174ee  owncloud-8.1.0.tar.bz2
@@ -224,7 +227,7 @@ sha256sums="3d308d3b3d7083ca9fbfdde461ccd4bb66b7fb36f922ade5e6baf1b03bf174ee  ow
 314621c290daee93429d881e78d8cae13faaca3205b23860f06450633c5c3b6a  owncloud-mozilla_sync-1.4.tar.gz
 dee4ded5b525097961e7f93e92404a4d1844a7d645a2e5847a4dc0354affb208  owncloud-music-0.3.5.zip
 3b012d16697094fb8a75e26b8612c0c6446c62cf8e5c397e1b1b40fb80ecb3de  owncloud-pdfviewer-8.1.0.tar.gz
-1e60df52c816ceb5e748e3231e95a22f96561df2ac0d6565819779ffff51accf  owncloud-tasks-0.6.tar.gz
+a6d63c2834101cd5b4f87572773a95e077ba16871f3d98c3681b662a1727d48b  owncloud-tasks-0.7.1.tar.gz
 7ec1e79c6dc8c154d9b7d4c6477a659be55798091f3e9d6c07fd3fcc16332692  owncloud.config.php
 3466ffbd22d4a9f04f4df862f3fb2f695fd1ca4bc6fb4b6a56258958064d5762  owncloud-6-always-return-true-isSetLocaleWorking.patch"
 sha512sums="5c27018c24cd489df9eb2384f2abcb98b569b816a14471bb857bea537a4f362dc209c10a6bed3e385e6dab03b406529dc80f01e002e9a1f1ebd0d7028d21d90d  owncloud-8.1.0.tar.bz2
@@ -235,6 +238,6 @@ b92e2c7550e06404d372f9cdc6780f8c8a3af523f686b59fe8428491a9f05538a331a148579d407c
 a279a6e0109aa3b17442265358284583d846f88afa3746005792b93dffbd3396dc1277ce892b2a226496038ec6e8ec7ef2295b981ef8acf1a3fa3c32886623d0  owncloud-mozilla_sync-1.4.tar.gz
 125e13c00ed92ce94bde5208cf72f13dda5361059736aad332da00021813d61801d380543de85e54142e81b7344df1d6f959e8f918b2938b448a5f1e608aaa16  owncloud-music-0.3.5.zip
 86cef942313a220e394e9aff1ee94f2789e6e8028801ced929274fc263a4d6926c3a5d5945c0e7cca6aca60fa6bca6c9d4202ba8e3904d2ba57fcc88f6d56f43  owncloud-pdfviewer-8.1.0.tar.gz
-79285efc95ec330b8d46d0360d70956b1c6c888c1da77c72377fb9ad9fa80f4410cdb09f7a611dc0887db09d8f7006c6525d41bdfe6515958a63a38fd4181f71  owncloud-tasks-0.6.tar.gz
+c9c9772e9209412850261b6f468d797263a9f0df44661d96f2d36e91f5529b9c38cd1ef4381f170213f3937f4552105d2c71eac3365bc830e93d58eeb1d9f7b5  owncloud-tasks-0.7.1.tar.gz
 a1142059f860ee1245ee2e324f206e1ab509ee6fcbd9020f793be557117ac5f6a8ba0e7a1677250df8662c19460e88b6ca2a24b40c14007d18535ab5110280e6  owncloud.config.php
 4b2038786571c62129d748bb71262a7cbc966cf4b97482f13bcedaa36fcfa343080a464fc74463a9bd6615c99a10cd590b91cacead62632db36bfd8940173d13  owncloud-6-always-return-true-isSetLocaleWorking.patch"
-- 
cgit v1.2.3