From acc9ebd68f351209b5fc895f50b2b998c9fb9d18 Mon Sep 17 00:00:00 2001
From: "github@kiekerjan.isdronken.nl" <github@kiekerjan.isdronken.nl>
Date: Wed, 29 Dec 2021 22:27:15 +0100
Subject: [PATCH] update nextcloud and webmail plugins

---
 setup/nextcloud.sh | 28 ++++++++++++++++++++--------
 setup/webmail.sh   |  6 +++---
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh
index 144b224f..15834d1c 100755
--- a/setup/nextcloud.sh
+++ b/setup/nextcloud.sh
@@ -49,11 +49,23 @@ InstallNextcloud() {
 	# their github repositories.
 	mkdir -p /usr/local/lib/owncloud/apps
 
-	wget_verify https://github.com/nextcloud/contacts/releases/download/v$version_contacts/contacts.tar.gz $hash_contacts /tmp/contacts.tgz
+	contacts_cutoff="3.5.1" # this version was the last posted version on 12/27/2021 that supported the old url format
+	if [ ${contacts_cutoff//.} -gt ${version_contacts//.} ]; then
+		wget_verify https://github.com/nextcloud/contacts/releases/download/v$version_contacts/contacts.tar.gz $hash_contacts /tmp/contacts.tgz
+	else
+		wget_verify https://github.com/nextcloud-releases/contacts/releases/download/v$version_contacts/contacts-v$version_contacts.tar.gz $hash_contacts /tmp/contacts.tgz
+	fi
+
 	tar xf /tmp/contacts.tgz -C /usr/local/lib/owncloud/apps/
 	rm /tmp/contacts.tgz
 
-	wget_verify https://github.com/nextcloud/calendar/releases/download/v$version_calendar/calendar.tar.gz $hash_calendar /tmp/calendar.tgz
+	calendar_cutoff="2.0.5" # this version was the last posted version on 12/27/2021 that supported the old url format
+	if [ ${calendar_cutoff//.} -gt ${version_calendar//.} ]; then
+		wget_verify https://github.com/nextcloud/calendar/releases/download/v$version_calendar/calendar.tar.gz $hash_calendar /tmp/calendar.tgz
+	else
+		wget_verify https://github.com/nextcloud-releases/calendar/releases/download/v$version_calendar/calendar.tar.gz $hash_calendar /tmp/calendar.tgz
+	fi
+
 	tar xf /tmp/calendar.tgz -C /usr/local/lib/owncloud/apps/
 	rm /tmp/calendar.tgz
 
@@ -102,12 +114,12 @@ InstallNextcloud() {
 # Nextcloud Version to install. Checks are done down below to step through intermediate versions.
 nextcloud_ver=22.2.3
 nextcloud_hash=58d2d897ba22a057aa03d29c762c5306211fefd2
-contacts_ver=4.0.0
-contacts_hash=f893ca57a543b260c9feeecbb5958c00b6998e18
-calendar_ver=2.2.2
-calendar_hash=923846d48afb5004a456b9079cf4b46d23b3ef3a
-user_external_ver=1.0.0
-user_external_hash=3bf2609061d7214e7f0f69dd8883e55c4ec8f50a
+contacts_ver=4.0.7
+contacts_hash=8ab31d205408e4f12067d8a4daa3595d46b513e3
+calendar_ver=3.0.2
+calendar_hash=dcc62633f81c2cb53ce202348c79a0ab5bf4c9a8
+user_external_ver=2.1.0
+user_external_hash=6e5afe7f36f398f864bfdce9cad72200e70322aa
 
 # Current Nextcloud Version, #1623
 # Checking /usr/local/lib/owncloud/version.php shows version of the Nextcloud application, not the DB
diff --git a/setup/webmail.sh b/setup/webmail.sh
index b2173b5b..e4ee18c4 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -36,8 +36,8 @@ HTML5_NOTIFIER_VERSION=68d9ca194212e15b3c7225eb6085dbcf02fd13d7 # version 0.6.4+
 CONTEXT_MENU_VERSION=602a3812922fb8f71814eb3b8d91e9b7859aab7e # version 3.2.1
 TWOFACT_COMMIT=a3944c4604fe86fc020847f281beea031e14e58e # master @ 17-10-2021
 
-CARDDAV_VERSION=4.1.1
-CARDDAV_HASH=87b73661b7799b2079c28324311eddb4241242bb
+CARDDAV_VERSION=4.3.0
+CARDDAV_HASH=4ad7df8843951062878b1375f77c614f68bc5c61
 
 UPDATE_KEY=$VERSION:$PERSISTENT_LOGIN_VERSION:$HTML5_NOTIFIER_VERSION:$CARDDAV_VERSION:$CONTEXT_MENU_VERSION:$TWOFACT_COMMIT
 
@@ -78,7 +78,7 @@ if [ $needs_update == 1 ]; then
 	# install roundcube html5_notifier plugin
 	git_clone https://github.com/kitist/html5_notifier.git $HTML5_NOTIFIER_VERSION '' ${RCM_PLUGIN_DIR}/html5_notifier
 
-	# download and verify the full release of the carddav plugin. Can't use github because does not include all dependencies
+	# download and verify the full release of the carddav plugin. Can't use git_clone because repository does not include all dependencies
 	wget_verify \
 		https://github.com/mstilkerich/rcmcarddav/releases/download/v${CARDDAV_VERSION}/carddav-v${CARDDAV_VERSION}.tar.gz \
 		$CARDDAV_HASH \