firewall: allow local redirection of ports

[openwrt.git] / package / busybox / config / coreutils / Config.in

diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 3487fc7..7508c72 100644 (file)
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -10,21 +10,103 @@ config BUSYBOX_CONFIG_BASENAME
        default y
        help
          basename is used to strip the directory and suffix from filenames,
        default y
        help
          basename is used to strip the directory and suffix from filenames,

-         leaving just the filename itself.  Enable this option if you wish
+         leaving just the filename itself. Enable this option if you wish

          to enable the 'basename' utility.
          to enable the 'basename' utility.

+config BUSYBOX_CONFIG_CAT
+       bool "cat"
+       default y
+       help
+         cat is used to concatenate files and print them to the standard
+         output. Enable this option if you wish to enable the 'cat' utility.
+config BUSYBOX_CONFIG_DATE
+       bool "date"
+       default y
+       help
+         date is used to set the system date or display the
+         current time in the given format.

 
 

-config BUSYBOX_CONFIG_CAL
-       bool "cal"
+config BUSYBOX_CONFIG_FEATURE_DATE_ISOFMT
+       bool "Enable ISO date format output (-I)"
+       default y
+       depends on BUSYBOX_CONFIG_DATE
+       help
+         Enable option (-I) to output an ISO-8601 compliant
+         date/time string.
+
+config BUSYBOX_CONFIG_FEATURE_DATE_NANO
+       bool "Support %[num]N nanosecond format specifier"

        default n
        default n

+       depends on BUSYBOX_CONFIG_DATE && BUSYBOX_CONFIG_PLATFORM_LINUX

        help
        help

-         cal is used to display a monthly calender.
+         Support %[num]N format specifier. Adds ~250 bytes of code.

 
 

-config BUSYBOX_CONFIG_CAT
-       bool "cat"
+config BUSYBOX_CONFIG_FEATURE_DATE_COMPAT
+       bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format"
+       default n
+       depends on BUSYBOX_CONFIG_DATE
+       help
+         System time can be set by 'date -s DATE' and simply 'date DATE',
+         but formats of DATE string are different. 'date DATE' accepts
+         a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
+         unnatural placement of year between minutes and seconds.
+         date -s (and other commands like touch -d) use more sensible
+         formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
+
+         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_TEST
+       bool "test"

        default y
        help
        default y
        help

-         cat is used to concatenate files and print them to the standard
-         output.  Enable this option if you wish to enable the 'cat' utility.
+         test is used to check file types and compare values,
+         returning an appropriate exit code. The bash shell
+         has test built in, ash can build it in optionally.
+
+config BUSYBOX_CONFIG_FEATURE_TEST_64
+       bool "Extend test to 64 bit"
+       default y
+       depends on BUSYBOX_CONFIG_TEST || BUSYBOX_CONFIG_ASH_BUILTIN_TEST || BUSYBOX_CONFIG_HUSH
+       help
+         Enable 64-bit support in test.
+
+config BUSYBOX_CONFIG_TR
+       bool "tr"
+       default y
+       help
+         tr is used to squeeze, and/or delete characters from standard
+         input, writing to standard output.
+
+config BUSYBOX_CONFIG_FEATURE_TR_CLASSES
+       bool "Enable character classes (such as [:upper:])"
+       default n
+       depends on BUSYBOX_CONFIG_TR
+       help
+         Enable character classes, enabling commands such as:
+         tr [:upper:] [:lower:] to convert input into lowercase.
+
+config BUSYBOX_CONFIG_FEATURE_TR_EQUIV
+       bool "Enable equivalence classes"
+       default n
+       depends on BUSYBOX_CONFIG_TR
+       help
+         Enable equivalence classes, which essentially add the enclosed
+         character to the current set. For instance, tr [=a=] xyz would
+         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_BASE64
+       bool "base64"
+       default n
+       help
+         Base64 encode and decode
+
+config BUSYBOX_CONFIG_CAL
+       bool "cal"
+       default n
+       help
+         cal is used to display a monthly calender.

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


@@ -52,6 +134,13 @@ config BUSYBOX_CONFIG_CHOWN
          chown is used to change the user and/or group ownership
          of files.
 
          chown is used to change the user and/or group ownership
          of files.
 

+config BUSYBOX_CONFIG_FEATURE_CHOWN_LONG_OPTIONS
+       bool "Enable long options"
+       default n
+       depends on BUSYBOX_CONFIG_CHOWN && BUSYBOX_CONFIG_LONG_OPTS
+       help
+         Enable use of long options
+

 config BUSYBOX_CONFIG_CHROOT
        bool "chroot"
        default y
 config BUSYBOX_CONFIG_CHROOT
        bool "chroot"
        default y


@@ -65,13 +154,6 @@ config BUSYBOX_CONFIG_CKSUM
        help
          cksum is used to calculate the CRC32 checksum of a file.
 
        help
          cksum is used to calculate the CRC32 checksum of a file.
 

-config BUSYBOX_CONFIG_CMP
-       bool "cmp"
-       default n
-       help
-         cmp is used to compare two files and returns the result
-         to standard output.
-

 config BUSYBOX_CONFIG_COMM
        bool "comm"
        default n
 config BUSYBOX_CONFIG_COMM
        bool "comm"
        default n


@@ -85,6 +167,14 @@ config BUSYBOX_CONFIG_CP
        help
          cp is used to copy files and directories.
 
        help
          cp is used to copy files and directories.
 

+config BUSYBOX_CONFIG_FEATURE_CP_LONG_OPTIONS
+       bool "Enable long options for cp"
+       default n
+       depends on BUSYBOX_CONFIG_CP && BUSYBOX_CONFIG_LONG_OPTS
+       help
+         Enable long options for cp.
+         Also add support for --parents option.
+

 config BUSYBOX_CONFIG_CUT
        bool "cut"
        default y
 config BUSYBOX_CONFIG_CUT
        bool "cut"
        default y


@@ -92,21 +182,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_DATE
-       bool "date"
-       default y
-       help
-         date is used to set the system date or display the
-         current time in the given format.
-
-config BUSYBOX_CONFIG_FEATURE_DATE_ISOFMT
-       bool "Enable ISO date format output (-I)"
-       default y
-       depends on BUSYBOX_CONFIG_DATE
-       help
-         Enable option (-I) to output an ISO-8601 compliant
-         date/time string.
-

 config BUSYBOX_CONFIG_DD
        bool "dd"
        default y
 config BUSYBOX_CONFIG_DD
        bool "dd"
        default y


@@ -120,12 +195,22 @@ config BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING
        default y
        depends on BUSYBOX_CONFIG_DD
        help
        default y
        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 
+         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.
 
          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
+         $ 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 n
+       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"
 
 config BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS
        bool "Enable ibs, obs and conv options"


@@ -142,37 +227,16 @@ config BUSYBOX_CONFIG_DF
          df reports the amount of disk space used and available
          on filesystems.
 
          df reports the amount of disk space used and available
          on filesystems.
 

-config BUSYBOX_CONFIG_DIFF
-       bool "diff"
+config BUSYBOX_CONFIG_FEATURE_DF_FANCY
+       bool "Enable -a, -i, -B"

        default n
        default n

+       depends on BUSYBOX_CONFIG_DF

        help
        help

-         diff compares two files or directories and outputs the
-         differences between them in a form that can be given to
-         the patch command.
+         This option enables -a, -i and -B.

 
 

-config BUSYBOX_CONFIG_FEATURE_DIFF_BINARY
-       bool "Enable checks for binary files"
-       default n
-       depends on BUSYBOX_CONFIG_DIFF
-       help
-         This option enables support for checking for binary files
-         before a comparison is carried out.
-
-config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
-       bool "Enable directory support"
-       default n
-       depends on BUSYBOX_CONFIG_DIFF
-       help
-         This option enables support for directory and subdirectory
-         comparison.
-
-config BUSYBOX_CONFIG_FEATURE_DIFF_MINIMAL
-       bool "Enable -d option to find smaller sets of changes"
-       default n
-       depends on BUSYBOX_CONFIG_DIFF
-       help
-         Enabling this option allows the use of -d to make diff
-         try hard to find the smallest possible set of changes.
+           -a Show all filesystems
+           -i Inodes
+           -B <SIZE> Blocksize

 
 config BUSYBOX_CONFIG_DIRNAME
        bool "dirname"
 
 config BUSYBOX_CONFIG_DIRNAME
        bool "dirname"


@@ -220,7 +284,7 @@ config BUSYBOX_CONFIG_ECHO
 config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO
        bool "Enable echo options (-n and -e)"
        default y
 config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO
        bool "Enable echo options (-n and -e)"
        default y

-       depends on BUSYBOX_CONFIG_ECHO
+       depends on BUSYBOX_CONFIG_ECHO || BUSYBOX_CONFIG_ASH_BUILTIN_ECHO || BUSYBOX_CONFIG_HUSH

        help
          This adds options (-n and -e) to echo.
 
        help
          This adds options (-n and -e) to echo.
 


@@ -235,10 +299,23 @@ config BUSYBOX_CONFIG_ENV
 config BUSYBOX_CONFIG_FEATURE_ENV_LONG_OPTIONS
        bool "Enable long options"
        default n
 config BUSYBOX_CONFIG_FEATURE_ENV_LONG_OPTIONS
        bool "Enable long options"
        default n

-       depends on BUSYBOX_CONFIG_ENV && BUSYBOX_CONFIG_GETOPT_LONG
+       depends on BUSYBOX_CONFIG_ENV && BUSYBOX_CONFIG_LONG_OPTS

        help
          Support long options for the env applet.
 
        help
          Support long options for the env applet.
 

+config BUSYBOX_CONFIG_EXPAND
+       bool "expand"
+       default n
+       help
+         By default, convert all tabs to spaces.
+
+config BUSYBOX_CONFIG_FEATURE_EXPAND_LONG_OPTIONS
+       bool "Enable long options"
+       default n
+       depends on BUSYBOX_CONFIG_EXPAND && BUSYBOX_CONFIG_LONG_OPTS
+       help
+         Support long options for the expand applet.
+

 config BUSYBOX_CONFIG_EXPR
        bool "expr"
        default y
 config BUSYBOX_CONFIG_EXPR
        bool "expr"
        default y


@@ -248,10 +325,10 @@ config BUSYBOX_CONFIG_EXPR
 
 config BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64
        bool "Extend Posix numbers support to 64 bit"
 
 config BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64
        bool "Extend Posix numbers support to 64 bit"

-       default n
+       default y

        depends on BUSYBOX_CONFIG_EXPR
        help
        depends on BUSYBOX_CONFIG_EXPR
        help

-         Enable 64-bit math support in the expr applet.  This will make
+         Enable 64-bit math support in the expr applet. This will make

          the applet slightly larger, but will allow computation with very
          large numbers.
 
          the applet slightly larger, but will allow computation with very
          large numbers.
 


@@ -267,6 +344,12 @@ config BUSYBOX_CONFIG_FOLD
        help
          Wrap text to fit a specific width.
 
        help
          Wrap text to fit a specific width.
 

+config BUSYBOX_CONFIG_FSYNC
+       bool "fsync"
+       default n
+       help
+         fsync is used to flush file-related cached blocks to disk.
+

 config BUSYBOX_CONFIG_HEAD
        bool "head"
        default y
 config BUSYBOX_CONFIG_HEAD
        bool "head"
        default y


@@ -303,7 +386,7 @@ config BUSYBOX_CONFIG_INSTALL
 config BUSYBOX_CONFIG_FEATURE_INSTALL_LONG_OPTIONS
        bool "Enable long options"
        default n
 config BUSYBOX_CONFIG_FEATURE_INSTALL_LONG_OPTIONS
        bool "Enable long options"
        default n

-       depends on BUSYBOX_CONFIG_INSTALL && BUSYBOX_CONFIG_GETOPT_LONG
+       depends on BUSYBOX_CONFIG_INSTALL && BUSYBOX_CONFIG_LONG_OPTS

        help
          Support long options for the install applet.
 
        help
          Support long options for the install applet.
 


@@ -376,7 +459,7 @@ config BUSYBOX_CONFIG_FEATURE_LS_USERNAME
 config BUSYBOX_CONFIG_FEATURE_LS_COLOR
        bool "Allow use of color to identify file types"
        default y
 config BUSYBOX_CONFIG_FEATURE_LS_COLOR
        bool "Allow use of color to identify file types"
        default y

-       depends on BUSYBOX_CONFIG_LS && BUSYBOX_CONFIG_GETOPT_LONG
+       depends on BUSYBOX_CONFIG_LS && BUSYBOX_CONFIG_LONG_OPTS

        help
          This enables the --color option to ls.
 
        help
          This enables the --color option to ls.
 


@@ -406,7 +489,7 @@ config BUSYBOX_CONFIG_MKDIR
 config BUSYBOX_CONFIG_FEATURE_MKDIR_LONG_OPTIONS
        bool "Enable long options"
        default n
 config BUSYBOX_CONFIG_FEATURE_MKDIR_LONG_OPTIONS
        bool "Enable long options"
        default n

-       depends on BUSYBOX_CONFIG_MKDIR && BUSYBOX_CONFIG_GETOPT_LONG
+       depends on BUSYBOX_CONFIG_MKDIR && BUSYBOX_CONFIG_LONG_OPTS

        help
          Support long options for the mkdir applet.
 
        help
          Support long options for the mkdir applet.
 


@@ -433,13 +516,13 @@ config BUSYBOX_CONFIG_MV
 config BUSYBOX_CONFIG_FEATURE_MV_LONG_OPTIONS
        bool "Enable long options"
        default n
 config BUSYBOX_CONFIG_FEATURE_MV_LONG_OPTIONS
        bool "Enable long options"
        default n

-       depends on BUSYBOX_CONFIG_MV && BUSYBOX_CONFIG_GETOPT_LONG
+       depends on BUSYBOX_CONFIG_MV && BUSYBOX_CONFIG_LONG_OPTS

        help
          Support long options for the mv applet.
 
 config BUSYBOX_CONFIG_NICE
        bool "nice"
        help
          Support long options for the mv applet.
 
 config BUSYBOX_CONFIG_NICE
        bool "nice"

-       default n
+       default y

        help
          nice runs a program with modified scheduling priority.
 
        help
          nice runs a program with modified scheduling priority.
 


@@ -474,6 +557,20 @@ config BUSYBOX_CONFIG_PWD
        help
          pwd is used to print the current directory.
 
        help
          pwd is used to print the current directory.
 

+config BUSYBOX_CONFIG_READLINK
+       bool "readlink"
+       default n
+       help
+         This program reads a symbolic link and returns the name
+         of the file it points to
+
+config BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW
+       bool "Enable canonicalization by following all symlinks (-f)"
+       default n
+       depends on BUSYBOX_CONFIG_READLINK
+       help
+         Enable the readlink option (-f).
+

 config BUSYBOX_CONFIG_REALPATH
        bool "realpath"
        default n
 config BUSYBOX_CONFIG_REALPATH
        bool "realpath"
        default n


@@ -493,6 +590,14 @@ config BUSYBOX_CONFIG_RMDIR
        help
          rmdir is used to remove empty directories.
 
        help
          rmdir is used to remove empty directories.
 

+config BUSYBOX_CONFIG_FEATURE_RMDIR_LONG_OPTIONS
+       bool "Enable long options"
+       default n
+       depends on BUSYBOX_CONFIG_RMDIR && BUSYBOX_CONFIG_LONG_OPTS
+       help
+         Support long options for the rmdir applet, including
+         --ignore-fail-on-non-empty for compatibility with GNU rmdir.
+

 config BUSYBOX_CONFIG_SEQ
        bool "seq"
        default y
 config BUSYBOX_CONFIG_SEQ
        bool "seq"
        default y


@@ -505,19 +610,46 @@ config BUSYBOX_CONFIG_SHA1SUM
        help
          Compute and check SHA1 message digest
 
        help
          Compute and check SHA1 message digest
 

+config BUSYBOX_CONFIG_SHA256SUM
+       bool "sha256sum"
+       default n
+       help
+         Compute and check SHA256 message digest
+
+config BUSYBOX_CONFIG_SHA512SUM
+       bool "sha512sum"
+       default n
+       help
+         Compute and check SHA512 message digest
+

 config BUSYBOX_CONFIG_SLEEP
 config BUSYBOX_CONFIG_SLEEP

-       bool "sleep (single integer arg with no suffix)"
+       bool "sleep"

        default y
        help
        default y
        help

-         sleep is used to pause for a specified number of seconds,
+         sleep is used to pause for a specified number of seconds.
+         It comes in 3 versions:
+         - small: takes one integer parameter
+         - fancy: takes multiple integer arguments with suffixes:
+           sleep 1d 2h 3m 15s
+         - fancy with fractional numbers:
+           sleep 2.3s 4.5h sleeps for 16202.3 seconds
+         Last one is "the most compatible" with coreutils sleep,
+         but it adds around 1k of code.

 
 config BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP
 
 config BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP

-       bool "Enable multiple integer args and optional time suffixes"
+       bool "Enable multiple arguments and s/m/h/d suffixes"

        default y
        depends on BUSYBOX_CONFIG_SLEEP
        help
          Allow sleep to pause for specified minutes, hours, and days.
 
        default y
        depends on BUSYBOX_CONFIG_SLEEP
        help
          Allow sleep to pause for specified minutes, hours, and days.
 

+config BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP
+       bool "Enable fractional arguments"
+       default n
+       depends on BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP
+       help
+         Allow for fractional numeric parameters.
+

 config BUSYBOX_CONFIG_SORT
        bool "sort"
        default y
 config BUSYBOX_CONFIG_SORT
        bool "sort"
        default y


@@ -525,20 +657,36 @@ config BUSYBOX_CONFIG_SORT
          sort is used to sort lines of text in specified files.
 
 config BUSYBOX_CONFIG_FEATURE_SORT_BIG
          sort is used to sort lines of text in specified files.
 
 config BUSYBOX_CONFIG_FEATURE_SORT_BIG

-       bool "full SuSv3 compliant sort (Support -ktcsbdfiozgM)"
+       bool "Full SuSv3 compliant sort (support -ktcsbdfiozgM)"

        default n
        depends on BUSYBOX_CONFIG_SORT
        help
        default n
        depends on BUSYBOX_CONFIG_SORT
        help

-         Without this, sort only supports  -r, -u, and an integer version
-         of -n.  Selecting this adds sort keys, floating point support, and
-         more.  This adds a little over 3k to a nonstatic build on x86.
+         Without this, sort only supports -r, -u, and an integer version
+         of -n. Selecting this adds sort keys, floating point support, and
+         more. This adds a little over 3k to a nonstatic build on x86.

 
          The SuSv3 sort standard is available at:
          http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
 
 
          The SuSv3 sort standard is available at:
          http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
 

+config BUSYBOX_CONFIG_SPLIT
+       bool "split"
+       default n
+       help
+         split a file into pieces.
+
+config BUSYBOX_CONFIG_FEATURE_SPLIT_FANCY
+       bool "Fancy extensions"
+       default n
+       depends on BUSYBOX_CONFIG_SPLIT
+       help
+         Add support for features not required by SUSv3.
+         Supports additional suffixes 'b' for 512 bytes,
+         'g' for 1GiB for the -b option.
+

 config BUSYBOX_CONFIG_STAT
        bool "stat"
        default n
 config BUSYBOX_CONFIG_STAT
        bool "stat"
        default n

+       depends on BUSYBOX_CONFIG_PLATFORM_LINUX

        help
          display file or filesystem status.
 
        help
          display file or filesystem status.
 


@@ -548,7 +696,7 @@ config BUSYBOX_CONFIG_FEATURE_STAT_FORMAT
        depends on BUSYBOX_CONFIG_STAT
        help
          Without this, stat will not support the '-c format' option where
        depends on BUSYBOX_CONFIG_STAT
        help
          Without this, stat will not support the '-c format' option where

-         users can pass a custom format string for output.  This adds about
+         users can pass a custom format string for output. This adds about

          7k to a nonstatic build on amd64.
 
 config BUSYBOX_CONFIG_STTY
          7k to a nonstatic build on amd64.
 
 config BUSYBOX_CONFIG_STTY


@@ -569,6 +717,12 @@ config BUSYBOX_CONFIG_SYNC
        help
          sync is used to flush filesystem buffers.
 
        help
          sync is used to flush filesystem buffers.
 

+config BUSYBOX_CONFIG_TAC
+       bool "tac"
+       default n
+       help
+         tac is used to concatenate and print files in reverse.
+

 config BUSYBOX_CONFIG_TAIL
        bool "tail"
        default y
 config BUSYBOX_CONFIG_TAIL
        bool "tail"
        default y


@@ -577,13 +731,17 @@ config BUSYBOX_CONFIG_TAIL
          from files.
 
 config BUSYBOX_CONFIG_FEATURE_FANCY_TAIL
          from files.
 
 config BUSYBOX_CONFIG_FEATURE_FANCY_TAIL

-       bool "Enable extra tail options (-q, -s, and -v)"
+       bool "Enable extra tail options (-q, -s, -v, and -F)"

        default y
        depends on BUSYBOX_CONFIG_TAIL
        help
          The options (-q, -s, and -v) are provided by GNU tail, but
          are not specific in the SUSv3 standard.
 
        default y
        depends on BUSYBOX_CONFIG_TAIL
        help
          The options (-q, -s, and -v) are provided by GNU tail, but
          are not specific in the SUSv3 standard.
 

+           -q      Never output headers giving file names
+           -s SEC  Wait SEC seconds between reads with -f
+           -v      Always output headers giving file names
+

 config BUSYBOX_CONFIG_TEE
        bool "tee"
        default y
 config BUSYBOX_CONFIG_TEE
        bool "tee"
        default y


@@ -592,27 +750,12 @@ config BUSYBOX_CONFIG_TEE
          to standard output and files.
 
 config BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO
          to standard output and files.
 
 config BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO

-       bool "Enable block i/o (larger/faster) instead of byte i/o."
+       bool "Enable block I/O (larger/faster) instead of byte I/O"

        default y
        depends on BUSYBOX_CONFIG_TEE
        help
          Enable this option for a faster tee, at expense of size.
 
        default y
        depends on BUSYBOX_CONFIG_TEE
        help
          Enable this option for a faster tee, at expense of size.
 

-config BUSYBOX_CONFIG_TEST
-       bool "test"
-       default y
-       help
-         test is used to check file types and compare values,
-         returning an appropriate exit code.  The bash shell
-         has test built in, ash can build it in optionally.
-
-config BUSYBOX_CONFIG_FEATURE_TEST_64
-       bool "Extend test to 64 bit"
-       default n
-       depends on BUSYBOX_CONFIG_TEST
-       help
-         Enable 64-bit support in test.
-

 config BUSYBOX_CONFIG_TOUCH
        bool "touch"
        default y
 config BUSYBOX_CONFIG_TOUCH
        bool "touch"
        default y


@@ -620,32 +763,6 @@ config BUSYBOX_CONFIG_TOUCH
          touch is used to create or change the access and/or
          modification timestamp of specified files.
 
          touch is used to create or change the access and/or
          modification timestamp of specified files.
 

-config BUSYBOX_CONFIG_TR
-       bool "tr"
-       default y
-       help
-         tr is used to squeeze, and/or delete characters from standard
-         input, writing to standard output.
-
-config BUSYBOX_CONFIG_FEATURE_TR_CLASSES
-       bool "Enable character classes (such as [:upper:])"
-       default n
-       depends on BUSYBOX_CONFIG_TR
-       help
-         Enable character classes, enabling commands such as:
-         tr [:upper:] [:lower:] to convert input into lowercase.
-
-config BUSYBOX_CONFIG_FEATURE_TR_EQUIV
-       bool "Enable equivalence classes"
-       default n
-       depends on BUSYBOX_CONFIG_TR
-       help
-         Enable equivalence classes, which essentially add the enclosed
-         character to the current set. For instance, tr [=a=] xyz would
-         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_TRUE
        bool "true"
        default y
 config BUSYBOX_CONFIG_TRUE
        bool "true"
        default y


@@ -665,6 +782,19 @@ config BUSYBOX_CONFIG_UNAME
        help
          uname is used to print system information.
 
        help
          uname is used to print system information.
 

+config BUSYBOX_CONFIG_UNEXPAND
+       bool "unexpand"
+       default n
+       help
+         By default, convert only leading sequences of blanks to tabs.
+
+config BUSYBOX_CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS
+       bool "Enable long options"
+       default n
+       depends on BUSYBOX_CONFIG_UNEXPAND && BUSYBOX_CONFIG_LONG_OPTS
+       help
+         Support long options for the unexpand applet.
+

 config BUSYBOX_CONFIG_UNIQ
        bool "uniq"
        default y
 config BUSYBOX_CONFIG_UNIQ
        bool "uniq"
        default y


@@ -689,14 +819,6 @@ config BUSYBOX_CONFIG_UUENCODE
        help
          uuencode is used to uuencode a file.
 
        help
          uuencode is used to uuencode a file.
 

-config BUSYBOX_CONFIG_WATCH
-       bool "watch"
-       default n
-       select BUSYBOX_CONFIG_DATE
-       help
-         watch is used to execute a program periodically, showing
-         output to the screen.
-

 config BUSYBOX_CONFIG_WC
        bool "wc"
        default y
 config BUSYBOX_CONFIG_WC
        bool "wc"
        default y


@@ -704,10 +826,17 @@ config BUSYBOX_CONFIG_WC
          wc is used to print the number of bytes, words, and lines,
          in specified files.
 
          wc is used to print the number of bytes, words, and lines,
          in specified files.
 

+config BUSYBOX_CONFIG_FEATURE_WC_LARGE
+       bool "Support very large files in wc"
+       default n
+       depends on BUSYBOX_CONFIG_WC
+       help
+         Use "unsigned long long" in wc for counter variables.
+

 config BUSYBOX_CONFIG_WHO
        bool "who"
        default n
 config BUSYBOX_CONFIG_WHO
        bool "who"
        default n

-       select BUSYBOX_CONFIG_FEATURE_UTMP
+       depends on BUSYBOX_CONFIG_FEATURE_UTMP

        help
          who is used to show who is logged on.
 
        help
          who is used to show who is logged on.
 


@@ -744,9 +873,9 @@ config BUSYBOX_CONFIG_FEATURE_AUTOWIDTH
        depends on BUSYBOX_CONFIG_LS || BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TELNET
        help
          This option allows utilities such as 'ls', 'more' and 'telnet'
        depends on BUSYBOX_CONFIG_LS || BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TELNET
        help
          This option allows utilities such as 'ls', 'more' and 'telnet'

-         to determine the width of the screen, which can allow them to 
+         to determine the width of the screen, which can allow them to

          display additional text or avoid wrapping text onto the next line.
          display additional text or avoid wrapping text onto the next line.

-         If you leave this disabled, your utilities will be especially 
+         If you leave this disabled, your utilities will be especially

          primitive and will be unable to determine the current screen width.
 
 comment "Common options for df, du, ls"
          primitive and will be unable to determine the current screen width.
 
 comment "Common options for df, du, ls"


@@ -759,13 +888,13 @@ config BUSYBOX_CONFIG_FEATURE_HUMAN_READABLE
        help
          Allow df, du, and ls to have human readable output.
 
        help
          Allow df, du, and ls to have human readable output.
 

-comment "Common options for md5sum, sha1sum"
-       depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM
+comment "Common options for md5sum, sha1sum, sha256sum, sha512sum"
+       depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM || BUSYBOX_CONFIG_SHA256SUM || BUSYBOX_CONFIG_SHA512SUM

 
 config BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
        bool "Enable -c, -s and -w options"
        default y
 
 config BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
        bool "Enable -c, -s and -w options"
        default y

-       depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM
+       depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM || BUSYBOX_CONFIG_SHA256SUM || BUSYBOX_CONFIG_SHA512SUM

        help
          Enabling the -c options allows files to be checked
          against pre-calculated hash values.
        help
          Enabling the -c options allows files to be checked
          against pre-calculated hash values.