diff options
| author | Max Rees <maxcrees@me.com> | 2020-12-04 01:42:56 -0500 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2023-04-12 03:25:27 +0000 |
| commit | 5c178e92646227d5a947d8e0c25c74625185d5d1 (patch) | |
| tree | c4cd3e550badca2c784a24f02ae41ca3554a044e | |
| parent | daca6dfa1964794c38b3265eb529d4f3ae91f907 (diff) | |
| download | packages-nextcloud.tar.gz packages-nextcloud.tar.bz2 packages-nextcloud.tar.xz packages-nextcloud.zip | |
user/nextcloud: bump to 18.0.11nextcloud
| -rw-r--r-- | user/nextcloud/APKBUILD | 8 | ||||
| -rw-r--r-- | user/nextcloud/dont-chmod.patch | 12 | ||||
| -rw-r--r-- | user/nextcloud/nextcloud-initscript.post-install | 4 |
3 files changed, 10 insertions, 14 deletions
diff --git a/user/nextcloud/APKBUILD b/user/nextcloud/APKBUILD index 05a578014..14173e265 100644 --- a/user/nextcloud/APKBUILD +++ b/user/nextcloud/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=nextcloud -pkgver=18.0.3 +pkgver=18.0.11 pkgrel=0 pkgdesc="Self-hosted file sync and groupware server" url="https://nextcloud.com" @@ -79,6 +79,7 @@ _bundled_apps="accessibility settings support twofactor_backupcodes + viewer workflowengine " for _i in $_bundled_apps; do @@ -111,7 +112,6 @@ _apps="activity text theming user_ldap - viewer " for _i in $_apps; do subpackages="$subpackages $pkgname-$_i:_package_app" @@ -255,8 +255,8 @@ _package_app() { mv "$pkgdir/$_appsdir/$_appname" "$subpkgdir/$_appsdir/" } -sha512sums="f7ae10f89ca4d1c0da240eefecadcddf15172177c411181a5dd7977b33ac2237805211156dbe229dfc9e71f8da3d1062677b8463f19b4103a757f1fd20af0b73 nextcloud-18.0.3.zip -3336c2f534de1e380d64bb87f07dcaeb617db5b7bb9446ed845e78be917c1c87eb6f7da71a6b4382198d977e21e550b3165d0b276b07b68a0a569a383766c75d dont-chmod.patch +sha512sums="270828fc69f657aa5ad7866f68d27ff17509821b834df04038fecdf6666e52f8c319fb53369e983b754cedbec7504622e20e4d5a93485981c5ec8d5fd35046d5 nextcloud-18.0.11.zip +6a417952bc6bb8d2d7fd086bc19c7191241d4e08315778449e00c0e52e2948d32aca6a389496e8a6a81feeb93318df983c1661056422cd20e3a696517017b776 dont-chmod.patch aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731 dont-update-htaccess.patch d2100a837fef1eeae5f706650ab4c985d9e00f61efa5526ef76c7c1f5811c3906eb6c3c13c151eff9677a0c303faab64411a5a84d6792728bc520d2c618d7d5b disable-integrity-check-as-default.patch de1b433c2fb2582b599cb25e718e454fc4b93543a5a60eee39a03bcccf35d281594611395bdebe02319bedd9a894507eef97010ebdfca381e0f1a09df283d375 iconv-ascii-translit-not-supported.patch diff --git a/user/nextcloud/dont-chmod.patch b/user/nextcloud/dont-chmod.patch index 02510fcb0..7a0476ffb 100644 --- a/user/nextcloud/dont-chmod.patch +++ b/user/nextcloud/dont-chmod.patch @@ -10,13 +10,13 @@ // 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 -@@ -137,9 +137,6 @@ class File implements IWriter, IFileBase - } - $entry = json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR); +--- nextcloud/lib/private/Log/File.php 2020-11-18 13:53:48.000000000 -0500 ++++ nextcloud/lib/private/Log/File.php 2020-12-04 01:01:17.090166495 -0500 +@@ -80,9 +80,6 @@ class File extends LogDetails implements + public function write(string $app, $message, int $level) { + $entry = $this->logDetailsAsJSON($app, $message, $level); $handle = @fopen($this->logFile, 'a'); -- if ($this->logFileMode > 0 && (fileperms($this->logFile) & 0777) != $this->logFileMode) { +- if ($this->logFileMode > 0 && is_file($this->logFile) && (fileperms($this->logFile) & 0777) != $this->logFileMode) { - @chmod($this->logFile, $this->logFileMode); - } if ($handle) { diff --git a/user/nextcloud/nextcloud-initscript.post-install b/user/nextcloud/nextcloud-initscript.post-install index c90d4de68..ca60372c1 100644 --- a/user/nextcloud/nextcloud-initscript.post-install +++ b/user/nextcloud/nextcloud-initscript.post-install @@ -8,10 +8,6 @@ for dir in /etc/nextcloud \ do chmod g-w $dir done -chgrp root /etc/nextcloud/config.php - -# This must be writable (only) by nextcloud user. -chmod 750 /var/log/nextcloud cat <<"EOF" * |