summaryrefslogtreecommitdiff
path: root/net-ftp/lftp/files
diff options
context:
space:
mode:
Diffstat (limited to 'net-ftp/lftp/files')
-rw-r--r--net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch11
-rw-r--r--net-ftp/lftp/files/lftp-4.9.0-ipv6.patch18
-rw-r--r--net-ftp/lftp/files/lftp-4.9.2-libressl.patch40
-rw-r--r--net-ftp/lftp/files/lftp-9999-libdir-readline.patch11
4 files changed, 40 insertions, 40 deletions
diff --git a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch b/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch
deleted file mode 100644
index 01c9371870c0..000000000000
--- a/net-ftp/lftp/files/lftp-4.7.5-libdir-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/lftp_lib_readline.m4
-+++ b/m4/lftp_lib_readline.m4
-@@ -107,7 +107,7 @@
- if test -f "$readline_include_dir/readline/readline.h"; then
- readline_include_dir="$readline_include_dir/readline"
- fi
-- readline_ld_flags="-L$readline_prefix/lib"
-+ readline_ld_flags="-L$libdir"
- readline_lib_flags="-lreadline"
- run_readline_test="yes"
- elif test "$readline_requested" = "yes"; then
diff --git a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch b/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
deleted file mode 100644
index 2c02ce5e787b..000000000000
--- a/net-ftp/lftp/files/lftp-4.9.0-ipv6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/ftpclass.cc
-+++ b/src/ftpclass.cc
-@@ -848,6 +848,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR()
- conn->data_sa.in.sin_port=htons(port);
- conn->data_sa.sa.sa_family=AF_INET;
- }
-+#if INET6
- // V6 / AF_INET6
- else if (proto == 2)
- {
-@@ -855,6 +856,7 @@ Ftp::pasv_state_t Ftp::Handle_EPSV_CEPR()
- conn->data_sa.in6.sin6_port=htons(port);
- conn->data_sa.sa.sa_family=AF_INET6;
- }
-+#endif
- else
- {
- Disconnect("unsupported address family");
diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
new file mode 100644
index 000000000000..51de51f780dd
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
@@ -0,0 +1,40 @@
+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/files/lftp-9999-libdir-readline.patch b/net-ftp/lftp/files/lftp-9999-libdir-readline.patch
deleted file mode 100644
index fde1017f4bdc..000000000000
--- a/net-ftp/lftp/files/lftp-9999-libdir-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/m4/lftp_lib_readline.m4
-+++ b/m4/lftp_lib_readline.m4
-@@ -107,7 +107,7 @@
- if test -f "$readline_include_dir/readline/readline.h"; then
- readline_include_dir="$readline_include_dir/readline"
- fi
-- readline_ld_flags="-L$readline_prefix/lib"
-+ readline_ld_flags="-L$libdir"
- if test -z "$readline_lib_flags"; then
- readline_lib_flags="-lreadline"
- fi