diff --git a/package/libest/0005-src-est-est_locl.h-add-missing-extern-on-e_ctx_ssl_e.patch b/package/libest/0005-src-est-est_locl.h-add-missing-extern-on-e_ctx_ssl_e.patch deleted file mode 100644 index ba0ecb4a86..0000000000 --- a/package/libest/0005-src-est-est_locl.h-add-missing-extern-on-e_ctx_ssl_e.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 32fe99fa403d2f51931615745a64f8aede1ca46f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 8 Jan 2022 13:38:17 +0100 -Subject: [PATCH] src/est/est_locl.h: add missing extern on - e_ctx_ssl_exdata_index - -Without this extern, the variable gets re-declared in each compilation -unit including est_locl.h, causing gcc >= 10 to complain with: - -/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_client.o:(.data+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here -/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_server.o:(.bss+0xc): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here -/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_server_http.o:(.bss+0x3b8): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here -/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_proxy.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here -/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_client_http.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here -/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_ossl_util.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here -/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_client_proxy.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here -/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_enhcd_cert_auth.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here -/home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: .libs/est_server_coap.o:(.bss+0x0): multiple definition of `e_ctx_ssl_exdata_index'; .libs/est.o:(.bss+0x8): first defined here -collect2: error: ld returned 1 exit status - -Upstream: https://github.com/cisco/libest/pull/107 -Signed-off-by: Thomas Petazzoni ---- - src/est/est_locl.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/est/est_locl.h b/src/est/est_locl.h -index 62dcbea..b16f62d 100644 ---- a/src/est/est_locl.h -+++ b/src/est/est_locl.h -@@ -590,7 +590,7 @@ typedef struct est_oid_list { - /* - * Index used to link the EST Ctx into the SSL structures - */ --int e_ctx_ssl_exdata_index; -+extern int e_ctx_ssl_exdata_index; - - LIBEST_TEST_API void est_log (EST_LOG_LEVEL lvl, char *format, ...); - LIBEST_TEST_API void est_log_backtrace (void); --- -2.33.1 - diff --git a/package/libest/libest.hash b/package/libest/libest.hash index dc9bc05255..2c2804a76f 100644 --- a/package/libest/libest.hash +++ b/package/libest/libest.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 83983ac05137fd73586ddcb4874e30689fe694ee9a329797b60b3defc9a87327 libest-f8a6e5b53a5f70e72fe4029981df0693b17cbb32.tar.gz +sha256 2e5c46610f6a3c12c1916c8a84de77421a88c9722e776e862a716f4a48220f2a libest-r3.2.0-9-ga464ba8a66717419ba71d289ef82c7b2315b2006.tar.gz sha256 fbdb055f98babf8d86095d6f9b9e34d2ff21a8212e442b8f18bdcb403e44366c LICENSE diff --git a/package/libest/libest.mk b/package/libest/libest.mk index 9f3168767d..5f93b2ab32 100644 --- a/package/libest/libest.mk +++ b/package/libest/libest.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEST_VERSION = f8a6e5b53a5f70e72fe4029981df0693b17cbb32 +LIBEST_VERSION = r3.2.0-9-ga464ba8a66717419ba71d289ef82c7b2315b2006 LIBEST_SITE = $(call github,cisco,libest,$(LIBEST_VERSION)) # We don't build examples, so we're not affected by the OpenSSL # license