initial buildroot for linux 5.15
This commit is contained in:
@@ -0,0 +1,47 @@
|
||||
From e5c5ed1c64cfc715729c9bfbfdcc4be225f344ff Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Wed, 4 Aug 2021 11:32:39 +0200
|
||||
Subject: [PATCH] openssl.c: fix build with wolfssl
|
||||
|
||||
Fix the following build failure with wolfssl:
|
||||
|
||||
/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c: In function 'ssl_context_new':
|
||||
/tmp/instance-4/output-1/build/libuhttpd-3.12.1/src/ssl/openssl.c:174:33: error: 'tls13_ciphersuites' undeclared (first use in this function)
|
||||
174 | SSL_CTX_set_ciphersuites(c, tls13_ciphersuites);
|
||||
| ^~~~~~~~~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/d0fb629b40b05ad828775894fabed878692bb222
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/zhaojh329/ssl/pull/1]
|
||||
---
|
||||
openssl.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/openssl.c b/openssl.c
|
||||
index 8f3d8b7..c42638c 100644
|
||||
--- a/src/ssl/openssl.c
|
||||
+++ b/src/ssl/openssl.c
|
||||
@@ -71,14 +71,14 @@
|
||||
"TLS13-AES256-GCM-SHA384:" \
|
||||
ecdhe_aead_ciphers
|
||||
#else
|
||||
-# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \
|
||||
- "TLS_AES_128_GCM_SHA256:" \
|
||||
- "TLS_AES_256_GCM_SHA384"
|
||||
-
|
||||
# define top_ciphers \
|
||||
ecdhe_aead_ciphers
|
||||
#endif
|
||||
|
||||
+# define tls13_ciphersuites "TLS_CHACHA20_POLY1305_SHA256:" \
|
||||
+ "TLS_AES_128_GCM_SHA256:" \
|
||||
+ "TLS_AES_256_GCM_SHA384"
|
||||
+
|
||||
#define ecdhe_aead_ciphers \
|
||||
"ECDHE-ECDSA-CHACHA20-POLY1305:" \
|
||||
"ECDHE-ECDSA-AES128-GCM-SHA256:" \
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
config BR2_PACKAGE_LIBUHTTPD
|
||||
bool "libuhttpd"
|
||||
select BR2_PACKAGE_LIBEV
|
||||
select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL
|
||||
help
|
||||
A lightweight and fully asynchronous HTTP server
|
||||
library based on libev
|
||||
|
||||
https://github.com/zhaojh329/libuhttpd
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 c234dd3d491c4daa047e28870c6e740529b2eff2dd027dafb6bf02d8dba286b0 libuhttpd-3.12.1.tar.gz
|
||||
sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE
|
||||
@@ -0,0 +1,48 @@
|
||||
################################################################################
|
||||
#
|
||||
# libuhttpd
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBUHTTPD_VERSION = 3.12.1
|
||||
LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION)
|
||||
LIBUHTTPD_LICENSE = MIT
|
||||
LIBUHTTPD_LICENSE_FILES = LICENSE
|
||||
LIBUHTTPD_INSTALL_STAGING = YES
|
||||
LIBUHTTPD_DEPENDENCIES = libev
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LIBUHTTPD_DEPENDENCIES += openssl
|
||||
LIBUHTTPD_CONF_OPTS += \
|
||||
-DSSL_SUPPORT=ON \
|
||||
-DUSE_MBEDTLS=OFF \
|
||||
-DUSE_OPENSSL=ON \
|
||||
-DUSE_WOLFSSL=OFF
|
||||
else ifeq ($(BR2_PACKAGE_WOLFSSL),y)
|
||||
LIBUHTTPD_DEPENDENCIES += wolfssl
|
||||
LIBUHTTPD_CONF_OPTS += \
|
||||
-DSSL_SUPPORT=ON \
|
||||
-DUSE_MBEDTLS=OFF \
|
||||
-DUSE_OPENSSL=OFF \
|
||||
-DUSE_WOLFSSL=ON
|
||||
else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
|
||||
LIBUHTTPD_DEPENDENCIES += mbedtls
|
||||
LIBUHTTPD_CONF_OPTS += \
|
||||
-DSSL_SUPPORT=ON \
|
||||
-DUSE_MBEDTLS=ON \
|
||||
-DUSE_OPENSSL=OFF \
|
||||
-DUSE_WOLFSSL=OFF
|
||||
else
|
||||
LIBUHTTPD_CONF_OPTS += \
|
||||
-DSSL_SUPPORT=OFF
|
||||
endif
|
||||
|
||||
# BUILD_STATIC builds *only* the static lib, which is not what we want for
|
||||
# BR2_SHARED_STATIC.
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC=ON
|
||||
else
|
||||
LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user