From 7ebb0943e50613afa90617167c649c32ff19c10d Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 10 Oct 2024 17:43:54 +0200
Subject: [PATCH] Release 6.1.0 RC 1

---
 com.woltlab.wcf/files_pre_check.tar           | Bin 20480 -> 20480 bytes
 com.woltlab.wcf/package.xml                   |  59 +++++++++++++++---
 .../install/files/lib/system/WCF.class.php    |   2 +-
 3 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/com.woltlab.wcf/files_pre_check.tar b/com.woltlab.wcf/files_pre_check.tar
index 421d622e8d58eb434536d344c6d26febefb08835..896c0dacf51d3fbb894afd28c490b9e3b8892b52 100644
GIT binary patch
delta 120
zcmZozz}T>WaYDC{xw*NCse!2(gMpE;xv@Eeg27}%#+1#Bj9u&~az-Wwa5+v?IU@r@
VGq{{!7c;Ux15*=IxSZ&JD*$#^8qxp&

delta 120
zcmZozz}T>WaYDC{skxz{shP0>gMpE;xsefrg27}%#+1#Bj9u&~az;kRa5+v?IU@rD
WL%5t^7c;Ux15=>UFf&E}TLA!Ny&8=G

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index f071c0195c..7294825876 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>6.1.0 Beta 2</version>
-		<date>2024-09-27</date>
+		<version>6.1.0 RC 1</version>
+		<date>2024-10-10</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -50,21 +50,60 @@
 		<instruction type="script">acp/install_com.woltlab.wcf_step2.php</instruction>
 	</instructions>
 
-	<instructions type="update" fromversion="6.1.0 Beta 1">
-		<!-- https://github.com/WoltLab/WCF/issues/5996 -->
+	<instructions type="update" fromversion="6.0.*">
+		<!--
+tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
+	acp/update_com.woltlab.wcf_6.1_checkSystemRequirements.php \
+	acp/update_com.woltlab.wcf_6.1_messageEmbeddedObject.php \
+	acp/update_com.woltlab.wcf_6.1_sharedTemplate.php \
+	acp/database/update_com.woltlab.wcf_6.1.php
+		-->
+		<instruction type="file">files_pre_check.tar</instruction>
+
+		<!-- Checks that need to happen before the upgrade starts. -->
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_checkSystemRequirements.php</instruction>
+
+		<!-- Required for the shared templates. -->
+		<instruction type="script">acp/update_com.woltlab.wcf_6.1_sharedTemplate.php</instruction>
+
+		<!-- Clean up any duplicate entries in the message embedded objects table. -->
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_messageEmbeddedObject.php</instruction>
+
+		<!-- Migrate the database as early as possible. -->
+		<instruction type="database">acp/database/update_com.woltlab.wcf_6.1.php</instruction>
+
+		<!-- Deploy the new application code. -->
+		<instruction type="file"/>
 		<instruction type="acpTemplate"/>
+		<instruction type="template"/>
 
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_spider_step1.php</instruction>
+		<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.1_spider_step2.php</instruction>
 
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1.0_beta_2_migrateStaticFiles.php</instruction>
-		
 		<instruction type="language"/>
+		<instruction type="objectTypeDefinition"/>
+		<instruction type="objectType"/>
 		<instruction type="page"/>
-		<instruction type="menuItem"/>
+		<instruction type="userGroupOption"/>
+		<instruction type="userProfileMenu"/>
+		<instruction type="bbcode"/>
 		<instruction type="acpTemplateDelete"/>
-		<instruction type="box"/>
 		<instruction type="fileDelete"/>
+		<instruction type="userMenu"/>
 		<instruction type="option"/>
+		<instruction type="templateDelete"/>
+		<instruction type="cronjob"/>
+		<instruction type="userOption"/>
+		<instruction type="userNotificationEvent"/>
+
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_serviceWorker.php</instruction>
+	</instructions>
+
+	<instructions type="update" fromversion="6.1.0 Beta 2">
+		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+		<instruction type="language"/>
+		<instruction type="fileDelete"/>
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 19d3497cfd..0d9489e13c 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -79,7 +79,7 @@
 \mb_language('uni');
 
 // define current woltlab suite version
-\define('WCF_VERSION', '6.1.0 Beta 2');
+\define('WCF_VERSION', '6.1.0 RC 1');
 
 // define current unix timestamp
 \define('TIME_NOW', \time());