rebase patches against busybox 1_21_0

patches/003-mount-umount-fsck-df.patch

@@ -6,27 +6,27 @@ patch modified from 'Bionic Patch V1.0 (Vitaly Greck)'
 https://code.google.com/p/busybox-android/downloads/detail?name=patch
 ---
  libbb/Kbuild.src |    3 +
- libbb/mntent_r.c |  290 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 293 insertions(+), 0 deletions(-)
+ libbb/mntent_r.c |  288 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 291 insertions(+)
  create mode 100644 libbb/mntent_r.c
 
 diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
-index 335b341..a054a44 100644
+index 61eec26..d456c3d 100644
 --- a/libbb/Kbuild.src
 +++ b/libbb/Kbuild.src
 @@ -115,6 +115,9 @@ lib-y += xgethostbyname.o
  lib-y += xreadlink.o
  lib-y += xrealloc_vector.o
-
+ 
 +# for android-busybox-ndk
 +lib-y += mntent_r.o
 +
  lib-$(CONFIG_PLATFORM_LINUX) += match_fstype.o
-
+ 
  lib-$(CONFIG_FEATURE_UTMP) += utmp.o
 diff --git a/libbb/mntent_r.c b/libbb/mntent_r.c
 new file mode 100644
-index 0000000..9944a2a
+index 0000000..1077487
 --- /dev/null
 +++ b/libbb/mntent_r.c
 @@ -0,0 +1,288 @@
@@ -318,6 +318,6 @@ index 0000000..9944a2a
 +
 +  return NULL;
 +}
---
-1.7.0.4
+-- 
+1.7.10.4
 

patches/024-hush.patch

@@ -12,7 +12,7 @@ http://dan.drown.org/android/src/busybox/
  shell/glob.h          |  113 +++++++
  shell/hush.c          |    3 +-
  shell/sigisemptyset.c |    8 +
- 4 files changed, 909 insertions(+), 1 deletions(-)
+ 4 files changed, 909 insertions(+), 1 deletion(-)
  create mode 100644 shell/glob.c
  create mode 100644 shell/glob.h
  create mode 100644 shell/sigisemptyset.c
@@ -929,7 +929,7 @@ index 0000000..e8e6578
 +
 +#endif /* !_GLOB_H_ */
 diff --git a/shell/hush.c b/shell/hush.c
-index 7a34f59..f8ddbdb 100644
+index e2dc1e2..7f8e0be 100644
 --- a/shell/hush.c
 +++ b/shell/hush.c
 @@ -86,7 +86,7 @@
@@ -941,7 +941,7 @@ index 7a34f59..f8ddbdb 100644
  /* #include <dmalloc.h> */
  #if ENABLE_HUSH_CASE
  # include <fnmatch.h>
-@@ -252,6 +252,7 @@ typedef void (*hush_sighandler_t)(int);
+@@ -248,6 +248,7 @@
  //applet:IF_FEATURE_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, BB_DIR_BIN, BB_SUID_DROP, bash))
 
  //kbuild:lib-$(CONFIG_HUSH) += hush.o match.o shell_common.o
@@ -964,5 +964,5 @@ index 0000000..8297313
 +  return set;
 +}
 -- 
-1.7.0.4
+1.7.10.4
 

patches/050-dietlibc_resolver-nslookup.patch

@@ -16,23 +16,23 @@ http://dan.drown.org/android/src/libres/
  Makefile                  |    1 +
  libres/Kbuild.src         |   11 +++
  libres/Makefile           |   32 ++++++++
- libres/README             |    5 +
+ libres/README             |    5 ++
  libres/dietdns.h          |  189 +++++++++++++++++++++++++++++++++++++++++++++
- libres/dn_expand.c        |   13 +++
+ libres/dn_expand.c        |   12 +++
  libres/dnscruft.c         |  119 ++++++++++++++++++++++++++++
  libres/dnscruft2.c        |  132 +++++++++++++++++++++++++++++++
  libres/dnscruft3.c        |    6 ++
  libres/freeaddrinfo.c     |   14 ++++
  libres/gai_strerror.c     |   14 ++++
  libres/getaddrinfo.c      |  137 ++++++++++++++++++++++++++++++++
- libres/gethostbyname2_r.c |   35 ++++++++
+ libres/gethostbyname2_r.c |   35 +++++++++
  libres/h_errno.c          |    1 +
  libres/res_init.c         |   12 +++
- libres/res_mkquery.c      |   86 ++++++++++++++++++++
+ libres/res_mkquery.c      |   85 ++++++++++++++++++++
  libres/res_query.c        |   81 +++++++++++++++++++
  libres/test.c             |  105 +++++++++++++++++++++++++
- networking/nslookup.c     |   25 ++++---
- 19 files changed, 1007 insertions(+), 11 deletions(-)
+ networking/nslookup.c     |   25 +++---
+ 19 files changed, 1005 insertions(+), 11 deletions(-)
  create mode 100644 libres/Kbuild.src
  create mode 100644 libres/Makefile
  create mode 100644 libres/README
@@ -52,10 +52,10 @@ http://dan.drown.org/android/src/libres/
  create mode 100644 libres/test.c
 
 diff --git a/Makefile b/Makefile
-index 35d2e1e..71b2b93 100644
+index c31ca89..8e0226a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -475,6 +475,7 @@ libs-y		:= \
+@@ -476,6 +476,7 @@ libs-y		:= \
  		init/ \
  		libbb/ \
  		libpwdgrp/ \
@@ -326,7 +326,7 @@ index 0000000..9ae0b4d
 +#endif
 diff --git a/libres/dn_expand.c b/libres/dn_expand.c
 new file mode 100644
-index 0000000..90a400f
+index 0000000..9eb4587
 --- /dev/null
 +++ b/libres/dn_expand.c
 @@ -0,0 +1,12 @@
@@ -868,7 +868,7 @@ index 0000000..c3a7e6d
 +}
 diff --git a/libres/res_mkquery.c b/libres/res_mkquery.c
 new file mode 100644
-index 0000000..8a48aef
+index 0000000..a8cece6
 --- /dev/null
 +++ b/libres/res_mkquery.c
 @@ -0,0 +1,85 @@
@@ -1239,5 +1239,5 @@ index f4fd407..465f4b4 100644
  	/* (but it also says "may be enabled in /etc/resolv.conf") */
  	/*_res.options |= RES_USE_INET6;*/
 -- 
-1.7.0.4
+1.7.10.4
 

patches/051-ash-history.patch

@@ -9,14 +9,14 @@ https://github.com/Gnurou/busybox-android
 ---
  include/libbb.h |    4 ++--
  init/init.c     |    2 +-
- shell/ash.c     |    4 ++++
- 3 files changed, 7 insertions(+), 3 deletions(-)
+ shell/ash.c     |    8 +++++++-
+ 3 files changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/include/libbb.h b/include/libbb.h
-index f22e58e..90b2866 100644
+index e520060..f91d635 100644
 --- a/include/libbb.h
 +++ b/include/libbb.h
-@@ -1757,12 +1757,12 @@ extern struct globals *const ptr_to_globals;
+@@ -1764,12 +1764,12 @@ extern struct globals *const ptr_to_globals;
   * use bb_default_login_shell and following defines.
   * If you change LIBBB_DEFAULT_LOGIN_SHELL,
   * don't forget to change increment constant. */
@@ -32,7 +32,7 @@ index f22e58e..90b2866 100644
  /* The following devices are the same on all systems.  */
  #define CURRENT_TTY "/dev/tty"
 diff --git a/init/init.c b/init/init.c
-index 7248946..8644cc8 100644
+index b84bdcc..b805a79 100644
 --- a/init/init.c
 +++ b/init/init.c
 @@ -1047,7 +1047,7 @@ int init_main(int argc UNUSED_PARAM, char **argv)
@@ -45,10 +45,10 @@ index 7248946..8644cc8 100644
 
  	if (argv[1])
 diff --git a/shell/ash.c b/shell/ash.c
-index b20c32b..5f75ed7 100644
+index 31fbc55..f9dad6a 100644
 --- a/shell/ash.c
 +++ b/shell/ash.c
-@@ -13172,12 +13172,16 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
+@@ -13213,20 +13213,26 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
  	if (iflag) {
  		const char *hp = lookupvar("HISTFILE");
  		if (!hp) {