cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r436977, patch fails to apply

Browse Source 
Reported by:	pkg-fallout
With hat:	portmgr
This commit is contained in:
Antoine Brodin 2017-03-27 05:38:23 +00:00
parent f4850c2455
commit 88ee59f524
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=437013
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ftp/proftpd/Makefile
View File

@ -174,6 +174,9 @@ CONFIGURE_ARGS+= --with-libraries=${LIBDIRS}
.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)

20
ftp/proftpd/files/patch-modules_mod__tls.c
View File

@ -1,20 +0,0 @@
--- 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 ||