Add SSL set_host_name patch to support SNI

https://sylpheed.sraoss.jp/redmine/issues/306

3 files changed, 27 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ffff78ecd97..17f3913896ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sylpheed-beta
 	pkgdesc = Lightweight and user-friendly e-mail client. Latest official beta version.
 	pkgver = 3.7.0beta1
-	pkgrel = 3
+	pkgrel = 4
 	url = http://sylpheed.sraoss.jp/en/
 	arch = i686
 	arch = x86_64
@@ -16,8 +16,11 @@ pkgbase = sylpheed-beta
 	options = libtool
 	source = http://sylpheed.sraoss.jp/sylpheed/v3.7beta/sylpheed-3.7.0beta1.tar.bz2
 	source = http://sylpheed.sraoss.jp/sylpheed/v3.7beta/sylpheed-3.7.0beta1.tar.bz2.asc
+	source = ssl-sni-support.patch
+	validpgpkeys = 8CF3A5AC417ADE72B0AA4A835024337CC00C2E26
 	md5sums = 21826a6096cc6feb732bdaeb87435435
 	md5sums = SKIP
+	md5sums = b05b75bb2bd46d4022f920e09e0b1923
 
 pkgname = sylpheed-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index d2f32ad764a3..597296456e8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=sylpheed-beta
 pkgver=3.7.0beta1
-pkgrel=3
+pkgrel=4
 pkgdesc="Lightweight and user-friendly e-mail client. Latest official beta version."
 arch=('i686' 'x86_64')
 url="http://sylpheed.sraoss.jp/en/"
@@ -11,7 +11,10 @@ depends=('gpgme' 'gtk2' 'compface' 'gtkspell')
 options=('libtool')
 conflicts=('sylpheed' 'sylpheed-beta-iconmod')
 provides=('sylpheed')
-source=(http://sylpheed.sraoss.jp/sylpheed/v3.7beta/sylpheed-$pkgver.tar.bz2{,.asc})
+source=(
+  http://sylpheed.sraoss.jp/sylpheed/v3.7beta/sylpheed-$pkgver.tar.bz2{,.asc}
+  ssl-sni-support.patch
+  )
 
 build() {
   cd "$srcdir/sylpheed-$pkgver"
@@ -21,6 +24,8 @@ build() {
   sed -i 's:enchant/enchant.h:enchant-2/enchant.h:g' src/compose.c
   sed -i 's:PKG_CONFIG --libs enchant:PKG_CONFIG --libs enchant-2:g' configure.ac
 
+  patch -p1 < "$srcdir/ssl-sni-support.patch"
+
   autoconf
   ./configure --prefix=/usr --enable-ldap --enable-gpgme
   make
@@ -35,4 +40,5 @@ package() {
 validpgpkeys=('8CF3A5AC417ADE72B0AA4A835024337CC00C2E26')
 
 md5sums=('21826a6096cc6feb732bdaeb87435435'
-         'SKIP')
+         'SKIP'
+         'b05b75bb2bd46d4022f920e09e0b1923')
diff --git a/ssl-sni-support.patch b/ssl-sni-support.patch
new file mode 100644
index 000000000000..8c9dcde7fdc7
--- /dev/null
+++ b/ssl-sni-support.patch
@@ -0,0 +1,14 @@
+diff --unified -r --text sylpheed-3.7.0beta1/libsylph/ssl.c patched/libsylph/ssl.c
+--- sylpheed-3.7.0beta1/libsylph/ssl.c	2019-08-16 09:34:58.296699900 +0300
++++ patched/libsylph/ssl.c	2019-08-16 09:40:01.656029709 +0300
+@@ -260,6 +260,10 @@
+ 		return FALSE;
+ 	}
+ 
++#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
++	SSL_set_tlsext_host_name(sockinfo->ssl, sockinfo->hostname);
++#endif
++
+ 	SSL_set_fd(sockinfo->ssl, sockinfo->sock);
+ 	while ((ret = SSL_connect(sockinfo->ssl)) != 1) {
+ 		err = SSL_get_error(sockinfo->ssl, ret);