Attachment 179897 Details for Bug 217025 – svn diff for ftp/proftpd

[patch] svn diff for ftp/proftpd

patch-ftp_proftpd-1.3.5d-LibreSSL (text/plain), 1.67 KB, created by Bernard Spil on 2017-02-12 12:23:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2017-02-12 12:23:42 UTC

Size: 1.67 KB

patch

obsolete

>Index: ftp/proftpd/Makefile
>===================================================================
>--- ftp/proftpd/Makefile	(revision 433903)
>+++ ftp/proftpd/Makefile	(working copy)
>@@ -174,9 +174,6 @@
> .if ${SSL_DEFAULT:Mopenssl-devel}
> BROKEN=		Does not build with openssl-devel
> .endif
>-.if ${SSL_DEFAULT:Mlibressl*}
>-BROKEN=		Does not build with libressl
>-.endif
> 
> .if !defined(_BUILDING_PROFTPD_MODULE)
> 
>Index: ftp/proftpd/files/patch-modules_mod__tls.c
>===================================================================
>--- ftp/proftpd/files/patch-modules_mod__tls.c	(nonexistent)
>+++ ftp/proftpd/files/patch-modules_mod__tls.c	(working copy)
>@@ -0,0 +1,20 @@
>+--- modules/mod_tls.c.orig	2017-01-16 01:13:01 UTC
>++++ modules/mod_tls.c
>+@@ -609,7 +609,7 @@ static void tls_diags_cb(const SSL *ssl,
>+         break;
>+ #endif
>+ 
>+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
>++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
>+       case TLS_ST_OK:
>+ #else
>+       case SSL_ST_OK:
>+@@ -633,7 +633,7 @@ static void tls_diags_cb(const SSL *ssl,
>+ 
>+     ssl_state = SSL_get_state(ssl);
>+ 
>+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
>++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
>+     if (ssl_state == TLS_ST_SR_CLNT_HELLO) {
>+ #else
>+     if (ssl_state == SSL3_ST_SR_CLNT_HELLO_A ||
>
>Property changes on: ftp/proftpd/files/patch-modules_mod__tls.c
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 217025: 179897 | 181645