From 9519b6c0134d44a6978aad9e781c30dbdb48d18c Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Wed, 20 Oct 2021 23:15:39 +0300 Subject: [PATCH] claws-mail rebuild. --- ...to_last_place_in_auto_auth_selection.patch | 46 ++++++++++++++++ network/mail/claws-mail/pspec.xml | 12 ++++- programming/library/gumbo-parser/actions.py | 17 ++++++ programming/library/gumbo-parser/pspec.xml | 54 +++++++++++++++++++ 4 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 network/mail/claws-mail/files/move_OAuth2_to_last_place_in_auto_auth_selection.patch create mode 100644 programming/library/gumbo-parser/actions.py create mode 100644 programming/library/gumbo-parser/pspec.xml diff --git a/network/mail/claws-mail/files/move_OAuth2_to_last_place_in_auto_auth_selection.patch b/network/mail/claws-mail/files/move_OAuth2_to_last_place_in_auto_auth_selection.patch new file mode 100644 index 0000000000..8232f4b15e --- /dev/null +++ b/network/mail/claws-mail/files/move_OAuth2_to_last_place_in_auto_auth_selection.patch @@ -0,0 +1,46 @@ +From 9c2585c58b49815a0eab8d683f0a94f75cbbe64e Mon Sep 17 00:00:00 2001 +From: paul +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 + diff --git a/network/mail/claws-mail/pspec.xml b/network/mail/claws-mail/pspec.xml index 6407c23673..eab06aec94 100644 --- a/network/mail/claws-mail/pspec.xml +++ b/network/mail/claws-mail/pspec.xml @@ -38,12 +38,13 @@ libsocket-devel openldap-server libarchive-devel + gumbo-parser-devel NetworkManager-devel python3-pygobject3-devel startup-notification-devel - + move_OAuth2_to_last_place_in_auto_auth_selection.patch @@ -63,12 +64,14 @@ libSM pango gnutls + libgcc libICE nettle libical librsvg openssl python3 + freetype compface enchant2 harfbuzz @@ -78,7 +81,9 @@ libnotify cyrus-sasl gdk-pixbuf + fontconfig libarchive + gumbo-parser libgpg-error openldap-client startup-notification @@ -97,6 +102,9 @@ claws-mail-devel claws-mail + gtk3-devel + glib2-devel + enchant2-devel /usr/include @@ -106,7 +114,7 @@ - 2021-10-13 + 2021-10-20 4.0.0 First build. fury diff --git a/programming/library/gumbo-parser/actions.py b/programming/library/gumbo-parser/actions.py new file mode 100644 index 0000000000..571315b174 --- /dev/null +++ b/programming/library/gumbo-parser/actions.py @@ -0,0 +1,17 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file https://www.gnu.org/licenses/gpl-3.0.txt + +from pisi.actionsapi import shelltools, autotools, get + +def setup(): + shelltools.system("NOCONFIGURE=1 ./autogen.sh") + autotools.configure("--disable-static") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) diff --git a/programming/library/gumbo-parser/pspec.xml b/programming/library/gumbo-parser/pspec.xml new file mode 100644 index 0000000000..fe05e1a9c1 --- /dev/null +++ b/programming/library/gumbo-parser/pspec.xml @@ -0,0 +1,54 @@ + + + + + gumbo-parser + https://github.com/google/gumbo-parser + + pisilinux community + admins@pisilinux.org + + Apache-2 + library + programming.library + An HTML5 parsing library in pure C99. + Gumbo is an implementation of the HTML5 parsing algorithm implemented as a pure C99 library with no outside dependencies. + + https://github.com/google/gumbo-parser/archive/refs/tags/v0.10.1.tar.gz + + + + + + + + gumbo-parser + + + + + /usr/lib + + + + + gumbo-parser-devel + + gumbo-parser + + + /usr/include + /usr/lib/pkgconfig + + + + + + 2021-10-20 + 0.10.1 + First build. + pisilinux community + admins@pisilinux.org + + +