claws-mail-4.1.0

network/mail/claws-mail/files/move_OAuth2_to_last_place_in_auto_auth_selection.patch

@@ -1,46 +0,0 @@
-From 9c2585c58b49815a0eab8d683f0a94f75cbbe64e Mon Sep 17 00:00:00 2001
-From: paul <paul@claws-mail.org>
-Date: Mon, 12 Jul 2021 10:08:33 +0100
-Subject: [PATCH] move OAuth2 to last place in auto auth selection
-
-IMAP: when using 'automatic' auth type, if the server offers LOGIN, GSSAPI or plaintext in addition to OAUTH2, yet OAUTH2 is unconfigured, authentication will fail. This broke previously working config
----
- src/imap.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/imap.c b/src/imap.c
-index c486c471a..b72ceea76 100644
---- a/src/imap.c
-+++ b/src/imap.c
-@@ -951,14 +951,14 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
- 			ok = imap_cmd_login(session, user, pass, "SCRAM-SHA-1");
- 		if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "PLAIN"))
- 			ok = imap_cmd_login(session, user, pass, "PLAIN");
--		if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "XOAUTH2"))
--			ok = imap_cmd_login(session, user, pass, "XOAUTH2");
- 		if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "LOGIN"))
- 			ok = imap_cmd_login(session, user, pass, "LOGIN");
- 		if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "GSSAPI"))
- 			ok = imap_cmd_login(session, user, pass, "GSSAPI");
- 		if (ok == MAILIMAP_ERROR_LOGIN) /* we always try plaintext login before giving up */
- 			ok = imap_cmd_login(session, user, pass, "plaintext");
-+		if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "XOAUTH2"))
-+			ok = imap_cmd_login(session, user, pass, "XOAUTH2");
- 	}
- 
- 	if (ok == MAILIMAP_NO_ERROR)
-@@ -994,6 +994,11 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
- 				     "LOGIN SASL plugin is installed.");
- 		}
- 
-+		if (type == IMAP_AUTH_OAUTH2) {
-+			ext_info = _("\n\nOAuth2 error. Check and correct your OAuth2 "
-+				     "account preferences.");
-+		} 
-+
- 		if (time(NULL) - last_login_err > 10) {
- 			if (!prefs_common.no_recv_err_panel) {
- 				alertpanel_error_log(_("Connection to %s failed: "
--- 
-2.25.1
-

network/mail/claws-mail/pspec.xml

@@ -15,8 +15,8 @@
 		<Description>
 			Claws Mail is a lightweight and highly configurable email client and news reader based on the GTK+ GUI toolkit.
 		</Description>
-		<Archive sha1sum="b4befc25649a28e89274ba72b50e9f9f66bf09b6" type="tarxz">
+		<Archive sha1sum="6adfe0953b749734e37a86f2b04a5d52b8b5082f" type="tarxz">
-			https://claws-mail.org/releases/claws-mail-4.0.0.tar.xz
+			https://claws-mail.org/releases/claws-mail-4.1.0.tar.xz
 		</Archive>
 		<BuildDependencies>
 			<Dependency>flex</Dependency>
@@ -44,7 +44,7 @@
 			<Dependency>startup-notification-devel</Dependency>
 		</BuildDependencies>
 		<Patches>
-			<Patch level="1">move_OAuth2_to_last_place_in_auto_auth_selection.patch</Patch>
+			<!-- <Patch level="1">missing.patch</Patch> -->
 		</Patches>
 	</Source>
 
@@ -113,6 +113,13 @@
 	</Package>
 
 	<History>
+		<Update release="2">
+			<Date>2022-04-14</Date>
+			<Version>4.1.0</Version>
+			<Comment>Version bump.</Comment>
+			<Name>fury</Name>
+			<Email>uglyside@yandex.ru</Email>
+		</Update>
 		<Update release="1">
 			<Date>2021-10-20</Date>
 			<Version>4.0.0</Version>