diff options
Diffstat (limited to 'package/lftp')
| -rw-r--r-- | package/lftp/Makefile | 13 | ||||
| -rw-r--r-- | package/lftp/patches/patch-src_lftp_ssl_cc | 38 |
2 files changed, 10 insertions, 41 deletions
diff --git a/package/lftp/Makefile b/package/lftp/Makefile index 993df08b3..a3706227e 100644 --- a/package/lftp/Makefile +++ b/package/lftp/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= lftp -PKG_VERSION:= 4.9.2 +PKG_VERSION:= 4.9.3 PKG_RELEASE:= 1 -PKG_HASH:= c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d +PKG_HASH:= 96e7199d7935be33cf6b1161e955b2aab40ab77ecdf2a19cea4fc1193f457edc PKG_DESCR:= ftp and http client PKG_SECTION:= net/http PKG_DEPENDS:= libncurses libexpat @@ -16,7 +16,10 @@ PKG_NEEDS:= c++ PKG_URL:= http://lftp.yar.ru/ PKG_SITES:= http://lftp.yar.ru/ftp/ -PKG_CHOICES_LFTP:= WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKG_CHOICES_LFTP:= WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl @@ -41,6 +44,10 @@ ifeq (${ADK_PACKAGE_LFTP_WITH_GNUTLS},y) CONFIGURE_ARGS+= --without-openssl \ --with-gnutls endif +ifeq (${ADK_PACKAGE_LFTP_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-openssl="$(STAGING_TARGET_DIR)/usr" \ + --without-gnutls +endif ifeq (${ADK_PACKAGE_LFTP_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-openssl="$(STAGING_TARGET_DIR)/usr" \ --without-gnutls diff --git a/package/lftp/patches/patch-src_lftp_ssl_cc b/package/lftp/patches/patch-src_lftp_ssl_cc deleted file mode 100644 index d8569322e..000000000 --- a/package/lftp/patches/patch-src_lftp_ssl_cc +++ /dev/null @@ -1,38 +0,0 @@ ---- lftp-4.9.2.orig/src/lftp_ssl.cc 2020-01-29 21:36:37.000000000 +0100 -+++ lftp-4.9.2/src/lftp_ssl.cc 2024-02-22 14:42:11.060809468 +0100 -@@ -34,7 +34,7 @@ - #include "misc.h" - #include "network.h" - #include "buffer.h" --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - #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_open - ssl_ctx=SSL_CTX_new(); - X509_set_default_verify_paths(ssl_ctx->cert); - #else --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - SSLeay_add_ssl_algorithms(); - #endif - ssl_ctx=SSL_CTX_new(SSLv23_client_method()); -@@ -1080,7 +1080,7 @@ void lftp_ssl_openssl::copy_sid(const lf - - const char *lftp_ssl_openssl::strerror() - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER - SSL_load_error_strings(); - #endif - int error=ERR_get_error(); |