initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,46 @@
|
||||
From 0276d5c239c41b3a63f738a5dc47fd56ac389cf0 Mon Sep 17 00:00:00 2001
|
||||
From: Ganael Laplanche <ganael.laplanche@martymac.org>
|
||||
Date: Thu, 20 Aug 2020 12:29:05 +0200
|
||||
Subject: [PATCH] Fix build with LibreSSL (following commit 537f37898)
|
||||
|
||||
Upstream status: https://github.com/lavv17/lftp/commit/0276d5c239c41b3a63f738a5dc47fd56ac389cf0
|
||||
Signed-off-by: Artem Panfilov <artemp@synopsys.com>
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
src/lftp_ssl.cc | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc
|
||||
index 14a3b9d4..968d3fb2 100644
|
||||
--- a/src/lftp_ssl.cc
|
||||
+++ b/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 || LIBRESSL_VERSION_NUMBER
|
||||
#define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
|
||||
#endif
|
||||
extern "C" {
|
||||
@@ -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);
|
||||
#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 lftp_ssl_openssl *o)
|
||||
|
||||
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();
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
config BR2_PACKAGE_LFTP
|
||||
bool "lftp"
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_READLINE
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS
|
||||
help
|
||||
LFTP is a sophisticated ftp/http client, and a file transfer
|
||||
program supporting a number of network protocols. Like BASH,
|
||||
it has job control and uses the readline library for input. It
|
||||
has bookmarks, a built-in mirror command, and can transfer
|
||||
several files in parallel.
|
||||
It was designed with reliability in mind.
|
||||
|
||||
http://lftp.yar.ru/
|
||||
|
||||
if BR2_PACKAGE_LFTP
|
||||
|
||||
comment "Commands"
|
||||
|
||||
config BR2_PACKAGE_LFTP_CMD_MIRROR
|
||||
bool "Mirror command"
|
||||
default y
|
||||
help
|
||||
Enable mirror command
|
||||
|
||||
config BR2_PACKAGE_LFTP_CMD_SLEEP
|
||||
bool "Sleep command"
|
||||
default y
|
||||
help
|
||||
Enable sleep command
|
||||
|
||||
config BR2_PACKAGE_LFTP_CMD_TORRENT
|
||||
bool "Torrent command"
|
||||
help
|
||||
Enable torrent command
|
||||
|
||||
comment "Protocols"
|
||||
|
||||
config BR2_PACKAGE_LFTP_PROTO_FISH
|
||||
bool "FISH protocol"
|
||||
help
|
||||
Enable FISH protocol
|
||||
|
||||
config BR2_PACKAGE_LFTP_PROTO_FTP
|
||||
bool "FTP protocol"
|
||||
default y
|
||||
help
|
||||
Enable FTP protocol
|
||||
|
||||
config BR2_PACKAGE_LFTP_PROTO_HTTP
|
||||
bool "HTTP protocol"
|
||||
help
|
||||
Enable HTTP protocol
|
||||
|
||||
config BR2_PACKAGE_LFTP_PROTO_SFTP
|
||||
bool "SFTP protocol"
|
||||
help
|
||||
Enable SFTP protocol
|
||||
|
||||
endif # BR2_PACKAGE_LFTP
|
||||
|
||||
comment "lftp requires a toolchain w/ C++, wchar"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !(BR2_USE_WCHAR && BR2_INSTALL_LIBSTDCPP)
|
||||
@@ -0,0 +1,7 @@
|
||||
# From http://lftp.yar.ru/ftp/lftp-4.9.2.md5sum
|
||||
md5 b3a272ecb7a2b60e3827776f90ffb2f3 lftp-4.9.2.tar.xz
|
||||
# Locally calculated after checking gpg signature
|
||||
sha256 c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d lftp-4.9.2.tar.xz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
@@ -0,0 +1,77 @@
|
||||
################################################################################
|
||||
#
|
||||
# lftp
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LFTP_VERSION = 4.9.2
|
||||
LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz
|
||||
LFTP_SITE = http://lftp.yar.ru/ftp
|
||||
LFTP_LICENSE = GPL-3.0+
|
||||
LFTP_LICENSE_FILES = COPYING
|
||||
LFTP_CPE_ID_VENDOR = lftp_project
|
||||
LFTP_DEPENDENCIES = readline zlib host-pkgconf
|
||||
|
||||
# Help lftp finding readline and zlib
|
||||
LFTP_CONF_OPTS = \
|
||||
--with-readline=$(STAGING_DIR)/usr \
|
||||
--with-readline-lib="`$(PKG_CONFIG_HOST_BINARY) --libs readline`" \
|
||||
--with-zlib=$(STAGING_DIR)/usr
|
||||
|
||||
ifneq ($(BR2_STATIC_LIBS),y)
|
||||
LFTP_CONF_OPTS += --with-modules
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EXPAT)$(BR2_PACKAGE_LFTP_PROTO_HTTP),yy)
|
||||
LFTP_DEPENDENCIES += expat
|
||||
LFTP_CONF_OPTS += --with-expat=$(STAGING_DIR)/usr
|
||||
else
|
||||
LFTP_CONF_OPTS += --without-expat
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
LFTP_DEPENDENCIES += gnutls
|
||||
LFTP_CONF_OPTS += --with-gnutls
|
||||
else
|
||||
LFTP_CONF_OPTS += --without-gnutls
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LFTP_DEPENDENCIES += openssl
|
||||
LFTP_CONF_OPTS += --with-openssl
|
||||
else
|
||||
LFTP_CONF_OPTS += --without-openssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBIDN2),y)
|
||||
LFTP_DEPENDENCIES += libidn2
|
||||
LFTP_CONF_OPTS += --with-libidn2=$(STAGING_DIR)/usr
|
||||
else
|
||||
LFTP_CONF_OPTS += --without-libidn2
|
||||
endif
|
||||
|
||||
# Remove /usr/share/lftp
|
||||
define LFTP_REMOVE_DATA
|
||||
$(RM) -fr $(TARGET_DIR)/usr/share/lftp
|
||||
endef
|
||||
|
||||
LFTP_POST_INSTALL_TARGET_HOOKS += LFTP_REMOVE_DATA
|
||||
|
||||
# Optional commands and protocols
|
||||
LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_CMD_MIRROR) += cmd-mirror.so
|
||||
LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_CMD_SLEEP) += cmd-sleep.so
|
||||
LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_CMD_TORRENT) += cmd-torrent.so
|
||||
LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_PROTO_FISH) += proto-fish.so
|
||||
LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_PROTO_FTP) += proto-ftp.so
|
||||
LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_PROTO_HTTP) += proto-http.so
|
||||
LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_PROTO_SFTP) += proto-sftp.so
|
||||
|
||||
define LFTP_REMOVE_MODULES
|
||||
for f in $(LFTP_MODULES_TO_REMOVE-) ; do \
|
||||
$(RM) -f $(TARGET_DIR)/usr/lib/lftp/$(LFTP_VERSION)/$$f ; \
|
||||
done
|
||||
endef
|
||||
|
||||
LFTP_POST_INSTALL_TARGET_HOOKS += LFTP_REMOVE_MODULES
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user