Attachment 184829 Details for Bug 218590 – svn diff for mail/qmail

[patch] svn diff for mail/qmail

patch-mail_qmail-LibreSSL.txt (text/plain), 1.96 KB, created by Bernard Spil on 2017-07-29 11:56:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2017-07-29 11:56:03 UTC

Size: 1.96 KB

patch

obsolete

>Index: mail/qmail/Makefile
>===================================================================
>--- mail/qmail/Makefile	(revision 446875)
>+++ mail/qmail/Makefile	(working copy)
>@@ -404,6 +404,7 @@
> .endif
> 
> .if defined(SLAVE_TLS)
>+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-qmail-tls-LibreSSL
> CFLAGS+=	-I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS=${TLS_PATCH_DATE}
> . if ${PORT_OPTIONS:MTLS_DEBUG}
> CFLAGS+=	-DDEBUG
>Index: mail/qmail/files/extra-patch-qmail-tls-LibreSSL
>===================================================================
>--- mail/qmail/files/extra-patch-qmail-tls-LibreSSL	(nonexistent)
>+++ mail/qmail/files/extra-patch-qmail-tls-LibreSSL	(working copy)
>@@ -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 ? SSL_get_state(ssl) : SSL_ST_BEFORE;
>+   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_accept_state(ssl);
>+   return ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0);
>+ }
>+ 
>
>Property changes on: mail/qmail/files/extra-patch-qmail-tls-LibreSSL
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

brnrd: maintainer-approval?

Actions: View | Diff

Attachments on bug 218590: 181717 | 182592 | 184829