diff options
author | Antoine Brodin <antoine@FreeBSD.org> | 2017-07-28 08:22:16 +0000 |
---|---|---|
committer | Antoine Brodin <antoine@FreeBSD.org> | 2017-07-28 08:22:16 +0000 |
commit | 944577e10218c915ba0016f33fca46519949466f (patch) | |
tree | 3e1c05275fb1f90076929cd719dea2c0806b927f /mail/qmail | |
parent | e34a4b86bb2586b71a2f6e2561c3f26050ca7829 (diff) | |
download | ports-944577e10218c915ba0016f33fca46519949466f.tar.gz ports-944577e10218c915ba0016f33fca46519949466f.zip |
Revert r446735 and unbreak, the patch fails to apply and is probably wrong
PR: 218590
Reported by: pkg-fallout
Notes
Notes:
svn path=/head/; revision=446810
Diffstat (limited to 'mail/qmail')
-rw-r--r-- | mail/qmail/files/patch-LibreSSL | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/mail/qmail/files/patch-LibreSSL b/mail/qmail/files/patch-LibreSSL deleted file mode 100644 index e46463f367a7..000000000000 --- a/mail/qmail/files/patch-LibreSSL +++ /dev/null @@ -1,26 +0,0 @@ ---- 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_accept_state(ssl); - return ssl_timeoutio(SSL_do_handshake, t, rfd, wfd, ssl, NULL, 0); - } - |