community/nextcloud: upgrade to 14.0.4

Edge (v3.9) will be moved to Nextcloud 15.
v3.7 has been moved to Nextcloud 13.

7 files changed, 28 insertions, 49 deletions

diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
index 73d2b58d0a..d28bfd03e0 100644
--- a/community/nextcloud/APKBUILD
+++ b/community/nextcloud/APKBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=nextcloud
-pkgver=13.0.8
+pkgver=14.0.4
 pkgrel=0
 pkgdesc="A safe home for all your data"
 url="http://nextcloud.com"
 arch="noarch"
 license="AGPL-3.0-only"
 _php=php7
-_php_mods="-ctype -curl -dom -gd -fileinfo -iconv -json -mbstring -openssl
-        -pcntl -posix -session -simplexml -xml -xmlreader -xmlwriter -zlib -zip"
+_php_mods="-ctype -curl -dom -gd -fileinfo -iconv -intl -json -mbstring -openssl
+        -pcntl -posix -session -simplexml -xml -xmlreader -xmlwriter -zip"
 depends="ca-certificates $_php ${_php_mods//-/$_php-}"
 makedepends="xmlstarlet"
 provides="$pkgname-dav=$pkgver-r$pkgrel
@@ -21,7 +21,7 @@ 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
-        nextcloud10-dont-chmod.patch
+        nextcloud14-dont-chmod.patch
         dont-update-htaccess.patch
         disable-integrity-check-as-default.patch
         app-encryption-info-add-mcrypt.patch
@@ -223,15 +223,15 @@ _package_app() {
         mv "$pkgdir"/$_appsdir/$appname "$subpkgdir"/$_appsdir/
 }
 
-sha512sums="091f69776718adfab54fff92de983f6c94c0d686640b2b2afe22997823db632555f15a90365d336d911d87b06cafffda6497b5e56bc8a92d06421b99042ae3a3  nextcloud-13.0.8.zip
-9c20237c4952ff543171768160c17c3608cc43ad9592fecccaeb337787d566f039f27f30f118359dfff7db58cd12d811c05be15e5994efee57a9ed75787d71f5  nextcloud10-dont-chmod.patch
+sha512sums="6c0fec7693388f9ad4217206956ab85275cce752cbdcbecc78db85e777e9ea1c10f228ad41a1c5f4d9e6fc4b1f69e04c893970ca0384a7b97f273204f2efcb10  nextcloud-14.0.4.zip
+63690b8d8ffe6d4896c5b666aa9d493b501aa3e171c6557e7a003599049f0d36f266a2a257a9535dea055bca1e84208b219c6cd5e4ecd70dd064e1dd1007203a  nextcloud14-dont-chmod.patch
 aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731  dont-update-htaccess.patch
-04783385ca35be9e8b895e91294b082cd2a1f50c4e17dc195901885ecd421db9a6fe45360d7eac623873ae4efad80b92f31ebde59f4ed76d832c8cac450dac85  disable-integrity-check-as-default.patch
-d6f951cbcb7ca48beb88d77e02a8669677e87bc32189b1eb7e63edc29c293bd6e1ee471c37b622e6b38fd2baf6cf198c872f92b256ffab17c92c31a3a05b5aa0  app-encryption-info-add-mcrypt.patch
-7d60ba2f1c012b0a1cded30f757b7ec0efe7fc4bfa7b5c6879f35eb80711ac1d5e6c894356346222a0de68b0808c99bac358aaae1c69124a855da2a98cdff6ec  iconv-ascii-translit-not-supported.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
-f224d72799ee5819979089eb58978225454223bee597c938681a4f6279eb49297fe9250ac54ccf8bcb33ae262bce43d085affb77723492ee662263710d4008c9  nextcloud.logrotate
+7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba  nextcloud.logrotate
 dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a  nextcloud.confd
 edb699ea6127b231793254115b334006c2d50a0d2ecc846188c3521ddffc3c0e19c5e2944f03cae81e6c645c859258380691081b1c522a22d40939b31db36e8a  nextcloud.cron
 ee9073a6df4286cba2d1d855cf40863968f20677729b2c7848ab50a70d4915b8e84c957a850a03a707231256c11312e5792e7817dd50afbf73efe767fef2112d  fpm-pool.conf
diff --git a/community/nextcloud/app-encryption-info-add-mcrypt.patch b/community/nextcloud/app-encryption-info-add-mcrypt.patch
index 35b7557ab5..025dee9368 100644
--- a/community/nextcloud/app-encryption-info-add-mcrypt.patch
+++ b/community/nextcloud/app-encryption-info-add-mcrypt.patch
@@ -4,12 +4,11 @@ dependencies can be read in info.xml).
 
 --- a/apps/encryption/appinfo/info.xml
 +++ b/apps/encryption/appinfo/info.xml
-@@ -25,6 +25,7 @@
-        </types>
+@@ -31,6 +31,7 @@
+ 
         <dependencies>
                 <lib>openssl</lib>
 +               <lib>mcrypt</lib>
-                <nextcloud min-version="13" max-version="13" />
+                <nextcloud min-version="14" max-version="14" />
         </dependencies>
-        <settings>
-
+ 
diff --git a/community/nextcloud/disable-integrity-check-as-default.patch b/community/nextcloud/disable-integrity-check-as-default.patch
index 87108c600a..54ea7a51e0 100644
--- a/community/nextcloud/disable-integrity-check-as-default.patch
+++ b/community/nextcloud/disable-integrity-check-as-default.patch
@@ -4,12 +4,12 @@ check doesn't add any value.
 
 --- a/lib/private/IntegrityCheck/Checker.php
 +++ b/lib/private/IntegrityCheck/Checker.php
-@@ -109,7 +109,7 @@ class Checker {
-                 * too prominent. So please do not add it to config.sample.php.
+@@ -111,7 +111,7 @@
                  */
+                $isIntegrityCheckDisabled = false;
                 if ($this->config !== null) {
 -                       $isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', false);
 +                       $isIntegrityCheckDisabled = $this->config->getSystemValue('integrity.check.disabled', true);
-                } else {
-                        $isIntegrityCheckDisabled = false;
                 }
+                if ($isIntegrityCheckDisabled === true) {
+                        return false;
diff --git a/community/nextcloud/iconv-ascii-translit-not-supported.patch b/community/nextcloud/iconv-ascii-translit-not-supported.patch
index f599a1b020..bb13a9514a 100644
--- a/community/nextcloud/iconv-ascii-translit-not-supported.patch
+++ b/community/nextcloud/iconv-ascii-translit-not-supported.patch
@@ -1,3 +1,5 @@
+iconv on Alpine does not support conversion to ASCII//TRANSLIT
+
 --- a/apps/user_ldap/lib/Access.php
 +++ b/apps/user_ldap/lib/Access.php
 @@ -1318,7 +1318,7 @@
diff --git a/community/nextcloud/nextcloud-1202-fix-6028.patch b/community/nextcloud/nextcloud-1202-fix-6028.patch
deleted file mode 100644
index bc7f64f796..0000000000
--- a/community/nextcloud/nextcloud-1202-fix-6028.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/lib/private/Template/CSSResourceLocator.php
-+++ b/lib/private/Template/CSSResourceLocator.php
-@@ -117,7 +117,7 @@
-                        parent::append($root, $file, $webRoot, $throw);
-                } else {
-                        if (!$webRoot) {
--                               $tmpRoot = realpath($root);
-+                               $tmpRoot = $root;
-                                /*
-                                 * traverse the potential web roots upwards in the path
-                                 *
---- a/lib/private/Template/ResourceLocator.php
-+++ b/lib/private/Template/ResourceLocator.php
-@@ -125,7 +125,7 @@
-                }
- 
-                if (!$webRoot) {
--                       $tmpRoot = realpath($root);
-+                       $tmpRoot = $root;
-                        /*
-                         * traverse the potential web roots upwards in the path
-                         *
diff --git a/community/nextcloud/nextcloud.logrotate b/community/nextcloud/nextcloud.logrotate
index c5981ccb88..19e17fdf4d 100644
--- a/community/nextcloud/nextcloud.logrotate
+++ b/community/nextcloud/nextcloud.logrotate
@@ -1,6 +1,6 @@
 /var/log/nextcloud/*.log {
         daily
-        rotate 7
         compress
         copytruncate
+        su nextcloud www-data
 }
diff --git a/community/nextcloud/nextcloud10-dont-chmod.patch b/community/nextcloud/nextcloud14-dont-chmod.patch
index 0a3b11975e..13b5e3efbf 100644
--- a/community/nextcloud/nextcloud10-dont-chmod.patch
+++ b/community/nextcloud/nextcloud14-dont-chmod.patch
@@ -1,6 +1,6 @@
 --- a/lib/private/Config.php
 +++ b/lib/private/Config.php
-@@ -229,9 +229,6 @@
+@@ -240,9 +240,6 @@
                 touch ($this->configFilePath);
                 $filePointer = fopen($this->configFilePath, 'r+');
  
@@ -12,19 +12,19 @@
                         // 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
-@@ -130,9 +130,6 @@
+@@ -134,9 +134,6 @@
                 }
                 $entry = json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR);
-                $handle = @fopen(self::$logFile, 'a');
--               if ((fileperms(self::$logFile) & 0777) != 0640) {
--                       @chmod(self::$logFile, 0640);
+                $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
-@@ -94,7 +94,6 @@
+@@ -95,7 +95,6 @@
                         if($postFix !== '') {
                                 $fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
                                 touch($fileNameWithPostfix);
@@ -34,7 +34,7 @@
                         }
 --- a/lib/private/legacy/util.php
 +++ b/lib/private/legacy/util.php
-@@ -965,7 +965,6 @@
+@@ -1008,7 +1008,6 @@
                         . ' cannot be listed by other users.');
                 $perms = substr(decoct(@fileperms($dataDirectory)), -3);
                 if (substr($perms, -1) !== '0') {