Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1543711727220180"
MIME-Version: 1.0
Date: Sun, 2 Dec 2018 00:48:47 +0000
From: "Leonardo Taccari" <leot@netbsd.org>
Subject: CVS commit: pkgsrc/mail/fdm
To: pkgsrc-changes@NetBSD.org
Reply-To: leot@netbsd.org
Message-Id: <20181202004847.0C63FFB1F@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1543711727220180
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	leot
Date:		Sun Dec  2 00:48:46 UTC 2018

Modified Files:
	pkgsrc/mail/fdm: Makefile distinfo
Added Files:
	pkgsrc/mail/fdm/patches: patch-connect.c

Log Message:
fdm: Backport patch to use SNI extension

When TLS 1.3 is used at least imap.gmail.com requires SNI extension
otherwise fails as follow:

 certificate verification failed: self signed certificate

(This can happen with OpenSSL 1.1.1.)

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/fdm/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/fdm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/fdm/patches/patch-connect.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1543711727220180
Content-Disposition: inline
Content-Length: 2141
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/fdm/Makefile
diff -u pkgsrc/mail/fdm/Makefile:1.10 pkgsrc/mail/fdm/Makefile:1.11
--- pkgsrc/mail/fdm/Makefile:1.10	Fri May  4 15:33:22 2018
+++ pkgsrc/mail/fdm/Makefile	Sun Dec  2 00:48:46 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2018/05/04 15:33:22 leot Exp $
+# $NetBSD: Makefile,v 1.11 2018/12/02 00:48:46 leot Exp $
 
 DISTNAME=	fdm-1.9
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=nicm/}
 

Index: pkgsrc/mail/fdm/distinfo
diff -u pkgsrc/mail/fdm/distinfo:1.9 pkgsrc/mail/fdm/distinfo:1.10
--- pkgsrc/mail/fdm/distinfo:1.9	Fri May  4 15:33:22 2018
+++ pkgsrc/mail/fdm/distinfo	Sun Dec  2 00:48:46 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2018/05/04 15:33:22 leot Exp $
+$NetBSD: distinfo,v 1.10 2018/12/02 00:48:46 leot Exp $
 
 SHA1 (fdm-1.9.tar.gz) = 818bf39418ae4b170b4c3aa7c852015bf4802d7a
 RMD160 (fdm-1.9.tar.gz) = f44d009ac29cdf244509ce032270758be7f4be32
@@ -6,4 +6,5 @@ SHA512 (fdm-1.9.tar.gz) = ec204e58a95b00
 Size (fdm-1.9.tar.gz) = 175815 bytes
 SHA1 (patch-Makefile.am) = 864d905906a0bd78a6beb95093300fba0f52f10c
 SHA1 (patch-configure.ac) = 745810f7b1fe7cf4295cf8b68a9c4757c6ce4386
+SHA1 (patch-connect.c) = ee95c91b2bbf37539a3c94e006e135c5c6c49f86
 SHA1 (patch-fdm.h) = 98d01387d0e17d782950571c1b25e8faf841649b

Added files:

Index: pkgsrc/mail/fdm/patches/patch-connect.c
diff -u /dev/null pkgsrc/mail/fdm/patches/patch-connect.c:1.1
--- /dev/null	Sun Dec  2 00:48:46 2018
+++ pkgsrc/mail/fdm/patches/patch-connect.c	Sun Dec  2 00:48:46 2018
@@ -0,0 +1,20 @@
+$NetBSD: patch-connect.c,v 1.1 2018/12/02 00:48:46 leot Exp $
+
+Use SNI extension, from Tomasz Miasko in GitHub issue 50.
+
+From upstream commit dde4c369359dc12bfe93329f3df9c9dfd2e3837d.
+
+--- connect.c.orig	2018-12-02 00:37:55.540662771 +0000
++++ connect.c
+@@ -584,6 +584,11 @@ makessl(struct server *srv, int fd, int 
+ 		goto error;
+ 	}
+ 
++	if (SSL_set_tlsext_host_name(ssl, srv->host) != 1) {
++		*cause = sslerror("SSL_set_tlsext_host_name");
++		goto error;
++	}
++
+ 	if (SSL_set_fd(ssl, fd) != 1) {
+ 		*cause = sslerror("SSL_set_fd");
+ 		goto error;


--_----------=_1543711727220180--