Merge commit '1_20_0' into merge

35 files changed, 209 insertions, 85 deletions

diff --git a/INSTALL b/INSTALL
index f93e5fb25..750cfc45b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -47,8 +47,11 @@ the only commands busybox can find are the built-in ones.
 
 Note that the standalone shell requires CONFIG_BUSYBOX_EXEC_PATH
 to be set appropriately, depending on whether or not /proc/self/exe is
-available or not. If you do not have /proc, then point that config option
+available. If you do not have /proc, then point that config option
 to the location of your busybox binary, usually /bin/busybox.
+Another solution is to patch the kernel (see
+examples/linux-*_proc_self_exe.patch) to make exec("/proc/self/exe")
+always work.
 
 Configuring Busybox:
 ====================
diff --git a/Makefile b/Makefile
index bc05f3a27..cfe4d5219 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 1
 PATCHLEVEL = 20
 SUBLEVEL = 0
-EXTRAVERSION = .git
+EXTRAVERSION =
 NAME = Unnamed
 
 # *DOCUMENTATION*
diff --git a/Makefile.flags b/Makefile.flags
index 2a3aa5812..0eb495c60 100644
--- a/Makefile.flags
+++ b/Makefile.flags
@@ -114,7 +114,10 @@ endif
 endif
 
 # Android has no separate crypt library
-CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' | $(CC) $(CFLAGS) -lcrypt -o /dev/null -xc - >/dev/null 2>&1 && echo "y")
+# gcc-4.2.1 fails if we try to feed C source on stdin:
+#  echo 'int main(void){return 0;}' | $(CC) $(CFLAGS) -lcrypt -o /dev/null -xc -
+# fall back to using a temp file:
+CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c)
 ifeq ($(CRYPT_AVAILABLE),y)
 LDLIBS += m crypt
 else
diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index 39c18f264..959221789 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -53,6 +53,8 @@ lib-$(CONFIG_UNCOMPRESS)                += decompress_uncompress.o
 lib-$(CONFIG_UNZIP)                     += decompress_gunzip.o
 lib-$(CONFIG_LZOP)                      += lzo1x_1.o lzo1x_1o.o lzo1x_d.o
 lib-$(CONFIG_LZOP_COMPR_HIGH)           += lzo1x_9x.o
+lib-$(CONFIG_MODINFO)                   += open_transformer.o
+lib-$(CONFIG_INSMOD)                    += open_transformer.o
 lib-$(CONFIG_FEATURE_SEAMLESS_Z)        += open_transformer.o decompress_uncompress.o
 lib-$(CONFIG_FEATURE_SEAMLESS_GZ)       += open_transformer.o decompress_gunzip.o
 lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o
diff --git a/coreutils/who.c b/coreutils/who.c
index c6c925264..f955ce6d3 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -48,6 +48,7 @@
 //usage:#define who_full_usage "\n\n"
 //usage:       "Show who is logged on\n"
 //usage:     "\n        -a      Show all"
+//usage:     "\n        -H      Print column headers"
 
 #include "libbb.h"
 
diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c
index 007cb1c5b..dbe430955 100644
--- a/debianutils/mktemp.c
+++ b/debianutils/mktemp.c
@@ -41,6 +41,7 @@
 ////usage:   "\n        -q      Fail silently on errors" - we ignore this opt
 //usage:     "\n        -t      Prepend base directory name to TEMPLATE"
 //usage:     "\n        -p DIR  Use DIR as a base directory (implies -t)"
+//usage:     "\n        -u      Do not create anything; print a name"
 //usage:     "\n"
 //usage:     "\nBase directory is: -p DIR, else $TMPDIR, else /tmp"
 //usage:
@@ -63,6 +64,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
                 OPT_q = 1 << 1,
                 OPT_t = 1 << 2,
                 OPT_p = 1 << 3,
+                OPT_u = 1 << 4,
         };
 
         path = getenv("TMPDIR");
@@ -71,7 +73,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
 
         /* -q is ignored */
         opt_complementary = "?1"; /* 1 argument max */
-        opts = getopt32(argv, "dqtp:", &path);
+        opts = getopt32(argv, "dqtp:u", &path);
 
         chp = argv[optind];
         if (!chp) {
@@ -81,6 +83,22 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
                 chp = xstrdup("tmp.XXXXXX");
                 opts |= OPT_t;
         }
+
+        if (opts & OPT_u) {
+                /* Remove (up to) 6 X's */
+                unsigned len = strlen(chp);
+                int cnt = len > 6 ? 6 : len;
+                while (--cnt >= 0 && chp[--len] == 'X')
+                        chp[len] = '\0';
+
+                chp = tempnam(opts & (OPT_t|OPT_p) ? path : "./", chp);
+                if (!chp)
+                        return EXIT_FAILURE;
+                if (!(opts & (OPT_t|OPT_p)))
+                        chp += 2;
+                goto ret;
+        }
+
         if (opts & (OPT_t|OPT_p))
                 chp = concat_path_file(path, chp);
 
@@ -91,8 +109,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
                 if (mkstemp(chp) < 0)
                         return EXIT_FAILURE;
         }
-
+ ret:
         puts(chp);
-
         return EXIT_SUCCESS;
 }
diff --git a/e2fsprogs/e2fs_lib.h b/e2fsprogs/e2fs_lib.h
index 3905ee71d..f2ae56f43 100644
--- a/e2fsprogs/e2fs_lib.h
+++ b/e2fsprogs/e2fs_lib.h
@@ -7,7 +7,7 @@
  */
 
 /* Constants and structures */
-#include "e2fs_defs.h"
+#include "bb_e2fs_defs.h"
 
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index 8fffa7f20..373e8ce91 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -11577,7 +11577,7 @@ static void check_resize_inode(e2fsck_t ctx)
          * s_reserved_gdt_blocks must be zero.
          */
         if (!(fs->super->s_feature_compat &
-              EXT2_FEATURE_COMPAT_RESIZE_INODE)) {
+              EXT2_FEATURE_COMPAT_RESIZE_INO)) {
                 if (fs->super->s_reserved_gdt_blocks) {
                         pctx.num = fs->super->s_reserved_gdt_blocks;
                         if (fix_problem(ctx, PR_0_NONZERO_RESERVED_GDT_BLOCKS,
@@ -11593,7 +11593,7 @@ static void check_resize_inode(e2fsck_t ctx)
         retval = ext2fs_read_inode(fs, EXT2_RESIZE_INO, &inode);
         if (retval) {
                 if (fs->super->s_feature_compat &
-                    EXT2_FEATURE_COMPAT_RESIZE_INODE)
+                    EXT2_FEATURE_COMPAT_RESIZE_INO)
                         ctx->flags |= E2F_FLAG_RESIZE_INODE;
                 return;
         }
@@ -11603,7 +11603,7 @@ static void check_resize_inode(e2fsck_t ctx)
          * the resize inode is cleared; then we're done.
          */
         if (!(fs->super->s_feature_compat &
-              EXT2_FEATURE_COMPAT_RESIZE_INODE)) {
+              EXT2_FEATURE_COMPAT_RESIZE_INO)) {
                 for (i=0; i < EXT2_N_BLOCKS; i++) {
                         if (inode.i_block[i])
                                 break;
diff --git a/e2fsprogs/old_e2fsprogs/e2p/feature.c b/e2fsprogs/old_e2fsprogs/e2p/feature.c
index b45754f97..2102ed8e7 100644
--- a/e2fsprogs/old_e2fsprogs/e2p/feature.c
+++ b/e2fsprogs/old_e2fsprogs/e2p/feature.c
@@ -34,7 +34,7 @@ static const struct feature feature_list[] = {
                         "ext_attr" },
         {       E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_DIR_INDEX,
                         "dir_index" },
-        {       E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_RESIZE_INODE,
+        {       E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_RESIZE_INO,
                         "resize_inode" },
         {       E2P_FEATURE_RO_INCOMPAT, EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER,
                         "sparse_super" },
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h b/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h
index 6f4f70862..80ea2cbdd 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h
@@ -475,7 +475,7 @@ struct ext2_super_block {
 #define EXT2_FEATURE_COMPAT_IMAGIC_INODES       0x0002
 #define EXT3_FEATURE_COMPAT_HAS_JOURNAL         0x0004
 #define EXT2_FEATURE_COMPAT_EXT_ATTR            0x0008
-#define EXT2_FEATURE_COMPAT_RESIZE_INODE        0x0010
+#define EXT2_FEATURE_COMPAT_RESIZE_INO          0x0010
 #define EXT2_FEATURE_COMPAT_DIR_INDEX           0x0020
 
 #define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER     0x0001
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h
index 9f772016f..39fb11620 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h
@@ -383,7 +383,7 @@ typedef struct ext2_icount *ext2_icount_t;
 #define EXT2_LIB_FEATURE_COMPAT_SUPP    (EXT2_FEATURE_COMPAT_DIR_PREALLOC|\
                                          EXT2_FEATURE_COMPAT_IMAGIC_INODES|\
                                          EXT3_FEATURE_COMPAT_HAS_JOURNAL|\
-                                         EXT2_FEATURE_COMPAT_RESIZE_INODE|\
+                                         EXT2_FEATURE_COMPAT_RESIZE_INO|\
                                          EXT2_FEATURE_COMPAT_DIR_INDEX|\
                                          EXT2_FEATURE_COMPAT_EXT_ATTR)
 
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c b/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c
index ef1d34379..da2d15137 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c
@@ -284,7 +284,7 @@ retry:
         /*
          * check the number of reserved group descriptor table blocks
          */
-        if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE)
+        if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INO)
                 rsv_gdt = calc_reserved_gdt_blocks(fs);
         else
                 rsv_gdt = 0;
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c
index 7555650a2..35d717a55 100644
--- a/e2fsprogs/old_e2fsprogs/mke2fs.c
+++ b/e2fsprogs/old_e2fsprogs/mke2fs.c
@@ -757,7 +757,7 @@ static void parse_extended_opts(struct ext2_super_block *sb_param,
 
                         if (rsv_gdb > 0) {
                                 sb_param->s_feature_compat |=
-                                        EXT2_FEATURE_COMPAT_RESIZE_INODE;
+                                        EXT2_FEATURE_COMPAT_RESIZE_INO;
 
                                 sb_param->s_reserved_gdt_blocks = rsv_gdb;
                         }
@@ -778,7 +778,7 @@ static void parse_extended_opts(struct ext2_super_block *sb_param,
 
 static __u32 ok_features[3] = {
         EXT3_FEATURE_COMPAT_HAS_JOURNAL |
-                EXT2_FEATURE_COMPAT_RESIZE_INODE |
+                EXT2_FEATURE_COMPAT_RESIZE_INO |
                 EXT2_FEATURE_COMPAT_DIR_INDEX,  /* Compat */
         EXT2_FEATURE_INCOMPAT_FILETYPE|         /* Incompat */
                 EXT3_FEATURE_INCOMPAT_JOURNAL_DEV|
@@ -1123,7 +1123,7 @@ static int PRS(int argc, char **argv)
         /* Since sparse_super is the default, we would only have a problem
          * here if it was explicitly disabled.
          */
-        if ((param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) &&
+        if ((param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INO) &&
             !(param.s_feature_ro_compat&EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)) {
                 bb_error_msg_and_die("reserved online resize blocks not supported "
                           "on non-sparse filesystem");
@@ -1312,7 +1312,7 @@ int mke2fs_main (int argc, char **argv)
                 reserve_inodes(fs);
                 create_bad_block_inode(fs, bb_list);
                 if (fs->super->s_feature_compat &
-                    EXT2_FEATURE_COMPAT_RESIZE_INODE) {
+                    EXT2_FEATURE_COMPAT_RESIZE_INO) {
                         retval = ext2fs_create_resize_inode(fs);
                         mke2fs_error_msg_and_die(retval, "reserve blocks for online resize");
                 }
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index 020bdaa33..46a745ee4 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -8,7 +8,7 @@
  */
 #include "libbb.h"
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
+#include "bb_e2fs_defs.h"
 
 // storage helpers
 char BUG_wrong_field_size(void);
diff --git a/e2fsprogs/e2fs_defs.h b/include/bb_e2fs_defs.h
index 379640eb8..7974497ca 100644
--- a/e2fsprogs/e2fs_defs.h
+++ b/include/bb_e2fs_defs.h
@@ -467,7 +467,7 @@ struct ext2_super_block {
 #define EXT2_FEATURE_COMPAT_IMAGIC_INODES       0x0002
 #define EXT3_FEATURE_COMPAT_HAS_JOURNAL         0x0004
 #define EXT2_FEATURE_COMPAT_EXT_ATTR            0x0008
-#define EXT2_FEATURE_COMPAT_RESIZE_INODE        0x0010
+#define EXT2_FEATURE_COMPAT_RESIZE_INO          0x0010
 #define EXT2_FEATURE_COMPAT_DIR_INDEX           0x0020
 
 #define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER     0x0001
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 4cb063f89..ad81ce46b 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -172,6 +172,7 @@ lib-$(CONFIG_PING) += inet_cksum.o
 lib-$(CONFIG_TRACEROUTE) += inet_cksum.o
 lib-$(CONFIG_TRACEROUTE6) += inet_cksum.o
 lib-$(CONFIG_UDHCPC) += inet_cksum.o
+lib-$(CONFIG_UDHCPC6) += inet_cksum.o
 lib-$(CONFIG_UDHCPD) += inet_cksum.o
 
 # We shouldn't build xregcomp.c if we don't need it - this ensures we don't
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 78244c395..77dc1c607 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2532,7 +2532,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                         switch (ic) {
                                 //case KEYCODE_LEFT: - bash doesn't do this
                                 case 'b':
-                                        ctrl_left();
+                                        ctrl_left();
                                         break;
                                 //case KEYCODE_RIGHT: - bash doesn't do this
                                 case 'f':
diff --git a/miscutils/less.c b/miscutils/less.c
index 045fd2db3..f0187bf8a 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -42,14 +42,11 @@
 //config:         brackets, facilitating programming.
 //config:
 //config:config FEATURE_LESS_FLAGS
-//config:       bool "Enable extra flags"
+//config:       bool "Enable -m/-M"
 //config:       default y
 //config:       depends on LESS
 //config:       help
-//config:         The extra flags provided do the following:
-//config:
-//config:         The -M flag enables a more sophisticated status line.
-//config:         The -m flag enables a simpler status line with a percentage.
+//config:         The -M/-m flag enables a more sophisticated status line.
 //config:
 //config:config FEATURE_LESS_MARKS
 //config:       bool "Enable marks"
@@ -101,15 +98,17 @@
 //config:         Enables "-N" command.
 
 //usage:#define less_trivial_usage
-//usage:       "[-EMNmh~I?] [FILE]..."
+//usage:       "[-E" IF_FEATURE_LESS_FLAGS("Mm") "Nh~I?] [FILE]..."
 //usage:#define less_full_usage "\n\n"
 //usage:       "View FILE (or stdin) one screenful at a time\n"
 //usage:     "\n        -E      Quit once the end of a file is reached"
+//usage:        IF_FEATURE_LESS_FLAGS(
 //usage:     "\n        -M,-m   Display status line with line numbers"
 //usage:     "\n                and percentage through the file"
+//usage:        )
 //usage:     "\n        -N      Prefix line number to each line"
 //usage:     "\n        -I      Ignore case in all searches"
-//usage:     "\n        -~      Suppress ~s displayed past the end of the file"
+//usage:     "\n        -~      Suppress ~s displayed past EOF"
 
 #include <sched.h>  /* sched_yield() */
 
diff --git a/networking/hostname.c b/networking/hostname.c
index 5f663908c..d2516b5fb 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -153,7 +153,7 @@ int hostname_main(int argc UNUSED_PARAM, char **argv)
                         if (hp->h_length == sizeof(struct in_addr)) {
                                 struct in_addr **h_addr_list = (struct in_addr **)hp->h_addr_list;
                                 while (*h_addr_list) {
-                                        printf("%s ", inet_ntoa(**h_addr_list));
+                                        printf(h_addr_list[1] ? "%s " : "%s", inet_ntoa(**h_addr_list));
                                         h_addr_list++;
                                 }
                                 bb_putchar('\n');
diff --git a/networking/httpd.c b/networking/httpd.c
index f233cb0ba..12218a0a3 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1594,7 +1594,7 @@ static NOINLINE void send_file_and_exit(const char *url, int what)
         }
         range_len = MAXINT(off_t);
         if (range_start >= 0) {
-                if (!range_end) {
+                if (!range_end || range_end > file_size - 1) {
                         range_end = file_size - 1;
                 }
                 if (range_end < range_start
@@ -1676,7 +1676,7 @@ static int checkPermIP(void)
 
 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
 
-# if ENABLE_FEATURE_HTTPD_AUTH_MD5 && ENABLE_PAM
+# if ENABLE_PAM
 struct pam_userinfo {
         const char *name;
         const char *pw;
@@ -1842,7 +1842,9 @@ static int check_user_passwd(const char *path, char *user_and_passwd)
 
                         if (passwd[0] == '$' && isdigit(passwd[1])) {
                                 char *encrypted;
+# if !ENABLE_PAM
  check_encrypted:
+# endif
                                 /* encrypt pwd from peer and check match with local one */
                                 encrypted = pw_encrypt(
                                         /* pwd (from peer): */  colon_after_user + 1,
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 4d939458c..603801ec6 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -276,6 +276,9 @@ struct globals {
         llist_t  *ntp_peers;
 #if ENABLE_FEATURE_NTPD_SERVER
         int      listen_fd;
+# define G_listen_fd (G.listen_fd)
+#else
+# define G_listen_fd (-1)
 #endif
         unsigned verbose;
         unsigned peer_cnt;
@@ -1815,10 +1818,10 @@ recv_and_process_client_pkt(void /*int fd*/)
         uint8_t          query_status;
         l_fixedpt_t      query_xmttime;
 
-        to = get_sock_lsa(G.listen_fd);
+        to = get_sock_lsa(G_listen_fd);
         from = xzalloc(to->len);
 
-        size = recv_from_to(G.listen_fd, &msg, sizeof(msg), MSG_DONTWAIT, from, &to->u.sa, to->len);
+        size = recv_from_to(G_listen_fd, &msg, sizeof(msg), MSG_DONTWAIT, from, &to->u.sa, to->len);
         if (size != NTP_MSGSIZE_NOAUTH && size != NTP_MSGSIZE) {
                 char *addr;
                 if (size < 0) {
@@ -1861,7 +1864,7 @@ recv_and_process_client_pkt(void /*int fd*/)
 
         /* We reply from the local address packet was sent to,
          * this makes to/from look swapped here: */
-        do_sendto(G.listen_fd,
+        do_sendto(G_listen_fd,
                 /*from:*/ &to->u.sa, /*to:*/ from, /*addrlen:*/ to->len,
                 &msg, size);
 
@@ -2000,11 +2003,11 @@ static NOINLINE void ntp_init(char **argv)
                 logmode = LOGMODE_NONE;
         }
 #if ENABLE_FEATURE_NTPD_SERVER
-        G.listen_fd = -1;
+        G_listen_fd = -1;
         if (opts & OPT_l) {
-                G.listen_fd = create_and_bind_dgram_or_die(NULL, 123);
-                socket_want_pktinfo(G.listen_fd);
-                setsockopt(G.listen_fd, IPPROTO_IP, IP_TOS, &const_IPTOS_LOWDELAY, sizeof(const_IPTOS_LOWDELAY));
+                G_listen_fd = create_and_bind_dgram_or_die(NULL, 123);
+                socket_want_pktinfo(G_listen_fd);
+                setsockopt(G_listen_fd, IPPROTO_IP, IP_TOS, &const_IPTOS_LOWDELAY, sizeof(const_IPTOS_LOWDELAY));
         }
 #endif
         /* I hesitate to set -20 prio. -15 should be high enough for timekeeping */
@@ -2078,8 +2081,8 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
 
                 i = 0;
 #if ENABLE_FEATURE_NTPD_SERVER
-                if (G.listen_fd != -1) {
-                        pfd[0].fd = G.listen_fd;
+                if (G_listen_fd != -1) {
+                        pfd[0].fd = G_listen_fd;
                         pfd[0].events = POLLIN;
                         i++;
                 }
@@ -2125,7 +2128,7 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
 
                 /* Here we may block */
                 VERB2 {
-                        if (i > (ENABLE_FEATURE_NTPD_SERVER && G.listen_fd != -1)) {
+                        if (i > (ENABLE_FEATURE_NTPD_SERVER && G_listen_fd != -1)) {
                                 /* We wait for at least one reply.
                                  * Poll for it, without wasting time for message.
                                  * Since replies often come under 1 second, this also
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index ff6347847..b43e52e96 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -118,8 +118,13 @@ int FAST_FUNC arpping(uint32_t test_nip,
                                 break;
                         }
                 }
-                timeout_ms -= (unsigned)monotonic_ms() - prevTime;
-        } while (timeout_ms > 0);
+                timeout_ms -= (unsigned)monotonic_ms() - prevTime + 1;
+
+                /* We used to check "timeout_ms > 0", but
+                 * this is more under/overflow-resistant
+                 * (people did see overflows here when system time jumps):
+                 */
+        } while ((unsigned)timeout_ms <= 2000);
 
  ret:
         close(s);
diff --git a/networking/udhcp/d6_common.h b/networking/udhcp/d6_common.h
index 4dd7e621e..eb211ea0f 100644
--- a/networking/udhcp/d6_common.h
+++ b/networking/udhcp/d6_common.h
@@ -115,7 +115,11 @@ int FAST_FUNC d6_send_kernel_packet(
                 struct in6_addr *dst_ipv6, int dest_port
 );
 
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
 void FAST_FUNC d6_dump_packet(struct d6_packet *packet);
+#else
+# define d6_dump_packet(packet) ((void)0)
+#endif
 
 
 POP_SAVED_FUNCTION_VISIBILITY
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 23e6862dc..a792a9dca 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -19,7 +19,7 @@
 
 //applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_BIN, BB_SUID_DROP))
 
-//kbuild:lib-$(CONFIG_UDHCPC6) += d6_dhcpc.o d6_packet.o d6_socket.o common.o
+//kbuild:lib-$(CONFIG_UDHCPC6) += d6_dhcpc.o d6_packet.o d6_socket.o common.o socket.o signalpipe.o
 
 
 #include <syslog.h>
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 2f2016cd5..ddb328dd5 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -101,6 +101,7 @@ static const uint8_t len_of_option_as_string[] = {
         [OPTION_STATIC_ROUTES   ] = sizeof("255.255.255.255/32 255.255.255.255 "),
         [OPTION_6RD             ] = sizeof("32 128 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 "),
         [OPTION_STRING          ] = 1,
+        [OPTION_STRING_HOST     ] = 1,
 #if ENABLE_FEATURE_UDHCP_RFC3397
         [OPTION_DNS_STRING      ] = 1, /* unused */
         /* Hmmm, this severely overestimates size if SIP_SERVERS option
diff --git a/procps/kill.c b/procps/kill.c
index b267a7aaf..cd189bcd6 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -163,7 +163,8 @@ int kill_main(int argc, char **argv)
                 /* Find out our session id */
                 sid = getsid(pid);
                 /* Stop all processes */
-                kill(-1, SIGSTOP);
+                if (signo != SIGSTOP && signo != SIGCONT)
+                        kill(-1, SIGSTOP);
                 /* Signal all processes except those in our session */
                 while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID)) != NULL) {
                         int i;
@@ -203,7 +204,8 @@ int kill_main(int argc, char **argv)
                 }
  resume:
                 /* And let them continue */
-                kill(-1, SIGCONT);
+                if (signo != SIGSTOP && signo != SIGCONT)
+                        kill(-1, SIGCONT);
                 return ret;
         }
 
diff --git a/procps/lsof.c b/procps/lsof.c
new file mode 100644
index 000000000..7e0ffa4e5
--- /dev/null
+++ b/procps/lsof.c
@@ -0,0 +1,76 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Mini lsof implementation for busybox
+ *
+ * Copyright (C) 2012 by Sven Oliver 'SvOlli' Moll <svolli@svolli.de>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+
+//config:config LSOF
+//config:       bool "lsof"
+//config:       default y
+//config:       help
+//config:         Show open files in the format of:
+//config:         PID <TAB> /path/to/executable <TAB> /path/to/opened/file
+
+//applet:IF_LSOF(APPLET(lsof, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_LSOF) += lsof.o
+
+//usage:#define lsof_trivial_usage
+//usage:       ""
+//usage:#define lsof_full_usage "\n\n"
+//usage:       "Show all open files"
+
+#include "libbb.h"
+
+/*
+ * Examples of "standard" lsof output:
+ *
+ * COMMAND    PID USER   FD   TYPE             DEVICE     SIZE       NODE NAME
+ * init         1 root  cwd    DIR                8,5     4096          2 /
+ * init         1 root  rtd    DIR                8,5     4096          2 /
+ * init         1 root  txt    REG                8,5   872400      63408 /app/busybox-1.19.2/busybox
+ * rpc.portm 1064 root  mem    REG                8,5    43494      47451 /app/glibc-2.11/lib/libnss_files-2.11.so
+ * rpc.portm 1064 root    3u  IPv4               2178                 UDP *:111
+ * rpc.portm 1064 root    4u  IPv4               1244                 TCP *:111 (LISTEN)
+ * runsvdir  1116 root    0r   CHR                1,3                1214 /dev/null
+ * runsvdir  1116 root    1w   CHR                1,3                1214 /dev/null
+ * runsvdir  1116 root    2w   CHR                1,3                1214 /dev/null
+ * runsvdir  1116 root    3r   DIR                8,6     1560      58359 /.local/var/service
+ * gpm       1128 root    4u  unix 0xffff88007c09ccc0                1302 /dev/gpmctl
+ */
+
+int lsof_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int lsof_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+{
+        procps_status_t *proc = NULL;
+
+        while ((proc = procps_scan(proc, PSSCAN_PID|PSSCAN_EXE)) != NULL) {
+                char name[sizeof("/proc/%u/fd/0123456789") + sizeof(int)*3];
+                unsigned baseofs;
+                DIR *d_fd;
+                char *fdlink;
+                struct dirent *entry;
+
+                if (getpid() == proc->pid)
+                        continue;
+
+                baseofs = sprintf(name, "/proc/%u/fd/", proc->pid);
+                d_fd = opendir(name);
+                if (d_fd) {
+                        while ((entry = readdir(d_fd)) != NULL) {
+                                if (entry->d_type == DT_LNK) {
+                                        safe_strncpy(name + baseofs, entry->d_name, 10);
+                                        fdlink = xmalloc_readlink(name);
+                                        printf("%d\t%s\t%s\n", proc->pid, proc->exe, fdlink);
+                                        free(fdlink);
+                                }
+                        }
+                        closedir(d_fd);
+                }
+        }
+
+        return EXIT_SUCCESS;
+}
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 0d3ff7f5e..6db2a5e58 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -39,25 +39,16 @@ if f1 is None or f2 is None:
 sym_args = " ".join(sys.argv[3 + flag_timing + dashes:])
 def getsizes(file):
     sym, alias, lut = {}, {}, {}
-    #dynsym_filter = re.compile("^\d+:\s+[\dA-Fa-f]+\s+\d+\s+\w+\s+\w+\s+\w+\s+\w+\s+\w+$")
     for l in os.popen("readelf -W -s %s %s" % (sym_args, file)).readlines():
-        if True:
-            l = l.strip()
-            if not (len(l) and l[0].isdigit() and len(l.split()) == 8):
-                continue
-            num, value, size, typ, bind, vis, ndx, name = l.split()
-            if ndx == "UND": continue # skip undefined
-            if typ in ["SECTION", "FILES"]: continue # skip sections and files
-        #else:
-        #    l = l.strip()
-        #    match = dynsym_filter.match(l)
-        #    if not match: continue
-        #    x, value, size, typ, bind, x, ndx, name = l.split()
-        #    if ndx == "UND": continue # skip undefined
-        #    if typ in ["SECTION", "FILES"]: continue # skip sections and files
+        l = l.strip()
+        if not (len(l) and l[0].isdigit() and len(l.split()) == 8):
+            continue
+        num, value, size, typ, bind, vis, ndx, name = l.split()
+        if ndx == "UND": continue # skip undefined
+        if typ in ["SECTION", "FILES"]: continue # skip sections and files
         if "." in name: name = "static." + name.split(".")[0]
         value = int(value, 16)
-        size = int(size)
+        size = int(size, 16) if size.startswith('0x') else int(size)
         if vis != "DEFAULT" and bind != "GLOBAL": # see if it is an alias
             alias[(value, size)] = {"name" : name}
         else:
diff --git a/scripts/randomtest.loop b/scripts/randomtest.loop
index 2c8a9bd35..758a8e862 100755
--- a/scripts/randomtest.loop
+++ b/scripts/randomtest.loop
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+run_testsuite=true
+
 test -d "$1" || { echo "'$1' is not a directory"; exit 1; }
 test -x "$1/scripts/randomtest" || { echo "No scripts/randomtest in '$1'"; exit 1; }
 
@@ -21,7 +23,9 @@ while sleep 1; do
                 echo "Failed build in: failed.$dir"
                 exit 1 # you may comment this out...
                 let fail++
-        else
+                continue
+        fi
+        if $run_testsuite; then
                 (
                         cd -- "$dir/testsuite" || exit 1
                         echo "Running testsuite in $dir..."
@@ -29,10 +33,12 @@ while sleep 1; do
                 )
                 if test $? != 0; then
                         echo "Failed runtest in $dir"
-                        exit 1
+                        exit 1 # you may comment this out...
+                        let fail++
+                        continue
                 fi
                 tail -n10 -- "$dir/testsuite/runtest.log"
-                rm -rf -- "$dir"
         fi
+        rm -rf -- "$dir"
         let cnt++
 done
diff --git a/shell/hush.c b/shell/hush.c
index 7a34f59ae..51d38d3ae 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -324,6 +324,8 @@ typedef void (*hush_sighandler_t)(int);
 # define ENABLE_FEATURE_EDITING 0
 # undef ENABLE_FEATURE_EDITING_FANCY_PROMPT
 # define ENABLE_FEATURE_EDITING_FANCY_PROMPT 0
+# undef ENABLE_FEATURE_EDITING_SAVE_ON_EXIT
+# define ENABLE_FEATURE_EDITING_SAVE_ON_EXIT 0
 #endif
 
 /* Do we support ANY keywords? */
@@ -524,7 +526,6 @@ typedef enum redir_type {
 struct command {
         pid_t pid;                  /* 0 if exited */
         int assignment_cnt;         /* how many argv[i] are assignments? */
-        smallint is_stopped;        /* is the command currently running? */
         smallint cmd_type;          /* CMD_xxx */
 #define CMD_NORMAL   0
 #define CMD_SUBSHELL 1
@@ -6767,7 +6768,6 @@ static int checkjobs(struct pipe *fg_pipe)
                                         }
                                         fg_pipe->cmds[i].cmd_exitcode = ex;
                                 } else {
-                                        fg_pipe->cmds[i].is_stopped = 1;
                                         fg_pipe->stopped_cmds++;
                                 }
                                 debug_printf_jobs("fg_pipe: alive_cmds %d stopped_cmds %d\n",
@@ -6828,7 +6828,6 @@ static int checkjobs(struct pipe *fg_pipe)
                         }
                 } else {
                         /* child stopped */
-                        pi->cmds[i].is_stopped = 1;
                         pi->stopped_cmds++;
                 }
 #endif
@@ -8596,7 +8595,6 @@ static int FAST_FUNC builtin_fg_bg(char **argv)
         debug_printf_jobs("reviving %d procs, pgrp %d\n", pi->num_cmds, pi->pgrp);
         for (i = 0; i < pi->num_cmds; i++) {
                 debug_printf_jobs("reviving pid %d\n", pi->cmds[i].pid);
-                pi->cmds[i].is_stopped = 0;
         }
         pi->stopped_cmds = 0;
 
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 6b4e29bfa..379eeb253 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -43,7 +43,7 @@ static time_t read_rtc(const char **pp_rtcname, struct timeval *sys_tv, int utc)
                 while (1) {
                         rtc_read_tm(&tm_time, fd);
                         gettimeofday(sys_tv, NULL);
-                        if (before != tm_time.tm_sec)
+                        if (before != (int)tm_time.tm_sec)
                                 break;
                 }
         }
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 67de52d06..0a34122b4 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -164,7 +164,10 @@ struct globals {
         struct rule cur_rule;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define INIT_G() do { \
+        IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.maj = -1;) \
+        IF_NOT_FEATURE_MDEV_CONF(G.cur_rule.mode = 0660;) \
+} while (0)
 
 
 /* Prevent infinite loops in /sys symlinks */
@@ -477,9 +480,8 @@ static void make_device(char *path, int delete)
                         }
                 }
                 /* else: it's final implicit "match-all" rule */
-#endif
-
  rule_matches:
+#endif
                 dbg("rule matched");
 
                 /* Build alias name */
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index 6cbbe0e07..69b25c946 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -48,7 +48,7 @@
 
 #include "libbb.h"
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
+#include "bb_e2fs_defs.h"
 
 #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0
 #define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX    1
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 807e89747..f1da30fac 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -1337,7 +1337,7 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
                                 "udp\0"
                                 "lock\0"
                                 "rdirplus\0"
-                                "acl\0";
+                                "acl\0";
                         int val = 1;
                         if (!strncmp(opt, "no", 2)) {
                                 val = 0;
@@ -1388,7 +1388,7 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
                                 nordirplus = !val;
                                 break;
                         case 12: // acl
-                                noacl = !val;
+                                noacl = !val;
                                 break;
                         default:
                                 bb_error_msg("unknown nfs mount option: %s%s", val ? "" : "no", opt);
@@ -1404,7 +1404,7 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts)
                 | (nocto ? NFS_MOUNT_NOCTO : 0)
                 | (noac ? NFS_MOUNT_NOAC : 0)
                 | (nordirplus ? NFS_MOUNT_NORDIRPLUS : 0)
-                | (noacl ? NFS_MOUNT_NOACL : 0);
+                | (noacl ? NFS_MOUNT_NOACL : 0);
         if (nfs_mount_version >= 2)
                 data.flags |= (tcp ? NFS_MOUNT_TCP : 0);
         if (nfs_mount_version >= 3)
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 5b716c688..4c2e8821e 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -22,7 +22,7 @@
 //usage:     "\n        -l      Lazy umount (detach filesystem)"
 //usage:     "\n        -f      Force umount (i.e., unreachable NFS server)"
 //usage:        IF_FEATURE_MOUNT_LOOP(
-//usage:     "\n        -d      Free loop device if it has been used"
+//usage:     "\n        -D      Don't free loop device even if it has been used"
 //usage:        )
 //usage:
 //usage:#define umount_example_usage
@@ -44,14 +44,22 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
 }
 #endif
 
-/* ignored: -v -d -t -i */
-#define OPTION_STRING           "fldnra" "vdt:i"
+/* Ignored: -v -t -i
+ * bbox always acts as if -d is present.
+ * -D can be used to suppress it (bbox extension).
+ * Rationale:
+ * (1) util-linux's umount does it if "loop=..." is seen in /etc/mtab:
+ * thus, on many systems, bare umount _does_ drop loop devices.
+ * (2) many users request this feature.
+ */
+#define OPTION_STRING           "fldDnra" "vt:i"
 #define OPT_FORCE               (1 << 0) // Same as MNT_FORCE
 #define OPT_LAZY                (1 << 1) // Same as MNT_DETACH
-#define OPT_FREELOOP            (1 << 2)
-#define OPT_NO_MTAB             (1 << 3)
-#define OPT_REMOUNT             (1 << 4)
-#define OPT_ALL                 (ENABLE_FEATURE_UMOUNT_ALL ? (1 << 5) : 0)
+//#define OPT_FREE_LOOP           (1 << 2) // -d is assumed always present
+#define OPT_DONT_FREE_LOOP      (1 << 3)
+#define OPT_NO_MTAB             (1 << 4)
+#define OPT_REMOUNT             (1 << 5)
+#define OPT_ALL                 (ENABLE_FEATURE_UMOUNT_ALL ? (1 << 6) : 0)
 
 int umount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int umount_main(int argc UNUSED_PARAM, char **argv)
@@ -165,7 +173,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
                 } else {
                         // De-allocate the loop device.  This ioctl should be ignored on
                         // any non-loop block devices.
-                        if (ENABLE_FEATURE_MOUNT_LOOP && (opt & OPT_FREELOOP) && m)
+                        if (ENABLE_FEATURE_MOUNT_LOOP && !(opt & OPT_DONT_FREE_LOOP) && m)
                                 del_loop(m->device);
                         if (ENABLE_FEATURE_MTAB_SUPPORT && !(opt & OPT_NO_MTAB) && m)
                                 erase_mtab(m->dir);