From fa516b964df3dcc93baa9956dfa2b49163c4c12f Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Thu, 9 Jan 2025 12:05:02 +0100
Subject: [PATCH 1/3] useGlobalPreferredServer=false in autoconfig

(cherry picked from commit 4cf35e7228ae2478e36d9a2ca0bb730fc619a8e7)
---
 core/admin/mailu/internal/views/autoconfig.py | 2 +-
 towncrier/newsfragments/3721.bugfix           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 towncrier/newsfragments/3721.bugfix

diff --git a/core/admin/mailu/internal/views/autoconfig.py b/core/admin/mailu/internal/views/autoconfig.py
index 46d6531f..32a475cd 100644
--- a/core/admin/mailu/internal/views/autoconfig.py
+++ b/core/admin/mailu/internal/views/autoconfig.py
@@ -31,7 +31,7 @@ def autoconfig_mozilla():
 <username>%EMAILADDRESS%</username>
 <authentication>password-cleartext</authentication>
 <addThisServer>true</addThisServer>
-<useGlobalPreferredServer>true</useGlobalPreferredServer>
+<useGlobalPreferredServer>false</useGlobalPreferredServer>
 </outgoingServer>
 
 <documentation url="https://{hostname}/admin/client">
diff --git a/towncrier/newsfragments/3721.bugfix b/towncrier/newsfragments/3721.bugfix
new file mode 100644
index 00000000..211ea2fe
--- /dev/null
+++ b/towncrier/newsfragments/3721.bugfix
@@ -0,0 +1 @@
+autoconfig shouldn't set useGlobalPreferredServer

From 8fb1e471d9bdaee1afabeb180a6d88072ce22605 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Thu, 9 Jan 2025 19:14:41 +0100
Subject: [PATCH 2/3] Fix CI

(cherry picked from commit 5f6eba6a032b9fb151b79db0d2578a4a36b1f4cd)
---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 8d06bd70..abdb8674 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,4 +1,4 @@
 docker==7.0.0
 colorama==0.4.6
-managesieve==0.7.1
+managesieve==0.8
 requests==2.31.0

From 2ebd507b37b27e2fd45abc16bc306c26bd78ead9 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Thu, 9 Jan 2025 19:38:54 +0100
Subject: [PATCH 3/3] doh

(cherry picked from commit ee5020733d486dc85f6dcb56d1872e0f1a84e727)
---
 tests/compose/core/05_connectivity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/compose/core/05_connectivity.py b/tests/compose/core/05_connectivity.py
index 44bb4553..0a180cda 100755
--- a/tests/compose/core/05_connectivity.py
+++ b/tests/compose/core/05_connectivity.py
@@ -119,7 +119,7 @@ def test_managesieve(server, username, password):
     except managesieve.MANAGESIEVE.abort:
         pass
 
-    m=managesieve.MANAGESIEVE(server, use_tls=True)
+    m=managesieve.MANAGESIEVE(server, use_tls=True, tls_verify=False)
     if m.login('', username, 'wrongpass') != 'NO':
         print(f'Authenticating to sieve://{username}:{password}@{server}:4190/ with wrong creds has worked!')
         sys.exit(108)