Date: Wed, 5 Oct 2022 18:45:53 GMT From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9a36ff5299c8 - main - ftp/lftp: Fix build with libressl >= 2.7.0 Message-ID: <202210051845.295Ijrbg014568@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a36ff5299c8de0f7a97093fcfe88a2befc0fe35 commit 9a36ff5299c8de0f7a97093fcfe88a2befc0fe35 Author: Ganael LAPLANCHE <martymac@FreeBSD.org> AuthorDate: 2022-10-05 18:38:05 +0000 Commit: Ganael LAPLANCHE <martymac@FreeBSD.org> CommitDate: 2022-10-05 18:45:45 +0000 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 --- ftp/lftp/files/patch-src-Makefile.in | 4 ++-- ftp/lftp/files/patch-src_lftp__ssl.cc | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ftp/lftp/files/patch-src-Makefile.in b/ftp/lftp/files/patch-src-Makefile.in index a0a82f1b3647..be33f1b58e7c 100644 --- a/ftp/lftp/files/patch-src-Makefile.in +++ b/ftp/lftp/files/patch-src-Makefile.in @@ -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: 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210051845.295Ijrbg014568>