[arch-commits] Commit in claws-mail/trunk (3 files)

[Andreas Radke]

    Date: Sunday, April 3, 2022 @ 17:48:02
  Author: andyrtr
Revision: 441406

upgpkg: claws-mail 4.1.0-1: upstream update 4.1.0

Modified:
  claws-mail/trunk/PKGBUILD
Deleted:
  claws-mail/trunk/0001_move_OAuth2_to_last_place_in_auto_auth_selection.diff
  claws-mail/trunk/0002_Fancy_crashes_when_opening_an_email.diff

------------------------------------------------------------+
 0001_move_OAuth2_to_last_place_in_auto_auth_selection.diff |   43 -----------
 0002_Fancy_crashes_when_opening_an_email.diff              |   23 -----
 PKGBUILD                                                   |   20 +----
 3 files changed, 7 insertions(+), 79 deletions(-)

Deleted: 0001_move_OAuth2_to_last_place_in_auto_auth_selection.diff
===================================================================
--- 0001_move_OAuth2_to_last_place_in_auto_auth_selection.diff	2022-04-03 17:03:27 UTC (rev 441405)
+++ 0001_move_OAuth2_to_last_place_in_auto_auth_selection.diff	2022-04-03 17:48:02 UTC (rev 441406)
@@ -1,43 +0,0 @@
-From: paul <paul at claws-mail.org>
-Date: Mon, 12 Jul 2021 09:08:33 +0000 (+0100)
-Subject: move OAuth2 to last place in auto auth selection
-X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=9c2585c58b49815a0eab8d683f0a94f75cbbe64e;hp=fae6b35be779b37270e76ef319128e3bb5251e51
-
-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
----
-
-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: "

Deleted: 0002_Fancy_crashes_when_opening_an_email.diff
===================================================================
--- 0002_Fancy_crashes_when_opening_an_email.diff	2022-04-03 17:03:27 UTC (rev 441405)
+++ 0002_Fancy_crashes_when_opening_an_email.diff	2022-04-03 17:48:02 UTC (rev 441406)
@@ -1,23 +0,0 @@
-From: paul <paul at claws-mail.org>
-Date: Mon, 12 Jul 2021 09:20:21 +0000 (+0100)
-Subject: fix bug 4496 'Fancy crashes when opening an email'
-X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f459d1c27426a10af90f8ef73aef78ec846ebffb;hp=9c2585c58b49815a0eab8d683f0a94f75cbbe64e
-
-fix bug 4496 'Fancy crashes when opening an email'
-
-Patch by Jonathan Boeing
----
-
-diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
-index 6ff5f1244..d57d33aa7 100644
---- a/src/plugins/fancy/fancy_viewer.c
-+++ b/src/plugins/fancy/fancy_viewer.c
-@@ -96,7 +96,7 @@ static void fancy_apply_prefs(FancyViewer *viewer)
- #endif
- 		NULL);
- 	if (fancy_prefs.stylesheet == NULL || strlen(fancy_prefs.stylesheet) == 0) {
--		gchar **msg_font_params = g_strsplit(prefs_common.textfont, " ", 0);
-+		gchar **msg_font_params = g_strsplit(prefs_common_get_prefs()->textfont, " ", 0);
- 		guint params_len = g_strv_length(msg_font_params);
- 
- 		if (params_len > 0) {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-03 17:03:27 UTC (rev 441405)
+++ PKGBUILD	2022-04-03 17:48:02 UTC (rev 441406)
@@ -1,8 +1,8 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=claws-mail
-pkgver=4.0.0
-pkgrel=3
+pkgver=4.1.0
+pkgrel=1
 pkgdesc="A GTK+ based e-mail client"
 arch=('x86_64')
 license=('GPL3')
@@ -36,23 +36,17 @@
 provides=('claws')
 install=$pkgname.install
 source=(https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz{,.asc}
-        0001_move_OAuth2_to_last_place_in_auto_auth_selection.diff
-        0002_Fancy_crashes_when_opening_an_email.diff
         bash_completion)
-sha256sums=('4af2bd26a5d91eacb2a9c09f67a6a46c2222b40817c1f525dc050bdc7b0ee475'
+sha256sums=('0e1a9ca0db8d2a9e058ae30cdc7fc919779214ec3c56ee0c8a7f88cc23817a8e'
             'SKIP'
-            'ffd5dfe8929a86667218512095a794263a2ae56fae4add83d3ad987f94e7f786'
-            'f56256a9535958063b966ab52abdf787422ff71ed2a5c41b3d9fea8716defe85'
             '3f6c248b8658cd7a62186bff572cce2525712a498f363cbbda1ed459021c28cb')
 validpgpkeys=('8B3B297A03468356692F8D592CD716D654D6BBD4') # Paul <paul at claws-mail.org>
 
 
-prepare() {
-  cd "${pkgname}"-${pkgver}
-  # upstream fixes
-  patch -Np1 -i ../0001_move_OAuth2_to_last_place_in_auto_auth_selection.diff
-  patch -Np1 -i ../0002_Fancy_crashes_when_opening_an_email.diff
-}
+#prepare() {
+#  cd "${pkgname}"-${pkgver}
+#  # upstream fixes
+#}
 
 build() {
   cd "${pkgname}"-${pkgver}