diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2018-08-04 00:11:42 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-27 10:29:07 +0000 |
| commit | bb3bc00f304cb4f0611d45555d124221d365bdce (patch) | |
| tree | 1f96878a551b23276542247f90cd195fc4754643 /main/busybox/0003-ash-exec-busybox.static.patch | |
| parent | 4ecb921f61d14dab2ac6ed518325df376138aa9b (diff) | |
| download | aports-bb3bc00f304cb4f0611d45555d124221d365bdce.tar.gz aports-bb3bc00f304cb4f0611d45555d124221d365bdce.tar.bz2 aports-bb3bc00f304cb4f0611d45555d124221d365bdce.tar.xz | |
main/busybox: upgrade to 1.29.3
* Remove all patches already applied upstream
* 0001-ash-add-support-for-command_not_found_handle-hook-fu.patch
* 0001-cat-fix-cat-e-and-cat-v-erroneously-numbering-1st-li.patch
* 0001-wget-emit-a-message-that-certificate-verification-is.patch
* 0015-ash-introduce-a-config-option-to-search-current-dire.patch
* 0016-top-handle-much-larger-VSZ-values.patch
* 0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch
* Rename config option for command_not_found hook
* upstream patch adding this hook slightly differs from our
downstream patch in this regard
* Rebase some patches manually:
* external_ssl_client.patch
* 0006-ping-make-ping-work-without-root-privileges.patch
* 0007-fbsplash-support-image-and-bar-alignment-and-positio.patch
* Add support for `-e` to our ssl_client
* See https://git.busybox.net/busybox/commit/?id=403f2999f94937ba3f37db6d093832f636815bb9
* Update the configuration file
* Regenerate all patches using `git format-patch --no-numbered --no-signature`
to reduce the diff for future upgrades.
Diffstat (limited to 'main/busybox/0003-ash-exec-busybox.static.patch')
| -rw-r--r-- | main/busybox/0003-ash-exec-busybox.static.patch | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/main/busybox/0003-ash-exec-busybox.static.patch b/main/busybox/0003-ash-exec-busybox.static.patch index 94239a2eb94..8247e357f8d 100644 --- a/main/busybox/0003-ash-exec-busybox.static.patch +++ b/main/busybox/0003-ash-exec-busybox.static.patch @@ -1,17 +1,17 @@ -From 36b6cc36d1f259e4ac76a1c2de743113845ff4cd Mon Sep 17 00:00:00 2001 +From d06a13f4cd81aeda9b02d4da90ef2b941899d6c5 Mon Sep 17 00:00:00 2001 From: Natanael Copa <ncopa@alpinelinux.org> Date: Thu, 4 Aug 2016 11:03:07 +0200 -Subject: [PATCH 03/16] ash: exec busybox.static +Subject: [PATCH] ash: exec busybox.static --- shell/ash.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/ash.c b/shell/ash.c -index 7ceb91920..d04096a9b 100644 +index 051cc671f..73470eab2 100644 --- a/shell/ash.c +++ b/shell/ash.c -@@ -7845,6 +7845,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c +@@ -7991,6 +7991,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); @@ -20,6 +20,3 @@ index 7ceb91920..d04096a9b 100644 /* If they called chroot or otherwise made the binary no longer * executable, fall through */ } --- -2.16.2 - |