Compare commits

...
29 Commits
Author SHA1 Message Date
Peter Korsgaard aeeeefb855 Update for 2024.02.12
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-24 18:24:45 +01:00
Waldemar Brodkorb f1a76fc8ec package/expat: security update to 2.7.0
Fixes CVE-2024-8176.

For more details, see:
https://blog.hartwork.org/posts/expat-2-7-0-released/

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit dcd6bea6ae)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-24 13:12:54 +01:00
Alex Bennée 2c20dbc8f8 package/fio: explicitly control libnfs dependency
The upstream uses pkg-config to detect and enable libnfs usage if it
is found [1]. This can get confused by the host configuration so at the
least we should disable detection if we are not planning to build with
it.

Note: the fio configure script accept both --enable-libnfs
and --disable-libnfs since upstream commit [2], first included
in fio v3.31. In Buildroot, this is supported since [3].

[1] https://github.com/axboe/fio/blob/fio-3.38/configure#L2360
[2] https://github.com/axboe/fio/commit/98ab12629c6a98fb53e28a4a70f53ce594cca858
[3] https://gitlab.com/buildroot.org/buildroot/-/commit/256395d8e5e7258df830dc19b47dc9ef19e48535

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
[Julien: add extra info in commit log]
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit fc690631ca)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-24 11:05:09 +01:00
Bernd Kuhls cf0f2ae539 {linux, linux-headers}: bump 5.{4, 10, 15}.x / 6.{1, 6, 12}.x series
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit a79c862fa1)
[Peter: drop 6.12.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-24 11:04:22 +01:00
Peter Korsgaard 2b39d1f89c package/php: security bump version to 8.2.28
Fixes the following vulnerabilities:

- CVE-2025-1217: Header parser of `http` stream wrapper does not handle
  folded headers
  https://github.com/php/php-src/security/advisories/GHSA-v8xr-gpvj-cx9g

- CVE-2025-1219: Libxml streams use wrong `content-type` header when
  requesting a redirected resource
  https://github.com/php/php-src/security/advisories/GHSA-p3x9-6h7p-cgfc

- CVE-2025-1734: Streams HTTP wrapper does not fail for headers with invalid
  name and no colon
  https://github.com/php/php-src/security/advisories/GHSA-pcmh-g36c-qc44

- CVE-2025-1736: Stream HTTP wrapper header check might omit basic auth
  header
  https://github.com/php/php-src/security/advisories/GHSA-hgf5-96fm-v528

- CVE-2025-1861: Stream HTTP wrapper truncate redirect location to 1024
  bytes
  https://github.com/php/php-src/security/advisories/GHSA-52jp-hrpf-2jff

Changelog: https://www.php.net/ChangeLog-8.php#8.2.28

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-23 07:40:40 +01:00
Yevhen Babiichuk (DustDFG) a8f8e3e658 package/llvm-project/compiler-rt: remove duplicate parameter
The COMPILER_RT_STANDALONE_BUILD parameter was passed twice.  One time as
FALSE and immediately after as TRUE which overrides previous value, so drop
the first one.

Signed-off-by: Yevhen Babiichuk (DustDFG) <dfgdust@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit acc7ce7262)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-22 08:37:37 +01:00
Yevhen Babiichuk (DustDFG) 03b06f7f5f package/{odb,sdbusplus}: use "host <foo>" prompt
For consistency with the other host packages.

Signed-off-by: Yevhen Babiichuk (DustDFG) <dfgdust@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 6979ee5db0)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-22 08:37:00 +01:00
Thomas Devoogdt e0403cef7d package/webkitgtk: bump to 2.46.4
Stable release to the 2.46 series.

Release notes:

  https://webkitgtk.org/2024/09/17/webkitgtk2.46.0-released.html
  https://webkitgtk.org/2024/09/30/webkitgtk2.46.1-released.html
  https://webkitgtk.org/2024/10/21/webkitgtk2.46.2-released.html
  https://webkitgtk.org/2024/10/30/webkitgtk2.46.3-released.html
  https://webkitgtk.org/2024/11/27/webkitgtk2.46.4-released.html

Added BR2_PACKAGE_WEBP_MUX to fix this error:

-- The following WebP libraries were not found:
--  mux (required)

Added USE_SYSTEM_SYSPROF_CAPTURE=OFF to fix this error:

-- Checking for module 'sysprof-capture-4'
--   Package 'sysprof-capture-4', required by 'virtual:world', not found
-- Could NOT find SysProfCapture (missing: SysProfCapture_LIBRARY SysProfCapture_INCLUDE_DIR)

For now, use USE_SKIA=OFF which is the replacement for cairo.

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit a199751e5b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-21 22:21:13 +01:00
Daniel Palmer bfcceaca1d package/musl: Add upstream patch to fix building strace on m68k
Fixes:
http://autobuild.buildroot.net/results/ec3de790a66373f270f731519e2ef51c293ba683/

Currently it's not possible to build strace on m68k when using
musl because the version of musl in buildroot doesn't have the
m68k specific definitions of POLLWRNORM and POLLWRBAND.

This is already fixed upstream so manually apply the patch
until the next release.

Signed-off-by: Daniel Palmer <daniel@0x0f.com>
[Peter: add autobuilder ref and upstream link / s-o-b in patch description]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 3e88ba41a9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-21 16:00:19 +01:00
Bernd Kuhls 78e596e45b {linux, linux-headers}: bump 6.{1, 6, 12}.x series
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit a3c3c2cc3b)
[Peter: drop 6.12.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-16 21:33:44 +01:00
Daniel Palmer 01e010cfc4 package/prboom: Fix big endian fix up
The hack to force big endian support when building
for a big endian machine doesn't work as there is
some whitespace between "#" and "undef" in config.h.

Add a wildcard between those two so that the target
line matches and the replacement is done.

Allows me to play DOOM on my LC475.

Signed-off-by: Daniel Palmer <daniel@0x0f.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit ebcd82198f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-16 21:24:04 +01:00
Peter Korsgaard 7d3901ca5f package/libjxl: security bump to version 0.9.4
Fixes:
https://www.cve.org/cverecord?id=CVE-2024-11403
https://www.cve.org/cverecord?id=CVE-2024-11498

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-16 21:21:52 +01:00
Vladimir Oltean 21357a66fb package/util-linux: add uuidd user and group
When util-linux is compiled with the uuidd daemon and with systemd
init, the rootfs creation fails in fakeroot as follows:

    printf 'host/bin/systemctl --root=build/buildroot-fs/ext2/target preset-all\n' >> build/buildroot-fs/ext2/fakeroot
    [...]
    FAKEROOTDONTTRYCHOWN=1 host/bin/fakeroot -- build/buildroot-fs/ext2/fakeroot
    rootdir=build/buildroot-fs/ext2/target
    table='build/buildroot-fs/full_devices_table.txt'
    ignored spec: h /var/log/journal/%m - - - - +C
    ignored spec: x /var/tmp/systemd-private-%b-*
    ignored spec: X /var/tmp/systemd-private-%b-*/tmp
    ignored spec: x  /var/lib/systemd/coredump/.#core*.%b*
    ignored spec: z /var/log/journal/%m 2755 root systemd-journal - -
    ignored spec: z /var/log/journal/%m/system.journal 0640 root systemd-journal - -
    <stdin>:37: Failed to resolve user 'uuidd': No such process
    make[1]: *** [fs/ext2/ext2.mk:66: images/rootfs.ext2] Error 65
    make: *** [Makefile:83: _all] Error 2

This error can be reproduced with the commands:

    cat <<EOF >.config
    BR2_aarch64=y
    BR2_TOOLCHAIN_EXTERNAL=y
    BR2_PACKAGE_UTIL_LINUX=y
    BR2_PACKAGE_UTIL_LINUX_UUIDD=y
    BR2_INIT_SYSTEMD=y
    BR2_TARGET_ROOTFS_EXT2=y
    EOF
    make olddefconfig
    make

The error comes from systemctl, which cannot find the uuidd user in
the target rootfs, needed in the uuidd.service unit file [1].

This commit fixes the issue by adding the uuidd user and group in
support/scripts/mkusers syntax.

[1] https://web.git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/misc-utils/uuidd.service.in?h=v2.40.2

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
[Julien: add commands to reproduce the issue in commit log]
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit 4809690d42)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-16 21:09:56 +01:00
Cherniaev Andrei 73b8529fd1 boot/grub2/readme.txt: typo
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit 3fbc4e583f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-16 21:06:17 +01:00
Daniel Lang f0b2e3f224 boot/optee-os: add CPE identifier
cpe:2.3:o:linaro:op-tee:4.3.0:*:*:*:*:*:*:* is a valid CPE ID.

See:
https://nvd.nist.gov/products/cpe/detail/2754E8CF-9BD5-448D-9F32-CFAC92278CD9

Note: this commit needs to set _CPE_ID_PREFIX because optee-os CPE
"part" needs to be set to "o" (OS), while the default Buildroot prefix
is "a" (Application).

Signed-off-by: Daniel Lang <dalang@gmx.at>
[Julien:
 - add extra info in commit log (and fix CVE to CPE)
 - add a new line after OPTEE_OS_CPE_ID_PRODUCT for readability
]
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit f2498258d4)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-16 21:04:59 +01:00
Adam Duskett 1637223b8d package/systemd: enable tmpfs kernel option
systemd automatically creates tmpfs mounts for /tmp, /run, /dev/shm, and
others. If tmpfs is not enabled in the kernel, systemd crashes with an
unknown filesystem error on boot. This hasn't manifested itself during
tests with defconfigs such as pc_x86_64_efi_defconfig for a few reasons:

  - No defconfig uses systemd as the init system by default
  - Even if a user does use pc_x86_64_efi_defconfig and changes to systemd,
    the board/pc/linux.config file enables CONFIG_PCI, which selects
    CONFIG_TMPFS.
  - The systemd init tests use a prebuilt kernel with tmpfs enabled.

Enable tmpfs unconditionally to ensure that systemd always boots, even with
a minimal kernel built.

Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit b19976abc9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-16 20:57:19 +01:00
Bernd Kuhls 01e9401746 {linux, linux-headers}: bump 6.{6, 12}.x series
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 2ef5e56d1f)
[Peter: drop 6.12.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-16 20:48:38 +01:00
Bernd Kuhls ce05244125 package/exim: security bump version to 4.98.1
Fixes CVE 2025-26794:
https://lists.exim.org/lurker/message/20250221.121401.a509f6c9.en.html
https://exim.org/static/doc/security/CVE-2025-26794.txt

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 97f8ba4ea2)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-14 11:25:32 +01:00
Fiona Klute (WIWA) 9af16eaf16 package/python-typing-extensions: update homepage link in help
Typing-extensions has moved to a separate repository, the previous
link now leads to a 404 page. The top level README in the previous
repository points at the new one, see:
https://github.com/python/typing/blob/fafcdeb724ac22ace877bee4485ed3b4c3edbbd8/README.md#repository-content

Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit a40ea829ab)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-14 11:23:32 +01:00
Kory Maincent b3a1b9f2ec board/octavo/osd32mp1: Fix TF-A build error
The Octavo defconfig currently uses TF-A version 2.4 from ST, which leads
to build errors due to missing patches. This update imports the necessary
TF-A 2.4 patches to ensure compatibility and resolve the build issues for
these boards.

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/8751983324
https://gitlab.com/buildroot.org/buildroot/-/jobs/8751983326

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 793b88a7ae)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-14 09:55:47 +01:00
Andreas Naumann e2e59f8891 DEVELOPERS: update email address for Andreas Naumann
Update my email address in the DEVELOPERS file.

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit fee61e3d8d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-13 21:42:52 +01:00
Thomas Petazzoni be2a4ed89a DEVELOPERS: put Andreas Naumann at the right place
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit c0aae3e424)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-13 21:42:38 +01:00
Thomas Bonnefille d976cec1be package/foot: support soft-float architecture
Architecture using soft float don't support the math FE_* exceptions.
This commit adds a patch to conditionnally build the FE_* exception
handling.

Fixes:
    https://autobuild.buildroot.org/results/88d/88d764dd12bdbdbe633ebc703c461ebe95b75693/

Signed-off-by: Thomas Bonnefille <thomas.bonnefille@bootlin.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit ac83fdcb29)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-13 21:19:46 +01:00
Raphaël Mélotte 3d6e2e4111 package/jbig2dec: add upstream security fix for CVE-2023-46361
Fixes the following security issue:
CVE-2023-46361: Artifex Software jbig2dec v0.20 was discovered to
contain a SEGV vulnerability via jbig2_error at /jbig2dec/jbig2.c.

https://www.cve.org/CVERecord?id=CVE-2023-46361

Note that jbig2dec version 0.19 (used in Buildroot 2024.02.11) is not
officially listed as affected, but it actually has the same bug.

Also note that this CVE is about a crash in the CLI tool only.

Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
[Julien: add JBIG2DEC_IGNORE_CVES]
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit 63c2dd2d40)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-13 21:12:23 +01:00
Scott Fan fa7d35db4c package/postgresql: bump version to 16.8
Release notes:
https://www.postgresql.org/docs/release/16.8/
https://www.postgresql.org/about/news/postgresql-174-168-1512-1417-and-1320-released-3018/

Updated license hash due to copyright year bump:
https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=759620716adb347c1d8c8b2e6f7d88b947a54c98

Signed-off-by: Scott Fan <fancp2007@gmail.com>
Reviewed-by: Maxim Kochetkov <fido_max@inbox.ru>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-03-12 19:54:33 +01:00
Fiona Klute (WIWA) 71ba740453 package/watchdogd: fix sysv init script
PIDFILE was set incorrectly, watchdogd writes its PID file to
/var/run/watchdogd/pid (note the slash), which is not configurable
without patching.

Restructure the rest of the script to match current style while at it.

Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 51b848b534)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-02-25 21:00:06 +01:00
Fiona Klute (WIWA) 1e0d7b66f2 package/watchdogd: fix use of uninitialized exit status
The bug could lead to incorrect "critical error" reports if that
uninitialized memory happened to contain a value that interpreted as
an int was above the critical threshold. It affected primarily scripts
running approximately one second or longer, because access happens by
timer.

Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit bfb87bafdb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-02-25 20:56:31 +01:00
Bernd Kuhls 5bf8e339bc {linux, linux-headers}: bump 6.{1, 6, 12}.x series
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit 1bcd3d6bc5)
[Peter: drop 6.12.x bump]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2025-02-25 20:50:03 +01:00
Peter Korsgaard e0b0fa2f16 package/libxml2: security bump to version 2.12.10
Fixes the following security vulnerabilities:

[CVE-2024-56171] Use-after-free in xmlSchemaIDCFillNodeTables
https://gitlab.gnome.org/GNOME/libxml2/-/issues/828

[CVE-2025-24928] Stack-buffer-overflow in xmlSnprintfElements
https://gitlab.gnome.org/GNOME/libxml2/-/issues/847

Null-deref in xmlPatMatch
https://gitlab.gnome.org/GNOME/libxml2/-/issues/861

https://www.openwall.com/lists/oss-security/2025/02/18/2

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
2025-02-25 08:12:31 +01:00
41 changed files with 449 additions and 85 deletions
-1
View File
@@ -1337,7 +1337,6 @@ package/waffle/0003-drop-C-dependency.patch Upstream
package/wampcc/0001-Add-RISC-V-endian-detection.patch Upstream
package/wampcc/0002-include-wampcc-platform.h-fix-build-with-musl-1.2.0.patch Upstream
package/wampcc/0003-Broken-build-on-Windows.patch Upstream
package/watchdogd/S01watchdogd Indent NotExecutable
package/wget/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch Upstream
package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch Upstream
package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch Upstream
+12
View File
@@ -1,3 +1,15 @@
2024.02.12, released March 24st, 2025
Important / security related fixes.
Defconfigs: Octavo osd23mp1: Fix TF-A/Linux compilation after
move to newer toolchain versions.
Updated/fixed packages: compiler-rt, exim, expat, fio, foot,
jbig2dec, libjxl, libxml2, musl, optee-os, php, postgresql,
prboom, python-typing-extensions, systemd, util-linux,
watchdogd, webkitgtk
2024.02.11, released February 21th, 2025
Important / security related fixes.
+6 -6
View File
@@ -166,6 +166,12 @@ F: package/wine/
N: Andreas Klinger <ak@it-klinger.de>
F: package/ply/
N: Andreas Naumann <dev@andin.de>
F: package/evemu/
F: package/libevdev/
F: package/pkg-qmake.mk
F: package/qt5/qt5opcua/
N: Andreas Ziegler <br015@umbiko.net>
F: package/mpd/
@@ -2282,12 +2288,6 @@ N: Nathaniel Roach <nroach44@gmail.com>
F: package/bandwidthd/
F: package/libgudev/
N: Naumann Andreas <ANaumann@ultratronik.de>
F: package/evemu/
F: package/libevdev/
F: package/pkg-qmake.mk
F: package/qt5/qt5opcua/
N: Neal Frager <neal.frager@amd.com>
F: board/versal/
F: board/zynq/
+2 -2
View File
@@ -90,9 +90,9 @@ all:
.PHONY: all
# Set and export the version string
export BR2_VERSION := 2024.02.11
export BR2_VERSION := 2024.02.12
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1740143000
BR2_VERSION_EPOCH = 1742837000
# Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -0,0 +1,61 @@
From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001
From: Marco Felsch <m.felsch@pengutronix.de>
Date: Wed, 9 Nov 2022 12:59:09 +0100
Subject: [PATCH] feat(build): add support for new binutils versions
Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces
of a new warning when linking the bl*.elf in the form:
ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack
ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions
ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions
These new warnings are enbaled by default to secure elf binaries:
- https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
- https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774
Fix it in a similar way to what the Linux kernel does, see:
https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/
Following the reasoning there, we set "-z noexecstack" for all linkers
(although LLVM's LLD defaults to it) and optional add
--no-warn-rwx-segments since this a ld.bfd related.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c
---
Makefile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 1ddb7b844..470956b19 100644
--- a/Makefile
+++ b/Makefile
@@ -416,6 +416,8 @@ endif
GCC_V_OUTPUT := $(shell $(CC) -v 2>&1)
+TF_LDFLAGS += -z noexecstack
+
# LD = armlink
ifneq ($(findstring armlink,$(notdir $(LD))),)
TF_LDFLAGS += --diag_error=warning --lto_level=O1
@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH)))
# LD = gcc-ld (ld) or llvm-ld (ld.lld) or other
else
-TF_LDFLAGS += --fatal-warnings -O1
+# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we
+# are not loaded by a elf loader.
+TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments)
+TF_LDFLAGS += -O1
TF_LDFLAGS += --gc-sections
# ld.lld doesn't recognize the errata flags,
# therefore don't add those in that case
--
2.30.2
@@ -0,0 +1,61 @@
From 0f75b03c008eacb9818af3a56dc088e72a623d17 Mon Sep 17 00:00:00 2001
From: Marco Felsch <m.felsch@pengutronix.de>
Date: Wed, 9 Nov 2022 12:59:09 +0100
Subject: [PATCH] feat(build): add support for new binutils versions
Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces
of a new warning when linking the bl*.elf in the form:
ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack
ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions
ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions
These new warnings are enbaled by default to secure elf binaries:
- https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
- https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774
Fix it in a similar way to what the Linux kernel does, see:
https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/
Following the reasoning there, we set "-z noexecstack" for all linkers
(although LLVM's LLD defaults to it) and optional add
--no-warn-rwx-segments since this a ld.bfd related.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
Upstream: https://github.com/ARM-software/arm-trusted-firmware/commit/1f49db5f25cdd4e43825c9bcc0575070b80f628c
---
Makefile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 1ddb7b844..470956b19 100644
--- a/Makefile
+++ b/Makefile
@@ -416,6 +416,8 @@ endif
GCC_V_OUTPUT := $(shell $(CC) -v 2>&1)
+TF_LDFLAGS += -z noexecstack
+
# LD = armlink
ifneq ($(findstring armlink,$(notdir $(LD))),)
TF_LDFLAGS += --diag_error=warning --lto_level=O1
@@ -442,7 +444,10 @@ TF_LDFLAGS += $(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH)))
# LD = gcc-ld (ld) or llvm-ld (ld.lld) or other
else
-TF_LDFLAGS += --fatal-warnings -O1
+# With ld.bfd version 2.39 and newer new warnings are added. Skip those since we
+# are not loaded by a elf loader.
+TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments)
+TF_LDFLAGS += -O1
TF_LDFLAGS += --gc-sections
# ld.lld doesn't recognize the errata flags,
# therefore don't add those in that case
--
2.30.2
+2 -2
View File
@@ -51,7 +51,7 @@ grub-bios-setup does but it works anyway.
To test your BIOS image in Qemu
-------------------------------
qemu-system-{i386,x86-64} -hda disk.img
qemu-system-{i386,x86_64} -hda disk.img
Notes on using Grub2 for x86/x86_64 EFI-based platforms
=======================================================
@@ -93,7 +93,7 @@ To test your i386/x86-64 EFI image in Qemu
[0] https://github.com/retrage/edk2-nightly
2. qemu-system-{i386,x86-64} -bios <path-to-OVMF.fd> -hda disk.img
2. qemu-system-{i386,x86_64} -bios <path-to-OVMF.fd> -hda disk.img
Notes on using Grub2 for ARM u-boot-based platforms
===================================================
+4
View File
@@ -10,6 +10,10 @@ ifeq ($(BR2_TARGET_OPTEE_OS_LATEST),y)
OPTEE_OS_LICENSE_FILES = LICENSE
endif
OPTEE_OS_CPE_ID_PREFIX = cpe:2.3:o
OPTEE_OS_CPE_ID_VENDOR = linaro
OPTEE_OS_CPE_ID_PRODUCT = op-tee
OPTEE_OS_INSTALL_STAGING = YES
OPTEE_OS_INSTALL_IMAGES = YES
+1 -1
View File
@@ -128,7 +128,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
default "6.6.78" if BR2_LINUX_KERNEL_LATEST_VERSION
default "6.6.83" 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 \
+5 -5
View File
@@ -1,10 +1,10 @@
# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
sha256 5aa39a9bd555133ad741058f9908a277e6b36bb928481e747d885b50aaaa93ed linux-6.6.78.tar.xz
sha256 874d67d3181570e69ac6b33853f0448f05fc90d4cf3e4baaadc4a9cede7c50f3 linux-6.1.128.tar.xz
sha256 894bbbe63b7484a0bc576a1e11a8dbc090fbd476d6424431bdc8435e03c2c208 linux-6.6.83.tar.xz
sha256 44caf510603b4cbbe78ef828620099d200536d666e909ddb73bb2938c7de5b16 linux-6.1.131.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
sha256 efe9f7eb5ea4d26cec6290689343e1804eb3b4a88ff5a60497a696fc08157c42 linux-5.15.178.tar.xz
sha256 9597c4fee2f1ce452acfec516f4325ad342155872052fd5f0d9ce2ddcc26ebe5 linux-5.10.234.tar.xz
sha256 6cc73cf2a7f50580f7d8c7e99d2f2e8ada8b7d2f4e76f5896f0daf691cc2a456 linux-5.4.290.tar.xz
sha256 9319a47b1e9b5d344ff6015431856d0c9640e4faedc527c87f9129061a27136f linux-5.15.179.tar.xz
sha256 953be3931101a94a93a644c1283ca41a7e567447ca87d3069ed4dd712dc1f1cc linux-5.10.235.tar.xz
sha256 b3ad64a4476a7c5450b92eab9a888b84ecb64dc613fcb0128f653f58e958ef6e linux-5.4.291.tar.xz
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 607bed7de5cda31a443df4c8a78dbe5e8a9ad31afde2a4d28fe99ab4730e8de1 linux-4.19.325.tar.xz
# Locally computed
+2 -2
View File
@@ -1,6 +1,6 @@
# From https://ftp.exim.org/pub/exim/exim4/00-sha256sums.txt
sha256 0ebc108a779f9293ba4b423c20818f9a3db79b60286d96abc6ba6b85a15852f7 exim-4.98.tar.xz
sha256 d858b75ad2cc6bf71c9071ba26a55b3ea9add26607bd832df3cb54f82221c2ce exim-4.98.1.tar.xz
# From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt
sha512 13dd963dd0899bb4d64bee44c20883e720e469a4d77456b877d6693cfc4419805a045cb561508cdf763dbb37cc84fbdc6177d68acc2183934c3224fbd03caf15 exim-4.98.tar.xz
sha512 8f80999a41ed40e86ee16eea5cfd765e2f164ea149f40eeb410fd02fcf35c23317dc69540efe336e9e0fae930b1cc6771e0180dd70f1314531cdb139740c744e exim-4.98.1.tar.xz
# Locally calculated
sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
EXIM_VERSION = 4.98
EXIM_VERSION = 4.98.1
EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz
EXIM_SITE = https://ftp.exim.org/pub/exim/exim4
EXIM_LICENSE = GPL-2.0+
+1 -1
View File
@@ -1,3 +1,3 @@
# Locally calculated
sha256 a695629dae047055b37d50a0ff4776d1d45d0a4c842cf4ccee158441f55ff7ee expat-2.6.4.tar.xz
sha256 25df13dd2819e85fb27a1ce0431772b7047d72af81ae78dc26b4c6e0805f48d1 expat-2.7.0.tar.xz
sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
EXPAT_VERSION = 2.6.4
EXPAT_VERSION = 2.7.0
EXPAT_SITE = https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(EXPAT_VERSION))
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
EXPAT_INSTALL_STAGING = YES
+4 -1
View File
@@ -16,7 +16,10 @@ FIO_DEPENDENCIES += libaio
endif
ifeq ($(BR2_PACKAGE_LIBNFS),y)
FIO_DEPENDENCIES += libnfs
FIO_OPTS += --enable-libnfs
FIO_DEPENDENCIES += host-pkgconf libnfs
else
FIO_OPTS += --disable-libnfs
endif
ifeq ($(BR2_PACKAGE_LIBISCSI),y)
@@ -0,0 +1,42 @@
From 9443ac7e2937bb4f26cf44c73bb8150860c5df45 Mon Sep 17 00:00:00 2001
From: Thomas Bonnefille <thomas.bonnefille@bootlin.com>
Date: Tue, 4 Feb 2025 09:48:13 +0100
Subject: [PATCH] box-drawings: handle architecture with soft-float
Currently, architecture using soft-floats doesn't support instructions
FE_INVALID, FE_DIVBYZERO, FE_OVERFLOW and FE_UNDERFLOW and so building
on those architectures results with a build error.
As the sqrt math function should set errno to EDOM if an error occurs,
fetestexcept shouldn't be mandatory.
This commit removes the float environment error handling.
Upstream: https://codeberg.org/dnkl/foot/commit/9443ac7e2937bb4f26cf44c73bb8150860c5df45
Signed-off-by: Thomas Bonnefille <thomas.bonnefille@bootlin.com>
---
box-drawing.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/box-drawing.c b/box-drawing.c
index 1c613051..421ff54d 100644
--- a/box-drawing.c
+++ b/box-drawing.c
@@ -1462,14 +1462,12 @@ draw_box_drawings_light_arc(struct buf *buf, char32_t wc)
*/
for (double i = y_min*16; i <= y_max*16; i++) {
errno = 0;
- feclearexcept(FE_ALL_EXCEPT);
double y = i / 16.;
double x = circle_hemisphere * sqrt(c_r2 - (y - c_y) * (y - c_y)) + c_x;
/* See math_error(7) */
- if (errno != 0 ||
- fetestexcept(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW | FE_UNDERFLOW))
+ if (errno != 0)
{
continue;
}
--
2.48.1
@@ -0,0 +1,28 @@
From e60a9f388bd5655cb514491ef8d55d403aef0773 Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@gmail.com>
Date: Sun, 5 Nov 2023 12:21:52 +0100
Subject: [PATCH] Bug 705041: jbig2dec: Avoid uninitialized allocator in
command-line tool.
Upstream: https://github.com/ArtifexSoftware/jbig2dec/commit/ee53a7e4bc7819d32e8c0b2057885bcc97586bf3
Signed-off-by: Raphaël Mélotte <raphael.melotte@mind.be>
---
jbig2dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jbig2dec.c b/jbig2dec.c
index 15d204d..1e1dad8 100644
--- a/jbig2dec.c
+++ b/jbig2dec.c
@@ -567,7 +567,7 @@ main(int argc, char **argv)
{
jbig2dec_params_t params;
jbig2dec_error_callback_state_t error_callback_state;
- jbig2dec_allocator_t allocator_;
+ jbig2dec_allocator_t allocator_ = { 0 };
jbig2dec_allocator_t *allocator = &allocator_;
Jbig2Ctx *ctx = NULL;
FILE *f = NULL, *f_page = NULL;
--
2.48.1
+3
View File
@@ -14,4 +14,7 @@ JBIG2DEC_INSTALL_STAGING = YES
# tarball is missing install-sh, install.sh, or shtool
JBIG2DEC_AUTORECONF = YES
# 0001-Bug-705041-jbig2dec-Avoid-uninitialized-allocator-in.patch
JBIG2DEC_IGNORE_CVES += CVE-2023-46361
$(eval $(autotools-package))
+1 -1
View File
@@ -1,4 +1,4 @@
# Locally computed:
sha256 d83bbe188d8fa9725bb75109c922c37fcff8c3b802808f3a6c2c14aaf8337d9f libjxl-0.9.0.tar.gz
sha256 ac9f034bf80516f072450edfb31d93c156e7136791df0d0ce14c5d0d3990fe64 libjxl-0.9.4.tar.gz
sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE
sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
LIBJXL_VERSION = 0.9.0
LIBJXL_VERSION = 0.9.4
LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION))
LIBJXL_LICENSE = BSD-3-Clause
LIBJXL_LICENSE_FILES = LICENSE PATENTS
+2 -2
View File
@@ -1,4 +1,4 @@
# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.9.sha256sum
sha256 59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590 libxml2-2.12.9.tar.xz
# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.10.sha256sum
sha256 c3d8c0c34aa39098f66576fe51969db12a5100b956233dc56506f7a8679be995 libxml2-2.12.10.tar.xz
# License files, locally calculated
sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright
+1 -1
View File
@@ -5,7 +5,7 @@
################################################################################
LIBXML2_VERSION_MAJOR = 2.12
LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).9
LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).10
LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz
LIBXML2_SITE = \
https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR)
+5 -5
View File
@@ -404,11 +404,11 @@ endchoice
config BR2_DEFAULT_KERNEL_HEADERS
string
default "4.19.325" if BR2_KERNEL_HEADERS_4_19
default "5.4.290" if BR2_KERNEL_HEADERS_5_4
default "5.10.234" if BR2_KERNEL_HEADERS_5_10
default "5.15.178" if BR2_KERNEL_HEADERS_5_15
default "6.1.128" if BR2_KERNEL_HEADERS_6_1
default "6.6.78" if BR2_KERNEL_HEADERS_6_6
default "5.4.291" if BR2_KERNEL_HEADERS_5_4
default "5.10.235" if BR2_KERNEL_HEADERS_5_10
default "5.15.179" if BR2_KERNEL_HEADERS_5_15
default "6.1.131" if BR2_KERNEL_HEADERS_6_1
default "6.6.83" if BR2_KERNEL_HEADERS_6_6
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 \
@@ -16,7 +16,7 @@ COMPILER_RT_SUPPORTS_IN_SOURCE_BUILD = NO
COMPILER_RT_INSTALL_STAGING = YES
COMPILER_RT_INSTALL_TARGET = NO
COMPILER_RT_CONF_OPTS=-DCOMPILER_RT_STANDALONE_BUILD=OFF \
COMPILER_RT_CONF_OPTS = \
-DCOMPILER_RT_STANDALONE_BUILD=ON \
-DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=$(GNU_TARGET_NAME) \
-DLLVM_CONFIG_PATH=$(HOST_DIR)/bin/llvm-config \
+26
View File
@@ -0,0 +1,26 @@
From b09e3174a695d1db60b2abc442d29ed3f87f0358 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Wed, 7 Aug 2024 08:51:03 +0300
Subject: m68k: fix POLLWRNORM and POLLWRBAND
As noted in commit f5011c62c3 ("fix POLLWRNORM and POLLWRBAND on mips")
m68k uses a different definition.
Signed-off-by: Daniel Palmer <daniel@0x0f.com>
Upstream: https://git.musl-libc.org/cgit/musl/commit/?id=b09e3174a695d1db60b2abc442d29ed3f87f0358
---
arch/m68k/bits/poll.h | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 arch/m68k/bits/poll.h
diff --git a/arch/m68k/bits/poll.h b/arch/m68k/bits/poll.h
new file mode 100644
index 00000000..00063f41
--- /dev/null
+++ b/arch/m68k/bits/poll.h
@@ -0,0 +1,2 @@
+#define POLLWRNORM POLLOUT
+#define POLLWRBAND 256
--
cgit v1.2.1
+1 -1
View File
@@ -1,5 +1,5 @@
config BR2_PACKAGE_HOST_ODB
bool "host-odb"
bool "host odb"
select BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT
help
This is a compiler that takes a specially crafted c++ header
+1 -1
View File
@@ -1,5 +1,5 @@
# From https://www.php.net/downloads.php
sha256 54747400cb4874288ad41a785e6147e2ff546cceeeb55c23c00c771ac125c6ef php-8.2.26.tar.xz
sha256 af8c9153153a7f489153b7a74f2f29a5ee36f5cb2c6c6929c98411a577e89c91 php-8.2.28.tar.xz
# License file
sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
PHP_VERSION = 8.2.26
PHP_VERSION = 8.2.28
PHP_SITE = https://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
+3 -3
View File
@@ -1,4 +1,4 @@
# From https://ftp.postgresql.org/pub/source/v16.7/postgresql-16.7.tar.bz2.sha256
sha256 62e02f77ebfc4a37f1700c20cc3ccd85ff797b5613766ebf949a7899bb2113fe postgresql-16.7.tar.bz2
# From https://ftp.postgresql.org/pub/source/v16.8/postgresql-16.8.tar.bz2.sha256
sha256 9468083a56ce0ee7d294601b74dad3dd9fc69d87aff61f0a9fb63c813ff7efd8 postgresql-16.8.tar.bz2
# License file, Locally calculated
sha256 9bf20ee493926a7e17a74bc7f05089fbc014269667b1540bc35a6b194a40c9de COPYRIGHT
sha256 e3822c4797fadcab31a3fc73f75c28ac20c73d72b565da91e9974cf9398ef4d2 COPYRIGHT
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
POSTGRESQL_VERSION = 16.7
POSTGRESQL_VERSION = 16.8
POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
POSTGRESQL_LICENSE = PostgreSQL
+1 -1
View File
@@ -40,7 +40,7 @@ PRBOOM_CONF_OPTS = \
# endianness detection isn't used when cross compiling
define PRBOOM_BIG_ENDIAN_FIXUP
$(SED) 's,.*#undef WORDS_BIGENDIAN.*,#define WORDS_BIGENDIAN 1,g' \
$(SED) 's,.*#.*undef WORDS_BIGENDIAN.*,#define WORDS_BIGENDIAN 1,g' \
$(PRBOOM_DIR)/config.h
endef
+1 -1
View File
@@ -3,4 +3,4 @@ config BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS
help
Backported and Experimental Type Hints for Python 3.5+.
https://github.com/python/typing/blob/master/typing_extensions/README.rst
https://github.com/python/typing_extensions
+1 -1
View File
@@ -1,5 +1,5 @@
config BR2_PACKAGE_HOST_SDBUSPLUS
bool "host-sdbusplus"
bool "host sdbusplus"
select BR2_PACKAGE_HOST_PKGCONF
help
A C++ library for sd-bus with a bindings and doc generator.
+1
View File
@@ -788,6 +788,7 @@ SYSTEMD_CONF_ENV = $(HOST_UTF8_LOCALE_ENV)
SYSTEMD_NINJA_ENV = $(HOST_UTF8_LOCALE_ENV)
define SYSTEMD_LINUX_CONFIG_FIXUPS
$(call KCONFIG_ENABLE_OPT,CONFIG_TMPFS)
$(call KCONFIG_ENABLE_OPT,CONFIG_DEVTMPFS)
$(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS)
$(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER)
+6
View File
@@ -53,6 +53,12 @@ HOST_UTIL_LINUX_CONF_OPTS = \
--with-systemdsystemunitdir=no \
--without-python
ifeq ($(BR2_PACKAGE_UTIL_LINUX_UUIDD),y)
define UTIL_LINUX_USERS
uuidd -1 uuidd -1 * - - - uuidd user
endef
endif
ifneq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES)$(BR2_PACKAGE_UTIL_LINUX_CRAMFS)$(BR2_PACKAGE_UTIL_LINUX_FSCK)$(BR2_PACKAGE_UTIL_LINUX_LOSETUP),)
UTIL_LINUX_SELINUX_MODULES = fstools
endif
@@ -0,0 +1,85 @@
From f6d56c374723923e276ccfd442fdd0cabf23d095 Mon Sep 17 00:00:00 2001
From: Fiona Klute <fiona.klute@gmx.de>
Date: Fri, 14 Feb 2025 19:26:24 +0100
Subject: [PATCH] Fix use of uninitialized exit status
Depending on the timing between the SIGCHLD callback run and the first
generic_cb() timer callback run, script_exit_status() sometimes
returned uninitialized memory as the exit status of a script. This
could lead to incorrect "critical error" reports if that uninitialized
memory happened to contain a value that interpreted as an int was
above the critical threshold.
Additionally, script_exit_status() unconditionally removed the process
information from the queue, meaning that if a process had not
completed by the time its status was first probed, its status could
never be updated or successfully probed again, leading to timeout. Fix
this by removing the process only if the status indicates it has
terminated (successful or not).
The problems affected primarily scripts running approximately one
second or longer, because very short running scripts will very likely
have their exit status collected by the SIGCHLD callback before the
first timer callback run.
Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
Upstream: https://github.com/troglobit/watchdogd/pull/52
---
src/script.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/script.c b/src/script.c
index 1220fb9..f6e0763 100644
--- a/src/script.c
+++ b/src/script.c
@@ -16,6 +16,7 @@
*/
#include <errno.h>
+#include <stdbool.h> /* bool type (before C23) */
#include <stdlib.h> /* setenv() */
#include <sys/wait.h> /* waitpid() */
#include <unistd.h> /* execv(), _exit() */
@@ -28,6 +29,7 @@
struct exec_info {
pid_t pid;
int exit_status;
+ bool exited;
void (*cb)(void *arg);
void *arg;
LIST_ENTRY(exec_info) entry;
@@ -64,6 +66,8 @@ static void add(pid_t pid, void (*cb)(void *), void *arg)
}
info->pid = pid;
+ info->exit_status = 0;
+ info->exited = false;
info->cb = cb;
info->arg = arg;
LIST_INSERT_HEAD(&exec_info_head, info, entry);
@@ -78,6 +82,7 @@ static int exec(pid_t pid, int status)
continue;
info->exit_status = status;
+ info->exited = true;
if (info->cb)
info->cb(info->arg);
@@ -96,9 +101,11 @@ int script_exit_status(pid_t pid)
if (info->pid != pid)
continue;
- status = info->exit_status;
- LIST_REMOVE(info, entry);
- free(info);
+ if (info->exited) {
+ status = info->exit_status;
+ LIST_REMOVE(info, entry);
+ free(info);
+ }
break;
}
--
2.47.2
Executable → Regular
+66 -36
View File
@@ -1,47 +1,77 @@
#!/bin/sh
DAEMON="watchdogd"
PIDFILE="/var/run/$DAEMON.pid"
PIDFILE="/var/run/$DAEMON/pid"
# shellcheck source=/dev/null
[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
cmd()
{
start-stop-daemon -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" "$@"
status=$?
if [ $status -eq 0 ]; then
echo "OK"
else
echo "FAIL"
fi
return $status
start() {
printf "Starting %s: " "$DAEMON"
# shellcheck disable=SC2086 # we need the word splitting
start-stop-daemon --start --pidfile "$PIDFILE" \
--exec "/usr/sbin/$DAEMON" -- $WATCHDOGD_ARGS
status=$?
if [ "$status" -eq 0 ]; then
echo "OK"
else
echo "FAIL"
fi
return "$status"
}
stop() {
printf "Stopping %s: " "$DAEMON"
start-stop-daemon --stop --pidfile "$PIDFILE" \
--exec "/usr/sbin/$DAEMON"
status=$?
if [ "$status" -eq 0 ]; then
echo "OK"
else
echo "FAIL"
fi
# watchdogd deletes its PID file on exit, wait for it to be gone
while [ -f "$PIDFILE" ]; do
sleep 0.1
done
return "$status"
}
restart() {
stop
start
}
reload() {
printf "Reloading %s config: " "$DAEMON"
start-stop-daemon --stop --signal HUP -q --pidfile "$PIDFILE" \
--exec "/usr/sbin/$DAEMON"
status=$?
if [ "$status" -eq 0 ]; then
echo "OK"
else
echo "FAIL"
fi
return "$status"
}
case "$1" in
start)
printf 'Starting %s: ' "$DAEMON"
# shellcheck disable=SC2086 # we need the word splitting
cmd -S -- $SMCROUTED_ARGS
;;
stop)
printf 'Stopping %s: ' "$DAEMON"
cmd -K
;;
restart)
$0 stop
sleep 1
$0 start
;;
reload)
printf 'Reloading %s: ' "$DAEMON"
cmd -K -s HUP
;;
*)
echo "Usage: $0 {start|stop|restart|reload}"
exit 1
start)
start
;;
stop)
stop
;;
restart)
restart
;;
reload)
reload
;;
*)
echo "Usage: $0 {start|stop|restart|reload}"
exit 1
;;
esac
exit $?
+1
View File
@@ -53,6 +53,7 @@ config BR2_PACKAGE_WEBKITGTK
select BR2_PACKAGE_SQLITE
select BR2_PACKAGE_WEBP
select BR2_PACKAGE_WEBP_DEMUX
select BR2_PACKAGE_WEBP_MUX
select BR2_PACKAGE_WOFF2
select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11
select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11
+3 -3
View File
@@ -1,6 +1,6 @@
# From https://www.webkitgtk.org/releases/webkitgtk-2.44.4.tar.xz.sums
sha1 3699ff9c9b84e755a0736e72dfd6e5a13151f7d6 webkitgtk-2.44.4.tar.xz
sha256 2ce4ec1b78413035037aba8326b31ed72696626b7bea7bace5e46ac0d8cbe796 webkitgtk-2.44.4.tar.xz
# From https://www.webkitgtk.org/releases/webkitgtk-2.46.4.tar.xz.sums
sha1 10d4dbd222acec30b1d20ee3b7d02c0d9727c5a9 webkitgtk-2.46.4.tar.xz
sha256 0eff5f0ab0a2872ec87df62bc32e3289c8af625716ac71e94b298d74e0374176 webkitgtk-2.46.4.tar.xz
# Hashes for license files:
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
+3 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
WEBKITGTK_VERSION = 2.44.4
WEBKITGTK_VERSION = 2.46.4
WEBKITGTK_SITE = https://www.webkitgtk.org/releases
WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
WEBKITGTK_INSTALL_STAGING = YES
@@ -30,6 +30,8 @@ WEBKITGTK_CONF_OPTS = \
-DUSE_AVIF=OFF \
-DUSE_GTK4=OFF \
-DUSE_LIBHYPHEN=OFF \
-DUSE_SKIA=OFF \
-DUSE_SYSTEM_SYSPROF_CAPTURE=OFF \
-DUSE_WOFF2=ON
ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y)
+1 -1
View File
@@ -5,7 +5,7 @@
################################################################################
# Buildroot version to use
RELEASE='2024.02.11'
RELEASE='2024.02.12'
### Change here for more memory/cores ###
VM_MEMORY=2048