From a258836a32e5e8afab455deb14226eeaa14006ea Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 30 Nov 2010 09:26:03 +0100 Subject: [PATCH] busybox: remove old patches Signed-off-by: Stephan Raue --- .../patches/busybox-1.17.3-00_halt_no_init.patch | 12 ------------ .../busybox/patches/busybox-1.17.3-dnsd.patch | 12 ------------ .../busybox/patches/busybox-1.17.3-sort.patch | 12 ------------ .../busybox/patches/busybox-1.17.3-unicode.patch | 12 ------------ 4 files changed, 48 deletions(-) delete mode 100644 packages/sysutils/busybox/patches/busybox-1.17.3-00_halt_no_init.patch delete mode 100644 packages/sysutils/busybox/patches/busybox-1.17.3-dnsd.patch delete mode 100644 packages/sysutils/busybox/patches/busybox-1.17.3-sort.patch delete mode 100644 packages/sysutils/busybox/patches/busybox-1.17.3-unicode.patch diff --git a/packages/sysutils/busybox/patches/busybox-1.17.3-00_halt_no_init.patch b/packages/sysutils/busybox/patches/busybox-1.17.3-00_halt_no_init.patch deleted file mode 100644 index ce454f4c07..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.17.3-00_halt_no_init.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur busybox-1.13.2/init/halt.c busybox-1.13.2a/init/halt.c ---- busybox-1.13.2/init/halt.c 2008-11-09 18:28:19.000000000 +0100 -+++ busybox-1.13.2a/init/halt.c 2009-02-01 16:38:37.000000000 +0100 -@@ -79,7 +79,7 @@ - - /* Perform action. */ - rc = 1; -- if (!(flags & 4)) { /* no -f */ -+ if (ENABLE_INIT && !(flags & 4)) { /* no -f */ - //TODO: I tend to think that signalling linuxrc is wrong - // pity original author didn't comment on it... - if (ENABLE_FEATURE_INITRD) { diff --git a/packages/sysutils/busybox/patches/busybox-1.17.3-dnsd.patch b/packages/sysutils/busybox/patches/busybox-1.17.3-dnsd.patch deleted file mode 100644 index b135c14637..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.17.3-dnsd.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urpN busybox-1.17.3/networking/dnsd.c busybox-1.17.3-dnsd/networking/dnsd.c ---- busybox-1.17.3/networking/dnsd.c 2010-10-09 21:57:14.000000000 +0200 -+++ busybox-1.17.3-dnsd/networking/dnsd.c 2010-10-29 00:37:43.066043841 +0200 -@@ -388,7 +388,7 @@ static int process_packet(struct dns_ent - query_len = strlen(query_string) + 1; - /* may be unaligned! */ - unaligned_type_class = (void *)(query_string + query_len); -- query_len += sizeof(unaligned_type_class); -+ query_len += sizeof(*unaligned_type_class); - /* where to append answer block */ - answb = (void *)(unaligned_type_class + 1); - diff --git a/packages/sysutils/busybox/patches/busybox-1.17.3-sort.patch b/packages/sysutils/busybox/patches/busybox-1.17.3-sort.patch deleted file mode 100644 index ebc9bf9f94..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.17.3-sort.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urpN busybox-1.17.3/coreutils/sort.c busybox-1.17.3-sort/coreutils/sort.c ---- busybox-1.17.3/coreutils/sort.c 2010-10-09 21:57:13.000000000 +0200 -+++ busybox-1.17.3-sort/coreutils/sort.c 2010-10-20 15:17:35.320293543 +0200 -@@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, cha - #if ENABLE_FEATURE_SORT_BIG - /* Open output file _after_ we read all input ones */ - if (option_mask32 & FLAG_o) -- xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO); -+ xmove_fd(xopen3(str_o, O_WRONLY|O_CREAT|O_TRUNC, 0666), STDOUT_FILENO); - #endif - flag = (option_mask32 & FLAG_z) ? '\0' : '\n'; - for (i = 0; i < linecount; i++) diff --git a/packages/sysutils/busybox/patches/busybox-1.17.3-unicode.patch b/packages/sysutils/busybox/patches/busybox-1.17.3-unicode.patch deleted file mode 100644 index dc3b02e22d..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.17.3-unicode.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urpN busybox-1.17.3/libbb/unicode.c busybox-1.17.3-unicode/libbb/unicode.c ---- busybox-1.17.3/libbb/unicode.c 2010-10-09 21:58:13.000000000 +0200 -+++ busybox-1.17.3-unicode/libbb/unicode.c 2010-10-29 00:48:36.951494079 +0200 -@@ -1006,7 +1006,7 @@ static char* FAST_FUNC unicode_conv_to_p - } - } - if (stats) -- stats->byte_count = stats->unicode_count = (d - dst); -+ stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst); - return dst; - } -