1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-10 07:04:03 +00:00

ftp/lftp: Fix build with libressl >= 2.7.0

While here, re-generate patches using makepatch target.

PR:		266803
Reported by:	tjlegg@gmail.com
Obtained from:	3ffa013298
This commit is contained in:
Ganael LAPLANCHE 2022-10-05 20:38:05 +02:00
parent fa0403090a
commit 9a36ff5299
2 changed files with 11 additions and 2 deletions

View File

@ -1,6 +1,6 @@
--- src/Makefile.in.orig 2019-12-21 09:41:47 UTC
--- src/Makefile.in.orig 2020-08-13 19:57:03 UTC
+++ src/Makefile.in
@@ -2607,7 +2607,7 @@ info: info-am
@@ -2625,7 +2625,7 @@ info: info-am
info-am:

View File

@ -9,6 +9,15 @@
#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);