diff options
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/Config.in | 4 | ||||
| -rw-r--r-- | package/busybox/busybox-1.7.4-grep.patch | 38 | ||||
| -rw-r--r-- | package/busybox/busybox-1.8.2-arping.patch | 13 | ||||
| -rw-r--r-- | package/busybox/busybox-1.8.2-static.patch | 12 | ||||
| -rw-r--r-- | package/busybox/busybox-1.8.2-vi.patch | 40 |
5 files changed, 2 insertions, 105 deletions
diff --git a/package/busybox/Config.in b/package/busybox/Config.in index 5a6dd5d4e..338baaef7 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -47,8 +47,8 @@ config BR2_BUSYBOX_VERSION string default "1.2.2.1" if BR2_BUSYBOX_VERSION_1_2_2_1 default "1.6.1" if BR2_BUSYBOX_VERSION_1_6_1 - default "1.7.4" if BR2_BUSYBOX_VERSION_1_7_X - default "1.8.2" if BR2_BUSYBOX_VERSION_1_8_X + default "1.7.5" if BR2_BUSYBOX_VERSION_1_7_X + default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X default "1.10.0" if BR2_BUSYBOX_VERSION_1_10_X diff --git a/package/busybox/busybox-1.7.4-grep.patch b/package/busybox/busybox-1.7.4-grep.patch deleted file mode 100644 index 3599d0aa9..000000000 --- a/package/busybox/busybox-1.7.4-grep.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -urN busybox-1.7.4/findutils/grep.c busybox-1.7.4-grep/findutils/grep.c ---- busybox-1.7.4/findutils/grep.c 2007-09-03 04:48:54.000000000 -0700 -+++ busybox-1.7.4-grep/findutils/grep.c 2007-12-08 19:02:33.000000000 -0800 -@@ -154,14 +154,14 @@ - - while ((line = xmalloc_getline(file)) != NULL) { - llist_t *pattern_ptr = pattern_head; -- grep_list_data_t * gl; -+ grep_list_data_t *gl = gl; /* for gcc */ - - linenum++; - ret = 0; - while (pattern_ptr) { - gl = (grep_list_data_t *)pattern_ptr->data; - if (FGREP_FLAG) { -- ret = strstr(line, gl->pattern) != NULL; -+ ret |= (strstr(line, gl->pattern) != NULL); - } else { - /* - * test for a postitive-assertion match (regexec returns success (0) -@@ -255,8 +255,15 @@ - print_n_lines_after = lines_after; - #endif - if (option_mask32 & OPT_o) { -- line[regmatch.rm_eo] = '\0'; -- print_line(line + regmatch.rm_so, linenum, ':'); -+ if (FGREP_FLAG) { -+ /* -Fo just prints the pattern -+ * (unless -v: -Fov doesnt print anything at all) */ -+ if (ret) -+ print_line(gl->pattern, linenum, ':'); -+ } else { -+ line[regmatch.rm_eo] = '\0'; -+ print_line(line + regmatch.rm_so, linenum, ':'); -+ } - } else { - print_line(line, linenum, ':'); - } diff --git a/package/busybox/busybox-1.8.2-arping.patch b/package/busybox/busybox-1.8.2-arping.patch deleted file mode 100644 index 9e1d77e5b..000000000 --- a/package/busybox/busybox-1.8.2-arping.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN busybox-1.8.2/networking/arping.c busybox-1.8.2-arping/networking/arping.c ---- busybox-1.8.2/networking/arping.c 2007-11-10 01:40:47.000000000 +0000 -+++ busybox-1.8.2-arping/networking/arping.c 2007-12-18 10:31:55.000000000 +0000 -@@ -207,7 +207,8 @@ - } - - if (last) { -- printf(" %u.%03ums\n", last / 1000, last % 1000); -+ unsigned diff = MONOTONIC_US() - last; -+ printf(" %u.%03ums\n", diff / 1000, diff % 1000); - } else { - printf(" UNSOLICITED?\n"); - } diff --git a/package/busybox/busybox-1.8.2-static.patch b/package/busybox/busybox-1.8.2-static.patch deleted file mode 100644 index 86fddef8a..000000000 --- a/package/busybox/busybox-1.8.2-static.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN busybox-1.8.2/applets/applets.c busybox-1.8.2-static/applets/applets.c ---- busybox-1.8.2/applets/applets.c 2007-11-10 01:40:53.000000000 +0000 -+++ busybox-1.8.2-static/applets/applets.c 2007-12-09 03:46:04.000000000 +0000 -@@ -17,7 +17,7 @@ - #warning See sources.redhat.com/bugzilla/show_bug.cgi?id=3400 - #warning Note that glibc is unsuitable for static linking anyway. - #warning If you still want to do it, remove -Wl,--gc-sections --#warning from top-level Makefile and remove this warning. -+#warning from file scripts/trylink and remove this warning. - #error Aborting compilation. - #endif - diff --git a/package/busybox/busybox-1.8.2-vi.patch b/package/busybox/busybox-1.8.2-vi.patch deleted file mode 100644 index cb588ac65..000000000 --- a/package/busybox/busybox-1.8.2-vi.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -urN busybox-1.8.2/editors/vi.c busybox-1.8.2-vi/editors/vi.c ---- busybox-1.8.2/editors/vi.c 2007-11-10 01:40:54.000000000 +0000 -+++ busybox-1.8.2-vi/editors/vi.c 2007-12-10 16:26:01.000000000 +0000 -@@ -184,6 +184,7 @@ - #if ENABLE_FEATURE_VI_COLON - char *initial_cmds[3]; // currently 2 entries, NULL terminated - #endif -+ char readbuffer[MAX_LINELEN]; - }; - #define G (*ptr_to_globals) - #define text (G.text ) -@@ -200,6 +201,10 @@ - #define term_orig (G.term_orig ) - #define term_vi (G.term_vi ) - #define initial_cmds (G.initial_cmds ) -+#define readbuffer (G.readbuffer ) -+#define INIT_G() do { \ -+ PTR_TO_GLOBALS = xzalloc(sizeof(G)); \ -+} while (0) - - static int init_text_buffer(char *); // init from file or create new - static void edit_file(char *); // edit one file -@@ -321,7 +326,7 @@ - my_pid = getpid(); - #endif - -- PTR_TO_GLOBALS = xzalloc(sizeof(G)); -+ INIT_G(); - - #if ENABLE_FEATURE_VI_CRASHME - srand((long) my_pid); -@@ -2142,8 +2147,6 @@ - return safe_poll(pfd, 1, hund*10) > 0; - } - --#define readbuffer bb_common_bufsiz1 -- - static int readed_for_parse; - - //----- IO Routines -------------------------------------------- |