diff options
| author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2022-10-05 20:38:05 +0200 |
|---|---|---|
| committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2022-10-05 20:45:45 +0200 |
| commit | 9a36ff5299c8de0f7a97093fcfe88a2befc0fe35 (patch) | |
| tree | a313f53954e507825a32e8db82d65f8bd2ee6f2c /ftp/lftp/files/patch-src_lftp__ssl.cc | |
| parent | science/cp2k: Update 2022.1 -> 2022.2 (diff) | |
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: https://github.com/lavv17/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54
Diffstat (limited to 'ftp/lftp/files/patch-src_lftp__ssl.cc')
| -rw-r--r-- | ftp/lftp/files/patch-src_lftp__ssl.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ftp/lftp/files/patch-src_lftp__ssl.cc b/ftp/lftp/files/patch-src_lftp__ssl.cc index 03a2b75a31c8..79d85fd04207 100644 --- a/ftp/lftp/files/patch-src_lftp__ssl.cc +++ b/ftp/lftp/files/patch-src_lftp__ssl.cc @@ -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); |