diff mbox series

[meta-oe] libwebsockets: Upgrade 5.0.0 -> 5.1.0

Message ID 20261104211107.2286440-1-peter.marko@siemens.com
State Under Review
Headers show
Series [meta-oe] libwebsockets: Upgrade 5.0.0 -> 5.1.0 | expand

Commit Message

Peter Marko Nov. 4, 2026, 9:11 p.m. UTC 
From: Peter Marko <peter.marko@siemens.com>

This includes fix for CVE-2026-114550.

Added a patch for reproducibility issue from this release.

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 ...urce-dir-from-installed-lws_config.h.patch | 34 +++++++++++++++++++
 ...ockets_5.0.0.bb => libwebsockets_5.1.0.bb} |  6 ++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-cmake-remove-source-dir-from-installed-lws_config.h.patch
 rename meta-oe/recipes-connectivity/libwebsockets/{libwebsockets_5.0.0.bb => libwebsockets_5.1.0.bb} (95%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-cmake-remove-source-dir-from-installed-lws_config.h.patch b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-cmake-remove-source-dir-from-installed-lws_config.h.patch
new file mode 100644
index 0000000000..0b096efe74
--- /dev/null
+++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-cmake-remove-source-dir-from-installed-lws_config.h.patch
@@ -0,0 +1,34 @@ 
+From 7de4adc4359dc45fd088ad11a8130dcb0fc95cdc Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Wed, 4 Nov 2026 21:52:32 +0100
+Subject: [PATCH] cmake: remove source dir from installed lws_config.h
+
+lws_config.h is installed and contains LWS_SOURCE_FONTS_DIR, which
+points into the build host's source tree. This makes builds
+non-reproducible, and the path does not exist once the component is
+packaged into a distribution.
+
+Nothing in the tree references LWS_SOURCE_FONTS_DIR, and the fonts'
+install destination is already available as LWS_FONTS_DIR on the
+line above.
+
+Remove the unused definition.
+
+Upstream-Status: Submitted [https://github.com/warmcat/libwebsockets/pull/3687]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ cmake/lws_config.h.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/cmake/lws_config.h.in b/cmake/lws_config.h.in
+index c716d4f0d..7ad2310fc 100644
+--- a/cmake/lws_config.h.in
++++ b/cmake/lws_config.h.in
+@@ -10,7 +10,6 @@
+ #define LWS_INSTALL_LIBDIR "${LWS_ABSOLUTE_INSTALL_LIBDIR}"
+ #define LWS_PLUGIN_DIR "${LWS_INSTALL_PLUGIN_DIR}"
+ #define LWS_FONTS_DIR "${LWS_ABSOLUTE_INSTALL_FONTS_DIR}"
+-#define LWS_SOURCE_FONTS_DIR "${PROJECT_SOURCE_DIR}/contrib/mcufont/fonts"
+ #define LWS_LIBRARY_VERSION_MAJOR ${LWS_LIBRARY_VERSION_MAJOR}
+ #define LWS_LIBRARY_VERSION_MINOR ${LWS_LIBRARY_VERSION_MINOR}
+ #define LWS_LIBRARY_VERSION_PATCH_ELABORATED ${LWS_LIBRARY_VERSION_PATCH_ELABORATED}
diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_5.0.0.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_5.1.0.bb
similarity index 95%
rename from meta-oe/recipes-connectivity/libwebsockets/libwebsockets_5.0.0.bb
rename to meta-oe/recipes-connectivity/libwebsockets/libwebsockets_5.1.0.bb
index bafaf10f9b..f4b804a5f0 100644
--- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_5.0.0.bb
+++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_5.1.0.bb
@@ -6,10 +6,12 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=d1d99ab4e0f1be7992a891906e47add2"
 DEPENDS = "zlib"
 DEPENDS:append:class-native = " libcap-native"
 
-SRCREV = "2491a1b101283cf7886d05033345b7e821825319"
-SRCBRANCH = "v${@oe.utils.trim_version("${PV}", 2)}-stable"
+SRCREV = "5f39aa483715b813f4d85a692fcb361b5d8d0c1b"
+#SRCBRANCH = "v${@oe.utils.trim_version("${PV}", 2)}-stable"
+SRCBRANCH = "main"
 SRC_URI = " \
     git://github.com/warmcat/libwebsockets.git;protocol=https;branch=${SRCBRANCH};tag=v${PV} \
+    file://0001-cmake-remove-source-dir-from-installed-lws_config.h.patch \
 "
 
 UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases"