summaryrefslogtreecommitdiff
path: root/ftp/lftp/files/patch-src_lftp__ssl.cc
diff options
context:
space:
mode:
authorGanael LAPLANCHE <martymac@FreeBSD.org>2024-11-29 12:30:30 +0100
committerGanael LAPLANCHE <martymac@FreeBSD.org>2024-11-29 12:30:30 +0100
commit7e86812c08aff5e0f2305fef7b9f6713836a6d5c (patch)
tree4f09e6268e5c3ed8e8ef3cc8fbe8f1f7f9fd538d /ftp/lftp/files/patch-src_lftp__ssl.cc
parentgraphics/R-cran-pdftools: new port (diff)
ftp/lftp: Update to 4.9.3
Also, fix LICENSE which is actually GPLv3+
Diffstat (limited to 'ftp/lftp/files/patch-src_lftp__ssl.cc')
-rw-r--r--ftp/lftp/files/patch-src_lftp__ssl.cc38
1 files changed, 0 insertions, 38 deletions
diff --git a/ftp/lftp/files/patch-src_lftp__ssl.cc b/ftp/lftp/files/patch-src_lftp__ssl.cc
deleted file mode 100644
index 79d85fd04207..000000000000
--- a/ftp/lftp/files/patch-src_lftp__ssl.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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" {
-@@ -775,7 +775,7 @@ error:
- #elif USE_OPENSSL
- //static int lftp_ssl_passwd_callback(char *buf,int size,int rwflag,void *userdata);
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L)
- // for compatibility with older versions
- X509_OBJECT *X509_OBJECT_new()
- {
-@@ -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();