From fe9c1e54fe3fef820a2bad52e88699f2bf5ab280 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Sun, 13 Sep 2020 12:33:17 +0200 Subject: [PATCH] lftp: update to 4.9.2. --- ...ftp-ssl-unbreak-libressl-compilation.patch | 29 +++++++++++++++++++ srcpkgs/lftp/template | 8 ++--- 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch new file mode 100644 index 00000000000..c0353b4089a --- /dev/null +++ b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch @@ -0,0 +1,29 @@ +From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001 +From: Anthony Iliopoulos +Date: Sun, 13 Sep 2020 12:27:12 +0200 +Subject: [PATCH] lftp/ssl: unbreak libressl compilation + +Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL +APIs") broke libressl compilation, fix it. + +Signed-off-by: Anthony Iliopoulos +--- + src/lftp_ssl.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/lftp_ssl.cc src/lftp_ssl.cc +index 14a3b9d4..83cbda1b 100644 +--- src/lftp_ssl.cc ++++ src/lftp_ssl.cc +@@ -34,7 +34,7 @@ + #include "misc.h" + #include "network.h" + #include "buffer.h" +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject + #endif + extern "C" { +-- +2.28.0 + diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template index efaa7854138..50f18cb4b25 100644 --- a/srcpkgs/lftp/template +++ b/srcpkgs/lftp/template @@ -1,7 +1,7 @@ # Template file for 'lftp' pkgname=lftp -version=4.9.1 -revision=2 +version=4.9.2 +revision=1 build_style=gnu-configure configure_args="--with-modules --disable-rpath --without-included-regex --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr @@ -10,10 +10,10 @@ hostmakedepends="pkg-config" makedepends="zlib-devel ncurses-devel readline-devel libressl-devel expat-devel libidn-devel gettext-devel" short_desc="Sophisticated FTP/HTTP client" -maintainer="Nathan Owens " +maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://lftp.yar.ru/" distfiles="http://lftp.yar.ru/ftp/lftp-${version}.tar.xz" -checksum=5969fcaefd102955dd882f3bcd8962198bc537224749ed92f206f415207a024b +checksum=c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d lib32disabled=yes conf_files="/etc/lftp.conf"