From 3f58367cf8347686ce7374567c6056c2df571351 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 15 Jan 2012 22:10:17 +0100 Subject: [PATCH] busybox: update busybox upstream patches Signed-off-by: Stephan Raue --- .../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 +++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 packages/sysutils/busybox/patches/busybox-1.19.3-getty.patch create mode 100644 packages/sysutils/busybox/patches/busybox-1.19.3-modinfo.patch create mode 100644 packages/sysutils/busybox/patches/busybox-1.19.3-wget.patch diff --git a/packages/sysutils/busybox/patches/busybox-1.19.3-getty.patch b/packages/sysutils/busybox/patches/busybox-1.19.3-getty.patch new file mode 100644 index 0000000000..84dad6f1bc --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.19.3-getty.patch @@ -0,0 +1,12 @@ +--- 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 new file mode 100644 index 0000000000..9dd5c103a5 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.19.3-modinfo.patch @@ -0,0 +1,10 @@ +--- 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 new file mode 100644 index 0000000000..e98a506cbb --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.19.3-wget.patch @@ -0,0 +1,29 @@ +--- 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;