From owner-svn-ports-head@freebsd.org Tue Oct 16 07:43:32 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4EA4610B7006; Tue, 16 Oct 2018 07:43:32 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F38F97F9A1; Tue, 16 Oct 2018 07:43:31 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED73119914; Tue, 16 Oct 2018 07:43:31 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9G7hVVv028939; Tue, 16 Oct 2018 07:43:31 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9G7hVpM028938; Tue, 16 Oct 2018 07:43:31 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201810160743.w9G7hVpM028938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Tue, 16 Oct 2018 07:43:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482205 - in head/mail/isync: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: in head/mail/isync: . files X-SVN-Commit-Revision: 482205 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Oct 2018 07:43:32 -0000 Author: ehaupt Date: Tue Oct 16 07:43:31 2018 New Revision: 482205 URL: https://svnweb.freebsd.org/changeset/ports/482205 Log: - Fix build with openssl 1.1.1 / unbreak on 12.0-ALPHA9 [1] - Merge a patch from upstream as some providers seem to require SNI when TLSv1.3 is used - Pacify portlint PR: 231776 Submitted by: Sascha Holzleiter Notified by: pkg-fallout [1] MFH: 2018Q4 (blanket) Modified: head/mail/isync/Makefile head/mail/isync/files/patch-src_socket.c Modified: head/mail/isync/Makefile ============================================================================== --- head/mail/isync/Makefile Tue Oct 16 06:56:17 2018 (r482204) +++ head/mail/isync/Makefile Tue Oct 16 07:43:31 2018 (r482205) @@ -3,6 +3,7 @@ PORTNAME= isync PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SF @@ -19,10 +20,14 @@ LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 USES= alias bdb cpe perl5 ssl USE_PERL5= build -CPE_VENDOR= oswald_buddenhagen + GNU_CONFIGURE= yes +CPE_VENDOR= oswald_buddenhagen + CONFIGURE_ARGS= --with-sasl=${LOCALBASE} \ --with-ssl=${OPENSSLLIB:H} + +MAKE_ARGS+= SSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" CPPFLAGS+= -I${BDB_INCLUDE_DIR} LDFLAGS+= -L${BDB_LIB_DIR} Modified: head/mail/isync/files/patch-src_socket.c ============================================================================== --- head/mail/isync/files/patch-src_socket.c Tue Oct 16 06:56:17 2018 (r482204) +++ head/mail/isync/files/patch-src_socket.c Tue Oct 16 07:43:31 2018 (r482205) @@ -1,4 +1,4 @@ ---- src/socket.c.orig 2017-08-13 23:04:40 UTC +--- src/socket.c.orig 2017-10-01 08:42:35 UTC +++ src/socket.c @@ -40,7 +40,7 @@ # include @@ -9,3 +9,12 @@ # define X509_OBJECT_get0_X509(o) ((o)->data.x509) # define X509_STORE_get0_objects(o) ((o)->objs) # endif +@@ -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 );