[MacPorts] #61005: lftp fails to build with libressl after upgrade to 4.9.2
MacPorts
noreply at macports.org
Tue Sep 1 05:49:50 UTC 2020
#61005: lftp fails to build with libressl after upgrade to 4.9.2
-----------------------+-------------------------
Reporter: bK4gYuRo | Owner: Schamschula
Type: defect | Status: assigned
Priority: Normal | Milestone:
Component: ports | Version:
Resolution: | Keywords:
Port: lftp |
-----------------------+-------------------------
Comment (by bK4gYuRo):
The diff file does not look right to me:
{{{
$ pwd
/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/net/lftp
$ cat files/patch-lftp-libressl.diff
Index: ftp/lftp/files/patch-src_lftp__ssl.cc
===================================================================
--- ftp/lftp/files/patch-src_lftp__ssl.cc (nonexistent)
+++ ftp/lftp/files/patch-src_lftp__ssl.cc (working copy)
@@ -0,0 +1,29 @@
+--- src/lftp_ssl.cc.orig 2020-01-29 20:36:37 UTC
++++ src/lftp_ssl.cc
+@@ -34,7 +34,7 @@
+ #include "misc.h"
+ #include "network.h"
+ #include "buffer.h"
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+ #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
+ #endif
+ extern "C" {
+@@ -840,7 +840,7 @@
lftp_ssl_openssl_instance::lftp_ssl_openssl_instance()
+ ssl_ctx=SSL_CTX_new();
+ X509_set_default_verify_paths(ssl_ctx->cert);
+ #else
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+ SSLeay_add_ssl_algorithms();
+ #endif
+ ssl_ctx=SSL_CTX_new(SSLv23_client_method());
+@@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const
lftp_ssl_openssl
+
+ const char *lftp_ssl_openssl::strerror()
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
+ SSL_load_error_strings();
+ #endif
+ int error=ERR_get_error();
Property changes on: ftp/lftp/files/patch-src_lftp__ssl.cc
___________________________________________________________________
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
}}}
--
Ticket URL: <https://trac.macports.org/ticket/61005#comment:8>
MacPorts <https://www.macports.org/>
Ports system for macOS
More information about the macports-tickets
mailing list