user/nextcloud: bump to 17.0.5

1 files changed, 45 insertions, 44 deletions

diff --git a/user/nextcloud/APKBUILD b/user/nextcloud/APKBUILD
index f9f3aae74..d5f62c610 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=16.0.8
+pkgver=17.0.5
 pkgrel=0
 pkgdesc="Self-hosted file sync and groupware server"
 url="https://nextcloud.com"
@@ -34,6 +34,7 @@ depends="
 	php7-zip
 	$pkgname-sqlite
 
+	!$pkgname-files_texteditor
 	!$pkgname-user_external
 "
 makedepends="libxml2-utils"
@@ -56,7 +57,7 @@ source="https://download.nextcloud.com/server/releases/$pkgname-$pkgver.zip
 	$pkgname.cron
 	fpm-pool.conf
 	occ
-"
+	"
 builddir="$srcdir/$pkgname"
 
 # $_bundled_apps are included in the main `nextcloud' package - it can't
@@ -77,7 +78,7 @@ _bundled_apps="accessibility
 	support
 	twofactor_backupcodes
 	workflowengine
-"
+	"
 for _i in $_bundled_apps; do
 	provides="$provides $pkgname-$_i=$pkgver-r$pkgrel"
 done
@@ -90,7 +91,6 @@ _apps="activity
 	files_pdfviewer
 	files_rightclick
 	files_sharing
-	files_texteditor
 	files_trashbin
 	files_versions
 	files_videoplayer
@@ -106,10 +106,11 @@ _apps="activity
 	sharebymail
 	survey_client
 	systemtags
+	text
 	theming
 	user_ldap
 	viewer
-"
+	"
 for _i in $_apps; do
 	subpackages="$subpackages $pkgname-$_i:_package_app"
 done
@@ -118,43 +119,43 @@ done
 _appsdir="usr/share/webapps/$pkgname/apps"
 
 package() {
-	local basedir="var/lib/$pkgname"
-	local datadir="$basedir/data"
-	local wwwdir="usr/share/webapps/$pkgname"
-	local confdir="etc/$pkgname"
+	_basedir="var/lib/$pkgname"
+	_datadir="$_basedir/data"
+	_wwwdir="usr/share/webapps/$pkgname"
+	_confdir="etc/$pkgname"
 
-	mkdir -p "$pkgdir/${wwwdir%/*}"
-	cp -a "$builddir" "$pkgdir/$wwwdir"
+	mkdir -p "$pkgdir/${_wwwdir%/*}"
+	cp -a "$builddir" "$pkgdir/$_wwwdir"
 
-	chmod +x "$pkgdir/$wwwdir/occ"
-	chmod 664 "$pkgdir/$wwwdir/.htaccess" "$pkgdir/$wwwdir/.user.ini"
+	chmod +x "$pkgdir/$_wwwdir/occ"
+	chmod 664 "$pkgdir/$_wwwdir/.htaccess" "$pkgdir/$_wwwdir/.user.ini"
 
 	# Let's not ship upstream's 'updatenotification' app and updater, which
 	# has zero chance of working and a big chance of blowing things up.
-	rm -r "$pkgdir/$wwwdir/apps/updatenotification" \
-		"$pkgdir/$wwwdir/lib/private/Updater"
+	rm -r "$pkgdir/$_wwwdir/apps/updatenotification" \
+		"$pkgdir/$_wwwdir/lib/private/Updater"
 
 	# Replace bundled CA bundle with ours.
 	ln -sf /etc/ssl/certs/ca-certificates.crt \
-		"$pkgdir/$wwwdir/resources/config/ca-bundle.crt"
+		"$pkgdir/$_wwwdir/resources/config/ca-bundle.crt"
 
 	install -dm 770 -o nextcloud -g www-data \
-		"$pkgdir/$confdir" "$pkgdir/$datadir" "$pkgdir/$basedir/appstore"
+		"$pkgdir/$_confdir" "$pkgdir/$_datadir" "$pkgdir/$_basedir/appstore"
 	install -dm 775 -o nextcloud -g www-data "$pkgdir/var/log/$pkgname"
 
 	# Create symlink from web root to site-apps, so web server can find
 	# assets w/o explicit configuration for this layout.
-	ln -s "/$basedir/appstore" "$pkgdir/$wwwdir/appstore"
+	ln -s "/$_basedir/appstore" "$pkgdir/$_wwwdir/appstore"
 
-	mv $pkgdir/$wwwdir/config/* "$pkgdir/$confdir/"
-	rm -r "$pkgdir/$wwwdir/config"
-	ln -s "/$confdir" "$pkgdir/$wwwdir/config"
+	mv "$pkgdir/$_wwwdir/config"/* "$pkgdir/$_confdir/"
+	rm -r "$pkgdir/$_wwwdir/config"
+	ln -s "/$_confdir" "$pkgdir/$_wwwdir/config"
 
 	mkdir -p "$pkgdir/usr/share/doc/$pkgname"
-	mv "$pkgdir/$wwwdir/core/doc" "$pkgdir/usr/share/doc/$pkgname/core"
+	mv "$pkgdir/$_wwwdir/core/doc" "$pkgdir/usr/share/doc/$pkgname/core"
 
 	install -m 660 -o nextcloud -g www-data \
-		"$srcdir/$pkgname-config.php" "$pkgdir/$confdir/config.php"
+		"$srcdir/$pkgname-config.php" "$pkgdir/$_confdir/config.php"
 
 	install -Dm 644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
 	install -Dm 755 "$srcdir/occ" "$pkgdir/usr/bin/occ"
@@ -173,9 +174,9 @@ package() {
 doc() {
 	default_doc
 
-	local target="$subpkgdir/usr/share/webapps/$pkgname/core/doc"
-	mkdir -p "${target%/*}"
-	ln -s "/usr/share/doc/$pkgname/core" "$target"
+	_target="$subpkgdir/usr/share/webapps/$pkgname/core/doc"
+	mkdir -p "${_target%/*}"
+	ln -s "/usr/share/doc/$pkgname/core" "$_target"
 }
 
 initscript() {
@@ -214,13 +215,13 @@ _default_apps() {
 	pkgdesc="Nextcloud default apps"
 	depends="$pkgname=$pkgver-r$pkgrel"
 
-	local path; for path in $pkgdir/$_appsdir/*; do
-		if grep -q '<default_enable\s*/>' "$path/appinfo/info.xml"; then
-			depends="$depends $pkgname-${path##*/}"
+	for _path in $pkgdir/$_appsdir/*; do
+		if grep -q '<default_enable\s*/>' "$_path/appinfo/info.xml"; then
+			depends="$depends $pkgname-${_path##*/}"
 		fi
-		if ! list_has "${path##*/}" $_apps \
-				&& ! list_has "${path##*/}" $_bundled_apps; then
-			warning "Maybe new app: nextcloud-${path##*/}"
+		if ! list_has "${_path##*/}" $_apps \
+				&& ! list_has "${_path##*/}" $_bundled_apps; then
+			warning "Maybe new app: nextcloud-${_path##*/}"
 		fi
 	done
 
@@ -228,31 +229,31 @@ _default_apps() {
 }
 
 _package_app() {
-	local appname="${subpkgname#$pkgname-}"
-	local appinfo="$pkgdir/$_appsdir/$appname/appinfo/info.xml"
+	_appname="${subpkgname#$pkgname-}"
+	_appinfo="$pkgdir/$_appsdir/$_appname/appinfo/info.xml"
 
-	local name="$(xmllint --xpath '//info/name/text()' "$appinfo" 2>/dev/null)"
-	pkgdesc="Nextcloud ${name:-$appname} app"
-	local php_deps="$(xmllint --xpath 'info/dependencies/lib/text()' \
-		"$appinfo" 2>/dev/null | sed 's/^/php7-/')"
+	_name="$(xmllint --xpath '//info/name/text()' "$_appinfo" 2>/dev/null)"
+	pkgdesc="Nextcloud ${_name:-$_appname} app"
+	_php_deps="$(xmllint --xpath 'info/dependencies/lib/text()' \
+		"$_appinfo" 2>/dev/null | sed 's/^/php7-/')"
 
-	case "$appname" in
-	files_external) php_deps="$php_deps php7-ftp";;
+	case "$_appname" in
+	files_external) _php_deps="$_php_deps php7-ftp";;
 	# TODO: add php7-imap, php7-smbclient
 	esac
 
-	case "$appname" in
+	case "$_appname" in
 	# Announcements are delivered via the notifications pane
 	nextcloud_announcements) app_deps="$pkgname-notifications";;
 	esac
 
-	depends="$pkgname=$pkgver-r$pkgrel $php_deps $app_deps"
+	depends="$pkgname=$pkgver-r$pkgrel $_php_deps $app_deps"
 
 	mkdir -p "$subpkgdir/$_appsdir"
-	mv "$pkgdir/$_appsdir/$appname" "$subpkgdir/$_appsdir/"
+	mv "$pkgdir/$_appsdir/$_appname" "$subpkgdir/$_appsdir/"
 }
 
-sha512sums="b53777db70e97a20a6a8bba0e2b630bff3e24dbd215a9f5679abc3ff49e210eca726020ab9f146b731fc31e0b16d2dc58c1f6db3f8b75fc0afcfd4744eb1328c  nextcloud-16.0.8.zip
+sha512sums="c23cc36ba7f1a203422485e90d7284e399282406f5672b6c82c345a9dea3908d9c135621d391eb91a03f5a1e42a233bea9cd82efe2089be38d259619e3dbe0f9  nextcloud-17.0.5.zip
 3336c2f534de1e380d64bb87f07dcaeb617db5b7bb9446ed845e78be917c1c87eb6f7da71a6b4382198d977e21e550b3165d0b276b07b68a0a569a383766c75d  dont-chmod.patch
 aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731  dont-update-htaccess.patch
 d2100a837fef1eeae5f706650ab4c985d9e00f61efa5526ef76c7c1f5811c3906eb6c3c13c151eff9677a0c303faab64411a5a84d6792728bc520d2c618d7d5b  disable-integrity-check-as-default.patch