commit: 408923604433c5b293d9a146155608232058b511
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Oct 7 18:56:38 2022 +0000
Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Fri Oct 7 21:11:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=40892360
net-ftp/lftp: Update patch for libressl 3.6.x
Signed-off-by: orbea <orbea <AT> riseup.net>
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
net-ftp/lftp/files/lftp-4.9.2-libressl.patch | 36 ++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
index 51de51f..c19bc3e 100644
--- a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
+++ b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
@@ -38,3 +38,39 @@ Subject: [PATCH] Fix build with LibreSSL (following commit
537f37898)
SSL_load_error_strings();
#endif
int error=ERR_get_error();
+https://github.com/orbea/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54
+
+From 3ffa0132987bdde986c82c924bc51b13b37f8b54 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Wed, 6 Apr 2022 22:56:21 +0200
+Subject: [PATCH] src/lftp_ssl.c: fix build with libressl >= 2.7.0
+
+X509_OBJECT_get0_X509_CRL is provided by libressl since version 2.7.0
+and
+https://github.com/libressl-portable/openbsd/commit/9866ae34c0af718973475296bd9ef036d3aaa94e
+resulting in the following build failure:
+
+/nvmedata/autobuild/instance-21/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblaze-buildroot-linux-musl/11.2.0/../../../../microblaze-buildroot-linux-musl/bin/ld:
/nvmedata/autobuild/instance-21/output-1/host/microblaze-buildroot-linux-musl/sysroot/usr/lib/libcrypto.a(x509_lu.c.o):
in function `X509_OBJECT_get0_X509_CRL':
+(.text+0xc3c): multiple definition of `X509_OBJECT_get0_X509_CRL';
/nvmedata/autobuild/instance-21/output-1/build/lftp-4.9.2/src/.libs/liblftp-network.a(liblftp_network_la-lftp_ssl.o):(.text+0x894):
first defined here
+
+Fixes:
+ -
http://autobuild.buildroot.org/results/7fd1dfd5bc750ae5a3278ca950c838ae90704b23
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ src/lftp_ssl.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc
+index 26e91e4b..a814543d 100644
+--- a/src/lftp_ssl.cc
++++ b/src/lftp_ssl.cc
+@@ -664,7 +664,7 @@ int gnutls_x509_crt_list_import(gnutls_x509_crt_t *certs,
unsigned int* cert_max
+ #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()
+ {
