View | Details | Raw Unified | Return to bug 217025 | Differences between
and this patch

Collapse All | Expand All

(-)ftp/proftpd/Makefile (-3 lines)
Lines 174-182 Link Here
174
.if ${SSL_DEFAULT:Mopenssl-devel}
174
.if ${SSL_DEFAULT:Mopenssl-devel}
175
BROKEN=		Does not build with openssl-devel
175
BROKEN=		Does not build with openssl-devel
176
.endif
176
.endif
177
.if ${SSL_DEFAULT:Mlibressl*}
178
BROKEN=		Does not build with libressl
179
.endif
180
177
181
.if !defined(_BUILDING_PROFTPD_MODULE)
178
.if !defined(_BUILDING_PROFTPD_MODULE)
182
179
(-)ftp/proftpd/files/patch-modules_mod__tls.c (+20 lines)
Line 0 Link Here
1
--- modules/mod_tls.c.orig	2017-01-16 01:13:01 UTC
2
+++ modules/mod_tls.c
3
@@ -609,7 +609,7 @@ static void tls_diags_cb(const SSL *ssl,
4
         break;
5
 #endif
6
 
7
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
8
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
9
       case TLS_ST_OK:
10
 #else
11
       case SSL_ST_OK:
12
@@ -633,7 +633,7 @@ static void tls_diags_cb(const SSL *ssl,
13
 
14
     ssl_state = SSL_get_state(ssl);
15
 
16
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
17
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
18
     if (ssl_state == TLS_ST_SR_CLNT_HELLO) {
19
 #else
20
     if (ssl_state == SSL3_ST_SR_CLNT_HELLO_A ||

Return to bug 217025