diff options
Diffstat (limited to 'package/busybox')
5 files changed, 1 insertions, 80 deletions
diff --git a/package/busybox/Config.in b/package/busybox/Config.in index 946134def..a07864474 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -36,7 +36,7 @@ config BR2_BUSYBOX_VERSION string default "1.18.5" if BR2_BUSYBOX_VERSION_1_18_X default "1.19.4" if BR2_BUSYBOX_VERSION_1_19_X - default "1.20.0" if BR2_BUSYBOX_VERSION_1_20_X + default "1.20.1" if BR2_BUSYBOX_VERSION_1_20_X config BR2_PACKAGE_BUSYBOX_CONFIG string "BusyBox configuration file to use?" diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch deleted file mode 100644 index b9d2a5e83..000000000 --- a/package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- busybox-1.20.0/archival/libarchive/Kbuild.src -+++ busybox-1.20.0-buildsys/archival/libarchive/Kbuild.src -@@ -60,7 +60,7 @@ lib-$(CONFIG_FEATURE_SEAMLESS_GZ) - lib-$(CONFIG_FEATURE_SEAMLESS_BZ2) += open_transformer.o decompress_bunzip2.o - lib-$(CONFIG_FEATURE_SEAMLESS_LZMA) += open_transformer.o decompress_unlzma.o - lib-$(CONFIG_FEATURE_SEAMLESS_XZ) += open_transformer.o decompress_unxz.o --lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += decompress_bunzip2.o -+lib-$(CONFIG_FEATURE_COMPRESS_USAGE) += open_transformer.o decompress_bunzip2.o - lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += decompress_bunzip2.o - lib-$(CONFIG_FEATURE_TAR_TO_COMMAND) += data_extract_to_command.o - diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch deleted file mode 100644 index ed52159ff..000000000 --- a/package/busybox/busybox-1.20.0/busybox-1.20.0-getty.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- busybox-1.20.0/loginutils/getty.c -+++ busybox-1.20.0-getty/loginutils/getty.c -@@ -561,8 +561,14 @@ int getty_main(int argc UNUSED_PARAM, ch - */ - fd = open("/dev/tty", O_RDWR | O_NONBLOCK); - if (fd >= 0) { -+ /* TIOCNOTTY sends SIGHUP to the foreground -+ * process group - which may include us! -+ * Make sure to not die on it: -+ */ -+ sighandler_t old = signal(SIGHUP, SIG_IGN); - ioctl(fd, TIOCNOTTY); - close(fd); -+ signal(SIGHUP, old); - } - } - diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch deleted file mode 100644 index ee236ffc8..000000000 --- a/package/busybox/busybox-1.20.0/busybox-1.20.0-lineedit.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- busybox-1.20.0/libbb/lineedit.c -+++ busybox-1.20.0-lineedit/libbb/lineedit.c -@@ -1352,8 +1352,7 @@ static void load_history(line_input_t *s - /* fill temp_h[], retaining only last MAX_HISTORY lines */ - memset(temp_h, 0, sizeof(temp_h)); - idx = 0; -- if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT) -- st_parm->cnt_history_in_file = 0; -+ st_parm->cnt_history_in_file = 0; - while ((line = xmalloc_fgetline(fp)) != NULL) { - if (line[0] == '\0') { - free(line); -@@ -1361,8 +1360,7 @@ static void load_history(line_input_t *s - } - free(temp_h[idx]); - temp_h[idx] = line; -- if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT) -- st_parm->cnt_history_in_file++; -+ st_parm->cnt_history_in_file++; - idx++; - if (idx == st_parm->max_history) - idx = 0; diff --git a/package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch b/package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch deleted file mode 100644 index 70dc63f46..000000000 --- a/package/busybox/busybox-1.20.0/busybox-1.20.0-sed.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- busybox-1.20.0/editors/sed.c -+++ busybox-1.20.0-sed/editors/sed.c -@@ -743,7 +743,7 @@ static int do_subst_command(sed_cmd_t *s - */ - if (!G.regmatch[0].rm_so && !G.regmatch[0].rm_eo && match_count) { - pipe_putc(*line++); -- continue; -+ goto next; - } - - match_count++; -@@ -755,7 +755,7 @@ static int do_subst_command(sed_cmd_t *s - ) { - for (i = 0; i < G.regmatch[0].rm_eo; i++) - pipe_putc(*line++); -- continue; -+ goto next; - } - - /* print everything before the match */ -@@ -773,7 +773,7 @@ static int do_subst_command(sed_cmd_t *s - /* if we're not doing this globally, get out now */ - if (sed_cmd->which_match != 0) - break; -- -+ next: - if (*line == '\0') - break; - |