community/nextcloud: upgrade to v15.0.0

3 files changed, 44 insertions, 25 deletions

diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
index d28bfd03e0..d579e5ec4a 100644
--- a/community/nextcloud/APKBUILD
+++ b/community/nextcloud/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=nextcloud
-pkgver=14.0.4
+pkgver=15.0.0
 pkgrel=0
 pkgdesc="A safe home for all your data"
 url="http://nextcloud.com"
@@ -21,10 +21,10 @@ install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
 subpackages="$pkgname-doc $pkgname-initscript $pkgname-mysql $pkgname-pgsql $pkgname-sqlite
 	$pkgname-default-apps:_default_apps"
 source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip
-	nextcloud14-dont-chmod.patch
+	nextcloud15-dont-chmod.patch
+	nextcloud15-app-encryption-info-add-mcrypt.patch
 	dont-update-htaccess.patch
 	disable-integrity-check-as-default.patch
-	app-encryption-info-add-mcrypt.patch
 	iconv-ascii-translit-not-supported.patch
 	use-external-docs-if-local-not-avail.patch
 
@@ -41,10 +41,14 @@ pkggroups="www-data"
 builddir="$srcdir"/$pkgname
 
 # List of bundled apps to separate into subpackages. Keep it in sync!
-# Note: Don't add "files", "dav", and "provisioning_api" here, these should
-# be always installed.
-_apps="activity
+# Note: Don't add "files", "dav", federatedfilesharing",
+# "lookup_server_connector", "provisioning_api", "oauth2",
+# "twofactor_backupcodes", "workflowengine"
+# here, these should be always installed.
+_apps="accessibility
+	activity
 	admin_audit
+	cloud_federation_api
 	comments
 	encryption
 	federation
@@ -58,20 +62,17 @@ _apps="activity
 	firstrunwizard
 	gallery
 	logreader
-	lookup_server_connector
 	nextcloud_announcements
 	notifications
-	oauth2
 	password_policy
 	serverinfo
+	support
 	sharebymail
 	survey_client
 	systemtags
 	theming
-	twofactor_backupcodes
 	user_external
 	user_ldap
-	workflowengine
 	"
 for _i in $_apps; do
 	subpackages="$subpackages $pkgname-$_i:_package_app"
@@ -223,11 +224,11 @@ _package_app() {
 	mv "$pkgdir"/$_appsdir/$appname "$subpkgdir"/$_appsdir/
 }
 
-sha512sums="6c0fec7693388f9ad4217206956ab85275cce752cbdcbecc78db85e777e9ea1c10f228ad41a1c5f4d9e6fc4b1f69e04c893970ca0384a7b97f273204f2efcb10  nextcloud-14.0.4.zip
-63690b8d8ffe6d4896c5b666aa9d493b501aa3e171c6557e7a003599049f0d36f266a2a257a9535dea055bca1e84208b219c6cd5e4ecd70dd064e1dd1007203a  nextcloud14-dont-chmod.patch
+sha512sums="5a3d8d0f299bcaa4b71abb4cb9140c969e1c7ba9febe6c38243619ea13cff10ecb340c5b444dfb98585fd6d9f4728ebb4e31f459de4c6a31be6690d7dc5ad42a  nextcloud-15.0.0.zip
+59151300c1153cad7fa2a1a972825c81a71df523b319b22799ce1bd846c1a63c7e37c608a125a98e4e733857cc65db9f329fafef7a5b1365d802c476450fce22  nextcloud15-dont-chmod.patch
+e9d15d00368c8840c0144a9f0f45a951717b6c441f98a98568c064639f223df4b6190be040fc56840d3a23b3f7c69348b3d9e94ad4e86f371754ecd057a329d2  nextcloud15-app-encryption-info-add-mcrypt.patch
 aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731  dont-update-htaccess.patch
 d2100a837fef1eeae5f706650ab4c985d9e00f61efa5526ef76c7c1f5811c3906eb6c3c13c151eff9677a0c303faab64411a5a84d6792728bc520d2c618d7d5b  disable-integrity-check-as-default.patch
-baa9d671643cc27cf0b3259ac25ad97811523aab223c35a30f23776ba4866156f7b04e39511b98e5fc0e7f12774ed44d510b9ce50fc8ccac51a17c70020aa0e6  app-encryption-info-add-mcrypt.patch
 de1b433c2fb2582b599cb25e718e454fc4b93543a5a60eee39a03bcccf35d281594611395bdebe02319bedd9a894507eef97010ebdfca381e0f1a09df283d375  iconv-ascii-translit-not-supported.patch
 478f5cd7c5d30380ea619d3e8ec623217a06a09b27534266f00297545c7d276b068c5d984673eebc5676e8bac7f45112549498944ce3fa678ac8a69541d7c430  use-external-docs-if-local-not-avail.patch
 5f73cd9399fa484ef15bd47e803c93381deffbc7699eceadbb5c27e43b20156806d74e5021a64d28f0165ef87b519e962780651711a37bceb9f0b04455dfdce1  nextcloud-config.php
diff --git a/community/nextcloud/nextcloud15-app-encryption-info-add-mcrypt.patch b/community/nextcloud/nextcloud15-app-encryption-info-add-mcrypt.patch
new file mode 100644
index 0000000000..2c1f11694b
--- /dev/null
+++ b/community/nextcloud/nextcloud15-app-encryption-info-add-mcrypt.patch
@@ -0,0 +1,16 @@
+mcrypt is not required, but it's recommended to increase file encryption
+performance. We're adding it to info.xml just to simplify abuild (all app
+dependencies can be read in info.xml).
+
+diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml
+index db4309c..4c43c09 100644
+--- a/apps/encryption/appinfo/info.xml
++++ b/apps/encryption/appinfo/info.xml
+@@ -31,6 +31,7 @@
+ 
+ 	<dependencies>
+ 		<lib>openssl</lib>
++		<lib>mcrypt</lib>
+ 		<nextcloud min-version="15" max-version="15" />
+ 	</dependencies>
+ 
diff --git a/community/nextcloud/nextcloud14-dont-chmod.patch b/community/nextcloud/nextcloud15-dont-chmod.patch
index 13b5e3efbf..b7474b9986 100644
--- a/community/nextcloud/nextcloud14-dont-chmod.patch
+++ b/community/nextcloud/nextcloud15-dont-chmod.patch
@@ -10,18 +10,6 @@
  		// File does not exist, this can happen when doing a fresh install
  		if(!is_resource ($filePointer)) {
  			// TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
---- a/lib/private/Log/File.php
-+++ b/lib/private/Log/File.php
-@@ -134,9 +134,6 @@
- 		}
- 		$entry = json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR);
- 		$handle = @fopen($this->logFile, 'a');
--		if ((fileperms($this->logFile) & 0777) != 0640) {
--			@chmod($this->logFile, 0640);
--		}
- 		if ($handle) {
- 			fwrite($handle, $entry."\n");
- 			fclose($handle);
 --- a/lib/private/TempManager.php
 +++ b/lib/private/TempManager.php
 @@ -95,7 +95,6 @@
@@ -42,3 +30,17 @@
  			clearstatcache();
  			$perms = substr(decoct(@fileperms($dataDirectory)), -3);
  			if ($perms[2] !== '0') {
+diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php
+index 6810e25..3a9e872 100644
+--- a/lib/private/Log/File.php
++++ b/lib/private/Log/File.php
+@@ -137,9 +137,6 @@ class File implements IWriter, IFileBased {
+ 		}
+ 		$entry = json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR);
+ 		$handle = @fopen($this->logFile, 'a');
+-		if ($this->logFileMode > 0 && (fileperms($this->logFile) & 0777) != $this->logFileMode) {
+-			@chmod($this->logFile, $this->logFileMode);
+-		}
+ 		if ($handle) {
+ 			fwrite($handle, $entry."\n");
+ 			fclose($handle);