From 1ec30e6f11f058b4510342a98639b06de1c43358 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 17 Nov 2024 18:03:43 +0100 Subject: [PATCH 1/3] Config.in: fix _FORTIFY_SOURCE help string typos The Config.in help string for BR2_FORTIFY_SOURCE_{2,3} mention "_FORTIFY_SOURCES" (plural, with an extra "S"). The correct macro name is "_FORTIFY_SOURCE" (without the "S"). See [1]. This commit fixes those typos. [1] https://www.gnu.org/software/libc/manual/html_node/Source-Fortification.html Signed-off-by: Julien Olivain Reviewed-by: Vincent Jardin Signed-off-by: Peter Korsgaard --- Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index df43db7eff13..d7a8dc68485c 100644 --- a/Config.in +++ b/Config.in @@ -963,7 +963,7 @@ config BR2_FORTIFY_SOURCE_2 # gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61164 depends on !BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_GCC_AT_LEAST_6 help - This option sets _FORTIFY_SOURCES to 2 and some more + This option sets _FORTIFY_SOURCE to 2 and some more checking is added, but some conforming programs might fail. Also adds checks at run-time (detected buffer overflow terminates the program) @@ -972,7 +972,7 @@ config BR2_FORTIFY_SOURCE_3 bool "Extended" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12 help - This option sets _FORTIFY_SOURCES to 3 and even more + This option sets _FORTIFY_SOURCE to 3 and even more checking is added compared to level 2. Extends checks at run-time that can introduce an additional performance overhead. From 5d49bc51e032b0d512741618dbec6596eac9d452 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 23 Nov 2024 11:24:30 +0100 Subject: [PATCH 2/3] {linux, linux-headers}: bump 6.{1, 6, 11}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 6 +++--- package/linux-headers/Config.in.host | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 62f0b06d7b63..92aeda5e6f04 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.11.9" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.11.10" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ diff --git a/linux/linux.hash b/linux/linux.hash index 07c1ce7e4f6e..0135a1411932 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 75658a7aa3bd9598c96ee1e5862c5e1d34fced75c28d825c727a1510a6f384b4 linux-6.11.9.tar.xz -sha256 e2c35611775534941b9d4dd871f3ae5b988b6594dc9033b5ca784366e07d9336 linux-6.6.62.tar.xz -sha256 010784bd7161c32c4cd68a423d4dcb14e4587677d238b2825a31fe012869224c linux-6.1.118.tar.xz +sha256 4bc184915290629d61f935aa1eb1b6e711b8e47d8f289a39f0d584ecbdb4fe77 linux-6.11.10.tar.xz +sha256 d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835 linux-6.6.63.tar.xz +sha256 aecdaf39d0a844a81ce4c67d9daff8979e938bb690df4f679fbbb494fe423278 linux-6.1.119.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 8a4b2a47ccc9b208b2b6ed9a216ea1a5eb12852c723bec1a04de9e671a1d7da8 linux-5.15.173.tar.xz sha256 cd1850ef3b771886df4e0b4c4eb07033864abab2bb553a20fd9e3cdc23584b47 linux-5.10.230.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index f74802adc9c1..9cf31c484d5d 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -432,9 +432,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.286" if BR2_KERNEL_HEADERS_5_4 default "5.10.230" if BR2_KERNEL_HEADERS_5_10 default "5.15.173" if BR2_KERNEL_HEADERS_5_15 - default "6.1.118" if BR2_KERNEL_HEADERS_6_1 - default "6.6.62" if BR2_KERNEL_HEADERS_6_6 - default "6.11.9" if BR2_KERNEL_HEADERS_6_11 + default "6.1.119" if BR2_KERNEL_HEADERS_6_1 + default "6.6.63" if BR2_KERNEL_HEADERS_6_6 + default "6.11.10" if BR2_KERNEL_HEADERS_6_11 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ From ed590a22e24bdc714d75005f7fe7a3ad3b001c4d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 24 Nov 2024 18:43:35 +0100 Subject: [PATCH 3/3] package/doxygen: fix _SITE download URL Doxygen source archive download fails with a HTTP 404 Not Found error. The doxygen download page [1] mention that older versions can be downloaded on SourceForge at [2]. This commit fixes the issue by changing _SITE to this new URL. Fixes: https://autobuild.buildroot.org/results/253450bf374ce858fe12712059c435fc773d52f8 [1] https://www.doxygen.nl/download.html [2] https://sourceforge.net/projects/doxygen/files/ Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/doxygen/doxygen.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/doxygen/doxygen.mk b/package/doxygen/doxygen.mk index b24c527a2069..b3bcb34097fb 100644 --- a/package/doxygen/doxygen.mk +++ b/package/doxygen/doxygen.mk @@ -6,7 +6,7 @@ DOXYGEN_VERSION = 1.8.18 DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz -DOXYGEN_SITE = http://doxygen.nl/files +DOXYGEN_SITE = https://sourceforge.net/projects/doxygen/files/rel-$(DOXYGEN_VERSION) DOXYGEN_LICENSE = GPL-2.0 DOXYGEN_LICENSE_FILES = LICENSE DOXYGEN_CPE_ID_VENDOR = doxygen