Received: by mail.netbsd.org (Postfix, from userid 605) id E7F0F84DEE; Fri, 8 Mar 2019 18:14:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 70B4484DDE for ; Fri, 8 Mar 2019 18:14:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id m8iD8-mPEMbr for ; Fri, 8 Mar 2019 18:14:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E019184CEA for ; Fri, 8 Mar 2019 18:14:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DA7D9FB16; Fri, 8 Mar 2019 18:14:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1552068885232180" MIME-Version: 1.0 Date: Fri, 8 Mar 2019 18:14:45 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/mail/isync To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20190308181445.DA7D9FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1552068885232180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Fri Mar 8 18:14:45 UTC 2019 Modified Files: pkgsrc/mail/isync: Makefile distinfo pkgsrc/mail/isync/patches: patch-src_socket.c Log Message: Support SNI with upstream patch * Support SNI. for example Google GMail IMAP4 server * Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 pkgsrc/mail/isync/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/isync/distinfo cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/isync/patches/patch-src_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1552068885232180 Content-Disposition: inline Content-Length: 2736 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/isync/Makefile diff -u pkgsrc/mail/isync/Makefile:1.41 pkgsrc/mail/isync/Makefile:1.42 --- pkgsrc/mail/isync/Makefile:1.41 Wed Sep 19 13:08:14 2018 +++ pkgsrc/mail/isync/Makefile Fri Mar 8 18:14:45 2019 @@ -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/} Index: pkgsrc/mail/isync/distinfo diff -u pkgsrc/mail/isync/distinfo:1.17 pkgsrc/mail/isync/distinfo:1.18 --- pkgsrc/mail/isync/distinfo:1.17 Wed Sep 19 13:08:14 2018 +++ pkgsrc/mail/isync/distinfo Fri Mar 8 18:14:45 2019 @@ -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) = e1a1badcb99fe6089a15a2 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 Index: pkgsrc/mail/isync/patches/patch-src_socket.c diff -u pkgsrc/mail/isync/patches/patch-src_socket.c:1.5 pkgsrc/mail/isync/patches/patch-src_socket.c:1.6 --- pkgsrc/mail/isync/patches/patch-src_socket.c:1.5 Wed Sep 19 13:08:14 2018 +++ pkgsrc/mail/isync/patches/patch-src_socket.c Fri Mar 8 18:14:45 2019 @@ -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 --_----------=_1552068885232180--