[meta-webserver,2/9] hiawatha: upgrade 11.7 -> 11.8

Message ID	20260202163714.2359370-2-skandigraun@gmail.com
State	Under Review
Headers	show Return-Path: <skandigraun@gmail.com> ip: 209.85.128.47, mailfrom: skandigraun@gmail.com) From: Gyorgy Sarvari <skandigraun@gmail.com> To: openembedded-devel@lists.openembedded.org Subject: [meta-webserver][PATCH 2/9] hiawatha: upgrade 11.7 -> 11.8 Date: Mon, 2 Feb 2026 17:37:07 +0100 Message-ID: <20260202163714.2359370-2-skandigraun@gmail.com> In-Reply-To: <20260202163714.2359370-1-skandigraun@gmail.com> References: <20260202163714.2359370-1-skandigraun@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[meta-gnome,1/9] gimp: mark CVE-2025-15059 patched \| expand [meta-gnome,1/9] gimp: mark CVE-2025-15059 patched [meta-webserver,2/9] hiawatha: upgrade 11.7 -> 11.8 [meta-oe,3/9] libcdio: upgrade 2.2.0 -> 2.3.0 [meta-oe,4/9] libcupsfilters: patch CVE-2025-64503 [meta-oe,5/9] ndpi: ignore CVE-2025-25066 [meta-oe,6/9] proftpd: ignore CVE-2021-47865 [meta-oe,7/9] python3-pyjwt: ignore CVE-2025-45768 [meta-oe,8/9] python3-pyjwt: upgrade 2.10.1 -> 2.11.0 [meta-oe,9/9] xrdp: upgrade 0.10.4.1 -> 0.10.5

diff --git a/meta-webserver/recipes-httpd/hiawatha/files/0001-Add-__attribute__-nonstring-to-remove-unterminated-s.patch b/meta-webserver/recipes-httpd/hiawatha/files/0001-Add-__attribute__-nonstring-to-remove-unterminated-s.patch deleted file mode 100644 index 5a9c719b6d..0000000000 --- a/meta-webserver/recipes-httpd/hiawatha/files/0001-Add-__attribute__-nonstring-to-remove-unterminated-s.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 56b26ede007453a4ee9832076597e82d2a903700 Mon Sep 17 00:00:00 2001 -From: Felix Conway <felix.conway@arm.com> -Date: Wed, 11 Jun 2025 16:04:06 +0100 -Subject: [PATCH 1/2] Add __attribute__ ((nonstring)) to remove - unterminated-string-initialization warning - -Upstream-Status: Backport [https://github.com/Mbed-TLS/mbedtls/pull/10216] -Signed-off-by: Felix Conway <felix.conway@arm.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - library/ssl_tls13_keys.c | 3 ++- - library/ssl_tls13_keys.h | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c -index 739414e..375814c 100644 ---- a/library/ssl_tls13_keys.c -+++ b/library/ssl_tls13_keys.c -@@ -81,7 +81,8 @@ struct mbedtls_ssl_tls13_labels_struct const mbedtls_ssl_tls13_labels = - * the HkdfLabel structure on success. - */ - --static const char tls13_label_prefix[6] = "tls13 "; -+/* We need to tell the compiler that we meant to leave out the null character. */ -+static const char tls13_label_prefix[6] __attribute__ ((nonstring)) = "tls13 "; - - #define SSL_TLS1_3_KEY_SCHEDULE_HKDF_LABEL_LEN(label_len, context_len) \ - (2 /* expansion length */ \ -diff --git a/library/ssl_tls13_keys.h b/library/ssl_tls13_keys.h -index d3a4c6c..95cde7a 100644 ---- a/library/ssl_tls13_keys.h -+++ b/library/ssl_tls13_keys.h -@@ -40,8 +40,9 @@ - - #if defined(MBEDTLS_SSL_PROTO_TLS1_3) - -+/* We need to tell the compiler that we meant to leave out the null character. */ - #define MBEDTLS_SSL_TLS1_3_LABEL(name, string) \ -- const unsigned char name [sizeof(string) - 1]; -+ const unsigned char name [sizeof(string) - 1] __attribute__ ((nonstring)); - - union mbedtls_ssl_tls13_labels_union { - MBEDTLS_SSL_TLS1_3_LABEL_LIST diff --git a/meta-webserver/recipes-httpd/hiawatha/files/0002-Replace-__attribute__-nonstring-with-macro-MBEDTLS_A.patch b/meta-webserver/recipes-httpd/hiawatha/files/0002-Replace-__attribute__-nonstring-with-macro-MBEDTLS_A.patch deleted file mode 100644 index 2f94cee277..0000000000 --- a/meta-webserver/recipes-httpd/hiawatha/files/0002-Replace-__attribute__-nonstring-with-macro-MBEDTLS_A.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 91ec670d3f6399510995dedbf99dca2e7e9bd2d8 Mon Sep 17 00:00:00 2001 -From: Felix Conway <felix.conway@arm.com> -Date: Thu, 12 Jun 2025 11:28:56 +0100 -Subject: [PATCH 2/2] Replace __attribute__((nonstring)) with macro - MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING - -This macro applies __attribute__((nonstring)) when using a compiler that supports it - -Upstream-Status: Backport [https://github.com/Mbed-TLS/mbedtls/pull/10216] -Signed-off-by: Felix Conway <felix.conway@arm.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - library/ssl_tls13_keys.c | 2 +- - library/ssl_tls13_keys.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c -index 375814c..621a7d5 100644 ---- a/library/ssl_tls13_keys.c -+++ b/library/ssl_tls13_keys.c -@@ -82,7 +82,7 @@ struct mbedtls_ssl_tls13_labels_struct const mbedtls_ssl_tls13_labels = - */ - - /* We need to tell the compiler that we meant to leave out the null character. */ --static const char tls13_label_prefix[6] __attribute__ ((nonstring)) = "tls13 "; -+static const char tls13_label_prefix[6] MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING = "tls13 "; - - #define SSL_TLS1_3_KEY_SCHEDULE_HKDF_LABEL_LEN(label_len, context_len) \ - (2 /* expansion length */ \ -diff --git a/library/ssl_tls13_keys.h b/library/ssl_tls13_keys.h -index 95cde7a..3aa94d7 100644 ---- a/library/ssl_tls13_keys.h -+++ b/library/ssl_tls13_keys.h -@@ -42,7 +42,7 @@ - - /* We need to tell the compiler that we meant to leave out the null character. */ - #define MBEDTLS_SSL_TLS1_3_LABEL(name, string) \ -- const unsigned char name [sizeof(string) - 1] __attribute__ ((nonstring)); -+ const unsigned char name [sizeof(string) - 1] MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING; - - union mbedtls_ssl_tls13_labels_union { - MBEDTLS_SSL_TLS1_3_LABEL_LIST diff --git a/meta-webserver/recipes-httpd/hiawatha/files/define-MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING.patch b/meta-webserver/recipes-httpd/hiawatha/files/define-MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING.patch deleted file mode 100644 index 6e2d9eb5f1..0000000000 --- a/meta-webserver/recipes-httpd/hiawatha/files/define-MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING.patch +++ /dev/null @@ -1,33 +0,0 @@ -Replace __attribute__((nonstring)) with macro MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING -This macro applies __attribute__((nonstring)) when using a compiler that supports it - -Upstream-Status: Backport [https://github.com/Mbed-TLS/TF-PSA-Crypto/commit/996f4fa3a2fbe8792ed3efd1bcb3657001f35ae1] - -Signed-off-by: Felix Conway <felix.conway@arm.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/library/ssl_tls13_keys.h -+++ b/library/ssl_tls13_keys.h -@@ -7,6 +7,22 @@ - #if !defined(MBEDTLS_SSL_TLS1_3_KEYS_H) - #define MBEDTLS_SSL_TLS1_3_KEYS_H - -+/* GCC >= 15 has a warning 'unterminated-string-initialization' which complains if you initialize -+ * a string into an array without space for a terminating NULL character. In some places in the -+ * codebase this behaviour is intended, so we add the macro MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING -+ * to suppress the warning in these places. -+ */ -+#if defined(__has_attribute) -+#if __has_attribute(nonstring) -+#define MBEDTLS_HAS_ATTRIBUTE_NONSTRING -+#endif /* __has_attribute(nonstring) */ -+#endif /* __has_attribute */ -+#if defined(MBEDTLS_HAS_ATTRIBUTE_NONSTRING) -+#define MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING __attribute__((nonstring)) -+#else -+#define MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING -+#endif /* MBEDTLS_HAS_ATTRIBUTE_NONSTRING */ -+ - /* This requires MBEDTLS_SSL_TLS1_3_LABEL( idx, name, string ) to be defined at - * the point of use. See e.g. the definition of mbedtls_ssl_tls13_labels_union - * below. */ diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.7.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.8.bb similarity index 89% rename from meta-webserver/recipes-httpd/hiawatha/hiawatha_11.7.bb rename to meta-webserver/recipes-httpd/hiawatha/hiawatha_11.8.bb index 4e7e5fa31d..720c292026 100644 --- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.7.bb +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_11.8.bb @@ -7,14 +7,11 @@ DEPENDS = "libxml2 libxslt virtual/crypt" SECTION = "net" SRC_URI = "https://hiawatha.leisink.net/files/hiawatha-${PV}.tar.gz \ - file://0001-Add-__attribute__-nonstring-to-remove-unterminated-s.patch;patchdir=mbedtls \ - file://0002-Replace-__attribute__-nonstring-with-macro-MBEDTLS_A.patch;patchdir=mbedtls \ - file://define-MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING.patch;patchdir=mbedtls \ file://hiawatha-init \ file://hiawatha.service \ " -SRC_URI[sha256sum] = "8bc180ae3b986d02466f081efeefdb1595d96783f581fded2a9b198752ab7ae1" +SRC_URI[sha256sum] = "1376763750fb9a88a780bac6aba8707bc2a78f8ee089c62d433e50216a5183bd" INITSCRIPT_NAME = "hiawatha" INITSCRIPT_PARAMS = "defaults 70"

[meta-webserver,2/9] hiawatha: upgrade 11.7 -> 11.8

Commit Message

Patch