From 0ad2a0d1533bd8d809d88b242ed1c31ef280dbb6 Mon Sep 17 00:00:00 2001 From: George Matsumura Date: Wed, 8 Jul 2020 21:16:47 -0600 Subject: [PATCH] sylpheed: patch to use SNI Prior to this patch, sylpheed built against newer versions of LibreSSL could not connect to IMAP server such as gmail's because it did not use SNI. This patch from OpenBSD is a simple fix to implement it. This patch is also necessary with OpenSSL. Also xlint template. Closes: #23487 [via git-merge-pr] --- srcpkgs/sylpheed/patches/libsylph_ssl_c.patch | 20 +++++++++++++++++++ srcpkgs/sylpheed/template | 8 ++++---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/sylpheed/patches/libsylph_ssl_c.patch diff --git a/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch b/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch new file mode 100644 index 00000000000..4ab0f7b5690 --- /dev/null +++ b/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch @@ -0,0 +1,20 @@ +See https://sylpheed.sraoss.jp/redmine/issues/306 + +Patch is necessary both on LibreSSL and OpenSSL + +--- libsylph/ssl.c.orig ++++ libsylph/ssl.c +@@ -258,6 +258,13 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinf + return FALSE; + } + ++#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME ++ if (!SSL_set_tlsext_host_name(sockinfo->ssl, sockinfo->hostname)) { ++ g_warning("Error setting servername extension\n"); ++ return FALSE; ++ } ++#endif ++ + SSL_set_fd(sockinfo->ssl, sockinfo->sock); + while ((ret = SSL_connect(sockinfo->ssl)) != 1) { + err = SSL_get_error(sockinfo->ssl, ret); diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template index be188c4e2db..1e01726ef40 100644 --- a/srcpkgs/sylpheed/template +++ b/srcpkgs/sylpheed/template @@ -1,18 +1,18 @@ -# Template build file for 'sylpheed'. +# Template file for 'sylpheed' pkgname=sylpheed version=3.7.0 -revision=5 -lib32disabled=yes +revision=6 build_style=gnu-configure configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr" hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel" makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel" short_desc="GTK+ Lightweight and user-friendly e-mail client" maintainer="Orphaned " -license="GPL-2, LGPL-2.1" +license=" GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://sylpheed.sraoss.jp" distfiles="http://sylpheed.sraoss.jp/sylpheed/v${version%.*}/$pkgname-$version.tar.bz2" checksum=eb23e6bda2c02095dfb0130668cf7c75d1f256904e3a7337815b4da5cb72eb04 +lib32disabled=yes pre_configure() { aclocal -I ac