community/nextcloud20: add versioned v20 package and remove v19

20 files changed, 39 insertions, 61 deletions

diff --git a/community/nextcloud/nextcloud19-dont-chmod.patch b/community/nextcloud/nextcloud-dont-chmod.patch
index 214550871d..214550871d 100644
--- a/community/nextcloud/nextcloud19-dont-chmod.patch
+++ b/community/nextcloud/nextcloud-dont-chmod.patch
diff --git a/community/nextcloud19/nextcloud19.post-upgrade b/community/nextcloud19/nextcloud19.post-upgrade
deleted file mode 100644
index 01f2002a61..0000000000
--- a/community/nextcloud19/nextcloud19.post-upgrade
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-ver_new="$1"
-ver_old="$2"
-
-if [ $(apk version -t "$ver_old" '12.0.0-r2') = '<' ]; then
-	cat >&2 <<-EOF
-	*
-	* All Nextcloud's bundled apps (except "files" and "dav") have been moved to
-	* separate subpackages (e.g. nextcloud-activity). If you want to install
-	* all apps that are enabled by default at once, run:
-	*
-	*     apk add nextcloud-default-apps
-	*
-	EOF
-
-	if [ "$(ls -A /var/lib/nextcloud/apps)" ]; then
-		cat >&2 <<-EOF
-		*
-		* Nextcloud's bundled apps have been moved from /var/lib/nextcloud/apps
-		* to /usr/share/webapps/nextcloud/apps. Only apps installed from App Store
-		* should be stored in /var/lib/nextcloud/apps.
-		*
-		* It seems that you have installed some apps from App Store, so you have to
-		* add /var/lib/nextcloud/apps to your apps_paths. Copy "apps_paths" key
-		* from /etc/nextcloud/config.php.apk-new to your config.php.
-		* 
-		EOF
-	fi
-fi
-
-if [ $(apk version -t "$ver_old" '15.0.2-r0') = '<' ]; then
-	cat >&2 <<-EOF
-	*
-	* App "user_external" is no longer available via release channel.
-	* You need to uninstall the package and install it via appstore:
-	*
-	*     apk del nextcloud-user_external
-	*
-	EOF
-
-fi
-
-if [ "${ver_new%-r*}" != "${ver_old%-r*}" ]; then
-	echo '  * Run "occ upgrade" to finish upgrading your NextCloud instance!' >&2
-fi
diff --git a/community/nextcloud19/APKBUILD b/community/nextcloud20/APKBUILD
index a021d2aae1..65cd942f0d 100644
--- a/community/nextcloud19/APKBUILD
+++ b/community/nextcloud20/APKBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
-pkgname=nextcloud19
+pkgname=nextcloud20
 _pkgname=nextcloud
-pkgver=19.0.7
-pkgrel=1
+pkgver=20.0.7
+pkgrel=0
+_replaced_ver=19
 pkgdesc="Transitional package to allow nextcloud upgrade from v18->v20 for Alpine 3.12->3.13"
 url="http://nextcloud.com"
 arch="noarch"
@@ -23,15 +24,17 @@ provides="$pkgname-contactsinteraction=$pkgver-r$pkgrel
 	$pkgname-provisioning_api=$pkgver-r$pkgrel
 	$pkgname-settings=$pkgver-r$pkgrel
 	$pkgname-twofactor_backupcodes=$pkgver-r$pkgrel
+	$pkgname-viewer=$pkgver-r$pkgrel
 	$pkgname-workflowengine=$pkgver-r$pkgrel
 	"
+replaces="nextcloud$_replaced_ver"
 install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
 	$pkgname-initscript.post-install"
 subpackages="$pkgname-doc $pkgname-initscript $pkgname-mysql $pkgname-pgsql $pkgname-sqlite
 	$pkgname-default-apps:_default_apps"
 source="https://download.nextcloud.com/server/releases/nextcloud-$pkgver.zip
-	nextcloud19-dont-chmod.patch
-	nextcloud17-app-encryption-info-add-mcrypt.patch
+	nextcloud-dont-chmod.patch
+	nextcloud-app-encryption-info-add-mcrypt.patch
 	dont-update-htaccess.patch
 	disable-integrity-check-as-default.patch
 	iconv-ascii-translit-not-supported.patch
@@ -59,6 +62,7 @@ _apps="accessibility
 	admin_audit
 	cloud_federation_api
 	comments
+	dashboard
 	encryption
 	federation
 	files_external
@@ -84,7 +88,8 @@ _apps="accessibility
 	text
 	theming
 	user_ldap
-	viewer
+	user_status
+	weather_status
 	"
 for _i in $_apps; do
 	subpackages="$subpackages $pkgname-$_i:_package_app"
@@ -150,6 +155,7 @@ package() {
 }
 
 doc() {
+	replaces="nextcloud${_replaced_ver}-doc"
 	default_doc
 
 	local target="$subpkgdir"/usr/share/webapps/$_pkgname/core/doc
@@ -160,6 +166,7 @@ doc() {
 initscript() {
 	pkgdesc="Init script that runs Nextcloud with php-fpm"
 	depends="$pkgname $_php-fpm"
+	replaces="nextcloud${_replaced_ver}-initscript"
 
 	local confdir="$subpkgdir/etc/$_php/php-fpm.d"
 	local fpm_name="php-fpm${_php#php}"
@@ -177,24 +184,28 @@ initscript() {
 pgsql() {
 	pkgdesc="Nextcloud PostgreSQL support"
 	depends="$pkgname $_php-pgsql $_php-pdo_pgsql"
+	replaces="nextcloud${_replaced_ver}-pgsql"
 	mkdir -p "$subpkgdir"
 }
 
 sqlite() {
 	pkgdesc="Nextcloud SQLite support"
 	depends="$pkgname $_php-sqlite3 $_php-pdo_sqlite"
+	replaces="nextcloud${_replaced_ver}-sqlite"
 	mkdir -p "$subpkgdir"
 }
 
 mysql() {
 	pkgdesc="Nextcloud MySQL support"
 	depends="$pkgname $_php-pdo_mysql"
+	replaces="nextcloud${_replaced_ver}-mysql"
 	mkdir -p "$subpkgdir"
 }
 
 _default_apps() {
 	pkgdesc="Nextcloud default apps"
 	depends="$pkgname"
+	replaces="nextcloud${_replaced_ver}-default-apps"
 
 	local path; for path in "$pkgdir"/$_appsdir/*; do
 		if grep -q '<default_enable\s*/>' "$path"/appinfo/info.xml; then
@@ -211,16 +222,21 @@ _package_app() {
 
 	local name=$(xmlstarlet sel -t -v 'info/name/text()' "$appinfo")
 	pkgdesc="Nextcloud ${name:-$appname} app"
+	replaces="nextcloud${_replaced_ver}-${appname}"
 
 	local php_deps=$(xmlstarlet sel -t -v 'info/dependencies/lib/text()' "$appinfo" \
 		| xargs -r -n1 printf "$_php-%s\n")
 	local app_deps=""
 
 	case "$appname" in
-		files_sharing)	app_deps="-federatedfilesharing";;
+		dashboard) app_deps="-accessibility"
+		;;
+		files_sharing)	app_deps="-federatedfilesharing"
+		;;
 		photos)
 				app_deps="-viewer"
 				provides="$_pkgname-gallery=$pkgver-r$pkgrel"
+				replaces="$replaces nextcloud${_replaced_ver}-gallery"
 		;;
 
 		# XXX: Provides/replaces for backward compatibility with <12.0.0-r2.
@@ -240,16 +256,16 @@ _package_app() {
 	mv "$pkgdir"/$_appsdir/$appname "$subpkgdir"/$_appsdir/
 }
 
-sha512sums="518f532c05492be3f2da37f4f7e6086f799ec4b3a962dbb49b8402fbb4c923f9f2a2a86c9f7b7434ed44818f1f39bc4ec4f69028444a056b2ddc4f0dbf42b808  nextcloud-19.0.7.zip
-aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9  nextcloud19-dont-chmod.patch
-56b187b5410452c5375b0503cfc154f86b8662f9590638c6975457675848b4251a8b1ed530741d815adfb4494ca44acc0ffea10471296be73026dcb4279aca60  nextcloud17-app-encryption-info-add-mcrypt.patch
+sha512sums="da20bd1b134e7227b71e5814bb1963c00438bfd31c7850c5e25ddb48165a90a52262d259e73fdedc220c89429e8da42b6063edd8f951c535407a17bf89d5ff9d  nextcloud-20.0.7.zip
+aea0adb2c3a48ec6af2958c6ccfe13adff86316a56084e763b7e6df9e21aa3435b13305b7c15cc2b795e83c9388b05006862f6465c29e3dc2c1fbd8eb8befcb9  nextcloud-dont-chmod.patch
+2d03b90c1e2f3d96001f31f1bbf902e4c411c8de7dc5a4f956fa8297533324cb12092d3ad2198f2e02ff4835dc22febee2d49e449b003caef5b990d9dcff1e70  nextcloud-app-encryption-info-add-mcrypt.patch
 aef3c92497d738d6968e0f0b0d415b4953500db24ae14af41ef972665cf7eff00cb6c53dc953845fdbb389c3c965a75b8b14b9247513c05cf4130fe1cfc61731  dont-update-htaccess.patch
 d2100a837fef1eeae5f706650ab4c985d9e00f61efa5526ef76c7c1f5811c3906eb6c3c13c151eff9677a0c303faab64411a5a84d6792728bc520d2c618d7d5b  disable-integrity-check-as-default.patch
 3fc3e06580a619d81b12f448976ffac34f0bb80fc73e9443fa213a73f160ba4b9bd14a26c134258ee12c04d8e103b46f4de10d7b11e4544a328878e57d436055  iconv-ascii-translit-not-supported.patch
 df1a16414a278c205876ec86c210a02a9009954e2d4f9033ff3c9b76c371e2764ef3587db5a4b8f76302655c6c8688c8729d1685279a77d279d3839cc359fbcd  use-external-docs-if-local-not-avail.patch
-5f73cd9399fa484ef15bd47e803c93381deffbc7699eceadbb5c27e43b20156806d74e5021a64d28f0165ef87b519e962780651711a37bceb9f0b04455dfdce1  nextcloud19-config.php
-7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba  nextcloud19.logrotate
-dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a  nextcloud19.confd
-edb699ea6127b231793254115b334006c2d50a0d2ecc846188c3521ddffc3c0e19c5e2944f03cae81e6c645c859258380691081b1c522a22d40939b31db36e8a  nextcloud19.cron
+5f73cd9399fa484ef15bd47e803c93381deffbc7699eceadbb5c27e43b20156806d74e5021a64d28f0165ef87b519e962780651711a37bceb9f0b04455dfdce1  nextcloud20-config.php
+7388458a9e8b7afd3d3269718306410ffa59c3c23da4bef367a4d7f6d2570136fae9dd421b19c1441e7ffb15a5405e18bb5da67b1a15f9f45e8b98d3fda532ba  nextcloud20.logrotate
+dcc57735d7d4af4a7ebbdd1186d301e51d2ae4675022aea6bf1111222dfa188a3a490ebd6e7c8a7ac30046cb7d93f81cec72a51acbc60d0c10b7fb64630c637a  nextcloud20.confd
+edb699ea6127b231793254115b334006c2d50a0d2ecc846188c3521ddffc3c0e19c5e2944f03cae81e6c645c859258380691081b1c522a22d40939b31db36e8a  nextcloud20.cron
 ee9073a6df4286cba2d1d855cf40863968f20677729b2c7848ab50a70d4915b8e84c957a850a03a707231256c11312e5792e7817dd50afbf73efe767fef2112d  fpm-pool.conf
 959852e34f010e635470829d66713f3e22c47717ec2c6487759eed2b6aeff9fd1421fe0271d494a02781bd1c98beb2823583623ee2cf03057cd5db794627d6c2  occ"
diff --git a/community/nextcloud19/app-encryption-info-add-mcrypt.patch b/community/nextcloud20/app-encryption-info-add-mcrypt.patch
index 025dee9368..025dee9368 100644
--- a/community/nextcloud19/app-encryption-info-add-mcrypt.patch
+++ b/community/nextcloud20/app-encryption-info-add-mcrypt.patch
diff --git a/community/nextcloud19/disable-integrity-check-as-default.patch b/community/nextcloud20/disable-integrity-check-as-default.patch
index 54ea7a51e0..54ea7a51e0 100644
--- a/community/nextcloud19/disable-integrity-check-as-default.patch
+++ b/community/nextcloud20/disable-integrity-check-as-default.patch
diff --git a/community/nextcloud19/dont-update-htaccess.patch b/community/nextcloud20/dont-update-htaccess.patch
index aecaebc715..aecaebc715 100644
--- a/community/nextcloud19/dont-update-htaccess.patch
+++ b/community/nextcloud20/dont-update-htaccess.patch
diff --git a/community/nextcloud19/fpm-pool.conf b/community/nextcloud20/fpm-pool.conf
index 69fef6e37a..69fef6e37a 100644
--- a/community/nextcloud19/fpm-pool.conf
+++ b/community/nextcloud20/fpm-pool.conf
diff --git a/community/nextcloud19/iconv-ascii-translit-not-supported.patch b/community/nextcloud20/iconv-ascii-translit-not-supported.patch
index e36f82b8c0..e36f82b8c0 100644
--- a/community/nextcloud19/iconv-ascii-translit-not-supported.patch
+++ b/community/nextcloud20/iconv-ascii-translit-not-supported.patch
diff --git a/community/nextcloud19/nextcloud17-app-encryption-info-add-mcrypt.patch b/community/nextcloud20/nextcloud-app-encryption-info-add-mcrypt.patch
index 3554fa524f..d926ee0a60 100644
--- a/community/nextcloud19/nextcloud17-app-encryption-info-add-mcrypt.patch
+++ b/community/nextcloud20/nextcloud-app-encryption-info-add-mcrypt.patch
@@ -7,6 +7,6 @@ index 5050996..6df2d2b 100644
  	<dependencies>
  		<lib>openssl</lib>
 +		<lib>mcrypt</lib>
- 		<nextcloud min-version="19" max-version="19"/>
+		<nextcloud min-version="20" max-version="20"/>
  	</dependencies>
  
diff --git a/community/nextcloud19/nextcloud19-dont-chmod.patch b/community/nextcloud20/nextcloud-dont-chmod.patch
index 214550871d..214550871d 100644
--- a/community/nextcloud19/nextcloud19-dont-chmod.patch
+++ b/community/nextcloud20/nextcloud-dont-chmod.patch
diff --git a/community/nextcloud19/nextcloud19-config.php b/community/nextcloud20/nextcloud20-config.php
index 035fb790ec..035fb790ec 100644
--- a/community/nextcloud19/nextcloud19-config.php
+++ b/community/nextcloud20/nextcloud20-config.php
diff --git a/community/nextcloud19/nextcloud19-initscript.post-install b/community/nextcloud20/nextcloud20-initscript.post-install
index 7759e65fa0..7759e65fa0 100644
--- a/community/nextcloud19/nextcloud19-initscript.post-install
+++ b/community/nextcloud20/nextcloud20-initscript.post-install
diff --git a/community/nextcloud19/nextcloud19.confd b/community/nextcloud20/nextcloud20.confd
index b24f26d7f1..b24f26d7f1 100644
--- a/community/nextcloud19/nextcloud19.confd
+++ b/community/nextcloud20/nextcloud20.confd
diff --git a/community/nextcloud19/nextcloud19.cron b/community/nextcloud20/nextcloud20.cron
index 096ce65a5d..096ce65a5d 100644
--- a/community/nextcloud19/nextcloud19.cron
+++ b/community/nextcloud20/nextcloud20.cron
diff --git a/community/nextcloud19/nextcloud19.logrotate b/community/nextcloud20/nextcloud20.logrotate
index 19e17fdf4d..19e17fdf4d 100644
--- a/community/nextcloud19/nextcloud19.logrotate
+++ b/community/nextcloud20/nextcloud20.logrotate
diff --git a/community/nextcloud20/nextcloud20.post-upgrade b/community/nextcloud20/nextcloud20.post-upgrade
new file mode 100644
index 0000000000..efcbc10de0
--- /dev/null
+++ b/community/nextcloud20/nextcloud20.post-upgrade
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+ver_new="$1"
+ver_old="$2"
+
+if [ "${ver_new%-r*}" != "${ver_old%-r*}" ]; then
+	echo '  * Run "occ upgrade" to finish upgrading your NextCloud instance!' >&2
+fi
diff --git a/community/nextcloud19/nextcloud19.pre-install b/community/nextcloud20/nextcloud20.pre-install
index e9cf53919c..e9cf53919c 100644
--- a/community/nextcloud19/nextcloud19.pre-install
+++ b/community/nextcloud20/nextcloud20.pre-install
diff --git a/community/nextcloud19/nextcloud19.pre-upgrade b/community/nextcloud20/nextcloud20.pre-upgrade
index f444e78f49..f444e78f49 100644
--- a/community/nextcloud19/nextcloud19.pre-upgrade
+++ b/community/nextcloud20/nextcloud20.pre-upgrade
diff --git a/community/nextcloud19/occ b/community/nextcloud20/occ
index 1e3c095adc..1e3c095adc 100644
--- a/community/nextcloud19/occ
+++ b/community/nextcloud20/occ
diff --git a/community/nextcloud19/use-external-docs-if-local-not-avail.patch b/community/nextcloud20/use-external-docs-if-local-not-avail.patch
index 62b60117a8..62b60117a8 100644
--- a/community/nextcloud19/use-external-docs-if-local-not-avail.patch
+++ b/community/nextcloud20/use-external-docs-if-local-not-avail.patch