diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-01-27 08:00:32 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-01-27 15:31:50 +0100 |
| commit | bf838d06ff00bcc52f2885ac691721367a49f6c6 (patch) | |
| tree | 02a8ef88a05f3c9fc288bedc0db9f0928e93ec23 /package/busybox/0002-ash.patch | |
| parent | 74dd54bf73ad25eb29384b7e2ca9ee5a2760d448 (diff) | |
| download | buildroot-bf838d06ff00bcc52f2885ac691721367a49f6c6.tar.gz buildroot-bf838d06ff00bcc52f2885ac691721367a49f6c6.zip | |
busybox: bump to version 1.23.1
Removed patches are upstream.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/busybox/0002-ash.patch')
| -rw-r--r-- | package/busybox/0002-ash.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/package/busybox/0002-ash.patch b/package/busybox/0002-ash.patch deleted file mode 100644 index fbd1fad43f..0000000000 --- a/package/busybox/0002-ash.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream http://busybox.net/downloads/fixes-1.23.0/busybox-1.23.0-ash.patch -post-release hotfix patch for ash segfault. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - ---- busybox-1.23.0/shell/ash.c -+++ busybox-1.23.0-ash/shell/ash.c -@@ -6746,6 +6746,14 @@ varvalue(char *name, int varflags, int f - len = strlen(p); - if (!(subtype == VSPLUS || subtype == VSLENGTH)) - memtodest(p, len, syntax, quotes); -+#if ENABLE_UNICODE_SUPPORT -+ if (subtype == VSLENGTH && len > 0) { -+ reinit_unicode_for_ash(); -+ if (unicode_status == UNICODE_ON) { -+ len = unicode_strlen(p); -+ } -+ } -+#endif - return len; - } - -@@ -6829,15 +6837,7 @@ evalvar(char *p, int flags, struct strli - varunset(p, var, 0, 0); - - if (subtype == VSLENGTH) { -- ssize_t n = varlen; -- if (n > 0) { -- reinit_unicode_for_ash(); -- if (unicode_status == UNICODE_ON) { -- const char *val = lookupvar(var); -- n = unicode_strlen(val); -- } -- } -- cvtnum(n > 0 ? n : 0); -+ cvtnum(varlen > 0 ? varlen : 0); - goto record; - } - |
