Bump Buildroot to 2021.02-rc3 (#1260)
* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
From bd59be8e4e339870a1400f6866a7b73ca11f6460 Mon Sep 17 00:00:00 2001
|
||||
From: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
Date: Wed, 12 Sep 2018 20:16:39 +0200
|
||||
Subject: [PATCH 1/3] configure, static linking: Fix SSL checks
|
||||
Subject: [PATCH] configure, static linking: Fix SSL checks
|
||||
|
||||
During checking of DTLS_method, the stub program is linked only with -ssl
|
||||
libssl.a lacks some function from -lcrypto:
|
||||
@@ -19,13 +19,17 @@ See also https://sourceforge.net/p/net-snmp/patches/1374/.
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
[bvanassche: Edited subject / rewrote this patch]
|
||||
[yann.morin.1998@free.fr:
|
||||
- use an actual backport of bd59be8e4e339870a1400f6866a7b73ca11f6460
|
||||
]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
configure | 52 ++++++++++++++++++++++++++++++++++---
|
||||
configure.d/config_os_libs2 | 14 +++++++---
|
||||
2 files changed, 58 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 6504a8e58..1116cecaa 100755
|
||||
index 6504a8e58a..1116cecaad 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -23228,16 +23228,60 @@ fi
|
||||
@@ -74,12 +78,12 @@ index 6504a8e58..1116cecaa 100755
|
||||
+$as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; }
|
||||
+if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then :
|
||||
+ CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"
|
||||
+fi
|
||||
+
|
||||
+
|
||||
fi
|
||||
|
||||
- fi
|
||||
+
|
||||
+fi
|
||||
+
|
||||
+ else
|
||||
+ LIBCRYPTO="-l${CRYPTO}"
|
||||
+ fi
|
||||
@@ -98,11 +102,11 @@ index 6504a8e58..1116cecaa 100755
|
||||
netsnmp_save_LIBS="$LIBS"
|
||||
- LIBS="-lssl"
|
||||
+ LIBS="-lssl $LIBCRYPTO"
|
||||
for ac_func in TLS_method TLSv1_method DTLS_method DTLSv1_method SSL_library_init SSL_load_error_strings
|
||||
for ac_func in TLS_method TLSv1_method DTLS_method DTLSv1_method SSL_library_init SSL_load_error_strings ERR_get_error_all
|
||||
do :
|
||||
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||
diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2
|
||||
index 4a1ad1551..75214cfff 100644
|
||||
index 4a1ad1551f..75214cfff3 100644
|
||||
--- a/configure.d/config_os_libs2
|
||||
+++ b/configure.d/config_os_libs2
|
||||
@@ -306,13 +306,19 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then
|
||||
@@ -138,5 +142,5 @@ index 4a1ad1551..75214cfff 100644
|
||||
[SSL_library_init SSL_load_error_strings])
|
||||
LIBS="$netsnmp_save_LIBS"
|
||||
--
|
||||
2.17.1
|
||||
2.25.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user