aports/main/busybox/0021-tests-fix-tarball-creation.patch
Sören Tempel 531e69840c main/busybox: upgrade to 1.37.0
Not a lot of big changes in this release, mostly code shrinks and bug
fixes here and there. Hence, I don't expect too much breakage. Most patches
applied as is and didn't require any changes either. Nonetheless, I
rebased the entire patchset and removed patches that were backported.

The 0001-modutils-check-ELF-header-before-calling-finit_modul.patch
should be superseded by an upstream modutils change which checks that
if the loaded module file path ends in .ko and if not attempts to
uncompress it first. Thereby preventing compressed modules to be
passed to the kernel and causing a weird error to be emitted. Therefore,
this patch was removed

See: https://git.busybox.net/busybox/commit/?id=af5277f883e8fc2e0236aa9ecc5115ecaffd0ccb
2024-10-20 10:16:15 +00:00

26 lines
1,012 B
Diff

From 1fa46981ad75f544b4e2a4b107caf59c1e453a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Wed, 4 Jan 2023 08:30:41 +0100
Subject: [PATCH] tests: fix tarball creation
Without this patch, the chmod 644 invocation takes away the executable
bit from the input_dir directory, thus preventing the chmod of the files
within the input_dir directory (due to lack of x-bit).
---
testsuite/tar.tests | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index 0f2e89112..18e571af3 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -67,7 +67,7 @@ testing "tar hardlinks and repeated files" '\
ln input_hard1 input_hard2
mkdir input_dir
>input_dir/file
-chmod -R 644 *
+for f in *; do [ "$f" = "input_dir" ] || chmod -R 644 "$f"; done
chmod 755 input_dir
tar cf test.tar input input_dir/ input_hard1 input_hard2 input_hard1 input_dir/ input
tar tvf test.tar | sed "s/.*[0-9] input/input/"