diff options
| -rw-r--r-- | net-ftp/lftp/files/lftp-4.9.2-libressl.patch | 40 | ||||
| -rw-r--r-- | net-ftp/lftp/lftp-4.9.2.ebuild | 1 |
2 files changed, 0 insertions, 41 deletions
diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch deleted file mode 100644 index 51de51f780dd..000000000000 --- a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/lavv17/lftp/commit/0276d5c239c41b3a63f738a5dc47fd56ac389cf0.patch - -From 0276d5c239c41b3a63f738a5dc47fd56ac389cf0 Mon Sep 17 00:00:00 2001 -From: Ganael Laplanche <ganael.laplanche@martymac.org> -Date: Thu, 20 Aug 2020 12:29:05 +0200 -Subject: [PATCH] Fix build with LibreSSL (following commit 537f37898) - ---- - src/lftp_ssl.cc | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/src/lftp_ssl.cc -+++ b/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 *o) - - 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(); diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild index 02b74c3a55b7..4dc03770f601 100644 --- a/net-ftp/lftp/lftp-4.9.2.ebuild +++ b/net-ftp/lftp/lftp-4.9.2.ebuild @@ -56,7 +56,6 @@ PATCHES=( "${FILESDIR}"/${PN}-4.8.2-libdir-openssl.patch "${FILESDIR}"/${PN}-4.8.2-libdir-zlib.patch "${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch - "${FILESDIR}"/${PN}-4.9.2-libressl.patch "${FILESDIR}"/${PN}-4.9.2-ac-270.patch ) |