Date: Thu, 27 Jul 2017 11:20:13 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446735 - head/mail/qmail/files Message-ID: <201707271120.v6RBKDPP036188@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707271120.v6RBKDPP036188>