Merge commit '1_23_0' into mergeTIG_1_23_0

Conflicts:
	libbb/lineedit.c

9 files changed, 31 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 6029f427f..a64b0c926 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 1
 PATCHLEVEL = 23
 SUBLEVEL = 0
-EXTRAVERSION = .git
+EXTRAVERSION =
 NAME = Unnamed
 
 # *DOCUMENTATION*
diff --git a/archival/tar.c b/archival/tar.c
index e00ed26a8..85551684b 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -747,11 +747,9 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
 #endif
         return errorFlag;
 }
-#else
-int writeTarFile(int tar_fd, int verboseFlag,
-        int recurseFlags, const llist_t *include,
-        const llist_t *exclude, const char *gzip);
-#endif /* FEATURE_TAR_CREATE */
+#else /* !FEATURE_TAR_CREATE */
+# define writeTarFile(...) 0
+#endif
 
 #if ENABLE_FEATURE_TAR_FROM
 static llist_t *append_file_list_to_list(llist_t *list)
diff --git a/include/libbb.h b/include/libbb.h
index 802779932..2850b1d5a 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1287,7 +1287,9 @@ char *bb_simplify_path(const char *path) FAST_FUNC;
 /* Returns ptr to NUL */
 char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC;
 
+#ifndef LOGIN_FAIL_DELAY
 #define LOGIN_FAIL_DELAY 3
+#endif
 extern void bb_do_delay(int seconds) FAST_FUNC;
 extern void change_identity(const struct passwd *pw) FAST_FUNC;
 extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) NORETURN FAST_FUNC;
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 1be87b337..d94b65008 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -144,6 +144,7 @@ lib-$(CONFIG_ADDUSER) += update_passwd.o
 lib-$(CONFIG_DELGROUP) += update_passwd.o
 lib-$(CONFIG_DELUSER) += update_passwd.o
 
+lib-$(CONFIG_FTPD) += correct_password.o
 lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
 lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
 lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
diff --git a/libbb/sysconf.c b/libbb/sysconf.c
index cfad9cdc0..8c1caef5c 100644
--- a/libbb/sysconf.c
+++ b/libbb/sysconf.c
@@ -11,7 +11,15 @@
 #if !defined(bb_arg_max)
 unsigned FAST_FUNC bb_arg_max(void)
 {
-        return sysconf(_SC_ARG_MAX);
+        long r = sysconf(_SC_ARG_MAX);
+
+        /* I've seen a version of uclibc which returned -1.
+         * Guard about it, and also avoid insanely large values
+         */
+        if ((unsigned long)r > 64*1024*1024)
+                r = 64*1024*1024;
+
+        return r;
 }
 #endif
 
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 29ff351a3..247fc72f4 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -36,16 +36,18 @@
 //usage:     "\n        -s ADDR Start address"
 
 //usage:#define nanddump_trivial_usage
-//usage:        "[-o] [--bb=padbad|skipbad] [-s ADDR] [-l LEN] [-f FILE] MTD_DEVICE"
+//usage:        "[-o]" IF_LONG_OPTS(" [--bb=padbad|skipbad]") " [-s ADDR] [-l LEN] [-f FILE] MTD_DEVICE"
 //usage:#define nanddump_full_usage "\n\n"
 //usage:        "Dump MTD_DEVICE\n"
 //usage:     "\n        -o      Dump oob data"
 //usage:     "\n        -s ADDR Start address"
 //usage:     "\n        -l LEN  Length"
 //usage:     "\n        -f FILE Dump to file ('-' for stdout)"
+//usage:     IF_LONG_OPTS(
 //usage:     "\n        --bb=METHOD:"
 //usage:     "\n                skipbad: skip bad blocks"
 //usage:     "\n                padbad: substitute bad blocks by 0xff (default)"
+//usage:     )
 
 #include "libbb.h"
 #include <mtd/mtd-user.h>
@@ -116,12 +118,13 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
         struct mtd_oob_buf oob;
         unsigned char *filebuf;
         const char *opt_s = "0", *opt_f = "-", *opt_l, *opt_bb;
-        static const char nanddump_longopts[] ALIGN1 =
-                "bb\0" Required_argument "\xff"; /* no short equivalent */
 
         if (IS_NANDDUMP) {
                 opt_complementary = "=1";
-                applet_long_options = nanddump_longopts;
+#if ENABLE_LONG_OPTS
+                applet_long_options =
+                        "bb\0" Required_argument "\xff"; /* no short equivalent */
+#endif
                 opts = getopt32(argv, "os:f:l:", &opt_s, &opt_f, &opt_l, &opt_bb);
         } else { /* nandwrite */
                 opt_complementary = "-1:?2";
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 35e7c2070..a34829c3a 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1697,6 +1697,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                 case RENEW_REQUESTED:
                 case REBINDING:
                         if (*message == DHCPACK) {
+                                unsigned start;
                                 uint32_t lease_seconds;
                                 struct in_addr temp_addr;
                                 uint8_t *temp;
@@ -1756,7 +1757,10 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
                                 bb_info_msg("Lease of %s obtained, lease time %u",
                                         inet_ntoa(temp_addr), (unsigned)lease_seconds);
                                 requested_ip = packet.yiaddr;
+
+                                start = monotonic_sec();
                                 udhcp_run_script(&packet, state == REQUESTING ? "bound" : "renew");
+                                already_waited_sec = (unsigned)monotonic_sec() - start;
 
                                 state = BOUND;
                                 change_listen_mode(LISTEN_NONE);
@@ -1774,7 +1778,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
 #endif
                                 /* make future renew packets use different xid */
                                 /* xid = random_xid(); ...but why bother? */
-                                already_waited_sec = 0;
+
                                 continue; /* back to main loop */
                         }
                         if (*message == DHCPNAK) {
diff --git a/testsuite/find.tests b/testsuite/find.tests
index f041106c3..78dfa1230 100755
--- a/testsuite/find.tests
+++ b/testsuite/find.tests
@@ -10,11 +10,12 @@
 mkdir -p find.tempdir
 touch find.tempdir/testfile
 
+optional FEATURE_FIND_TYPE
 testing "find -type f" \
         "cd find.tempdir && find -type f 2>&1" \
         "./testfile\n" \
         "" ""
-
+SKIP=
 optional FEATURE_FIND_EXEC
 testing "find -exec exitcode 1" \
         "cd find.tempdir && find testfile -exec true {} \; 2>&1; echo \$?" \
diff --git a/testsuite/mdev.tests b/testsuite/mdev.tests
index 48d3dcc2c..59873011a 100755
--- a/testsuite/mdev.tests
+++ b/testsuite/mdev.tests
@@ -168,7 +168,7 @@ SKIP=
 # continuing to use directory structure from prev test
 rm -rf mdev.testdir/dev/*
 echo "sda 0:0 644 @echo @echo TEST" >mdev.testdir/etc/mdev.conf
-optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH
+optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH ASH_BUILTIN_ECHO
 testing "mdev command" \
         "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
         ls -lnR mdev.testdir/dev | $FILTER_LS" \