user/nextcloud: bump to 15.0.14

* Remove nextcloud-user_external

  "Unbundle user_external to release it via appstore (server#13329)"
  https://github.com/nextcloud/server/pull/13329

* +depends=openssl

  The file /etc/ssl/openssl.cnf is now required (and provided by the
  package `openssl')

3 files changed, 45 insertions, 10 deletions

diff --git a/user/nextcloud/APKBUILD b/user/nextcloud/APKBUILD
index 39c53fe86..46a03ba71 100644
--- a/user/nextcloud/APKBUILD
+++ b/user/nextcloud/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=nextcloud
-pkgver=14.0.13
-pkgrel=1
+pkgver=15.0.14
+pkgrel=0
 pkgdesc="Self-hosted file sync and groupware server"
 url="https://nextcloud.com"
 arch="noarch"
@@ -11,6 +11,7 @@ options="!check"  # No test suite.
 license="AGPL-3.0+ AND AGPL-3.0-only AND MIT AND Apache-2.0 AND (MIT OR GPL-2.0-only) AND BSD-3-Clause AND (Apache-2.0 OR GPL-2.0-only) AND GPL-3.0+ AND BSD-2-Clause AND PHP-3.0 AND (Apache-2.0 OR MPL-2.0)"
 depends="
 	ca-certificates
+	openssl
 	php7
 	php7-ctype
 	php7-curl
@@ -32,6 +33,8 @@ depends="
 	php7-xmlwriter
 	php7-zip
 	$pkgname-sqlite
+
+	!$pkgname-user_external
 "
 makedepends="libxml2-utils"
 provides="
@@ -49,10 +52,11 @@ pkggroups="www-data"
 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
+	dont-chmod.patch
 	dont-update-htaccess.patch
 	disable-integrity-check-as-default.patch
 	iconv-ascii-translit-not-supported.patch
+	openssl.patch
 	use-external-docs-if-local-not-avail.patch
 
 	$pkgname-config.php
@@ -93,7 +97,6 @@ _apps="activity
 	systemtags
 	theming
 	twofactor_backupcodes
-	user_external
 	user_ldap
 	workflowengine
 "
@@ -221,7 +224,6 @@ _package_app() {
 	encryption) php_deps="php7-openssl";;
 	files_external) php_deps="php7-ftp";;
 	# TODO: add php7-imap, php7-smbclient
-	user_external) php_deps="php7-ftp";;
 	user_ldap) php_deps="php7-ldap";;
 	esac
 
@@ -239,11 +241,12 @@ _package_app() {
 	mv "$pkgdir/$_appsdir/$appname" "$subpkgdir/$_appsdir/"
 }
 
-sha512sums="ea6d688fb23bc6b6fbaa8b4c5bf8bdb8732825cf43bc3a09df288d128218b1ef5d743f042ec36d5e4813f0e0349524c2ff426abc1786cb77902ca20a3db7c392  nextcloud-14.0.13.zip
-63690b8d8ffe6d4896c5b666aa9d493b501aa3e171c6557e7a003599049f0d36f266a2a257a9535dea055bca1e84208b219c6cd5e4ecd70dd064e1dd1007203a  nextcloud14-dont-chmod.patch
+sha512sums="d847342bdeb298efafc691b1d3f3095e24643e429639be05bda51cd84c4c9c60cd82d467328a685b02f8cd48e97ed59e4ed68f8f984a71d36a009072a10754a5  nextcloud-15.0.14.zip
+3336c2f534de1e380d64bb87f07dcaeb617db5b7bb9446ed845e78be917c1c87eb6f7da71a6b4382198d977e21e550b3165d0b276b07b68a0a569a383766c75d  dont-chmod.patch
 aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731  dont-update-htaccess.patch
 d2100a837fef1eeae5f706650ab4c985d9e00f61efa5526ef76c7c1f5811c3906eb6c3c13c151eff9677a0c303faab64411a5a84d6792728bc520d2c618d7d5b  disable-integrity-check-as-default.patch
 de1b433c2fb2582b599cb25e718e454fc4b93543a5a60eee39a03bcccf35d281594611395bdebe02319bedd9a894507eef97010ebdfca381e0f1a09df283d375  iconv-ascii-translit-not-supported.patch
+17da9bcf569524ed0006a86d510f9a7a2475372559c36730bd98fe336b13e39fcc6757b759e6dd6732b2653ba3d0631e0dc2b228238115ff1ab4af3946cfc30d  openssl.patch
 478f5cd7c5d30380ea619d3e8ec623217a06a09b27534266f00297545c7d276b068c5d984673eebc5676e8bac7f45112549498944ce3fa678ac8a69541d7c430  use-external-docs-if-local-not-avail.patch
 4d01c89d5fd86190fb3bd6a5ca97bc623ec55d92cbf030c18c5811d711cea557485d334a6588e458eea4e0b3ad82f4defd7cb5a9d4f393ce4d5b32abf45db596  nextcloud-config.php
 7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba  nextcloud.logrotate
diff --git a/user/nextcloud/nextcloud14-dont-chmod.patch b/user/nextcloud/dont-chmod.patch
index 13b5e3efb..02510fcb0 100644
--- a/user/nextcloud/nextcloud14-dont-chmod.patch
+++ b/user/nextcloud/dont-chmod.patch
@@ -12,12 +12,12 @@
  			// 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 @@
+@@ -137,9 +137,6 @@ class File implements IWriter, IFileBase
  		}
  		$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 ($this->logFileMode > 0 && (fileperms($this->logFile) & 0777) != $this->logFileMode) {
+-			@chmod($this->logFile, $this->logFileMode);
 -		}
  		if ($handle) {
  			fwrite($handle, $entry."\n");
diff --git a/user/nextcloud/openssl.patch b/user/nextcloud/openssl.patch
new file mode 100644
index 000000000..f705da0ec
--- /dev/null
+++ b/user/nextcloud/openssl.patch
@@ -0,0 +1,32 @@
+--- nextcloud/lib/private/Authentication/Token/PublicKeyTokenProvider.php	2019-12-19 08:23:31.000000000 +0000
++++ nextcloud/lib/private/Authentication/Token/PublicKeyTokenProvider.php	2020-02-18 00:55:54.210000000 +0000
+@@ -295,7 +295,15 @@ class PublicKeyTokenProvider implements
+ 
+ 		// Generate new key
+ 		$res = openssl_pkey_new($config);
+-		openssl_pkey_export($res, $privateKey);
++		if ($res === false) {
++			$this->logOpensslError();
++			throw new \RuntimeException('OpenSSL reported a problem');
++		}
++
++		if (openssl_pkey_export($res, $privateKey, null, $config) === false) {
++			$this->logOpensslError();
++			throw new \RuntimeException('OpenSSL reported a problem');
++		}
+ 
+ 		// Extract the public key from $res to $pubKey
+ 		$publicKey = openssl_pkey_get_details($res);
+@@ -343,5 +351,11 @@ class PublicKeyTokenProvider implements
+ 		}
+ 	}
+ 
+-
++	private function logOpensslError() {
++		$errors = [];
++		while ($error = openssl_error_string()) {
++			$errors[] = $error;
++		}
++		$this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
++	}
+ }