fix build breakage found by randconfig

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index 39c18f264219ef482aa292e86de58dcb94f6a70b..7ae013e84dfc15c65bb328ba60b80aa74422d080 100644 (file)
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -53,6 +53,7 @@ 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_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/libbb/Kbuild.src b/libbb/Kbuild.src
index 335b341288d400b5730d7101a0acb093de6dcb23..61eec26f70a7503ce1f8ea62b7e3b41e01ca5744 100644 (file)
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -170,6 +170,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/networking/httpd.c b/networking/httpd.c
index fb6ecbf70b24eeb2b03b02c1da2821fbe8681749..12218a0a32246bfe9c11547b8e859657d8ac4b6c 100644 (file)
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -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/udhcp/d6_common.h b/networking/udhcp/d6_common.h
index 4dd7e621ecffabdaf2d78657c364f93c58492d0d..eb211ea0f14517994c93e9c91a2ac3e0d35bf066 100644 (file)
--- 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 23e6862dc41ed054df6e10d1661b4684ea55b0ec..a792a9dcab49d8fc006574af85103893a1513de3 100644 (file)
--- 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/scripts/randomtest.loop b/scripts/randomtest.loop
index 2c8a9bd35ba6688fe000006dbe07cbd8c1e77634..758a8e86290d96e49429db29e3620a42aa9b75a7 100755 (executable)
--- 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 180ae4a6261e40a9a7d08d61af21899b322340b7..51d38d3aef65220a751b9d56c53d6c737025407d 100644 (file)
--- 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? */