diff options
| author | Nick Hainke <vincent@systemli.org> | 2021-05-08 09:38:58 +0200 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2021-05-12 18:32:03 +0200 |
| commit | 6713fe030fca32fc3d5ad9761f3b2f96501aedd6 (patch) | |
| tree | 19c8544e3347b66a35e33a8f50791c7f9ef4614f /package/utils/busybox/patches/001-backport1330fix-ash-make-strdup-copy.patch | |
| parent | 025bd93f36c9923127674ce127e22933592cba6c (diff) | |
| download | upstream-6713fe030fca32fc3d5ad9761f3b2f96501aedd6.tar.gz upstream-6713fe030fca32fc3d5ad9761f3b2f96501aedd6.tar.bz2 upstream-6713fe030fca32fc3d5ad9761f3b2f96501aedd6.zip | |
busybox: update to 1.33.1
Remove backports:
- 001-backport1330fix-ash-make-strdup-copy.patch
- 002-backport1330fix-traceroute.patch
- 005-backport-CVE-2021-28831.patch
Remove upstreamed:
- 010-fix-wrong-variable.patch
Signed-off-by: Nick Hainke <vincent@systemli.org>
[don't use $(AUTORELEASE) for now]
Signed-off-by: Paul Spooren <mail@aparcar.org>
Diffstat (limited to 'package/utils/busybox/patches/001-backport1330fix-ash-make-strdup-copy.patch')
| -rw-r--r-- | package/utils/busybox/patches/001-backport1330fix-ash-make-strdup-copy.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/package/utils/busybox/patches/001-backport1330fix-ash-make-strdup-copy.patch b/package/utils/busybox/patches/001-backport1330fix-ash-make-strdup-copy.patch deleted file mode 100644 index b495227d9f..0000000000 --- a/package/utils/busybox/patches/001-backport1330fix-ash-make-strdup-copy.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 67cc582d4289c5de521d11b08307c8ab26ee1e28 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko <vda.linux@googlemail.com> -Date: Sun, 3 Jan 2021 10:55:39 +0100 -Subject: ash: make a strdup copy of $HISTFILE for line editing - -Otherwise if $HISTFILE is unset or reassigned, bad things can happen. - -function old new delta -ash_main 1210 1218 +8 - -Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> ---- - shell/ash.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/shell/ash.c b/shell/ash.c -index f16d7fb6a..ecbfbf091 100644 ---- a/shell/ash.c -+++ b/shell/ash.c -@@ -14499,7 +14499,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv) - - if (sflag || minusc == NULL) { - #if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY -- if (iflag) { -+ if (line_input_state) { - const char *hp = lookupvar("HISTFILE"); - if (!hp) { - hp = lookupvar("HOME"); -@@ -14513,7 +14513,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv) - } - } - if (hp) -- line_input_state->hist_file = hp; -+ line_input_state->hist_file = xstrdup(hp); - # if ENABLE_FEATURE_SH_HISTFILESIZE - hp = lookupvar("HISTFILESIZE"); - line_input_state->max_history = size_from_HISTFILESIZE(hp); --- -cgit v1.2.1 - |