From owner-svn-ports-head@freebsd.org Thu Jul 27 11:20:14 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64992DC8640; Thu, 27 Jul 2017 11:20:14 +0000 (UTC) (envelope-from brnrd@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 mx1.freebsd.org (Postfix) with ESMTPS id 24AF172187; Thu, 27 Jul 2017 11:20:14 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6RBKDAB036189; Thu, 27 Jul 2017 11:20:13 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6RBKDPP036188; Thu, 27 Jul 2017 11:20:13 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201707271120.v6RBKDPP036188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Thu, 27 Jul 2017 11:20:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446735 - head/mail/qmail/files X-SVN-Group: ports-head X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: head/mail/qmail/files X-SVN-Commit-Revision: 446735 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.23 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: Thu, 27 Jul 2017 11:20:14 -0000 Author: brnrd Date: Thu Jul 27 11:20:12 2017 New Revision: 446735 URL: https://svnweb.freebsd.org/changeset/ports/446735 Log: mail/qmail-tls: Fix build with LibreSSL - Replace direct struct access with get/setters PR: 218590 Approved by: erdgeist (maintainer) MFH: 2017Q3 Added: head/mail/qmail/files/patch-LibreSSL (contents, props changed) Added: head/mail/qmail/files/patch-LibreSSL ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/qmail/files/patch-LibreSSL Thu Jul 27 11:20:12 2017 (r446735) @@ -0,0 +1,26 @@ +--- qmail-remote.c.orig 2017-05-14 13:50:09 UTC ++++ qmail-remote.c +@@ -266,7 +266,7 @@ char *append; + { + #ifdef TLS + /* shouldn't talk to the client unless in an appropriate state */ +- int state = ssl ? ssl->state : SSL_ST_BEFORE; ++ int state = SSL_get_state(ssl); + if (state & SSL_ST_OK || (!smtps && state & SSL_ST_BEFORE)) + #endif + substdio_putsflush(&smtpto,"QUIT\r\n"); +--- ssl_timeoutio.c.orig 2017-05-14 13:50:09 UTC ++++ ssl_timeoutio.c +@@ -74,10 +74,10 @@ int ssl_timeoutrehandshake(int t, int rf + + SSL_renegotiate(ssl); + r = ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0); +- if (r <= 0 || ssl->type == SSL_ST_CONNECT) return r; ++ if (r <= 0 || SSL_get_state(ssl) == SSL_ST_CONNECT) return r; + + /* this is for the server only */ +- ssl->state = SSL_ST_ACCEPT; ++ SSL_set_connect_state(ssl); + return ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0); + } +