diff options
| author | ryoon <ryoon@pkgsrc.org> | 2019-03-08 18:14:45 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2019-03-08 18:14:45 +0000 |
| commit | 10fc4bc9fa4307aa3a1e7074ca0e3bb4c6dbb78d (patch) | |
| tree | 3cd24ed85b3aca9f702fda6135c3c5ec9ec417b6 /mail | |
| parent | 0e32587216c7bb9aa41f9edd6995c99c754d36cd (diff) | |
| download | pkgsrc-10fc4bc9fa4307aa3a1e7074ca0e3bb4c6dbb78d.tar.gz | |
Support SNI with upstream patch
* Support SNI. for example Google GMail IMAP4 server
* Bump PKGREVISION
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/isync/Makefile | 3 | ||||
| -rw-r--r-- | mail/isync/distinfo | 4 | ||||
| -rw-r--r-- | mail/isync/patches/patch-src_socket.c | 15 |
3 files changed, 17 insertions, 5 deletions
diff --git a/mail/isync/Makefile b/mail/isync/Makefile index 3f15f69fc5d..866cf18eea8 100644 --- a/mail/isync/Makefile +++ b/mail/isync/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2018/09/19 13:08:14 schmonz Exp $ +# $NetBSD: Makefile,v 1.42 2019/03/08 18:14:45 ryoon Exp $ DISTNAME= isync-1.3.0 +PKGRESISION= 1 CATEGORIES= mail net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/} diff --git a/mail/isync/distinfo b/mail/isync/distinfo index a659e2f3d58..adbb3018b0a 100644 --- a/mail/isync/distinfo +++ b/mail/isync/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2018/09/19 13:08:14 schmonz Exp $ +$NetBSD: distinfo,v 1.18 2019/03/08 18:14:45 ryoon Exp $ SHA1 (isync-1.3.0.tar.gz) = 07f6d7cfc39ed2678791f625de70cdeff3d3bfba RMD160 (isync-1.3.0.tar.gz) = 01d7b028fc61e7ad3b51b529a082637fbc4a6816 @@ -8,4 +8,4 @@ SHA1 (patch-ae) = e1a1badcb99fe6089a15a259985933aceedfc110 SHA1 (patch-af) = 14e50c12d34af78b379ea9b8bacbf835b6a009ce SHA1 (patch-src_Makefile.in) = b989a7627dbb7c989dd26c3e20beeceb000a7a47 SHA1 (patch-src_compat_Makefile.in) = ffaba182c6b6b5c50fe82104d508438a3b62ecfd -SHA1 (patch-src_socket.c) = a2dc6ed4a03f265456d73a01dee23e219ece75da +SHA1 (patch-src_socket.c) = 33706f994ccd5f2f1263174bfe9d357bd8afe7c1 diff --git a/mail/isync/patches/patch-src_socket.c b/mail/isync/patches/patch-src_socket.c index 6e6348aae9c..5eed895bad0 100644 --- a/mail/isync/patches/patch-src_socket.c +++ b/mail/isync/patches/patch-src_socket.c @@ -1,10 +1,21 @@ -$NetBSD: patch-src_socket.c,v 1.5 2018/09/19 13:08:14 schmonz Exp $ +$NetBSD: patch-src_socket.c,v 1.6 2019/03/08 18:14:45 ryoon Exp $ + +Support SNI, from https://sourceforge.net/p/isync/isync/ci/17babc1695e82ca80d032b79e920fcb86ede2347/tree/src/socket.c?diff=f698f16967ae8341ff4b506f96b8cd5790c05d27 Prevent mbsync from crashing, PR pkg/49784. --- src/socket.c.orig 2017-10-01 08:42:35.000000000 +0000 +++ src/socket.c -@@ -542,8 +542,10 @@ static void +@@ -270,6 +270,8 @@ socket_start_tls( conn_t *conn, void (*c + + init_wakeup( &conn->ssl_fake, ssl_fake_cb, conn ); + conn->ssl = SSL_new( ((server_conf_t *)conn->conf)->SSLContext ); ++ if (ssl_return( "set server name", conn, SSL_set_tlsext_host_name( conn->ssl, conn->conf->host ) ) < 0) ++ return; + SSL_set_fd( conn->ssl, conn->fd ); + SSL_set_mode( conn->ssl, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER ); + socket_expect_read( conn, 1 ); +@@ -542,8 +544,10 @@ static void socket_connected( conn_t *conn ) { #ifdef HAVE_IPV6 |