logo

etc_portage

Unnamed repository; edit this file 'description' to name the repository. git clone https://anongit.hacktivis.me/git/etc_portage.git/
commit: 2a278ae2022c3eabbfc7e7a66eb277a58df9e211
parent 9069a529042aa8dba0cf4616d133b9f4fe1d9d18
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Sun, 28 Dec 2025 06:44:15 +0100

patches/sys-apps/busybox: fortify_source fix + touch usage fix

Diffstat:

Apatches/sys-apps/busybox/0001-coreutils-touch.c-document-f-as-ignored-in-usage.patch31+++++++++++++++++++++++++++++++
Apatches/sys-apps/busybox/0001-split-include-fix-unmatched-buffer_size-on-fp_find-f.patch30++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+), 0 deletions(-)

diff --git a/patches/sys-apps/busybox/0001-coreutils-touch.c-document-f-as-ignored-in-usage.patch b/patches/sys-apps/busybox/0001-coreutils-touch.c-document-f-as-ignored-in-usage.patch @@ -0,0 +1,31 @@ +From 5012ccb757d7ee6f1410f8e5d22e0082ee8c090b Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me> +Date: Thu, 5 Dec 2024 03:38:16 +0100 +Subject: [PATCH] coreutils/touch.c: document -f as ignored in usage + +--- + coreutils/touch.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/coreutils/touch.c b/coreutils/touch.c +index ced596c..abe4a4a 100644 +--- a/coreutils/touch.c ++++ b/coreutils/touch.c +@@ -31,12 +31,13 @@ + //kbuild:lib-$(CONFIG_TOUCH) += touch.o + + //usage:#define touch_trivial_usage +-//usage: "[-ch" IF_FEATURE_TOUCH_SUSV3("am") "]" ++//usage: "[-cfh" IF_FEATURE_TOUCH_SUSV3("am") "]" + //usage: IF_FEATURE_TOUCH_SUSV3(" [-d DATE] [-t DATE] [-r FILE]") + //usage: " FILE..." + //usage:#define touch_full_usage "\n\n" + //usage: "Update mtime of FILEs\n" + //usage: "\n -c Don't create files" ++//usage: "\n -f (ignored, BSD compat)" + //usage: "\n -h Don't follow links" + //usage: IF_FEATURE_TOUCH_SUSV3( + //usage: "\n -a Change only atime" +-- +2.45.2 + diff --git a/patches/sys-apps/busybox/0001-split-include-fix-unmatched-buffer_size-on-fp_find-f.patch b/patches/sys-apps/busybox/0001-split-include-fix-unmatched-buffer_size-on-fp_find-f.patch @@ -0,0 +1,30 @@ +From b9beca9da16fe9e3e2d42af5c81c9166e95bab98 Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me> +Date: Sun, 28 Dec 2025 04:47:12 +0100 +Subject: [PATCH busybox] split-include: fix unmatched buffer_size on fp_find + fgets + +Found with building busybox with standalone fortify-headers 3.0 +--- + scripts/basic/split-include.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/basic/split-include.c b/scripts/basic/split-include.c +index 6ef29195e..93011d511 100644 +--- a/scripts/basic/split-include.c ++++ b/scripts/basic/split-include.c +@@ -195,7 +195,7 @@ int main(int argc, const char * argv []) + ERROR_EXIT( "find" ); + + line[0] = '\n'; +- while (fgets(line+1, buffer_size, fp_find)) ++ while (fgets(line+1, buffer_size-1, fp_find)) + { + if (strstr(list_target, line) == NULL) + { + +base-commit: d755846906800ac4156ef4f83430ba8e69edb4df +prerequisite-patch-id: fcfb7829b8e8db7390554366601f27e4132d88e8 +-- +2.51.2 +