main/owncloud: upgrade to 7.0.0

3 files changed, 32 insertions, 65 deletions

diff --git a/main/owncloud/APKBUILD b/main/owncloud/APKBUILD
index e0aca0132a..9132f453a0 100644
--- a/main/owncloud/APKBUILD
+++ b/main/owncloud/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname="owncloud"
-pkgver="6.0.4"
+pkgver="7.0.0"
 pkgrel=0
 pkgdesc="Your own WebDAV-based cloud service"
 url="http://owncloud.org"
@@ -12,11 +12,11 @@ depends_dev=
 makedepends="$depends_dev"
 install=
 subpackages="$pkgname-pgsql $pkgname-sqlite $pkgname-mysql $pkgname-documents
-	$pkgname-external $pkgname-texteditor $pkgname-videoviewer"
+	$pkgname-external $pkgname-ldap $pkgname-search $pkgname-texteditor 
+	$pkgname-videoviewer"
 replaces="$pkgname-plugins"
 source="http://download.owncloud.org/community/$pkgname-$pkgver.tar.bz2
 	owncloud.config.php
-	owncloud-5.0.13-remove-shares-where-files-do-not-exist-postgres.patch
 	owncloud-6-always-return-true-isSetLocaleWorking.patch
 	"
 pkggroups="www-data"
@@ -94,43 +94,54 @@ _mv_app() {
 	mv "$pkgdir"${_ocappsdir}/$1 "$subpkgdir"${_ocappsdir}
 }
 
-texteditor() {
+documents() {
 	arch="noarch"
-	pkgdesc="ownCloud integrated text editor"
+	pkgdesc="ownCloud integrated documents editor"
 	depends="owncloud"
-	_mv_app files_texteditor
+	_mv_app documents
 }
 
-videoviewer() {
+external() {
 	arch="noarch"
-	pkgdesc="ownCloud integrated video viewer"
+	pkgdesc="ownCloud integrated external storage support"
 	depends="owncloud"
-	_mv_app files_videoviewer
+	_mv_app files_external
 }
 
-documents() {
+ldap() {
 	arch="noarch"
-	pkgdesc="ownCloud integrated video viewer"
+        pkgdesc="ownCloud integrated LDAP authentication"
 	depends="owncloud"
-	_mv_app documents
+	_mv_app user_ldap
 }
 
-external() {
+search() {
+	arch="noarch"
+        pkgdesc="ownCloud integrated search engine"
+	depends="owncloud"
+	_mv_app search_lucene
+}
+
+texteditor() {
+	arch="noarch"
+	pkgdesc="ownCloud integrated text editor"
+	depends="owncloud"
+	_mv_app files_texteditor
+}
+
+videoviewer() {
 	arch="noarch"
 	pkgdesc="ownCloud integrated video viewer"
 	depends="owncloud"
-	_mv_app files_external
+	_mv_app files_videoviewer
 }
 
-md5sums="0a92cf5971e9c9c58e40219b385bd8f4  owncloud-6.0.4.tar.bz2
+md5sums="28cfdc99e8ee9350fe88430b4c7d62f2  owncloud-7.0.0.tar.bz2
 f15efb780f109648432132861828417c  owncloud.config.php
-e033c3211983429ef811ffea8159bb46  owncloud-5.0.13-remove-shares-where-files-do-not-exist-postgres.patch
 f497dbf3a67d14fc9049ca680673c805  owncloud-6-always-return-true-isSetLocaleWorking.patch"
-sha256sums="49b576bf9e7131c08f0437bbbaafdcd900b37010eb90b23048b69dbbb6c01532  owncloud-6.0.4.tar.bz2
+sha256sums="9aca2aa0a0cd7b052e881c30ad6de25d135ec3f88a3920274f1be223b4cabedf  owncloud-7.0.0.tar.bz2
 012e6bf876643f65fdaf2eb9f8b3d0a04d555dd3a40d5a67576c96e59a434516  owncloud.config.php
-0dc56930cc725def606aabdb3ba380fc38daa203b4544ddde523a7d1f962ade8  owncloud-5.0.13-remove-shares-where-files-do-not-exist-postgres.patch
 3466ffbd22d4a9f04f4df862f3fb2f695fd1ca4bc6fb4b6a56258958064d5762  owncloud-6-always-return-true-isSetLocaleWorking.patch"
-sha512sums="ddabb2a14f507833069039ba43555419c6224681d3e5c821d2c9936f50577f1eea07785ca61f14e5bab5da73349ebf6bbb5504c0582351e3826d0e6bd9855f43  owncloud-6.0.4.tar.bz2
+sha512sums="42bcce55b2d7a6e9a8be5a9f194d121a93874c44d4f158a018a236926df6d4c9ea9a2a61325e573f152e4ae34a991a88135a339bfbcf016a2599b56247d2030e  owncloud-7.0.0.tar.bz2
 6bbc7bd28236549ac5660f1c1ec89fc68c28849a44cfe970cef4efc43891463d83818efd2d335802390c7db1ea2a9f7d15220a09fb567fd7e27b8cee7f1acd02  owncloud.config.php
-1c05b9c96c92e74d0b603fe76facb4fc9510dbb18dc210cd0b073ca2776886416303abb28d66266982a60e67aa6c7ba06c2ad45dfd926f3a6260f58f1a90e882  owncloud-5.0.13-remove-shares-where-files-do-not-exist-postgres.patch
 4b2038786571c62129d748bb71262a7cbc966cf4b97482f13bcedaa36fcfa343080a464fc74463a9bd6615c99a10cd590b91cacead62632db36bfd8940173d13  owncloud-6-always-return-true-isSetLocaleWorking.patch"
diff --git a/main/owncloud/owncloud-5.0.13-remove-shares-where-files-do-not-exist-postgres.patch b/main/owncloud/owncloud-5.0.13-remove-shares-where-files-do-not-exist-postgres.patch
deleted file mode 100644
index be239aa1d7..0000000000
--- a/main/owncloud/owncloud-5.0.13-remove-shares-where-files-do-not-exist-postgres.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 8509994c2a7f3cdddbb48b8a1f6a952b437a315c Mon Sep 17 00:00:00 2001
-From: Jamie McClelland <jm@mayfirst.org>
-Date: Sat, 23 Nov 2013 19:47:45 -0500
-Subject: [PATCH] fix update to remove shares where file doesn't exist on
- postgres
-
-Without patch, breaks with: Failed to upgrade "files_sharing".
-Exception="SQLSTATE[22P02]: Invalid text representation: 7 ERROR:
-invalid input syntax for integer: "5,179""
-
-See: https://github.com/owncloud/core/issues/5758
----
- apps/files_sharing/appinfo/update.php | 17 +++--------------
- 1 file changed, 3 insertions(+), 14 deletions(-)
-
-diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
-index 0d827da..721b53e 100644
---- a/apps/files_sharing/appinfo/update.php
-+++ b/apps/files_sharing/appinfo/update.php
-@@ -71,18 +71,7 @@
- 
- // clean up oc_share table from files which are no longer exists
- if (version_compare($installedVersion, '0.3.5', '<')) {
--
--	// get all shares where the original file no longer exists
--	$findShares = \OC_DB::prepare('SELECT `file_source` FROM `*PREFIX*share` LEFT JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*filecache`.`fileid` IS NULL AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\')');
--	$sharesFound = $findShares->execute(array())->fetchAll();
--
--	// delete those shares from the oc_share table
--	if (is_array($sharesFound) && !empty($sharesFound)) {
--		$delArray = array();
--		foreach ($sharesFound as $share) {
--			$delArray[] = $share['file_source'];
--		}
--		$removeShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `file_source` IN (?)');
--		$result = $removeShares->execute(array(implode(',', $delArray)));
--	}
-+	// delete all shares where the original file no longer exists
-+	$removeShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `file_source` IN (SELECT `file_source` FROM `*PREFIX*share` LEFT JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*filecache`.`fileid` IS NULL AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\'))');
-+	$result = $removeShares->execute(array(implode(',', $delArray)));
- }
--- 
-1.8.4
-
diff --git a/main/owncloud/owncloud.config.php b/main/owncloud/owncloud.config.php
index 8efeab5e27..5318ffdc60 100644
--- a/main/owncloud/owncloud.config.php
+++ b/main/owncloud/owncloud.config.php
@@ -15,7 +15,7 @@ $CONFIG = array(
     ),
     */
   ),
-  'version' => '6.0.4',
+  'version' => '7.0.0',
   'dbname' => 'owncloud',
   'dbhost' => 'localhost',
   'dbuser' => 'owncloud',