1 files changed, 133 insertions, 111 deletions

diff --git a/debian/config-static b/debian/config-static
index 45238704c..082c46da9 100644
--- a/debian/config-static
+++ b/debian/config-static
@@ -26,6 +26,12 @@ DOLFS=y
 EXTRA_CFLAGS_OPTIONS=""
 
 #
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+PREFIX="./_install"
+
+#
 # Archival Utilities
 #
 CONFIG_AR=y
@@ -47,63 +53,49 @@ CONFIG_FEATURE_TAR_CREATE=y
 CONFIG_FEATURE_TAR_BZIP2=y
 CONFIG_FEATURE_TAR_EXCLUDE=y
 CONFIG_FEATURE_TAR_GZIP=y
-CONFIG_FEATURE_TAR_OLD_FORMAT=y
-CONFIG_FEATURE_GNUTAR_LONG_FILENAME=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
 CONFIG_FEATURE_UNARCHIVE_TAPE=y
 CONFIG_UNCOMPRESS=y
 CONFIG_UNZIP=y
 
 #
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-CONFIG_LOADACM=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_SETKEYCODES=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-CONFIG_READLINK=y
-CONFIG_RUN_PARTS=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-
-#
-# File Utilities
+# Coreutils
 #
+CONFIG_BASENAME=y
+CONFIG_CAL=y
+CONFIG_CAT=y
+CONFIG_CHGRP=y
 CONFIG_CHMOD=y
 CONFIG_CHOWN=y
-CONFIG_CHGRP=y
+CONFIG_CHROOT=y
+CONFIG_CMP=y
 CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+
+#
+# date (forced enabled for use with watch)
+#
+CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
 CONFIG_DF=y
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
 CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_EXPR=y
+CONFIG_FALSE=y
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_LENGTH=y
 CONFIG_LN=y
+CONFIG_LOGNAME=y
 CONFIG_LS=y
 CONFIG_FEATURE_LS_FILETYPES=y
 CONFIG_FEATURE_LS_FOLLOWLINKS=y
@@ -112,14 +104,48 @@ CONFIG_FEATURE_LS_SORTFILES=y
 CONFIG_FEATURE_LS_TIMESTAMPS=y
 CONFIG_FEATURE_LS_USERNAME=y
 CONFIG_FEATURE_LS_COLOR=y
+CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
 CONFIG_MKFIFO=y
 CONFIG_MKNOD=y
 CONFIG_MV=y
+CONFIG_OD=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+# CONFIG_REALPATH is not set
 CONFIG_RM=y
 CONFIG_RMDIR=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_REVERSE=y
+CONFIG_FEATURE_SORT_UNIQUE=y
+CONFIG_STTY=y
 CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+
+#
+# test (forced enabled for use with shell)
+#
 CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WATCH=y
+CONFIG_WC=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
 
 #
 # Common options for cp and mv
@@ -137,6 +163,47 @@ CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_FEATURE_HUMAN_READABLE=y
 
 #
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_LOADACM=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_SETKEYCODES=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_READLINK=y
+CONFIG_RUN_PARTS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_SED=y
+# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
+CONFIG_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
 # Finding Utilities
 #
 CONFIG_FIND=y
@@ -144,6 +211,8 @@ CONFIG_FEATURE_FIND_MTIME=y
 CONFIG_FEATURE_FIND_PERM=y
 CONFIG_FEATURE_FIND_TYPE=y
 CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
 CONFIG_GREP=y
 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 CONFIG_FEATURE_GREP_CONTEXT=y
@@ -176,12 +245,16 @@ CONFIG_LOGIN=y
 CONFIG_FEATURE_SECURETTY=y
 CONFIG_PASSWD=y
 CONFIG_SU=y
-CONFIG_FEATURE_SHADOWPASSWDS=y
-CONFIG_USE_BB_SHADOW=y
 CONFIG_SULOGIN=y
 CONFIG_VLOCK=y
 
 #
+# Common options for adduser, deluser, login, su
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+CONFIG_USE_BB_SHADOW=y
+
+#
 # Miscellaneous Utilities
 #
 CONFIG_ADJTIMEX=y
@@ -197,7 +270,7 @@ CONFIG_UPDATE=y
 CONFIG_WATCHDOG=y
 
 #
-# Module Utilities
+# Linux Module Utilities
 #
 # CONFIG_INSMOD is not set
 # CONFIG_LSMOD is not set
@@ -213,7 +286,14 @@ CONFIG_FTPGET=y
 CONFIG_FTPPUT=y
 CONFIG_HOSTNAME=y
 CONFIG_HTTPD=y
+# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_DECODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -226,6 +306,7 @@ CONFIG_FEATURE_IFUPDOWN_IPV4=y
 CONFIG_FEATURE_IFUPDOWN_IPV6=y
 CONFIG_FEATURE_IFUPDOWN_IPX=y
 CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_INETD is not set
 CONFIG_IP=y
 CONFIG_FEATURE_IP_ADDRESS=y
 
@@ -265,6 +346,7 @@ CONFIG_ROUTE=y
 CONFIG_TELNET=y
 CONFIG_FEATURE_TELNET_TTYPE=y
 CONFIG_TELNETD=y
+# CONFIG_FEATURE_TELNETD_INETD is not set
 CONFIG_TFTP=y
 CONFIG_FEATURE_TFTP_GET=y
 CONFIG_FEATURE_TFTP_PUT=y
@@ -273,6 +355,7 @@ CONFIG_FEATURE_TFTP_DEBUG=y
 CONFIG_TRACEROUTE=y
 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
 CONFIG_FEATURE_TRACEROUTE_SO_DEBUG=y
+# CONFIG_VCONFIG is not set
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
@@ -341,76 +424,14 @@ CONFIG_FEATURE_SH_FANCY_PROMPT=y
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 
 #
-# Shell Utilities
-#
-CONFIG_BASENAME=y
-CONFIG_CAL=y
-CONFIG_CHROOT=y
-CONFIG_DATE=y
-
-#
-# date (forced enabled for use with watch)
-#
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_DIRNAME=y
-CONFIG_ECHO=y
-CONFIG_ENV=y
-CONFIG_EXPR=y
-CONFIG_FALSE=y
-CONFIG_HOSTID=y
-CONFIG_ID=y
-CONFIG_LOGNAME=y
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-# CONFIG_REALPATH is not set
-CONFIG_SLEEP=y
-CONFIG_STTY=y
-CONFIG_TEE=y
-CONFIG_TRUE=y
-CONFIG_TEST=y
-
-#
-# test (forced enabled for use with shell)
-#
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_USLEEP=y
-CONFIG_WATCH=y
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
 # System Logging Utilities
 #
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
 CONFIG_SYSLOGD=y
 CONFIG_FEATURE_REMOTE_LOG=y
 CONFIG_FEATURE_IPC_SYSLOG=y
 CONFIG_LOGREAD=y
-
-#
-# Text Utilities
-#
-CONFIG_CAT=y
-CONFIG_CMP=y
-CONFIG_CUT=y
-CONFIG_DOS2UNIX=y
-CONFIG_HEAD=y
-CONFIG_LENGTH=y
-CONFIG_MD5SUM=y
-CONFIG_OD=y
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_REVERSE=y
-CONFIG_FEATURE_SORT_UNIQUE=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TR=y
-CONFIG_UNIQ=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
-CONFIG_WC=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
 
 #
 # Linux System Utilities
@@ -460,6 +481,7 @@ CONFIG_FEATURE_MOUNT_FORCE=y
 #
 CONFIG_FEATURE_MOUNT_LOOP=y
 CONFIG_FEATURE_MTAB_SUPPORT=y
+CONFIG_FEATURE_MTAB_FILENAME="/etc/mtab"
 
 #
 # Debugging Options