Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23f4e37f authored Mar 24, 2026 by Akhil

Merge branch 'dev/nc32' of https://gitlab.e.foundation/e/infra/ecloud/nextcloud into dev/nc32

parents 2bf6b139 6c4f767c

patches/013-revert-token-password-update.patch

+4 −5

Original line number	Diff line number	Diff line
		@@ -5,9 +5,9 @@ Subject: [PATCH] Reverts token password update on each login
		NC 21 started updating password of each and every token on each login. This introduces a huge load on database.
		This patch reverts to only update when there are expired tokens.

		--- ./lib/private/Authentication/Token/PublicKeyTokenProvider.php 2024-07-25 17:51:37 +0530
		+++ ./lib/private/Authentication/Token/PublicKeyTokenProvider-new.php 2024-07-25 17:53:16 +0530
		@@ -504,6 +504,11 @@
		--- ./lib/private/Authentication/Token/PublicKeyTokenProvider.php 2026-03-23 17:46:39.518001611 +0600
		+++ ./lib/private/Authentication/Token/PublicKeyTokenProvider-new.php 2026-03-24 00:00:01.266417815 +0600
		@@ -519,6 +519,11 @@
		}

		public function updatePasswords(string $uid, string $password) {
		@@ -19,4 +19,3 @@ This patch reverts to only update when there are expired tokens.
		// prevent setting an empty pw as result of pw-less-login
		if ($password === '' \|\| !$this->config->getSystemValueBool('auth.storeCryptedPassword', true)) {
		return;

patches/014-add-mail-usage.patch

+5 −5

Original line number	Diff line number	Diff line
		--- lib/private/legacy/OC_Helper.php 2025-05-25 16:00:00.880495300 +0530
		+++ lib/private/legacy/OC_Helper-new.php 2025-05-25 16:02:00.970495300 +0530
		@@ -512,6 +512,13 @@
		--- ./lib/private/legacy/OC_Helper.php 2026-03-23 17:46:39.587001442 +0600
		+++ ./lib/private/legacy/OC_Helper-new.php 2026-03-24 00:06:16.021120690 +0600
		@@ -286,6 +286,13 @@
		}
		try {
		$free = $sourceStorage->free_space($rootInfo->getInternalPath());
		@@ -14,7 +14,7 @@
		if (is_bool($free)) {
		$free = 0.0;
		}
		@@ -547,7 +554,6 @@
		@@ -321,7 +328,6 @@
		*/
		$isRemoteShare = $storage->instanceOfStorage(\OCA\Files_Sharing\External\Storage::class);