gentoo auto-resync : 05:05:2023 - 05:29:57

3 files changed, 41 insertions, 1 deletions

diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index d0a158e57e84..d33f092c1411 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -10,7 +10,8 @@ AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8
 AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b
 AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08
 AUX lftp-4.9.2-configure-clang16.patch 617 BLAKE2B c8e2f3476011b6fa154de4021644bfed1c9fb420940c26cdc57a4ac9939c84bf5c123745cb8d5749a776a29a0afee65dd11c4faa97c3d2ef53f5545b86bf4d54 SHA512 078c309e20a49e28a65ec5d6c732ea0a57c0cdbc8b9e54f4fc5ddc917bc3fe439c1e4592243b57117f0d32ba7ae17067124e8a17e57513326a4fda7abdf5b6ac
+AUX lftp-4.9.2-libressl.patch 1964 BLAKE2B 045b1436b970530741b4109b8408151b5d0714310667b8a4eec9817e14e96395e47141112b22acf0a5e28dac0eb157029e2bef8a5cd677eba8b1d8471e02d814 SHA512 081dc57c78645bb528d745406789e9edf7d6b54f16c4df825b69829df2e0d8f383d11f8fe15530c406f15debb0cad17e5fa0b1415529068228c380503c974d55
 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad
-EBUILD lftp-4.9.2-r1.ebuild 2708 BLAKE2B b0613d9932f8010911d0877f8a6b74423324191b8747f5e381dccacb2b917bef31fc2606ecc5c28339c2b4768f25f6df3129b73019ac304c4994191543979f99 SHA512 279248619815058833a5d7f538267cb8a637edc91a6696c708c15141636ae6be3dfd0f5673faddfecb41c942401125f88595459a2cbd92bfe5b549d657e12205
+EBUILD lftp-4.9.2-r1.ebuild 2758 BLAKE2B 5cb484a6d8fd7fa9e85d297d589df8559856873e9a3c843a80ef6ac11720696befce046832ea950705b7275baec79b7442aeb22284dad434a519337ee9a76737 SHA512 e00c1f6507809d4c52b09b81d6edc20184633b35e39866b246275f692b072b0ea62f43794071f11e562bbf98bff3808193cafbf43d1285525e6a988c81ba4332
 EBUILD lftp-9999.ebuild 2445 BLAKE2B 3a39352024188a959e6d2d6cadab400acdb7f0e2977e58d4e97be6e52cc9d9dc7733baace2fe77b754f317b59ecddd58dda6da2d03c4ab0923861f1091c6d857 SHA512 0bb8e954d106b9e14899bd1375cc0e22fa2511f83e361903a0b21969e3b3f2158368ff61efed4306fb7dd43f23cc63675e4914ff5fa2734ebcd18693d6b5b96c
 MISC metadata.xml 556 BLAKE2B d7469c2b0a5fd85a1a102b587d9cb992bee74a41df956bb91c6b944d6ab5f3bdbf003c8e2a4e89f8326e1c0290dde88efdc2689d212e284b7394383f2e4ded99 SHA512 84c61561f72df1c9daaa60b493877be495e35f306d65aeff607c356484492cecd40e1e4a1f6a5143e3cf5b2fed665489a50af8f5ed5afe38c614674692de0ca8
diff --git a/net-ftp/lftp/files/lftp-4.9.2-libressl.patch b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
new file mode 100644
index 000000000000..a0b52df4a9e5
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.2-libressl.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/903001
+https://github.com/lavv17/lftp/pull/663
+https://github.com/lavv17/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54
+
+From 3ffa0132987bdde986c82c924bc51b13b37f8b54 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+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 <fontaine.fabrice@gmail.com>
+---
+ 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()
+ {
diff --git a/net-ftp/lftp/lftp-4.9.2-r1.ebuild b/net-ftp/lftp/lftp-4.9.2-r1.ebuild
index 9047ab306f17..f7b4b9adf626 100644
--- a/net-ftp/lftp/lftp-4.9.2-r1.ebuild
+++ b/net-ftp/lftp/lftp-4.9.2-r1.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
 	"${FILESDIR}"/${PN}-4.9.2-ac-270.patch
 	"${FILESDIR}"/${PN}-4.9.2-configure-clang16.patch
+	"${FILESDIR}"/${PN}-4.9.2-libressl.patch #903001
 )
 
 src_prepare() {