From 6b6a97fdbb4c71288d260d785be394cc07b9b002 Mon Sep 17 00:00:00 2001 From: Dennis Groenen Date: Mon, 28 May 2012 11:00:19 +0200 Subject: [PATCH] update busybox-power against BusyBox 1.20.1 release --- build.sh | 2 +- debian/patches/hotfixes/busybox-1.20.0-getty.patch | 17 ------------ .../patches/hotfixes/busybox-1.20.0-lineedit.patch | 22 --------------- debian/patches/hotfixes/busybox-1.20.0-sed.patch | 29 -------------------- debian/patches/series | 3 -- 5 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 debian/patches/hotfixes/busybox-1.20.0-getty.patch delete mode 100644 debian/patches/hotfixes/busybox-1.20.0-lineedit.patch delete mode 100644 debian/patches/hotfixes/busybox-1.20.0-sed.patch diff --git a/build.sh b/build.sh index c18fd2a..3e91881 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ # Helper script to build busybox-power # Please run me from within Scratchbox -BBVERSION="1.20.0" +BBVERSION="1.20.1" MAKETHREADS="8" SCRIPTDIR=`dirname $(readlink -f $0)` BUILDDIR="$SCRIPTDIR/../busybox-power-build" diff --git a/debian/patches/hotfixes/busybox-1.20.0-getty.patch b/debian/patches/hotfixes/busybox-1.20.0-getty.patch deleted file mode 100644 index ed52159..0000000 --- a/debian/patches/hotfixes/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/debian/patches/hotfixes/busybox-1.20.0-lineedit.patch b/debian/patches/hotfixes/busybox-1.20.0-lineedit.patch deleted file mode 100644 index ee236ff..0000000 --- a/debian/patches/hotfixes/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/debian/patches/hotfixes/busybox-1.20.0-sed.patch b/debian/patches/hotfixes/busybox-1.20.0-sed.patch deleted file mode 100644 index 70dc63f..0000000 --- a/debian/patches/hotfixes/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; - diff --git a/debian/patches/series b/debian/patches/series index 6242d20..da3d14d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,9 +21,6 @@ ps-accept-and-ignore-missing-options.patch showkey-default-option.patch #Hotfixes -hotfixes/busybox-1.20.0-getty.patch -hotfixes/busybox-1.20.0-lineedit.patch -hotfixes/busybox-1.20.0-sed.patch #Patched pulled from busybox git -- 1.7.9.5