Update files and version number prepratory to cutting a release.
-Erik
diff --git a/debian/Config.h-static b/debian/Config.h-static
index c4ce444..aa634be 100644
--- a/debian/Config.h-static
+++ b/debian/Config.h-static
@@ -25,7 +25,7 @@
#define BB_DIRNAME
#define BB_DMESG
#define BB_DOS2UNIX
-//#define BB_DPKG
+#define BB_DPKG
#define BB_DPKG_DEB
#define BB_DUTMP
#define BB_DU
@@ -37,7 +37,7 @@
#define BB_FIND
#define BB_FREE
#define BB_FREERAMDISK
-//#define BB_FSCK_MINIX
+#define BB_FSCK_MINIX
#define BB_GETOPT
#define BB_GREP
#define BB_GUNZIP
@@ -52,6 +52,7 @@
//#define BB_INSMOD
#define BB_KILL
#define BB_KILLALL
+#define BB_KLOGD
#define BB_LENGTH
#define BB_LN
#define BB_LOADACM
@@ -60,12 +61,12 @@
#define BB_LOGGER
#define BB_LOGNAME
#define BB_LS
-//#define BB_LSMOD
+#define BB_LSMOD
#define BB_MAKEDEVS
#define BB_MD5SUM
#define BB_MKDIR
#define BB_MKFIFO
-//#define BB_MKFS_MINIX
+#define BB_MKFS_MINIX
#define BB_MKNOD
#define BB_MKSWAP
#define BB_MKTEMP
@@ -87,9 +88,9 @@
#define BB_RESET
#define BB_RM
#define BB_RMDIR
-//#define BB_RMMOD
+#define BB_RMMOD
#define BB_ROUTE
-//#define BB_RPMUNPACK
+#define BB_RPMUNPACK
#define BB_SED
#define BB_SETKEYCODES
#define BB_SH
@@ -104,6 +105,7 @@
#define BB_TEE
#define BB_TEST
#define BB_TELNET
+#define BB_TFTP
#define BB_TOUCH
#define BB_TR
#define BB_TRUE_FALSE
@@ -113,7 +115,6 @@
#define BB_UMOUNT
#define BB_UNIQ
#define BB_UNAME
-#define BB_UNIX2DOS
#define BB_UPDATE
#define BB_UPTIME
#define BB_USLEEP
@@ -128,7 +129,7 @@
//
//
//
-// ---------------------------------------------------------
+
// This is where feature definitions go. Generally speaking,
// turning this stuff off makes things a bit smaller (and less
// pretty/useful).
@@ -194,12 +195,12 @@
//Make sure nothing is printed to the console on boot
//#define BB_FEATURE_EXTRA_QUIET
//
-//Should syslogd also provide klogd support?
-#define BB_FEATURE_KLOGD
-//
// enable syslogd -R remotehost
#define BB_FEATURE_REMOTE_LOG
//
+// enable syslogd -C
+//#define BB_FEATURE_IPC_SYSLOG
+//
//Simple tail implementation (2.34k vs 3k for the full one).
//Both provide 'tail -f', but this cuts out -c, -q, -s, and -v.
#define BB_FEATURE_SIMPLE_TAIL
@@ -219,6 +220,9 @@
// (i.e. in case of an unreachable NFS system).
#define BB_FEATURE_MOUNT_FORCE
//
+// use -i (interactive) flag for rm
+//#define BB_FEATURE_RM_INTERACTIVE
+//
// Enable support for creation of tar files.
#define BB_FEATURE_TAR_CREATE
//
@@ -232,12 +236,19 @@
#define BB_FEATURE_SORT_REVERSE
//
// Enable command line editing in the shell.
-// Only relevant if BB_SH is enabled.
-#define BB_FEATURE_SH_COMMAND_EDITING
+// Only relevant if BB_SH is enabled. On by default.
+#define BB_FEATURE_COMMAND_EDITING
+//
+// Enable tab completion in the shell. This is now working quite nicely.
+// This feature adds a bit over 4k. Only relevant if BB_SH is enabled.
+#define BB_FEATURE_COMMAND_TAB_COMPLETION
+//
+// Attempts to match usernames in a ~-prefixed path
+//#define BB_FEATURE_COMMAND_USERNAME_COMPLETION
//
//Allow the shell to invoke all the compiled in BusyBox applets as if they
//were shell builtins. Nice for staticly linking an emergency rescue shell,
-//among other things.
+//among other things. Off by default.
// Only relevant if BB_SH is enabled.
#define BB_FEATURE_SH_STANDALONE_SHELL
//
@@ -247,33 +258,24 @@
//will use BusyBox cat even if /bin/cat exists on the filesystem and is _not_
//busybox. Some systems want this, others do not. Choose wisely. :-) This
//only has meaning when BB_FEATURE_SH_STANDALONE_SHELL is enabled.
-// Only relevant if BB_SH is enabled.
-#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN
-//
-// Enable tab completion in the shell. This is now working quite nicely.
-// This feature adds a bit over 4k. Only relevant if BB_SH is enabled.
-#define BB_FEATURE_SH_TAB_COMPLETION
-//
-// Enable a simpler shell prompt of the form "path #"
-// instead of the default "[username@hostname path]#"
+// Only relevant if BB_SH is enabled. Off by default.
+//#define BB_FEATURE_SH_APPLETS_ALWAYS_WIN
//
// Some deeply embedded systems don't have usernames or even hostnames,
// and the default prompt can look rather hideous on them. Uncomment
// this option for a simpler, path-only prompt (which was the default until
-// around BusyBox-0.48):
+// around BusyBox-0.48). On by default.
+// Only relevant if BB_SH is enabled.
#define BB_FEATURE_SH_SIMPLE_PROMPT
//
-// Attempts to match usernames in a ~-prefixed path
-//#define BB_FEATURE_SH_USERNAME_COMPLETION
-//
//Turn on extra fbset options
-#define BB_FEATURE_FBSET_FANCY
+//#define BB_FEATURE_FBSET_FANCY
//
//Turn on fbset readmode support
-#define BB_FEATURE_FBSET_READMODE
+//#define BB_FEATURE_FBSET_READMODE
//
// Support insmod/lsmod/rmmod for post 2.1 kernels
-//#define BB_FEATURE_NEW_MODULE_INTERFACE
+#define BB_FEATURE_NEW_MODULE_INTERFACE
//
// Support insmod/lsmod/rmmod for pre 2.1 kernels
//#define BB_FEATURE_OLD_MODULE_INTERFACE
@@ -284,11 +286,22 @@
// Support for Minix filesystem, version 2
//#define BB_FEATURE_MINIX2
//
+// Enable ifconfig status reporting output -- this feature adds 12k.
+#define BB_FEATURE_IFCONFIG_STATUS
+//
+// Enable ifconfig slip-specific options "keepalive" and "outfill"
+#define BB_FEATURE_IFCONFIG_SLIP
+//
+// Enable ifconfig options "mem_start", "io_addr", and "irq".
+#define BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
+//
+// Enable ifconfig option "hw". Currently works for only with "ether".
+#define BB_FEATURE_IFCONFIG_HW
//
// Enable busybox --install [-s]
// to create links (or symlinks) for all the commands that are
// compiled into the binary. (needs /proc filesystem)
-// #define BB_FEATURE_INSTALLER
+//#define BB_FEATURE_INSTALLER
//
// Enable a nifty progress meter in wget (adds just under 2k)
#define BB_FEATURE_WGET_STATUSBAR
@@ -313,6 +326,13 @@
// Support for the -A -B and -C context flags in grep
//#define BB_FEATURE_GREP_CONTEXT
//
+// Support for the EGREP applet (alias to the grep applet)
+//#define BB_FEATURE_GREP_EGREP_ALIAS
+//
+// Tell tftp what commands that should be supported.
+#define BB_FEATURE_TFTP_PUT
+#define BB_FEATURE_TFTP_GET
+//
// End of Features List
//
//
@@ -358,7 +378,6 @@
#endif
//
#ifndef BB_INIT
- #undef BB_LINUXRC
#undef BB_FEATURE_LINUXRC
#endif
//
@@ -427,5 +446,3 @@
#if defined BB_DOS2UNIX
#define BB_UNIX2DOS
#endif
-
-