busybox: Update config for 1.24.1

r47288 updated to Busybox 1.24.1 but did not update the configuration.

The configuration is updated by running

cd config
../convert_menuconfig.pl .../build_dir/target-*/busybox-1.24.1
cd ..
./convert_defaults.pl < .../build_dir/target-*/busybox-1.24.1/.config > \
    Config-defaults.in

Signed-off-by: Mark Mentovai <mark@moxienet.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47775 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
index 2689b4f..75c5976 100644 (file)
--- a/package/utils/busybox/Config-defaults.in
+++ b/package/utils/busybox/Config-defaults.in
@@ -361,6 +361,9 @@ config BUSYBOX_DEFAULT_FEATURE_GZIP_LONG_OPTIONS
 config BUSYBOX_DEFAULT_GZIP_FAST
        int
        default 0
 config BUSYBOX_DEFAULT_GZIP_FAST
        int
        default 0

+config BUSYBOX_DEFAULT_FEATURE_GZIP_LEVELS
+       bool
+       default n

 config BUSYBOX_DEFAULT_LZOP
        bool
        default n
 config BUSYBOX_DEFAULT_LZOP
        bool
        default n


@@ -430,6 +433,21 @@ config BUSYBOX_DEFAULT_FEATURE_DATE_NANO
 config BUSYBOX_DEFAULT_FEATURE_DATE_COMPAT
        bool
        default n
 config BUSYBOX_DEFAULT_FEATURE_DATE_COMPAT
        bool
        default n

+config BUSYBOX_DEFAULT_DD
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_DD_SIGNAL_HANDLING
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_DD_THIRD_STATUS_LINE
+       bool
+       default n
+config BUSYBOX_DEFAULT_FEATURE_DD_IBS_OBS
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_DD_STATUS
+       bool
+       default n

 config BUSYBOX_DEFAULT_HOSTID
        bool
        default n
 config BUSYBOX_DEFAULT_HOSTID
        bool
        default n


@@ -442,6 +460,12 @@ config BUSYBOX_DEFAULT_GROUPS
 config BUSYBOX_DEFAULT_SHUF
        bool
        default n
 config BUSYBOX_DEFAULT_SHUF
        bool
        default n

+config BUSYBOX_DEFAULT_SYNC
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_SYNC_FANCY
+       bool
+       default n

 config BUSYBOX_DEFAULT_TEST
        bool
        default y
 config BUSYBOX_DEFAULT_TEST
        bool
        default y


@@ -466,6 +490,9 @@ config BUSYBOX_DEFAULT_FEATURE_TR_CLASSES
 config BUSYBOX_DEFAULT_FEATURE_TR_EQUIV
        bool
        default n
 config BUSYBOX_DEFAULT_FEATURE_TR_EQUIV
        bool
        default n

+config BUSYBOX_DEFAULT_TRUNCATE
+       bool
+       default n

 config BUSYBOX_DEFAULT_UNLINK
        bool
        default n
 config BUSYBOX_DEFAULT_UNLINK
        bool
        default n


@@ -514,18 +541,6 @@ config BUSYBOX_DEFAULT_FEATURE_CP_LONG_OPTIONS
 config BUSYBOX_DEFAULT_CUT
        bool
        default y
 config BUSYBOX_DEFAULT_CUT
        bool
        default y

-config BUSYBOX_DEFAULT_DD
-       bool
-       default y
-config BUSYBOX_DEFAULT_FEATURE_DD_SIGNAL_HANDLING
-       bool
-       default y
-config BUSYBOX_DEFAULT_FEATURE_DD_THIRD_STATUS_LINE
-       bool
-       default n
-config BUSYBOX_DEFAULT_FEATURE_DD_IBS_OBS
-       bool
-       default y

 config BUSYBOX_DEFAULT_DF
        bool
        default y
 config BUSYBOX_DEFAULT_DF
        bool
        default y


@@ -730,9 +745,6 @@ config BUSYBOX_DEFAULT_STTY
 config BUSYBOX_DEFAULT_SUM
        bool
        default n
 config BUSYBOX_DEFAULT_SUM
        bool
        default n

-config BUSYBOX_DEFAULT_SYNC
-       bool
-       default y

 config BUSYBOX_DEFAULT_TAC
        bool
        default n
 config BUSYBOX_DEFAULT_TAC
        bool
        default n


@@ -757,6 +769,9 @@ config BUSYBOX_DEFAULT_TTY
 config BUSYBOX_DEFAULT_UNAME
        bool
        default y
 config BUSYBOX_DEFAULT_UNAME
        bool
        default y

+config BUSYBOX_DEFAULT_UNAME_OSNAME
+       string
+       default "GNU/Linux"

 config BUSYBOX_DEFAULT_UNEXPAND
        bool
        default n
 config BUSYBOX_DEFAULT_UNEXPAND
        bool
        default n


@@ -1348,9 +1363,42 @@ config BUSYBOX_DEFAULT_FEATURE_MDEV_EXEC
 config BUSYBOX_DEFAULT_FEATURE_MDEV_LOAD_FIRMWARE
        bool
        default n
 config BUSYBOX_DEFAULT_FEATURE_MDEV_LOAD_FIRMWARE
        bool
        default n

+config BUSYBOX_DEFAULT_MOUNT
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_FAKE
+       bool
+       default n
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_VERBOSE
+       bool
+       default n
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_HELPERS
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_LABEL
+       bool
+       default n
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_NFS
+       bool
+       default n
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_CIFS
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_FLAGS
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_FSTAB
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_OTHERTAB
+       bool
+       default n

 config BUSYBOX_DEFAULT_REV
        bool
        default n
 config BUSYBOX_DEFAULT_REV
        bool
        default n

+config BUSYBOX_DEFAULT_UEVENT
+       bool
+       default n

 config BUSYBOX_DEFAULT_ACPID
        bool
        default n
 config BUSYBOX_DEFAULT_ACPID
        bool
        default n


@@ -1486,33 +1534,6 @@ config BUSYBOX_DEFAULT_FEATURE_MKSWAP_UUID
 config BUSYBOX_DEFAULT_MORE
        bool
        default n
 config BUSYBOX_DEFAULT_MORE
        bool
        default n

-config BUSYBOX_DEFAULT_MOUNT
-       bool
-       default y
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_FAKE
-       bool
-       default n
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_VERBOSE
-       bool
-       default n
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_HELPERS
-       bool
-       default y
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_LABEL
-       bool
-       default n
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_NFS
-       bool
-       default n
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_CIFS
-       bool
-       default y
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_FLAGS
-       bool
-       default y
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_FSTAB
-       bool
-       default y

 config BUSYBOX_DEFAULT_PIVOT_ROOT
        bool
        default y
 config BUSYBOX_DEFAULT_PIVOT_ROOT
        bool
        default y


@@ -1645,6 +1666,18 @@ config BUSYBOX_DEFAULT_FEATURE_CROND_CALL_SENDMAIL
 config BUSYBOX_DEFAULT_FEATURE_CROND_DIR
        string
        default "/etc"
 config BUSYBOX_DEFAULT_FEATURE_CROND_DIR
        string
        default "/etc"

+config BUSYBOX_DEFAULT_I2CGET
+       bool
+       default n
+config BUSYBOX_DEFAULT_I2CSET
+       bool
+       default n
+config BUSYBOX_DEFAULT_I2CDUMP
+       bool
+       default n
+config BUSYBOX_DEFAULT_I2CDETECT
+       bool
+       default n

 config BUSYBOX_DEFAULT_LESS
        bool
        default y
 config BUSYBOX_DEFAULT_LESS
        bool
        default y


@@ -1657,6 +1690,9 @@ config BUSYBOX_DEFAULT_FEATURE_LESS_BRACKETS
 config BUSYBOX_DEFAULT_FEATURE_LESS_FLAGS
        bool
        default n
 config BUSYBOX_DEFAULT_FEATURE_LESS_FLAGS
        bool
        default n

+config BUSYBOX_DEFAULT_FEATURE_LESS_TRUNCATE
+       bool
+       default n

 config BUSYBOX_DEFAULT_FEATURE_LESS_MARKS
        bool
        default n
 config BUSYBOX_DEFAULT_FEATURE_LESS_MARKS
        bool
        default n


@@ -1930,6 +1966,27 @@ config BUSYBOX_DEFAULT_PING6
 config BUSYBOX_DEFAULT_FEATURE_FANCY_PING
        bool
        default y
 config BUSYBOX_DEFAULT_FEATURE_FANCY_PING
        bool
        default y

+config BUSYBOX_DEFAULT_WGET
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_WGET_STATUSBAR
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_WGET_AUTHENTICATION
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_WGET_LONG_OPTIONS
+       bool
+       default y
+config BUSYBOX_DEFAULT_FEATURE_WGET_TIMEOUT
+       bool
+       default n
+config BUSYBOX_DEFAULT_FEATURE_WGET_OPENSSL
+       bool
+       default n
+config BUSYBOX_DEFAULT_FEATURE_WGET_SSL_HELPER
+       bool
+       default n

 config BUSYBOX_DEFAULT_WHOIS
        bool
        default n
 config BUSYBOX_DEFAULT_WHOIS
        bool
        default n


@@ -2113,6 +2170,9 @@ config BUSYBOX_DEFAULT_FEATURE_IP_LINK
 config BUSYBOX_DEFAULT_FEATURE_IP_ROUTE
        bool
        default y
 config BUSYBOX_DEFAULT_FEATURE_IP_ROUTE
        bool
        default y

+config BUSYBOX_DEFAULT_FEATURE_IP_ROUTE_DIR
+       string
+       default "n"

 config BUSYBOX_DEFAULT_FEATURE_IP_TUNNEL
        bool
        default n
 config BUSYBOX_DEFAULT_FEATURE_IP_TUNNEL
        bool
        default n


@@ -2302,21 +2362,6 @@ config BUSYBOX_DEFAULT_UDPSVD
 config BUSYBOX_DEFAULT_VCONFIG
        bool
        default n
 config BUSYBOX_DEFAULT_VCONFIG
        bool
        default n

-config BUSYBOX_DEFAULT_WGET
-       bool
-       default y
-config BUSYBOX_DEFAULT_FEATURE_WGET_STATUSBAR
-       bool
-       default y
-config BUSYBOX_DEFAULT_FEATURE_WGET_AUTHENTICATION
-       bool
-       default y
-config BUSYBOX_DEFAULT_FEATURE_WGET_LONG_OPTIONS
-       bool
-       default y
-config BUSYBOX_DEFAULT_FEATURE_WGET_TIMEOUT
-       bool
-       default n

 config BUSYBOX_DEFAULT_ZCIP
        bool
        default n
 config BUSYBOX_DEFAULT_ZCIP
        bool
        default n

diff --git a/package/utils/busybox/config/archival/Config.in b/package/utils/busybox/config/archival/Config.in
index e977bb4..1ca610c 100644 (file)
--- a/package/utils/busybox/config/archival/Config.in
+++ b/package/utils/busybox/config/archival/Config.in
@@ -236,6 +236,16 @@ config BUSYBOX_CONFIG_GZIP_FAST
          1: larger buffers, larger hash-tables
          2: larger buffers, largest hash-tables
          Larger models may give slightly better compression
          1: larger buffers, larger hash-tables
          2: larger buffers, largest hash-tables
          Larger models may give slightly better compression

+
+config BUSYBOX_CONFIG_FEATURE_GZIP_LEVELS
+       bool "Enable compression levels"
+       default BUSYBOX_DEFAULT_FEATURE_GZIP_LEVELS
+       depends on BUSYBOX_CONFIG_GZIP
+       help
+         Enable support for compression levels 4-9. The default level
+         is 6. If levels 1-3 are specified, 4 is used.
+         If this option is not selected, -N options are ignored and -9
+         is used.

 config BUSYBOX_CONFIG_LZOP
        bool "lzop"
        default BUSYBOX_DEFAULT_LZOP
 config BUSYBOX_CONFIG_LZOP
        bool "lzop"
        default BUSYBOX_DEFAULT_LZOP

diff --git a/package/utils/busybox/config/coreutils/Config.in b/package/utils/busybox/config/coreutils/Config.in
index f50823f..2f94738 100644 (file)
--- a/package/utils/busybox/config/coreutils/Config.in
+++ b/package/utils/busybox/config/coreutils/Config.in
@@ -58,6 +58,50 @@ config BUSYBOX_CONFIG_FEATURE_DATE_COMPAT
          With this option off, 'date DATE' is 'date -s DATE' support
          the same format. With it on, 'date DATE' additionally supports
          MMDDhhmm[[YY]YY][.ss] format.
          With this option off, 'date DATE' is 'date -s DATE' support
          the same format. With it on, 'date DATE' additionally supports
          MMDDhhmm[[YY]YY][.ss] format.

+config BUSYBOX_CONFIG_DD
+       bool "dd"
+       default BUSYBOX_DEFAULT_DD
+       help
+         dd copies a file (from standard input to standard output,
+         by default) using specific input and output blocksizes,
+         while optionally performing conversions on it.
+
+config BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING
+       bool "Enable signal handling for status reporting"
+       default BUSYBOX_DEFAULT_FEATURE_DD_SIGNAL_HANDLING
+       depends on BUSYBOX_CONFIG_DD
+       help
+         Sending a SIGUSR1 signal to a running `dd' process makes it
+         print to standard error the number of records read and written
+         so far, then to resume copying.
+
+         $ dd if=/dev/zero of=/dev/null &
+         $ pid=$!; kill -USR1 $pid; sleep 1; kill $pid
+         10899206+0 records in
+         10899206+0 records out
+
+config BUSYBOX_CONFIG_FEATURE_DD_THIRD_STATUS_LINE
+       bool "Enable the third status line upon signal"
+       default BUSYBOX_DEFAULT_FEATURE_DD_THIRD_STATUS_LINE
+       depends on BUSYBOX_CONFIG_DD && BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING
+       help
+         Displays a coreutils-like third status line with transferred bytes,
+         elapsed time and speed.
+
+config BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS
+       bool "Enable ibs, obs and conv options"
+       default BUSYBOX_DEFAULT_FEATURE_DD_IBS_OBS
+       depends on BUSYBOX_CONFIG_DD
+       help
+         Enables support for writing a certain number of bytes in and out,
+         at a time, and performing conversions on the data stream.
+
+config BUSYBOX_CONFIG_FEATURE_DD_STATUS
+       bool "Enable status display options"
+       default BUSYBOX_DEFAULT_FEATURE_DD_STATUS
+       depends on BUSYBOX_CONFIG_DD
+       help
+         Enables support for status=noxfer/none option.

 config BUSYBOX_CONFIG_HOSTID
        bool "hostid"
        default BUSYBOX_DEFAULT_HOSTID
 config BUSYBOX_CONFIG_HOSTID
        bool "hostid"
        default BUSYBOX_DEFAULT_HOSTID


@@ -79,6 +123,18 @@ config BUSYBOX_CONFIG_SHUF
        default BUSYBOX_DEFAULT_SHUF
        help
          Generate random permutations
        default BUSYBOX_DEFAULT_SHUF
        help
          Generate random permutations

+config BUSYBOX_CONFIG_SYNC
+       bool "sync"
+       default BUSYBOX_DEFAULT_SYNC
+       help
+         sync is used to flush filesystem buffers.
+config BUSYBOX_CONFIG_FEATURE_SYNC_FANCY
+       bool "Enable -d and -f flags (requres syncfs(2) in libc)"
+       default BUSYBOX_DEFAULT_FEATURE_SYNC_FANCY
+       depends on BUSYBOX_CONFIG_SYNC
+       help
+         sync -d FILE... executes fdatasync() on each FILE.
+         sync -f FILE... executes syncfs() on each FILE.

 config BUSYBOX_CONFIG_TEST
        bool "test"
        default BUSYBOX_DEFAULT_TEST
 config BUSYBOX_CONFIG_TEST
        bool "test"
        default BUSYBOX_DEFAULT_TEST


@@ -139,6 +195,12 @@ config BUSYBOX_CONFIG_FEATURE_TR_EQUIV
          replace all instances of 'a' with 'xyz'. This option is mainly
          useful for cases when no other way of expressing a character
          is possible.
          replace all instances of 'a' with 'xyz'. This option is mainly
          useful for cases when no other way of expressing a character
          is possible.

+config BUSYBOX_CONFIG_TRUNCATE
+       bool "truncate"
+       default BUSYBOX_DEFAULT_TRUNCATE
+       help
+         truncate truncates files to a given size. If a file does
+         not exist, it is created unless told otherwise.

 config BUSYBOX_CONFIG_UNLINK
        bool "unlink"
        default BUSYBOX_DEFAULT_UNLINK
 config BUSYBOX_CONFIG_UNLINK
        bool "unlink"
        default BUSYBOX_DEFAULT_UNLINK


@@ -166,7 +228,7 @@ config BUSYBOX_CONFIG_CAL
        bool "cal"
        default BUSYBOX_DEFAULT_CAL
        help
        bool "cal"
        default BUSYBOX_DEFAULT_CAL
        help

-         cal is used to display a monthly calender.
+         cal is used to display a monthly calendar.

 
 config BUSYBOX_CONFIG_CATV
        bool "catv"
 
 config BUSYBOX_CONFIG_CATV
        bool "catv"


@@ -242,44 +304,6 @@ config BUSYBOX_CONFIG_CUT
          cut is used to print selected parts of lines from
          each file to stdout.
 
          cut is used to print selected parts of lines from
          each file to stdout.
 

-config BUSYBOX_CONFIG_DD
-       bool "dd"
-       default BUSYBOX_DEFAULT_DD
-       help
-         dd copies a file (from standard input to standard output,
-         by default) using specific input and output blocksizes,
-         while optionally performing conversions on it.
-
-config BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING
-       bool "Enable DD signal handling for status reporting"
-       default BUSYBOX_DEFAULT_FEATURE_DD_SIGNAL_HANDLING
-       depends on BUSYBOX_CONFIG_DD
-       help
-         Sending a SIGUSR1 signal to a running `dd' process makes it
-         print to standard error the number of records read and written
-         so far, then to resume copying.
-
-         $ dd if=/dev/zero of=/dev/null&
-         $ pid=$! kill -USR1 $pid; sleep 1; kill $pid
-         10899206+0 records in
-         10899206+0 records out
-
-config BUSYBOX_CONFIG_FEATURE_DD_THIRD_STATUS_LINE
-       bool "Enable the third status line upon signal"
-       default BUSYBOX_DEFAULT_FEATURE_DD_THIRD_STATUS_LINE
-       depends on BUSYBOX_CONFIG_DD && BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING
-       help
-         Displays a coreutils-like third status line with transferred bytes,
-         elapsed time and speed.
-
-config BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS
-       bool "Enable ibs, obs and conv options"
-       default BUSYBOX_DEFAULT_FEATURE_DD_IBS_OBS
-       depends on BUSYBOX_CONFIG_DD
-       help
-         Enables support for writing a certain number of bytes in and out,
-         at a time, and performing conversions on the data stream.
-

 config BUSYBOX_CONFIG_DF
        bool "df"
        default BUSYBOX_DEFAULT_DF
 config BUSYBOX_CONFIG_DF
        bool "df"
        default BUSYBOX_DEFAULT_DF


@@ -764,12 +788,6 @@ config BUSYBOX_CONFIG_SUM
        help
          checksum and count the blocks in a file
 
        help
          checksum and count the blocks in a file
 

-config BUSYBOX_CONFIG_SYNC
-       bool "sync"
-       default BUSYBOX_DEFAULT_SYNC
-       help
-         sync is used to flush filesystem buffers.
-

 config BUSYBOX_CONFIG_TAC
        bool "tac"
        default BUSYBOX_DEFAULT_TAC
 config BUSYBOX_CONFIG_TAC
        bool "tac"
        default BUSYBOX_DEFAULT_TAC


@@ -829,6 +847,14 @@ config BUSYBOX_CONFIG_UNAME
        help
          uname is used to print system information.
 
        help
          uname is used to print system information.
 

+config BUSYBOX_CONFIG_UNAME_OSNAME
+       string "Operating system name"
+       default BUSYBOX_DEFAULT_UNAME_OSNAME
+       depends on BUSYBOX_CONFIG_UNAME
+       help
+         Sets the operating system name reported by uname -o.  The
+         default BUSYBOX_DEFAULT_UNAME_OSNAME "GNU/Linux".
+

 config BUSYBOX_CONFIG_UNEXPAND
        bool "unexpand"
        default BUSYBOX_DEFAULT_UNEXPAND
 config BUSYBOX_CONFIG_UNEXPAND
        bool "unexpand"
        default BUSYBOX_DEFAULT_UNEXPAND

diff --git a/package/utils/busybox/config/miscutils/Config.in b/package/utils/busybox/config/miscutils/Config.in
index 7819e30..c6deaaf 100644 (file)
--- a/package/utils/busybox/config/miscutils/Config.in
+++ b/package/utils/busybox/config/miscutils/Config.in
@@ -48,6 +48,34 @@ config BUSYBOX_CONFIG_FEATURE_CROND_DIR
        depends on BUSYBOX_CONFIG_CROND || BUSYBOX_CONFIG_CRONTAB
        help
          Location of crond spool.
        depends on BUSYBOX_CONFIG_CROND || BUSYBOX_CONFIG_CRONTAB
        help
          Location of crond spool.

+config BUSYBOX_CONFIG_I2CGET
+       bool "i2cget"
+       default BUSYBOX_DEFAULT_I2CGET
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       help
+         Read from I2C/SMBus chip registers.
+
+config BUSYBOX_CONFIG_I2CSET
+       bool "i2cset"
+       default BUSYBOX_DEFAULT_I2CSET
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       help
+         Set I2C registers.
+
+config BUSYBOX_CONFIG_I2CDUMP
+       bool "i2cdump"
+       default BUSYBOX_DEFAULT_I2CDUMP
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       help
+         Examine I2C registers.
+
+config BUSYBOX_CONFIG_I2CDETECT
+       bool "i2cdetect"
+       default BUSYBOX_DEFAULT_I2CDETECT
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       help
+         Detect I2C chips.
+

 config BUSYBOX_CONFIG_LESS
        bool "less"
        default BUSYBOX_DEFAULT_LESS
 config BUSYBOX_CONFIG_LESS
        bool "less"
        default BUSYBOX_DEFAULT_LESS


@@ -75,6 +103,14 @@ config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS
        help
          The -M/-m flag enables a more sophisticated status line.
 
        help
          The -M/-m flag enables a more sophisticated status line.
 

+config BUSYBOX_CONFIG_FEATURE_LESS_TRUNCATE
+       bool "Enable -S"
+       default BUSYBOX_DEFAULT_FEATURE_LESS_TRUNCATE
+       depends on BUSYBOX_CONFIG_LESS
+       help
+         The -S flag causes long lines to be truncated rather than
+         wrapped.
+

 config BUSYBOX_CONFIG_FEATURE_LESS_MARKS
        bool "Enable marks"
        default BUSYBOX_DEFAULT_FEATURE_LESS_MARKS
 config BUSYBOX_CONFIG_FEATURE_LESS_MARKS
        bool "Enable marks"
        default BUSYBOX_DEFAULT_FEATURE_LESS_MARKS

diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
index b3dd8c8..40b3c68 100644 (file)
--- a/package/utils/busybox/config/networking/Config.in
+++ b/package/utils/busybox/config/networking/Config.in
@@ -94,6 +94,89 @@ config BUSYBOX_CONFIG_FEATURE_FANCY_PING
        help
          Make the output from the ping applet include statistics, and at the
          same time provide full support for ICMP packets.
        help
          Make the output from the ping applet include statistics, and at the
          same time provide full support for ICMP packets.

+config BUSYBOX_CONFIG_WGET
+       bool "wget"
+       default BUSYBOX_DEFAULT_WGET
+       help
+         wget is a utility for non-interactive download of files from HTTP
+         and FTP servers.
+
+config BUSYBOX_CONFIG_FEATURE_WGET_STATUSBAR
+       bool "Enable a nifty process meter (+2k)"
+       default BUSYBOX_DEFAULT_FEATURE_WGET_STATUSBAR
+       depends on BUSYBOX_CONFIG_WGET
+       help
+         Enable the transfer progress bar for wget transfers.
+
+config BUSYBOX_CONFIG_FEATURE_WGET_AUTHENTICATION
+       bool "Enable HTTP authentication"
+       default BUSYBOX_DEFAULT_FEATURE_WGET_AUTHENTICATION
+       depends on BUSYBOX_CONFIG_WGET
+       help
+         Support authenticated HTTP transfers.
+
+config BUSYBOX_CONFIG_FEATURE_WGET_LONG_OPTIONS
+       bool "Enable long options"
+       default BUSYBOX_DEFAULT_FEATURE_WGET_LONG_OPTIONS
+       depends on BUSYBOX_CONFIG_WGET && BUSYBOX_CONFIG_LONG_OPTS
+       help
+         Support long options for the wget applet.
+
+config BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
+       bool "Enable timeout option -T SEC"
+       default BUSYBOX_DEFAULT_FEATURE_WGET_TIMEOUT
+       depends on BUSYBOX_CONFIG_WGET
+       help
+         Supports network read and connect timeouts for wget,
+         so that wget will give up and timeout, through the -T
+         command line option.
+
+         Currently only connect and network data read timeout are
+         supported (i.e., timeout is not applied to the DNS query). When
+         FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
+         will work in addition to -T.
+
+config BUSYBOX_CONFIG_FEATURE_WGET_OPENSSL
+       bool "Try to connect to HTTPS using openssl"
+       default BUSYBOX_DEFAULT_FEATURE_WGET_OPENSSL
+       depends on BUSYBOX_CONFIG_WGET
+       help
+         Choose how wget establishes SSL connection for https:// URLs.
+
+         Busybox itself contains no SSL code. wget will spawn
+         a helper program to talk over HTTPS.
+
+         OpenSSL has a simple SSL client for debug purposes.
+         If you select "openssl" helper, wget will effectively call
+         "openssl s_client -quiet -connect IP:443 2>/dev/null"
+         and pipe its data through it.
+         Note inconvenient API: host resolution is done twice,
+         and there is no guarantee openssl's idea of IPv6 address
+         format is the same as ours.
+         Another problem is that s_client prints debug information
+         to stderr, and it needs to be suppressed. This means
+         all error messages get suppressed too.
+         openssl is also a big binary, often dynamically linked
+         against ~15 libraries.
+
+config BUSYBOX_CONFIG_FEATURE_WGET_SSL_HELPER
+       bool "Try to connect to HTTPS using ssl_helper"
+       default BUSYBOX_DEFAULT_FEATURE_WGET_SSL_HELPER
+       depends on BUSYBOX_CONFIG_WGET
+       help
+         Choose how wget establishes SSL connection for https:// URLs.
+
+         Busybox itself contains no SSL code. wget will spawn
+         a helper program to talk over HTTPS.
+
+         ssl_helper is a tool which can be built statically
+         from busybox sources against a small embedded SSL library.
+         Please see networking/ssl_helper/README.
+         It does not require double host resolution and emits
+         error messages to stderr.
+
+         Precompiled static binary may be available at
+         http://busybox.net/downloads/binaries/

 config BUSYBOX_CONFIG_WHOIS
        bool "whois"
        default BUSYBOX_DEFAULT_WHOIS
 config BUSYBOX_CONFIG_WHOIS
        bool "whois"
        default BUSYBOX_DEFAULT_WHOIS


@@ -626,6 +709,13 @@ config BUSYBOX_CONFIG_FEATURE_IP_ROUTE
        help
          Add support for routing table management to "ip".
 
        help
          Add support for routing table management to "ip".
 

+config BUSYBOX_CONFIG_FEATURE_IP_ROUTE_DIR
+       string "ip route configuration directory"
+       default BUSYBOX_DEFAULT_FEATURE_IP_ROUTE_DIR
+       depends on BUSYBOX_CONFIG_FEATURE_IP_ROUTE
+       help
+         Location of the "ip" applet routing configuration.
+

 config BUSYBOX_CONFIG_FEATURE_IP_TUNNEL
        bool "ip tunnel"
        default BUSYBOX_DEFAULT_FEATURE_IP_TUNNEL
 config BUSYBOX_CONFIG_FEATURE_IP_TUNNEL
        bool "ip tunnel"
        default BUSYBOX_DEFAULT_FEATURE_IP_TUNNEL


@@ -849,8 +939,7 @@ config BUSYBOX_CONFIG_TELNETD
 
          Note that for busybox telnetd to work you need several things:
          First of all, your kernel needs:
 
          Note that for busybox telnetd to work you need several things:
          First of all, your kernel needs:

-                 UNIX98_PTYS=y
-                 DEVPTS_FS=y
+                 CONFIG_UNIX98_PTYS=y

 
          Next, you need a /dev/pts directory on your root filesystem:
 
 
          Next, you need a /dev/pts directory on your root filesystem:
 


@@ -1047,48 +1136,6 @@ config BUSYBOX_CONFIG_VCONFIG
        help
          Creates, removes, and configures VLAN interfaces
 
        help
          Creates, removes, and configures VLAN interfaces
 

-config BUSYBOX_CONFIG_WGET
-       bool "wget"
-       default BUSYBOX_DEFAULT_WGET
-       help
-         wget is a utility for non-interactive download of files from HTTP
-         and FTP servers.
-
-config BUSYBOX_CONFIG_FEATURE_WGET_STATUSBAR
-       bool "Enable a nifty process meter (+2k)"
-       default BUSYBOX_DEFAULT_FEATURE_WGET_STATUSBAR
-       depends on BUSYBOX_CONFIG_WGET
-       help
-         Enable the transfer progress bar for wget transfers.
-
-config BUSYBOX_CONFIG_FEATURE_WGET_AUTHENTICATION
-       bool "Enable HTTP authentication"
-       default BUSYBOX_DEFAULT_FEATURE_WGET_AUTHENTICATION
-       depends on BUSYBOX_CONFIG_WGET
-       help
-         Support authenticated HTTP transfers.
-
-config BUSYBOX_CONFIG_FEATURE_WGET_LONG_OPTIONS
-       bool "Enable long options"
-       default BUSYBOX_DEFAULT_FEATURE_WGET_LONG_OPTIONS
-       depends on BUSYBOX_CONFIG_WGET && BUSYBOX_CONFIG_LONG_OPTS
-       help
-         Support long options for the wget applet.
-
-config BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT
-       bool "Enable timeout option -T SEC"
-       default BUSYBOX_DEFAULT_FEATURE_WGET_TIMEOUT
-       depends on BUSYBOX_CONFIG_WGET
-       help
-         Supports network read and connect timeouts for wget,
-         so that wget will give up and timeout, through the -T
-         command line option.
-
-         Currently only connect and network data read timeout are
-         supported (i.e., timeout is not applied to the DNS query). When
-         FEATURE_WGET_LONG_OPTIONS is also enabled, the --timeout option
-         will work in addition to -T.
-

 config BUSYBOX_CONFIG_ZCIP
        bool "zcip"
        default BUSYBOX_DEFAULT_ZCIP
 config BUSYBOX_CONFIG_ZCIP
        bool "zcip"
        default BUSYBOX_DEFAULT_ZCIP

diff --git a/package/utils/busybox/config/selinux/Config.in b/package/utils/busybox/config/selinux/Config.in
index 3340e4b..1d23f7d 100644 (file)
--- a/package/utils/busybox/config/selinux/Config.in
+++ b/package/utils/busybox/config/selinux/Config.in
@@ -64,7 +64,7 @@ config BUSYBOX_CONFIG_RUNCON
        default BUSYBOX_DEFAULT_RUNCON
        depends on BUSYBOX_CONFIG_SELINUX
        help
        default BUSYBOX_DEFAULT_RUNCON
        depends on BUSYBOX_CONFIG_SELINUX
        help

-         Enable support to run command in speficied security context.
+         Enable support to run command in specified security context.

 
 config BUSYBOX_CONFIG_FEATURE_RUNCON_LONG_OPTIONS
        bool "Enable long options"
 
 config BUSYBOX_CONFIG_FEATURE_RUNCON_LONG_OPTIONS
        bool "Enable long options"

diff --git a/package/utils/busybox/config/util-linux/Config.in b/package/utils/busybox/config/util-linux/Config.in
index 8d1464d..8c87f53 100644 (file)
--- a/package/utils/busybox/config/util-linux/Config.in
+++ b/package/utils/busybox/config/util-linux/Config.in
@@ -80,11 +80,112 @@ config BUSYBOX_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE
          These devices will request userspace look up the files in
          /lib/firmware/ and if it exists, send it to the kernel for
          loading into the hardware.
          These devices will request userspace look up the files in
          /lib/firmware/ and if it exists, send it to the kernel for
          loading into the hardware.

+config BUSYBOX_CONFIG_MOUNT
+       bool "mount"
+       default BUSYBOX_DEFAULT_MOUNT
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       help
+         All files and filesystems in Unix are arranged into one big directory
+         tree. The 'mount' utility is used to graft a filesystem onto a
+         particular part of the tree. A filesystem can either live on a block
+         device, or it can be accessible over the network, as is the case with
+         NFS filesystems. Most people using BusyBox will also want to enable
+         the 'mount' utility.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE
+       bool "Support option -f"
+       default BUSYBOX_DEFAULT_FEATURE_MOUNT_FAKE
+       depends on BUSYBOX_CONFIG_MOUNT
+       help
+         Enable support for faking a file system mount.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE
+       bool "Support option -v"
+       default BUSYBOX_DEFAULT_FEATURE_MOUNT_VERBOSE
+       depends on BUSYBOX_CONFIG_MOUNT
+       help
+         Enable multi-level -v[vv...] verbose messages. Useful if you
+         debug mount problems and want to see what is exactly passed
+         to the kernel.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS
+       bool "Support mount helpers"
+       default BUSYBOX_DEFAULT_FEATURE_MOUNT_HELPERS
+       depends on BUSYBOX_CONFIG_MOUNT
+       help
+         Enable mounting of virtual file systems via external helpers.
+         E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call
+         "obexfs -b00.11.22.33.44.55 /mnt"
+         Also "mount -t sometype [-o opts] fs /mnt" will try
+         "sometype [-o opts] fs /mnt" if simple mount syscall fails.
+         The idea is to use such virtual filesystems in /etc/fstab.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL
+       bool "Support specifying devices by label or UUID"
+       default BUSYBOX_DEFAULT_FEATURE_MOUNT_LABEL
+       depends on BUSYBOX_CONFIG_MOUNT
+       select BUSYBOX_CONFIG_VOLUMEID
+       help
+         This allows for specifying a device by label or uuid, rather than by
+         name. This feature utilizes the same functionality as blkid/findfs.
+         This also enables label or uuid support for swapon.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
+       bool "Support mounting NFS file systems on Linux < 2.6.23"
+       default BUSYBOX_DEFAULT_FEATURE_MOUNT_NFS
+       depends on BUSYBOX_CONFIG_MOUNT
+       select BUSYBOX_CONFIG_FEATURE_HAVE_RPC
+       select BUSYBOX_CONFIG_FEATURE_SYSLOG
+       help
+         Enable mounting of NFS file systems on Linux kernels prior
+         to version 2.6.23. Note that in this case mounting of NFS
+         over IPv6 will not be possible.
+
+         Note that this option links in RPC support from libc,
+         which is rather large (~10 kbytes on uclibc).
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_CIFS
+       bool "Support mounting CIFS/SMB file systems"
+       default BUSYBOX_DEFAULT_FEATURE_MOUNT_CIFS
+       depends on BUSYBOX_CONFIG_MOUNT
+       help
+         Enable support for samba mounts.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS
+       depends on BUSYBOX_CONFIG_MOUNT
+       bool "Support lots of -o flags in mount"
+       default BUSYBOX_DEFAULT_FEATURE_MOUNT_FLAGS
+       help
+         Without this, mount only supports ro/rw/remount. With this, it
+         supports nosuid, suid, dev, nodev, exec, noexec, sync, async, atime,
+         noatime, diratime, nodiratime, loud, bind, move, shared, slave,
+         private, unbindable, rshared, rslave, rprivate, and runbindable.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_FSTAB
+       depends on BUSYBOX_CONFIG_MOUNT
+       bool "Support /etc/fstab and -a"
+       default BUSYBOX_DEFAULT_FEATURE_MOUNT_FSTAB
+       help
+         Support mount all and looking for files in /etc/fstab.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_OTHERTAB
+       depends on BUSYBOX_CONFIG_FEATURE_MOUNT_FSTAB
+       bool "Support -T <alt_fstab>"
+       default BUSYBOX_DEFAULT_FEATURE_MOUNT_OTHERTAB
+       help
+         Support mount -T (specifying an alternate fstab)

 config BUSYBOX_CONFIG_REV
        bool "rev"
        default BUSYBOX_DEFAULT_REV
        help
          Reverse lines of a file or files.
 config BUSYBOX_CONFIG_REV
        bool "rev"
        default BUSYBOX_DEFAULT_REV
        help
          Reverse lines of a file or files.

+config BUSYBOX_CONFIG_UEVENT
+       bool "uevent"
+       default BUSYBOX_DEFAULT_UEVENT
+       select BUSYBOX_CONFIG_PLATFORM_LINUX
+       help
+         uevent is a netlink listener for kernel uevent notifications
+         sent via netlink. It is usually used for dynamic device creation.

 
 config BUSYBOX_CONFIG_ACPID
        bool "acpid"
 
 config BUSYBOX_CONFIG_ACPID
        bool "acpid"


@@ -513,94 +614,6 @@ config BUSYBOX_CONFIG_MORE
          you will probably find this utility very helpful. If you don't have
          any need to reading text files, you can leave this disabled.
 
          you will probably find this utility very helpful. If you don't have
          any need to reading text files, you can leave this disabled.
 

-config BUSYBOX_CONFIG_MOUNT
-       bool "mount"
-       default BUSYBOX_DEFAULT_MOUNT
-       select BUSYBOX_CONFIG_PLATFORM_LINUX
-       help
-         All files and filesystems in Unix are arranged into one big directory
-         tree. The 'mount' utility is used to graft a filesystem onto a
-         particular part of the tree. A filesystem can either live on a block
-         device, or it can be accessible over the network, as is the case with
-         NFS filesystems. Most people using BusyBox will also want to enable
-         the 'mount' utility.
-
-config BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE
-       bool "Support option -f"
-       default BUSYBOX_DEFAULT_FEATURE_MOUNT_FAKE
-       depends on BUSYBOX_CONFIG_MOUNT
-       help
-         Enable support for faking a file system mount.
-
-config BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE
-       bool "Support option -v"
-       default BUSYBOX_DEFAULT_FEATURE_MOUNT_VERBOSE
-       depends on BUSYBOX_CONFIG_MOUNT
-       help
-         Enable multi-level -v[vv...] verbose messages. Useful if you
-         debug mount problems and want to see what is exactly passed
-         to the kernel.
-
-config BUSYBOX_CONFIG_FEATURE_MOUNT_HELPERS
-       bool "Support mount helpers"
-       default BUSYBOX_DEFAULT_FEATURE_MOUNT_HELPERS
-       depends on BUSYBOX_CONFIG_MOUNT
-       help
-         Enable mounting of virtual file systems via external helpers.
-         E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call
-         "obexfs -b00.11.22.33.44.55 /mnt"
-         Also "mount -t sometype [-o opts] fs /mnt" will try
-         "sometype [-o opts] fs /mnt" if simple mount syscall fails.
-         The idea is to use such virtual filesystems in /etc/fstab.
-
-config BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL
-       bool "Support specifying devices by label or UUID"
-       default BUSYBOX_DEFAULT_FEATURE_MOUNT_LABEL
-       depends on BUSYBOX_CONFIG_MOUNT
-       select BUSYBOX_CONFIG_VOLUMEID
-       help
-         This allows for specifying a device by label or uuid, rather than by
-         name. This feature utilizes the same functionality as blkid/findfs.
-         This also enables label or uuid support for swapon.
-
-config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
-       bool "Support mounting NFS file systems on Linux < 2.6.23"
-       default BUSYBOX_DEFAULT_FEATURE_MOUNT_NFS
-       depends on BUSYBOX_CONFIG_MOUNT
-       select BUSYBOX_CONFIG_FEATURE_HAVE_RPC
-       select BUSYBOX_CONFIG_FEATURE_SYSLOG
-       help
-         Enable mounting of NFS file systems on Linux kernels prior
-         to version 2.6.23. Note that in this case mounting of NFS
-         over IPv6 will not be possible.
-
-         Note that this option links in RPC support from libc,
-         which is rather large (~10 kbytes on uclibc).
-
-config BUSYBOX_CONFIG_FEATURE_MOUNT_CIFS
-       bool "Support mounting CIFS/SMB file systems"
-       default BUSYBOX_DEFAULT_FEATURE_MOUNT_CIFS
-       depends on BUSYBOX_CONFIG_MOUNT
-       help
-         Enable support for samba mounts.
-
-config BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS
-       depends on BUSYBOX_CONFIG_MOUNT
-       bool "Support lots of -o flags in mount"
-       default BUSYBOX_DEFAULT_FEATURE_MOUNT_FLAGS
-       help
-         Without this, mount only supports ro/rw/remount. With this, it
-         supports nosuid, suid, dev, nodev, exec, noexec, sync, async, atime,
-         noatime, diratime, nodiratime, loud, bind, move, shared, slave,
-         private, unbindable, rshared, rslave, rprivate, and runbindable.
-
-config BUSYBOX_CONFIG_FEATURE_MOUNT_FSTAB
-       depends on BUSYBOX_CONFIG_MOUNT
-       bool "Support /etc/fstab and -a"
-       default BUSYBOX_DEFAULT_FEATURE_MOUNT_FSTAB
-       help
-         Support mount all and looking for files in /etc/fstab.
-

 config BUSYBOX_CONFIG_PIVOT_ROOT
        bool "pivot_root"
        default BUSYBOX_DEFAULT_PIVOT_ROOT
 config BUSYBOX_CONFIG_PIVOT_ROOT
        bool "pivot_root"
        default BUSYBOX_DEFAULT_PIVOT_ROOT