From 5a30065db77a058e3a9c4496c8cfb36d30313e14 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 7 Feb 2012 02:01:19 +0100 Subject: [PATCH] busybox: update to busybox-1.19.4 Signed-off-by: Stephan Raue --- packages/sysutils/busybox/meta | 2 +- .../patches/busybox-1.19.3-getty.patch | 12 -------- .../patches/busybox-1.19.3-modinfo.patch | 10 ------- .../busybox/patches/busybox-1.19.3-wget.patch | 29 ------------------- ...h => busybox-1.19.4-00_halt_no_init.patch} | 0 ...patch => busybox-1.19.4-01_check_cc.patch} | 0 6 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 packages/sysutils/busybox/patches/busybox-1.19.3-getty.patch delete mode 100644 packages/sysutils/busybox/patches/busybox-1.19.3-modinfo.patch delete mode 100644 packages/sysutils/busybox/patches/busybox-1.19.3-wget.patch rename packages/sysutils/busybox/patches/{busybox-1.19.3-00_halt_no_init.patch => busybox-1.19.4-00_halt_no_init.patch} (100%) rename packages/sysutils/busybox/patches/{busybox-1.19.3-01_check_cc.patch => busybox-1.19.4-01_check_cc.patch} (100%) diff --git a/packages/sysutils/busybox/meta b/packages/sysutils/busybox/meta index c8e62c34ac..e996dc7e6c 100644 --- a/packages/sysutils/busybox/meta +++ b/packages/sysutils/busybox/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="busybox" -PKG_VERSION="1.19.3" +PKG_VERSION="1.19.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/busybox/patches/busybox-1.19.3-getty.patch b/packages/sysutils/busybox/patches/busybox-1.19.3-getty.patch deleted file mode 100644 index 84dad6f1bc..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.19.3-getty.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- busybox-1.19.3/loginutils/getty.c -+++ busybox-1.19.3-getty/loginutils/getty.c -@@ -271,7 +271,9 @@ static void termios_init(int speed) - #ifdef CMSPAR - | CMSPAR /* mark or space parity */ - #endif -+#ifdef CBAUD - | CBAUD /* (output) baud rate */ -+#endif - #ifdef CBAUDEX - | CBAUDEX /* (output) baud rate */ - #endif diff --git a/packages/sysutils/busybox/patches/busybox-1.19.3-modinfo.patch b/packages/sysutils/busybox/patches/busybox-1.19.3-modinfo.patch deleted file mode 100644 index 9dd5c103a5..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.19.3-modinfo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- busybox-1.19.3/modutils/modinfo.c -+++ busybox-1.19.3-modinfo/modutils/modinfo.c -@@ -13,6 +13,7 @@ - //config:config MODINFO - //config: bool "modinfo" - //config: default y -+//config: select PLATFORM_LINUX - //config: help - //config: Show information about a Linux Kernel module - diff --git a/packages/sysutils/busybox/patches/busybox-1.19.3-wget.patch b/packages/sysutils/busybox/patches/busybox-1.19.3-wget.patch deleted file mode 100644 index e98a506cbb..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.19.3-wget.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- busybox-1.19.3/networking/wget.c -+++ busybox-1.19.3-wget/networking/wget.c -@@ -552,6 +552,7 @@ static void download_one_url(const char - FILE *dfp; /* socket to ftp server (data) */ - char *proxy = NULL; - char *fname_out_alloc; -+ char *redirected_path = NULL; - struct host_info server; - struct host_info target; - -@@ -794,8 +795,8 @@ However, in real world it was observed t - bb_error_msg_and_die("too many redirections"); - fclose(sfp); - if (str[0] == '/') { -- free(target.allocated); -- target.path = target.allocated = xstrdup(str+1); -+ free(redirected_path); -+ target.path = redirected_path = xstrdup(str+1); - /* lsa stays the same: it's on the same server */ - } else { - parse_url(str, &target); -@@ -850,6 +851,7 @@ However, in real world it was observed t - free(server.allocated); - free(target.allocated); - free(fname_out_alloc); -+ free(redirected_path); - } - - int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; diff --git a/packages/sysutils/busybox/patches/busybox-1.19.3-00_halt_no_init.patch b/packages/sysutils/busybox/patches/busybox-1.19.4-00_halt_no_init.patch similarity index 100% rename from packages/sysutils/busybox/patches/busybox-1.19.3-00_halt_no_init.patch rename to packages/sysutils/busybox/patches/busybox-1.19.4-00_halt_no_init.patch diff --git a/packages/sysutils/busybox/patches/busybox-1.19.3-01_check_cc.patch b/packages/sysutils/busybox/patches/busybox-1.19.4-01_check_cc.patch similarity index 100% rename from packages/sysutils/busybox/patches/busybox-1.19.3-01_check_cc.patch rename to packages/sysutils/busybox/patches/busybox-1.19.4-01_check_cc.patch