mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-05-05 21:34:19 +02:00
531e69840c
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
25 lines
841 B
Diff
25 lines
841 B
Diff
From 83ee1a13131b6088ab570710b2f5c739e6db9061 Mon Sep 17 00:00:00 2001
|
|
From: Natanael Copa <ncopa@alpinelinux.org>
|
|
Date: Thu, 4 Aug 2016 02:09:48 +0200
|
|
Subject: [PATCH] ash: exec busybox.static
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
---
|
|
shell/ash.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/shell/ash.c b/shell/ash.c
|
|
index e6c1c8e47..e31a20f9c 100644
|
|
--- a/shell/ash.c
|
|
+++ b/shell/ash.c
|
|
@@ -8289,6 +8289,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c
|
|
}
|
|
/* re-exec ourselves with the new arguments */
|
|
execve(bb_busybox_exec_path, argv, envp);
|
|
+ execve("/bin/busybox.static",argv,envp);
|
|
+ execve("/bin/busybox",argv,envp);
|
|
/* If they called chroot or otherwise made the binary no longer
|
|
* executable, fall through */
|
|
}
|