From 19b0cb25090e5cd95aa70329a9c77ec6c5fb6625 Mon Sep 17 00:00:00 2001 From: Dennis Groenen Date: Sun, 5 Feb 2012 14:33:35 +0100 Subject: [PATCH] update busybox-power against BusyBox 1.19.4 release --- build.sh | 2 +- debian/patches/hotfixes/busybox-1.19.3-getty.patch | 12 -------- debian/patches/hotfixes/busybox-1.19.3-mdev.patch | 11 -------- .../patches/hotfixes/busybox-1.19.3-modinfo.patch | 10 ------- debian/patches/hotfixes/busybox-1.19.3-wget.patch | 29 -------------------- debian/patches/series | 4 --- 6 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 debian/patches/hotfixes/busybox-1.19.3-getty.patch delete mode 100644 debian/patches/hotfixes/busybox-1.19.3-mdev.patch delete mode 100644 debian/patches/hotfixes/busybox-1.19.3-modinfo.patch delete mode 100644 debian/patches/hotfixes/busybox-1.19.3-wget.patch diff --git a/build.sh b/build.sh index 51e21cd..29bbc7a 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.19.3" +BBVERSION="1.19.4" MAKETHREADS="8" SCRIPTDIR=`dirname $(readlink -f $0)` BUILDDIR="$SCRIPTDIR/../busybox-power-build" diff --git a/debian/patches/hotfixes/busybox-1.19.3-getty.patch b/debian/patches/hotfixes/busybox-1.19.3-getty.patch deleted file mode 100644 index 84dad6f..0000000 --- a/debian/patches/hotfixes/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/debian/patches/hotfixes/busybox-1.19.3-mdev.patch b/debian/patches/hotfixes/busybox-1.19.3-mdev.patch deleted file mode 100644 index 653ac35..0000000 --- a/debian/patches/hotfixes/busybox-1.19.3-mdev.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- busybox-1.19.3/util-linux/mdev.c -+++ busybox-1.19.3-mdev/util-linux/mdev.c -@@ -610,7 +610,7 @@ int mdev_main(int argc UNUSED_PARAM, cha - int seqlen; - char seqbuf[sizeof(int)*3 + 2]; - -- seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf-1)); -+ seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1); - if (seqlen < 0) { - seq = NULL; - break; diff --git a/debian/patches/hotfixes/busybox-1.19.3-modinfo.patch b/debian/patches/hotfixes/busybox-1.19.3-modinfo.patch deleted file mode 100644 index 9dd5c10..0000000 --- a/debian/patches/hotfixes/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/debian/patches/hotfixes/busybox-1.19.3-wget.patch b/debian/patches/hotfixes/busybox-1.19.3-wget.patch deleted file mode 100644 index e98a506..0000000 --- a/debian/patches/hotfixes/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/debian/patches/series b/debian/patches/series index 8e02856..eac5971 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -23,10 +23,6 @@ showkey-default-option.patch 0001-vi-implement-p-go-to-previous-file.patch #Hotfixes -hotfixes/busybox-1.19.3-getty.patch -hotfixes/busybox-1.19.3-modinfo.patch -hotfixes/busybox-1.19.3-wget.patch -hotfixes/busybox-1.19.3-mdev.patch #Patched pulled from busybox git git-backports/0001-lineedit-fix-atomic-replace-of-history-file-hush-fix.patch -- 1.7.9.5