svn commit: r436977 - in head/ftp/proftpd: . files

[Bernard Spil]

Author: brnrd
Date: Sun Mar 26 18:52:35 2017
New Revision: 436977
URL: https://svnweb.freebsd.org/changeset/ports/436977

Log:
  ftp/proftpd: Fix mod_tls build with LibreSSL
  
    - Remove IGNORE with LibreSSL SSL_DEFAULT
    - Add patch for mod_tls to build with LibreSSL
  
  PR:		217025
  Approved by:	maintainer timeout

Added:
  head/ftp/proftpd/files/patch-modules_mod__tls.c   (contents, props changed)
Modified:
  head/ftp/proftpd/Makefile

Modified: head/ftp/proftpd/Makefile
==============================================================================
--- head/ftp/proftpd/Makefile	Sun Mar 26 18:30:24 2017	(r436976)
+++ head/ftp/proftpd/Makefile	Sun Mar 26 18:52:35 2017	(r436977)
@@ -174,9 +174,6 @@ CONFIGURE_ARGS+=	--with-libraries=${LIBD
 .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)
 

Added: head/ftp/proftpd/files/patch-modules_mod__tls.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/proftpd/files/patch-modules_mod__tls.c	Sun Mar 26 18:52:35 2017	(r436977)
@@ -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 ||