commit: e044e81c7698453a7df7359f21fbf42b0998eefb Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Sun Jan 28 09:54:41 2024 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Sun Jan 28 10:00:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e044e81c
mail-client/claws-mail: drop 4.1.0-r2, 4.1.1-r3 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> mail-client/claws-mail/Manifest | 1 - mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild | 217 ------- mail-client/claws-mail/claws-mail-4.1.1-r3.ebuild | 216 ------- .../files/claws-mail-4.1.0-disable_gnutls.patch | 641 --------------------- 4 files changed, 1075 deletions(-) diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest index 10afbbca8ea9..1d802f06ad7f 100644 --- a/mail-client/claws-mail/Manifest +++ b/mail-client/claws-mail/Manifest @@ -1,5 +1,4 @@ DIST claws-mail-3.19.0.tar.xz 6543188 BLAKE2B eeb7df2b921dbd7ad40c845804fcabe5ddc2064fcf410e7809004be472bbe2ba8bfd89a868420a1bb76845180856fee8a0b3cde879ae67b1a1aab14442fe5d2d SHA512 88780df55873919197d3c6df5102a8eb89a586e8287419c179e1d0af839435a719814b1e3643aa783a7badeadceafda2dc3cb4a3265432b5ad3a210663922b20 DIST claws-mail-3.20.0.tar.xz 6687376 BLAKE2B 9a72e77ea922271fdb947e4f76229c89cb0fb2589921fca6fd161714a3093a137165b84b84db5cece5cb6b06998e237d524104ddddd87078dcba36a94f02e0eb SHA512 66d0087493452cf43357fbfb2338b3716ec45d202f51cce033aa3a8888ec4dac2d6eb9e652efb22bcfcab1e6c00ff650a9926114fb4647f753e44013e607d923 -DIST claws-mail-4.1.0.tar.xz 6471604 BLAKE2B 30d1725c2679e8a0b44edd6c30b15f28633c0a017935980d1412dabffdfb1f33e1c36bee3506e90af54410db222b64422155be821ba18f5e315ed411d477ed63 SHA512 83c7b1a8065628b1dcac58feb4d852b759b3fc376531572e88450b8e9517172a641f710a219b7e16bbc672dbe69853783e4edd1d7647a3f2aacb92e47be9175b DIST claws-mail-4.1.1.tar.xz 6523688 BLAKE2B 7e1b1ae201a67e14821f415d2b51f6eebfc2896699d89f2088fa9f7f21de984f6d8e4e92791c233ec755a15184ff5e562ce96ad9d197acc4e1f8dadb3fd57c30 SHA512 4157772fd0e918bae1df11230ce52691ff86181a0c164c0c5116d1ebb91885910e2e24ff18ae5e5ad4ed1c83ef830773de0b4ab40da988607909e0c17efb26b4 DIST claws-mail-4.2.0.tar.xz 6674872 BLAKE2B b3118b45f1d3e8ae31a9c7bfa529fd5c8fda3ff8823e88a5ef078432d38d4150b05791deafff2577378ea17b03d965374755d2536ff6835ed46bcd566fefddaf SHA512 2415f246fc88b76263e1c43860c0638e08c581493333a3d846831f26cda21f0f14035a759379031d52e56aef2516bacec147a2cd5a153fc8fecf02ede64077f1 diff --git a/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild b/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild deleted file mode 100644 index 0e559de511fe..000000000000 --- a/mail-client/claws-mail/claws-mail-4.1.0-r2.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) - -inherit autotools desktop python-any-r1 xdg - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="https://www.claws-mail.org/"; - -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git"; -else - SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" -fi - -SLOT="0" -LICENSE="GPL-3" - -IUSE="+appindicator archive bogofilter calendar clamav dbus debug doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface" -REQUIRED_USE=" - appindicator? ( notification ) - libcanberra? ( notification ) - libnotify? ( notification ) - networkmanager? ( dbus ) - smime? ( pgp ) -" - -COMMONDEPEND=" - dev-libs/nettle:= - net-mail/ytnef - sys-libs/zlib:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2[jpeg] - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - archive? ( - app-arch/libarchive - >=net-misc/curl-7.9.7 - ) - bogofilter? ( mail-filter/bogofilter ) - calendar? ( - >=dev-libs/libical-2.0.0:= - >=net-misc/curl-7.9.7 - ) - dbus? ( - >=dev-libs/dbus-glib-0.60 - sys-apps/dbus - ) - gdata? ( >=dev-libs/libgdata-0.17.2 ) - gnutls? ( >=net-libs/gnutls-3.0 ) - imap? ( >=net-libs/libetpan-0.57 ) - ldap? ( >=net-nds/openldap-2.0.7:= ) - litehtml? ( - >=dev-libs/glib-2.36:2 - >=dev-libs/gumbo-0.10:= - net-misc/curl - media-libs/fontconfig - ) - nls? ( >=sys-devel/gettext-0.18 ) - nntp? ( >=net-libs/libetpan-0.57 ) - notification? ( - dev-libs/glib:2 - appindicator? ( dev-libs/libindicate:3[gtk] ) - libcanberra? ( media-libs/libcanberra[gtk3] ) - libnotify? ( x11-libs/libnotify ) - ) - pdf? ( app-text/poppler[cairo] ) - pgp? ( >=app-crypt/gpgme-1.0.0:= ) - session? ( - x11-libs/libICE - x11-libs/libSM - ) - smime? ( >=app-crypt/gpgme-1.0.0:= ) - spam-report? ( >=net-misc/curl-7.9.7 ) - spell? ( >=app-text/enchant-2.0.0:2= ) - startup-notification? ( x11-libs/startup-notification ) - svg? ( >=gnome-base/librsvg-2.40.5 ) - valgrind? ( dev-debug/valgrind ) - webkit? ( net-libs/webkit-gtk:4 ) -" - -DEPEND="${COMMONDEPEND} - xface? ( >=media-libs/compface-1.4 ) -" -BDEPEND=" - ${PYTHON_DEPS} - app-arch/xz-utils - virtual/pkgconfig -" -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - x11-misc/shared-mime-info - clamav? ( app-antivirus/clamav ) - networkmanager? ( net-misc/networkmanager ) - pdf? ( app-text/ghostscript-gpl ) - perl? ( dev-lang/perl:= ) - rss? ( - dev-libs/libxml2 - net-misc/curl - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" - "${FILESDIR}/${PN}-4.1.0-perl-5.36.patch" - "${FILESDIR}/${PN}-4.1.0-disable_gnutls.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Don't use libsoup-gnome (bug #565924) - export HAVE_LIBSOUP_GNOME=no - - local myeconfargs=( - --disable-bsfilter-plugin - --disable-dillo-plugin - --disable-generic-umpc - --disable-jpilot #735118 - --enable-acpi_notifier-plugin - --enable-address_keeper-plugin - --enable-alternate-addressbook - --enable-att_remover-plugin - --enable-attachwarner-plugin - --enable-fetchinfo-plugin - --enable-mailmbox-plugin - --enable-newmail-plugin - --enable-tnef_parse-plugin - --with-password-encryption=$(usex gnutls gnutls old) - $(use_enable archive archive-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable calendar vcalendar-plugin) - $(use_enable clamav clamd-plugin) - $(use_enable dbus) - $(use_enable debug crash-dialog) - $(use_enable doc manual) - $(use_enable gdata gdata-plugin) - $(use_enable gnutls) - $(use_enable ipv6) - $(use_enable ldap) - $(use_enable litehtml litehtml_viewer-plugin) - $(use_enable networkmanager) - $(use_enable nls) - $(use_enable notification notification-plugin) - $(use_enable pdf pdf_viewer-plugin) - $(use_enable perl perl-plugin) - $(use_enable pgp pgpcore-plugin) - $(use_enable pgp pgpinline-plugin) - $(use_enable pgp pgpmime-plugin) - --disable-python-plugin - $(use_enable rss rssyl-plugin) - $(use_enable session libsm) - $(use_enable sieve managesieve-plugin) - $(use_enable smime smime-plugin) - $(use_enable spam-report spam_report-plugin) - $(use_enable spamassassin spamassassin-plugin) - $(use_enable spell enchant) - $(use_enable startup-notification) - $(use_enable svg) - $(use_enable valgrind valgrind) - $(use_enable webkit fancy-plugin) - $(use_enable xface compface) - ) - - # libetpan is needed if user wants nntp or imap functionality - if use imap || use nntp ; then - myeconfargs+=( --enable-libetpan ) - else - myeconfargs+=( --disable-libetpan ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) - default - - # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins ${PN}.png - local size - for size in 64 128 ; do - newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png - done - - docinto tools - dodoc tools/README* - - domenu ${PN}.desktop - - einfo "Installing extra tools" - cd "${S}"/tools || die - exeinto /usr/$(get_libdir)/${PN}/tools - doexe *.pl *.py *.conf *.sh - doexe tb2claws-mail update-po uudec uuooffice - - # kill useless files - find "${ED}"/usr/$(get_libdir)/${PN}/plugins/ \ - \( -name "*.a" -o -name "*.la" \) -delete || die -} - -pkg_postinst() { - ewarn "When upgrading from version 3.x please re-load any plugin you use" - xdg_pkg_postinst -} diff --git a/mail-client/claws-mail/claws-mail-4.1.1-r3.ebuild b/mail-client/claws-mail/claws-mail-4.1.1-r3.ebuild deleted file mode 100644 index 9b8a1f96ad41..000000000000 --- a/mail-client/claws-mail/claws-mail-4.1.1-r3.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit autotools desktop python-any-r1 xdg - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="https://www.claws-mail.org/"; - -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git"; -else - SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -SLOT="0" -LICENSE="GPL-3" - -IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface" -REQUIRED_USE=" - libcanberra? ( notification ) - libnotify? ( notification ) - networkmanager? ( dbus ) - oauth? ( gnutls ) - smime? ( pgp ) -" - -COMMONDEPEND=" - >=dev-libs/glib-2.36:2 - dev-libs/nettle:= - net-mail/ytnef - sys-libs/zlib:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2[jpeg] - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - archive? ( - app-arch/libarchive - >=net-misc/curl-7.9.7 - ) - bogofilter? ( mail-filter/bogofilter ) - calendar? ( - dev-lang/perl:= - >=dev-libs/libical-2.0.0:= - >=net-misc/curl-7.9.7 - ) - dbus? ( - >=dev-libs/dbus-glib-0.60 - sys-apps/dbus - ) - gdata? ( >=dev-libs/libgdata-0.17.2 ) - gnutls? ( >=net-libs/gnutls-3.0 ) - imap? ( >=net-libs/libetpan-0.57 ) - ldap? ( >=net-nds/openldap-2.0.7:= ) - litehtml? ( - >=dev-libs/gumbo-0.10:= - net-misc/curl - media-libs/fontconfig - ) - nls? ( >=sys-devel/gettext-0.18 ) - nntp? ( >=net-libs/libetpan-0.57 ) - notification? ( - libcanberra? ( media-libs/libcanberra[gtk3] ) - libnotify? ( x11-libs/libnotify ) - ) - perl? ( dev-lang/perl:= ) - pdf? ( app-text/poppler[cairo] ) - pgp? ( >=app-crypt/gpgme-1.0.0:= ) - rss? ( - dev-libs/libxml2 - net-misc/curl - ) - session? ( - x11-libs/libICE - x11-libs/libSM - ) - smime? ( >=app-crypt/gpgme-1.0.0:= ) - spam-report? ( >=net-misc/curl-7.9.7 ) - spell? ( >=app-text/enchant-2.0.0:2= ) - startup-notification? ( x11-libs/startup-notification ) - svg? ( >=gnome-base/librsvg-2.40.5 ) - valgrind? ( dev-debug/valgrind ) - webkit? ( net-libs/webkit-gtk:4 ) -" - -DEPEND="${COMMONDEPEND} - xface? ( >=media-libs/compface-1.4 ) -" -BDEPEND=" - ${PYTHON_DEPS} - app-arch/xz-utils - virtual/pkgconfig -" -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - x11-misc/shared-mime-info - clamav? ( app-antivirus/clamav ) - networkmanager? ( net-misc/networkmanager ) - pdf? ( app-text/ghostscript-gpl ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" - "${FILESDIR}/${PN}-4.1.1-fix_lto.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Don't use libsoup-gnome (bug #565924) - export HAVE_LIBSOUP_GNOME=no - - local myeconfargs=( - --disable-bsfilter-plugin - --disable-dillo-plugin - --disable-generic-umpc - --disable-jpilot #735118 - --disable-python-plugin - --enable-acpi_notifier-plugin - --enable-address_keeper-plugin - --enable-alternate-addressbook - --enable-att_remover-plugin - --enable-attachwarner-plugin - --enable-fetchinfo-plugin - --enable-ipv6 - --enable-mailmbox-plugin - --enable-newmail-plugin - --enable-tnef_parse-plugin - --with-password-encryption=$(usex gnutls gnutls old) - $(use_enable archive archive-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable calendar vcalendar-plugin) - $(use_enable clamav clamd-plugin) - $(use_enable dbus) - $(use_enable debug crash-dialog) - $(use_enable doc manual) - $(use_enable gdata gdata-plugin) - $(use_enable gnutls) - $(use_enable ldap) - $(use_enable litehtml litehtml_viewer-plugin) - $(use_enable networkmanager) - $(use_enable nls) - $(use_enable notification notification-plugin) - $(use_enable oauth oauth2) - $(use_enable pdf pdf_viewer-plugin) - $(use_enable perl perl-plugin) - $(use_enable pgp pgpcore-plugin) - $(use_enable pgp pgpinline-plugin) - $(use_enable pgp pgpmime-plugin) - $(use_enable rss rssyl-plugin) - $(use_enable session libsm) - $(use_enable sieve managesieve-plugin) - $(use_enable smime smime-plugin) - $(use_enable spam-report spam_report-plugin) - $(use_enable spamassassin spamassassin-plugin) - $(use_enable spell enchant) - $(use_enable startup-notification) - $(use_enable svg) - $(use_enable valgrind valgrind) - $(use_enable webkit fancy-plugin) - $(use_enable xface compface) - ) - - # libetpan is needed if user wants nntp or imap functionality - if use imap || use nntp ; then - myeconfargs+=( --enable-libetpan ) - else - myeconfargs+=( --disable-libetpan ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) - default - - # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins ${PN}.png - local size - for size in 64 128 ; do - newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png - done - - docinto tools - dodoc tools/README* - - domenu ${PN}.desktop - - einfo "Installing extra tools" - cd "${S}"/tools || die - exeinto /usr/$(get_libdir)/${PN}/tools - doexe *.pl *.py *.conf *.sh - doexe tb2claws-mail update-po uudec uuooffice - - # kill useless files - find "${ED}"/usr/$(get_libdir)/${PN}/plugins/ \ - \( -name "*.a" -o -name "*.la" \) -delete || die -} - -pkg_postinst() { - ewarn "When upgrading from version 3.x please re-load any plugin you use" - xdg_pkg_postinst -} diff --git a/mail-client/claws-mail/files/claws-mail-4.1.0-disable_gnutls.patch b/mail-client/claws-mail/files/claws-mail-4.1.0-disable_gnutls.patch deleted file mode 100644 index 5bfea4727e51..000000000000 --- a/mail-client/claws-mail/files/claws-mail-4.1.0-disable_gnutls.patch +++ /dev/null @@ -1,641 +0,0 @@ -diff -Naur claws-mail-4.1.0.orig/src/common/smtp.c claws-mail-4.1.0/src/common/smtp.c ---- claws-mail-4.1.0.orig/src/common/smtp.c 2022-03-19 13:03:24.000000000 +0100 -+++ claws-mail-4.1.0/src/common/smtp.c 2022-07-23 22:10:48.323673856 +0200 -@@ -1,6 +1,6 @@ - /* - * Claws Mail -- a GTK based, lightweight, and fast e-mail client -- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team -+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -42,11 +42,11 @@ - static gint smtp_auth(SMTPSession *session); - #ifdef USE_GNUTLS - static gint smtp_starttls(SMTPSession *session); -+static gint smtp_auth_oauth2(SMTPSession *session); - #endif - static gint smtp_auth_cram_md5(SMTPSession *session); - static gint smtp_auth_login(SMTPSession *session); - static gint smtp_auth_plain(SMTPSession *session); --static gint smtp_auth_oauth2(SMTPSession *session); - - static gint smtp_ehlo(SMTPSession *session); - static gint smtp_ehlo_recv(SMTPSession *session, const gchar *msg); -@@ -176,11 +176,13 @@ - && - (session->avail_auth_type & SMTPAUTH_PLAIN) != 0) - smtp_auth_plain(session); -+#ifdef USE_GNUTLS - else if ((session->forced_auth_type == SMTPAUTH_OAUTH2 - || session->forced_auth_type == 0) - && - (session->avail_auth_type & SMTPAUTH_OAUTH2) != 0) - smtp_auth_oauth2(session); -+#endif - else if (session->forced_auth_type == 0) { - log_warning(LOG_PROTOCOL, _("No SMTP AUTH method available\n")); - return SM_AUTHFAIL; -@@ -323,8 +325,10 @@ - session->avail_auth_type |= SMTPAUTH_CRAM_MD5; - if (strcasestr(p, "DIGEST-MD5")) - session->avail_auth_type |= SMTPAUTH_DIGEST_MD5; -+#ifdef USE_GNUTLS - if (strcasestr(p, "XOAUTH2")) - session->avail_auth_type |= SMTPAUTH_OAUTH2; -+#endif - } - if (g_ascii_strncasecmp(p, "SIZE", 4) == 0) { - p += 5; -@@ -399,7 +403,7 @@ - return SM_OK; - } - -- -+#ifdef USE_GNUTLS - static gint smtp_auth_oauth2(SMTPSession *session) - { - gchar buf[MESSAGEBUFSIZE], *b64buf, *out; -@@ -428,6 +432,7 @@ - - return SM_OK; - } -+#endif - - static gint smtp_auth_login(SMTPSession *session) - { -@@ -547,7 +552,9 @@ - case SMTP_AUTH_PLAIN: - case SMTP_AUTH_LOGIN_USER: - case SMTP_AUTH_LOGIN_PASS: -+#ifdef USE_GNUTLS - case SMTP_AUTH_OAUTH2: -+#endif - case SMTP_AUTH_CRAM_MD5: - log_print(LOG_PROTOCOL, "ESMTP< %s\n", msg); - break; -@@ -670,7 +677,9 @@ - break; - case SMTP_AUTH_PLAIN: - case SMTP_AUTH_LOGIN_PASS: -+#ifdef USE_GNUTLS - case SMTP_AUTH_OAUTH2: -+#endif - case SMTP_AUTH_CRAM_MD5: - ret = smtp_from(smtp_session); - break; -diff -Naur claws-mail-4.1.0.orig/src/etpan/imap-thread.c claws-mail-4.1.0/src/etpan/imap-thread.c ---- claws-mail-4.1.0.orig/src/etpan/imap-thread.c 2022-03-19 13:03:24.000000000 +0100 -+++ claws-mail-4.1.0/src/etpan/imap-thread.c 2022-07-23 22:10:48.324673857 +0200 -@@ -1,6 +1,6 @@ - /* - * Claws Mail -- a GTK based, lightweight, and fast e-mail client -- * Copyright (C) 2005-2016 DINH Viet Hoa and the Claws Mail team -+ * Copyright (C) 2005-2022 the Claws Mail team and DINH Viet Hoa - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -999,9 +999,11 @@ - param->type, NULL, NULL, NULL, - NULL, param->login, - param->password, NULL); -- else if (!strcmp(param->type, "XOAUTH2")) { -+#ifdef USE_GNUTLS -+ else if (!strcmp(param->type, "XOAUTH2")) - r = mailimap_oauth2_authenticate(param->imap, param->login, param->password); -- } else -+#endif -+ else - r = mailimap_authenticate(param->imap, - param->type, NULL, NULL, NULL, - param->login, param->login, -diff -Naur claws-mail-4.1.0.orig/src/imap.c claws-mail-4.1.0/src/imap.c ---- claws-mail-4.1.0.orig/src/imap.c 2022-03-19 13:03:24.000000000 +0100 -+++ claws-mail-4.1.0/src/imap.c 2022-07-23 22:10:48.325673859 +0200 -@@ -72,7 +72,9 @@ - #include "main.h" - #include "passwordstore.h" - #include "file-utils.h" -+#ifdef USE_GNUTLS - #include "oauth2.h" -+#endif - - typedef struct _IMAPFolder IMAPFolder; - typedef struct _IMAPSession IMAPSession; -@@ -913,9 +915,11 @@ - case IMAP_AUTH_PLAIN: - ok = imap_cmd_login(session, user, pass, "PLAIN"); - break; -+#ifdef USE_GNUTLS - case IMAP_AUTH_OAUTH2: - ok = imap_cmd_login(session, user, pass, "XOAUTH2"); - break; -+#endif - case IMAP_AUTH_LOGIN: - ok = imap_cmd_login(session, user, pass, "LOGIN"); - break; -@@ -932,7 +936,9 @@ - "\t DIGEST-MD5 %d\n" - "\t SCRAM-SHA-1 %d\n" - "\t PLAIN %d\n" -+#ifdef USE_GNUTLS - "\t OAUTH2 %d\n" -+#endif - "\t LOGIN %d\n" - "\t GSSAPI %d\n", - imap_has_capability(session, "ANONYMOUS"), -@@ -940,7 +946,9 @@ - imap_has_capability(session, "DIGEST-MD5"), - imap_has_capability(session, "SCRAM-SHA-1"), - imap_has_capability(session, "PLAIN"), -+#ifdef USE_GNUTLS - imap_has_capability(session, "XOAUTH2"), -+#endif - imap_has_capability(session, "LOGIN"), - imap_has_capability(session, "GSSAPI")); - if (imap_has_capability(session, "CRAM-MD5")) -@@ -957,8 +965,10 @@ - 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"); -+#ifdef USE_GNUTLS - if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "XOAUTH2")) - ok = imap_cmd_login(session, user, pass, "XOAUTH2"); -+#endif - } - - if (ok == MAILIMAP_NO_ERROR) -@@ -993,12 +1003,12 @@ - "compiled with SASL support and the " - "LOGIN SASL plugin is installed."); - } -- -+#ifdef USE_GNUTLS - if (type == IMAP_AUTH_OAUTH2) { - ext_info = _("\n\nOAuth2 error. Check and correct your OAuth2 " - "account preferences."); - } -- -+#endif - if (time(NULL) - last_login_err > 10) { - if (!prefs_common.no_recv_err_panel) { - alertpanel_error_log(_("Connection to %s failed: " -@@ -1320,10 +1330,10 @@ - gboolean failed = FALSE; - gint ok = MAILIMAP_NO_ERROR; - g_return_val_if_fail(account->userid != NULL, MAILIMAP_ERROR_BAD_STATE); -- -+#ifdef USE_GNUTLS - if(account->imap_auth_type == IMAP_AUTH_OAUTH2) - oauth2_check_passwds (account); -- -+#endif - if (!password_get(account->userid, account->recv_server, "imap", - SESSION(session)->port, &acc_pass)) { - acc_pass = passwd_store_get_account(account->account_id, -diff -Naur claws-mail-4.1.0.orig/src/inc.c claws-mail-4.1.0/src/inc.c ---- claws-mail-4.1.0.orig/src/inc.c 2022-03-19 13:03:24.000000000 +0100 -+++ claws-mail-4.1.0/src/inc.c 2022-07-23 22:10:48.325673859 +0200 -@@ -61,7 +61,9 @@ - #include "hooks.h" - #include "logwindow.h" - #include "passwordstore.h" -+#ifdef USE_GNUTLS - #include "oauth2.h" -+#endif - - extern SessionStats session_stats; - -@@ -633,11 +635,12 @@ - manage_window_focus_in - (inc_dialog->dialog->window, - NULL, NULL); -- -+#ifdef USE_GNUTLS - if(pop3_session->ac_prefs->use_pop_auth && - pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2) - oauth2_check_passwds (pop3_session->ac_prefs); -- -+#endif -+ - if (password_get(pop3_session->user, - pop3_session->ac_prefs->recv_server, - "pop3", pop3_get_port(pop3_session), -diff -Naur claws-mail-4.1.0.orig/src/oauth2.c claws-mail-4.1.0/src/oauth2.c ---- claws-mail-4.1.0.orig/src/oauth2.c 2022-03-19 13:03:24.000000000 +0100 -+++ claws-mail-4.1.0/src/oauth2.c 2022-07-23 22:10:48.325673859 +0200 -@@ -22,6 +22,8 @@ - #include "claws-features.h" - #endif - -+#ifdef USE_GNUTLS -+ - #include <glib.h> - #ifdef ENABLE_NLS - #include <glib/gi18n.h> -@@ -715,3 +717,5 @@ - - return (0); - } -+ -+#endif /* USE_GNUTLS */ -diff -Naur claws-mail-4.1.0.orig/src/oauth2.h claws-mail-4.1.0/src/oauth2.h ---- claws-mail-4.1.0.orig/src/oauth2.h 2022-03-19 13:03:24.000000000 +0100 -+++ claws-mail-4.1.0/src/oauth2.h 2022-07-23 22:10:48.325673859 +0200 -@@ -1,6 +1,6 @@ - /* - * Claws Mail -- a GTK based, lightweight, and fast e-mail client -- * Copyright (C) 2020 the Claws Mail team -+ * Copyright (C) 2020-2022 the Claws Mail team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -21,6 +21,8 @@ - #include "claws-features.h" - #endif - -+#ifdef USE_GNUTLS -+ - #include <glib.h> - - #include "socket.h" -@@ -79,3 +81,5 @@ - gint oauth2_use_refresh_token (Oauth2Service provider, OAUTH2Data *OAUTH2Data); - guchar* oauth2_decode(const gchar *in); - void oauth2_encode(const gchar *in); -+ -+#endif /* USE_GNUTLS */ -diff -Naur claws-mail-4.1.0.orig/src/pop.c claws-mail-4.1.0/src/pop.c ---- claws-mail-4.1.0.orig/src/pop.c 2022-03-19 13:03:24.000000000 +0100 -+++ claws-mail-4.1.0/src/pop.c 2022-07-23 22:10:48.325673859 +0200 -@@ -1,6 +1,6 @@ - /* - * Claws Mail -- a GTK based, lightweight, and fast e-mail client -- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team -+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -178,6 +178,7 @@ - return PS_SUCCESS; - } - -+#ifdef USE_GNUTLS - static gint pop3_getauth_oauth2_send(Pop3Session *session) - { - gchar buf[MESSAGEBUFSIZE], *b64buf, *out; -@@ -202,6 +203,7 @@ - g_free(out); - return PS_SUCCESS; - } -+#endif - - static gint pop3_getrange_stat_send(Pop3Session *session) - { -@@ -533,8 +535,10 @@ - - if (!g_ascii_strncasecmp(buf, "PASS ", 5)) - log_print(LOG_PROTOCOL, "POP> PASS ********\n"); -+#ifdef USE_GNUTLS - else if (!g_ascii_strncasecmp(buf, "AUTH XOAUTH2 ", 13)) - log_print(LOG_PROTOCOL, "POP> AUTH XOAUTH2 ********\n"); -+#endif - else - log_print(LOG_PROTOCOL, "POP> %s\n", buf); - -@@ -989,12 +993,12 @@ - #ifdef USE_GNUTLS - if (pop3_session->ac_prefs->ssl_pop == SSL_STARTTLS) - val = pop3_stls_send(pop3_session); -+ else if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2) -+ val = pop3_getauth_oauth2_send(pop3_session); - else - #endif - if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_APOP) - val = pop3_getauth_apop_send(pop3_session); -- else if (pop3_session->ac_prefs->use_pop_auth && pop3_session->ac_prefs->pop_auth_type == POPAUTH_OAUTH2) -- val = pop3_getauth_oauth2_send(pop3_session); - else - val = pop3_getauth_user_send(pop3_session); - break; -@@ -1015,7 +1019,9 @@ - break; - case POP3_GETAUTH_PASS: - case POP3_GETAUTH_APOP: -+#ifdef USE_GNUTLS - case POP3_GETAUTH_OAUTH2: -+#endif - if (!pop3_session->pop_before_smtp) - val = pop3_getrange_stat_send(pop3_session); - else -diff -Naur claws-mail-4.1.0.orig/src/prefs_account.c claws-mail-4.1.0/src/prefs_account.c ---- claws-mail-4.1.0.orig/src/prefs_account.c 2022-03-19 13:03:24.000000000 +0100 -+++ claws-mail-4.1.0/src/prefs_account.c 2022-07-23 22:14:18.477957308 +0200 -@@ -1,6 +1,6 @@ - /* - * Claws Mail -- a GTK based, lightweight, and fast e-mail client -- * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto -+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -54,7 +54,9 @@ - #include "smtp.h" - #include "imap.h" - #include "pop.h" -+#ifdef USE_GNUTLS - #include "oauth2.h" -+#endif - #include "remotefolder.h" - #include "combobox.h" - #include "setup.h" -@@ -200,6 +202,7 @@ - GtkWidget *pop_auth_minutes_lbl; - } SendPage; - -+#ifdef USE_GNUTLS - typedef struct Oauth2Page - { - PrefsPage page; -@@ -218,6 +221,7 @@ - GtkWidget *oauth2_client_secret_entry; - - } Oauth2Page; -+#endif - - typedef struct - { -@@ -373,7 +377,9 @@ - static BasicPage basic_page; - static ReceivePage receive_page; - static SendPage send_page; -+#ifdef USE_GNUTLS - static Oauth2Page oauth2_page; -+#endif - static ComposePage compose_page; - static TemplatesPage templates_page; - static PrivacyPage privacy_page; -@@ -416,7 +422,8 @@ - static void prefs_account_pop_auth_type_set_data_from_optmenu - (PrefParam *pparam); - static void prefs_account_pop_auth_type_set_optmenu (PrefParam *pparam); -- -+ -+#ifdef USE_GNUTLS - static void prefs_account_oauth2_provider_set_data_from_optmenu - (PrefParam *pparam); - static void prefs_account_oauth2_provider_set_optmenu (PrefParam *pparam); -@@ -425,6 +432,7 @@ - static void prefs_account_oauth2_set_sensitivity(void); - static void prefs_account_oauth2_set_auth_sensitivity(void); - static void prefs_account_oauth2_obtain_tokens(GtkButton *button, gpointer data); -+#endif - static void prefs_account_set_autochk_interval_from_widgets(PrefParam *pparam); - static void prefs_account_set_autochk_interval_to_widgets(PrefParam *pparam); - -@@ -652,6 +660,7 @@ - }; - - static PrefParam oauth2_param[] = { -+#ifdef USE_GNUTLS - {"oauth2_auth_provider", "0", &tmp_ac_prefs.oauth2_provider, P_ENUM, - &oauth2_page.oauth2_auth_optmenu, - prefs_account_oauth2_provider_set_data_from_optmenu, -@@ -668,6 +677,23 @@ - - {"oauth2_client_secret", NULL, &tmp_ac_prefs.oauth2_client_secret, P_STRING, - &oauth2_page.oauth2_client_secret_entry, prefs_set_data_from_entry, prefs_set_entry}, -+#else -+ {"oauth2_auth_provider", "0", &tmp_ac_prefs.oauth2_provider, P_ENUM, -+ NULL, NULL, NULL}, -+ -+ {"oauth2_date", 0, &tmp_ac_prefs.oauth2_date, P_INT, -+ NULL, NULL, NULL}, -+ -+ {"oauth2_authcode", NULL, &tmp_ac_prefs.oauth2_authcode, P_PASSWORD, -+ NULL, NULL, NULL}, -+ -+ {"oauth2_client_id", NULL, &tmp_ac_prefs.oauth2_client_id, P_STRING, -+ NULL, NULL, NULL}, -+ -+ {"oauth2_client_secret", NULL, &tmp_ac_prefs.oauth2_client_secret, P_STRING, -+ NULL, NULL, NULL}, -+ -+#endif - - {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL} - }; -@@ -1624,8 +1650,9 @@ - COMBOBOX_ADD (menu2, _("Select"), 0); - COMBOBOX_ADD (menu2, NULL, 0); - COMBOBOX_ADD (menu2, "APOP", POPAUTH_APOP); -+#ifdef USE_GNUTLS - COMBOBOX_ADD (menu2, "OAuth2", POPAUTH_OAUTH2); -- -+#endif - SET_TOGGLE_SENSITIVITY (pop_auth_checkbtn, vbox5); - - PACK_CHECK_BUTTON (vbox2, rmmail_checkbtn, -@@ -1762,7 +1789,9 @@ - COMBOBOX_ADD (menu, "SCRAM-SHA-1", IMAP_AUTH_SCRAM_SHA1); - COMBOBOX_ADD (menu, "PLAIN", IMAP_AUTH_PLAIN); - COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN); -+#ifdef USE_GNUTLS - COMBOBOX_ADD (menu, "OAUTH2", IMAP_AUTH_OAUTH2); -+#endif - - hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 8); - gtk_widget_show (hbox1); -@@ -2019,7 +2048,9 @@ - COMBOBOX_ADD (menu, "PLAIN", SMTPAUTH_PLAIN); - COMBOBOX_ADD (menu, "LOGIN", SMTPAUTH_LOGIN); - COMBOBOX_ADD (menu, "CRAM-MD5", SMTPAUTH_CRAM_MD5); -+#ifdef USE_GNUTLS - COMBOBOX_ADD (menu, "OAUTH2", SMTPAUTH_OAUTH2); -+#endif - COMBOBOX_ADD (menu, "DIGEST-MD5", SMTPAUTH_DIGEST_MD5); - gtk_list_store_set(menu, &iter, COMBOBOX_SENS, FALSE, -1); - -@@ -2165,6 +2196,7 @@ - page->page.widget = vbox1; - } - -+#ifdef USE_GNUTLS - static void oauth2_create_widget_func(PrefsPage * _page, - GtkWindow * window, - gpointer data) -@@ -2379,6 +2411,7 @@ - /* oauth2_encode(OAUTH2info[0][OA2_CLIENT_ID]); */ - - } -+#endif - - static void compose_create_widget_func(PrefsPage * _page, - GtkWindow * window, -@@ -3612,8 +3645,10 @@ - gtk_entry_get_text(GTK_ENTRY(basic_page.pass_entry)), - FALSE); - -+#ifdef USE_GNUTLS - /* Manual password change - reset expiry on OAUTH2 tokens*/ - passwd_store_set_account(tmp_ac_prefs.account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, "0", FALSE); -+#endif - - if (protocol == A_IMAP4 || protocol == A_NNTP) { - new_id = g_strdup_printf("#%s/%s", -@@ -3656,13 +3691,15 @@ - PWS_ACCOUNT_SEND, - gtk_entry_get_text(GTK_ENTRY(send_page.smtp_pass_entry)), - FALSE); -- -+#ifdef USE_GNUTLS - /* Manual password change - reset expiry on OAUTH2 tokens*/ - passwd_store_set_account(tmp_ac_prefs.account_id, PWS_ACCOUNT_OAUTH2_EXPIRY, "0", FALSE); -+#endif - - return 0; - } - -+#ifdef USE_GNUTLS - static gint prefs_oauth2_apply(void) - { - prefs_set_data_from_dialog(oauth2_param); -@@ -3675,6 +3712,7 @@ - - return 0; - } -+#endif - - static gint prefs_compose_apply(void) - { -@@ -3773,10 +3811,12 @@ - /* SendPage *page = (SendPage *) _page; */ - } - -+#ifdef USE_GNUTLS - static void oauth2_destroy_widget_func(PrefsPage *_page) - { - /* Oauth2Page *page = (Oauth2Page *) _page; */ - } -+#endif - - static void compose_destroy_widget_func(PrefsPage *_page) - { -@@ -3840,6 +3880,7 @@ - return prefs_send_apply() >= 0; - } - -+#ifdef USE_GNUTLS - static gboolean oauth2_can_close_func(PrefsPage *_page) - { - Oauth2Page *page = (Oauth2Page *) _page; -@@ -3849,6 +3890,7 @@ - - return prefs_oauth2_apply() >= 0; - } -+#endif - - static gboolean compose_can_close_func(PrefsPage *_page) - { -@@ -3945,6 +3987,7 @@ - cancelled = FALSE; - } - -+#ifdef USE_GNUTLS - static void oauth2_save_func(PrefsPage *_page) - { - Oauth2Page *page = (Oauth2Page *) _page; -@@ -3955,6 +3998,7 @@ - if (prefs_oauth2_apply() >= 0) - cancelled = FALSE; - } -+#endif - - static void compose_save_func(PrefsPage *_page) - { -@@ -4090,6 +4134,7 @@ - prefs_account_register_page((PrefsPage *) &send_page); - } - -+#ifdef USE_GNUTLS - static void register_oauth2_page(void) - { - static gchar *path[3]; -@@ -4107,6 +4152,7 @@ - - prefs_account_register_page((PrefsPage *) &oauth2_page); - } -+#endif - - static void register_compose_page(void) - { -@@ -4296,7 +4342,9 @@ - hooks_register_hook(SSL_CERT_GET_PASSWORD, sslcert_get_password, NULL); - #endif - register_proxy_page(); -+#ifdef USE_GNUTLS - register_oauth2_page(); -+#endif - register_advanced_page(); - } - -@@ -5043,6 +5091,7 @@ - combobox_select_by_data(optmenu, type); - } - -+#ifdef USE_GNUTLS - static void prefs_account_oauth2_provider_set_data_from_optmenu(PrefParam *pparam) - { - *((Oauth2Service *)pparam->data) = -@@ -5177,6 +5226,7 @@ - g_free(trim_text); - g_free(OAUTH2Data); - } -+#endif - - static void prefs_account_set_autochk_interval_to_widgets(PrefParam *pparam) - { -diff -Naur claws-mail-4.1.0.orig/src/prefs_account.h claws-mail-4.1.0/src/prefs_account.h ---- claws-mail-4.1.0.orig/src/prefs_account.h 2022-03-19 13:03:24.000000000 +0100 -+++ claws-mail-4.1.0/src/prefs_account.h 2022-07-23 22:10:48.328673863 +0200 -@@ -1,6 +1,6 @@ - /* - * Claws Mail -- a GTK based, lightweight, and fast e-mail client -- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team -+ * Copyright (C) 1999-2022 the Claws Mail team and Hiroyuki Yamamoto - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -diff -Naur claws-mail-4.1.0.orig/src/send_message.c claws-mail-4.1.0/src/send_message.c ---- claws-mail-4.1.0.orig/src/send_message.c 2022-03-19 13:03:24.000000000 +0100 -+++ claws-mail-4.1.0/src/send_message.c 2022-07-23 22:10:48.328673863 +0200 -@@ -57,7 +57,9 @@ - #include "log.h" - #include "passwordstore.h" - #include "file-utils.h" -+#ifdef USE_GNUTLS - #include "oauth2.h" -+#endif - - typedef struct _SendProgressDialog SendProgressDialog; - -@@ -282,6 +284,9 @@ - strlen(ac_prefs->gnutls_priority)) - session->gnutls_priority = g_strdup(ac_prefs->gnutls_priority); - session->use_tls_sni = ac_prefs->use_tls_sni; -+ -+ if (ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2) -+ oauth2_check_passwds (ac_prefs); - #else - if (ac_prefs->ssl_smtp != SSL_NONE) { - if (alertpanel_full(_("Insecure connection"), -@@ -299,9 +304,6 @@ - } - port = ac_prefs->set_smtpport ? ac_prefs->smtpport : SMTP_PORT; - #endif -- -- if(ac_prefs->use_smtp_auth && ac_prefs->smtp_auth_type == SMTPAUTH_OAUTH2) -- oauth2_check_passwds (ac_prefs); - - if (ac_prefs->use_smtp_auth) { - smtp_session->forced_auth_type = ac_prefs->smtp_auth_type;
