aboutsummaryrefslogtreecommitdiffstats
path: root/main/busybox/0001-ash-exec-busybox.static.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-12-29 17:05:27 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2016-12-29 16:10:34 +0000
commit6cd2a0970fff43c9000bfb5f48d0e348963875fb (patch)
tree1ccdf651e58cef2f2d889b482cafd908cf632af3 /main/busybox/0001-ash-exec-busybox.static.patch
parent338b9d74c73b3c61c93da3b3abd9c5a5cffe6d4f (diff)
downloadaports-6cd2a0970fff43c9000bfb5f48d0e348963875fb.tar.bz2
aports-6cd2a0970fff43c9000bfb5f48d0e348963875fb.tar.xz
main/busybox: upgrade to 1.26.0
Diffstat (limited to 'main/busybox/0001-ash-exec-busybox.static.patch')
-rw-r--r--main/busybox/0001-ash-exec-busybox.static.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/main/busybox/0001-ash-exec-busybox.static.patch b/main/busybox/0001-ash-exec-busybox.static.patch
index f5f0e54bd8..7bdf874275 100644
--- a/main/busybox/0001-ash-exec-busybox.static.patch
+++ b/main/busybox/0001-ash-exec-busybox.static.patch
@@ -1,17 +1,17 @@
-From 1e3c84d780b94719575dc8afbe4a08050596a6d8 Mon Sep 17 00:00:00 2001
+From 6ad2305eb299c864dbe04b368a9921e91fd41bcb Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 4 Aug 2016 11:03:07 +0200
-Subject: [PATCH 01/15] ash: exec busybox.static
+Subject: [PATCH 01/12] ash: exec busybox.static
---
shell/ash.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/shell/ash.c b/shell/ash.c
-index faa45a8..1348ece 100644
+index 8d8cc466b..1b1012e76 100644
--- a/shell/ash.c
+++ b/shell/ash.c
-@@ -7380,6 +7380,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
+@@ -7552,6 +7552,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
}
/* re-exec ourselves with the new arguments */
execve(bb_busybox_exec_path, argv, envp);
@@ -21,5 +21,5 @@ index faa45a8..1348ece 100644
* executable, fall through */
}
--
-2.9.1
+2.11.0