From patchwork Sun Aug 4 02:32:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waldemar Brodkorb X-Patchwork-Id: 1968764 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wc3Wz4JBtz1yYD for ; Sun, 4 Aug 2024 12:33:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4884A403B9; Sun, 4 Aug 2024 02:33:01 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id HQK3lrOBknk9; Sun, 4 Aug 2024 02:32:59 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 432A7403B2 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 432A7403B2; Sun, 4 Aug 2024 02:32:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id B534A1BF4E7 for ; Sun, 4 Aug 2024 02:32:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A2BE540223 for ; Sun, 4 Aug 2024 02:32:57 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ZDCe01gGzVQN for ; Sun, 4 Aug 2024 02:32:55 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=89.238.66.15; helo=helium.openadk.org; envelope-from=wbx@openadk.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org DE33940102 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org DE33940102 Received: from helium.openadk.org (helium.openadk.org [89.238.66.15]) by smtp2.osuosl.org (Postfix) with ESMTPS id DE33940102 for ; Sun, 4 Aug 2024 02:32:53 +0000 (UTC) Received: by helium.openadk.org (Postfix, from userid 1000) id EDEF735367F4; Sun, 4 Aug 2024 04:32:50 +0200 (CEST) Date: Sun, 4 Aug 2024 04:32:50 +0200 From: Waldemar Brodkorb To: buildroot@buildroot.org Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Operating-System: Linux 5.10.0-31-amd64 x86_64 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=openadk.org; s=2022; t=1722738770; bh=az/yiNATkU45JYDpB5F4A68swq2YMHxb7kE6Y9iV31w=; h=Date:From:To:Subject:From; b=Ix0cB2HPgIo9V/P292/mQ8ROBrPzO0aQaWzNukqw1/h+yz6tClqgLlsCqwuPBKuYW yu0bY34PhUmP9kq/gkpFXGjbsNjiXf5AN8JoyEbvdTbCa0Fc8iOu06rU+SRexMc1ZV m0ItQBV3oxjoMS9MuNq9GxVqJEJG9Ch1QPja3Qucub32+fpnVC/Fx13IgkzqLSRCPb x1v+urb4/wWY8ONHGKNKVDCabWAgIyPaRoyVcOOC7gXzNs2bMNL/6KO6h14QjIq9Le 8bu/HIO01Y/bl0uCqhPLjNjtqXbC1Z12vtf83PqtOISC5IoqdjvjaBdyOvV3TObSf5 hmgcRZX/e1yBQ== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=none (p=none dis=none) header.from=openadk.org X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=openadk.org header.i=@openadk.org header.a=rsa-sha256 header.s=2022 header.b=Ix0cB2HP Subject: [Buildroot] [PATCH] package/libressl: update to 3.9.2 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Release notes: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.9.2-relnotes.txt Patches 0002/0003 are upstream. 0004 got renamed to 0002. Disable ASM for PowerPC target, as it fails to link binaries when enabled: /home/autobuild/autobuild/instance-15/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibc/13.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: ../../crypto/libcrypto.so.52.0.0: undefined reference to `bn_mul_add_words' ... Fixes: http://autobuild.buildroot.net/results/ddd/dddd58def99b28c5afa9896622259b652a4287da/ Signed-off-by: Waldemar Brodkorb --- ...sts-txt-Fix-HOST-variable-for-ppc64.patch} | 0 ...02-Fix-a-few-symbols-in-EXTRA_EXPORT.patch | 133 ------------------ ...x-some-compat-symbols-with-libressl_.patch | 130 ----------------- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 6 +- 5 files changed, 6 insertions(+), 265 deletions(-) rename package/libressl/{0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch => 0002-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch} (100%) delete mode 100644 package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch delete mode 100644 package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch diff --git a/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch b/package/libressl/0002-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch similarity index 100% rename from package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch rename to package/libressl/0002-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch diff --git a/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch b/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch deleted file mode 100644 index 411132ff20..0000000000 --- a/package/libressl/0002-Fix-a-few-symbols-in-EXTRA_EXPORT.patch +++ /dev/null @@ -1,133 +0,0 @@ -From c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd Mon Sep 17 00:00:00 2001 -From: Theo Buehler -Date: Mon, 11 Dec 2023 17:56:33 +0100 -Subject: [PATCH] Fix a few symbols in EXTRA_EXPORT - -I thought we stopped doing this, but that's for a separate thread. - -Upstream: https://github.com/libressl/portable/commit/c54bd8ba318dec4b4fbf4df1d92acbe2c032f3fd -Signed-off-by: Fabrice Fontaine ---- - crypto/CMakeLists.txt | 37 +++++++++++++++++++------------------ - 1 file changed, 19 insertions(+), 18 deletions(-) - -diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt -index 605647151..8046efe87 100644 ---- a/crypto/CMakeLists.txt -+++ b/crypto/CMakeLists.txt -@@ -767,13 +767,13 @@ endif() - - if(NOT HAVE_ASPRINTF) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/bsd-asprintf.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} asprintf) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} vasprintf) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_asprintf) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_vasprintf) - endif() - - if(NOT HAVE_FREEZERO) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/freezero.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} freezero) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_freezero) - endif() - - if(NOT HAVE_GETOPT) -@@ -799,46 +799,46 @@ endif() - - if(NOT HAVE_REALLOCARRAY) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_reallocarray) - endif() - - if(NOT HAVE_RECALLOCARRAY) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/recallocarray.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} recallocarray) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_recallocarray) - endif() - - if(NOT HAVE_STRCASECMP) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strcasecmp.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strcasecmp) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strcasecmp) - endif() - - if(NOT HAVE_STRLCAT) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcat.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcat) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcat) - endif() - - if(NOT HAVE_STRLCPY) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcpy.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcpy) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strlcpy) - endif() - - if(NOT HAVE_STRNDUP) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strndup.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strndup) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strndup) - if(NOT HAVE_STRNLEN) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strnlen.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strnlen) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strnlen) - endif() - endif() - - if(NOT HAVE_STRSEP) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strsep.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strsep) - endif() - - if(NOT HAVE_STRTONUM) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/strtonum.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} strtonum) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_strtonum) - endif() - - if(NOT HAVE_SYSLOG_R) -@@ -857,15 +857,15 @@ if(NOT HAVE_EXPLICIT_BZERO) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c) - set_source_files_properties(compat/explicit_bzero.c PROPERTIES COMPILE_FLAGS -O0) - endif() -- set(EXTRA_EXPORT ${EXTRA_EXPORT} explicit_bzero) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_explicit_bzero) - endif() - - if(NOT HAVE_ARC4RANDOM_BUF) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random.c) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_buf) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_buf) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_arc4random_uniform) - - if(NOT HAVE_GETENTROPY) - if(WIN32) -@@ -891,12 +891,12 @@ endif() - - if(NOT HAVE_TIMINGSAFE_BCMP) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_bcmp.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_bcmp) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_bcmp) - endif() - - if(NOT HAVE_TIMINGSAFE_MEMCMP) - set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c) -- set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_memcmp) -+ set(EXTRA_EXPORT ${EXTRA_EXPORT} libressl_timingsafe_memcmp) - endif() - - if(NOT ENABLE_ASM) -@@ -919,6 +919,7 @@ foreach(SYM IN LISTS CRYPTO_UNEXPORT) - string(REPLACE "${SYM}\n" "" SYMS ${SYMS}) - endforeach() - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym ${SYMS}) -+# XXX should we still be doing this? - if(EXTRA_EXPORT) - list(SORT EXTRA_EXPORT) - foreach(SYM IN LISTS EXTRA_EXPORT) diff --git a/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch b/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch deleted file mode 100644 index 42fbbe9069..0000000000 --- a/package/libressl/0003-Prefix-some-compat-symbols-with-libressl_.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 Mon Sep 17 00:00:00 2001 -From: Theo Buehler -Date: Sat, 18 Nov 2023 10:53:09 +0100 -Subject: [PATCH] Prefix some compat symbols with libressl_ - -See #928. This isn't a full fix, but should remove much of the friction -already. - -Upstream: https://github.com/libressl/portable/pull/961/commits/0a446e81ed77c20aa87563d45ef0ef8f5fa283d8 -Signed-off-by: Fabrice Fontaine ---- - include/compat/stdio.h | 2 ++ - include/compat/stdlib.h | 10 ++++++++++ - include/compat/string.h | 11 +++++++++++ - 3 files changed, 23 insertions(+) - -diff --git a/include/compat/stdio.h b/include/compat/stdio.h -index d5725c9ac9..4ddd63aee1 100644 ---- a/include/compat/stdio.h -+++ b/include/compat/stdio.h -@@ -20,7 +20,9 @@ - - #ifndef HAVE_ASPRINTF - #include -+#define vasprintf libressl_vasprintf - int vasprintf(char **str, const char *fmt, va_list ap); -+#define asprintf libressl_asprintf - int asprintf(char **str, const char *fmt, ...); - #endif - -diff --git a/include/compat/stdlib.h b/include/compat/stdlib.h -index 2eaea244c0..76dc07c35a 100644 ---- a/include/compat/stdlib.h -+++ b/include/compat/stdlib.h -@@ -20,26 +20,36 @@ - #include - - #ifndef HAVE_ARC4RANDOM_BUF -+#define arc4random libressl_arc4random - uint32_t arc4random(void); -+#define arc4random_buf libressl_arc4random_buf - void arc4random_buf(void *_buf, size_t n); -+#define arc4random_uniform libressl_arc4random_uniform - uint32_t arc4random_uniform(uint32_t upper_bound); - #endif - - #ifndef HAVE_FREEZERO -+#define freezero libressl_freezero - void freezero(void *ptr, size_t sz); - #endif - - #ifndef HAVE_GETPROGNAME -+#define getprogname libressl_getprogname - const char * getprogname(void); - #endif - -+#ifndef HAVE_REALLOCARRAY -+#define reallocarray libressl_reallocarray - void *reallocarray(void *, size_t, size_t); -+#endif - - #ifndef HAVE_RECALLOCARRAY -+#define recallocarray libressl_recallocarray - void *recallocarray(void *, size_t, size_t, size_t); - #endif - - #ifndef HAVE_STRTONUM -+#define strtonum libressl_strtonum - long long strtonum(const char *nptr, long long minval, - long long maxval, const char **errstr); - #endif -diff --git a/include/compat/string.h b/include/compat/string.h -index 4bf7519b5b..6a82793f62 100644 ---- a/include/compat/string.h -+++ b/include/compat/string.h -@@ -27,43 +27,54 @@ - #endif - - #ifndef HAVE_STRCASECMP -+#define strcasecmp libressl_strcasecmp - int strcasecmp(const char *s1, const char *s2); -+#define strncasecmp libressl_strncasecmp - int strncasecmp(const char *s1, const char *s2, size_t len); - #endif - - #ifndef HAVE_STRLCPY -+#define strlcpy libressl_strlcpy - size_t strlcpy(char *dst, const char *src, size_t siz); - #endif - - #ifndef HAVE_STRLCAT -+#define strlcat libressl_strlcat - size_t strlcat(char *dst, const char *src, size_t siz); - #endif - - #ifndef HAVE_STRNDUP -+#define strndup libressl_strndup - char * strndup(const char *str, size_t maxlen); - /* the only user of strnlen is strndup, so only build it if needed */ - #ifndef HAVE_STRNLEN -+#define strnlen libressl_strnlen - size_t strnlen(const char *str, size_t maxlen); - #endif - #endif - - #ifndef HAVE_STRSEP -+#define strsep libressl_strsep - char *strsep(char **stringp, const char *delim); - #endif - - #ifndef HAVE_EXPLICIT_BZERO -+#define explicit_bzero libressl_explicit_bzero - void explicit_bzero(void *, size_t); - #endif - - #ifndef HAVE_TIMINGSAFE_BCMP -+#define timingsafe_bcmp libressl_timingsafe_bcmp - int timingsafe_bcmp(const void *b1, const void *b2, size_t n); - #endif - - #ifndef HAVE_TIMINGSAFE_MEMCMP -+#define timingsafe_memcmp libressl_timingsafe_memcmp - int timingsafe_memcmp(const void *b1, const void *b2, size_t len); - #endif - - #ifndef HAVE_MEMMEM -+#define memmem libressl_memmem - void * memmem(const void *big, size_t big_len, const void *little, - size_t little_len); - #endif diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 5d3b54ea9c..692dce28e3 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 c0cef9cfe174ac366ce482f542fddb07721e7fa0caface34b49a8720fa37fe7d libressl-3.8.4.tar.gz +sha256 7b031dac64a59eb6ee3304f7ffb75dad33ab8c9d279c847f92c89fb846068f97 libressl-3.9.2.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 1d90aa853d..1d53460063 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.8.4 +LIBRESSL_VERSION = 3.9.2 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING @@ -12,6 +12,10 @@ LIBRESSL_CPE_ID_VENDOR = openbsd LIBRESSL_INSTALL_STAGING = YES LIBRESSL_CONF_OPTS = -DLIBRESSL_TESTS=OFF -DOPENSSLDIR="/etc/ssl" +ifeq ($(BR2_powerpc),y) +LIBRESSL_CONF_OPTS += -DENABLE_ASM=OFF +endif + ifeq ($(BR2_PACKAGE_LIBRESSL_BIN),) define LIBRESSL_REMOVE_BIN $(RM) -f $(TARGET_DIR)/usr/bin/openssl