diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/config-deb | 2 | ||||
| -rw-r--r-- | debian/config-static | 4 | ||||
| -rw-r--r-- | debian/config-udeb | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | include/applets.h | 10 |
6 files changed, 20 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 5f7fb692c..3c871609a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +busybox-cvs (0.60.99.cvs20030114-1) unstable; urgency=low + + * new cvs version + + -- Bastian Blank <waldi@debian.org> Tue, 14 Jan 2003 17:06:43 +0000 + busybox-cvs (0.60.99.cvs20030105-1) unstable; urgency=low * Fix ip command build failure on ia64 (Closes: #172580 diff --git a/debian/config-deb b/debian/config-deb index f44784464..00c0db6be 100644 --- a/debian/config-deb +++ b/debian/config-deb @@ -191,9 +191,11 @@ CONFIG_REBOOT=y # Networking Utilities # # CONFIG_FEATURE_IPV6 is not set +# CONFIG_ARPING is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set diff --git a/debian/config-static b/debian/config-static index 5e1867918..45238704c 100644 --- a/debian/config-static +++ b/debian/config-static @@ -208,9 +208,12 @@ CONFIG_WATCHDOG=y # Networking Utilities # CONFIG_FEATURE_IPV6=y +CONFIG_ARPING=y CONFIG_FTPGET=y CONFIG_FTPPUT=y CONFIG_HOSTNAME=y +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_SLIP=y @@ -218,6 +221,7 @@ CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y CONFIG_FEATURE_IFCONFIG_HW=y CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set CONFIG_FEATURE_IFUPDOWN_IPV4=y CONFIG_FEATURE_IFUPDOWN_IPV6=y CONFIG_FEATURE_IFUPDOWN_IPX=y diff --git a/debian/config-udeb b/debian/config-udeb index ccf57207e..d9ed0e143 100644 --- a/debian/config-udeb +++ b/debian/config-udeb @@ -191,9 +191,11 @@ CONFIG_REBOOT=y # Networking Utilities # # CONFIG_FEATURE_IPV6 is not set +# CONFIG_ARPING is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set # CONFIG_HOSTNAME is not set +# CONFIG_HTTPD is not set # CONFIG_IFCONFIG is not set # CONFIG_IFUPDOWN is not set CONFIG_IP=y diff --git a/debian/rules b/debian/rules index 74073e44c..a1fe24543 100755 --- a/debian/rules +++ b/debian/rules @@ -46,7 +46,7 @@ clean: rm -f build-arch-stamp build-indep-stamp debian/files~ $(MAKE) distclean - -rm -f busybox-deb busybox-static .config busybox.1 + -rm -f busybox-deb busybox-static busybox.1 dh_clean diff --git a/include/applets.h b/include/applets.h index 9e95b2e9d..0d8f0b4cb 100644 --- a/include/applets.h +++ b/include/applets.h @@ -267,22 +267,22 @@ APPLET(insmod, insmod_main, _BB_DIR_SBIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_IP - APPLET(ip, ip_main, _BB_DIR_SBIN, _BB_SUID_NEVER) + APPLET(ip, ip_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_IPCALC APPLET(ipcalc, ipcalc_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_IPADDRESS - APPLET(ipaddr, ipaddr_main, _BB_DIR_SBIN, _BB_SUID_NEVER) + APPLET(ipaddr, ipaddr_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_IPLINK - APPLET(iplink, iplink_main, _BB_DIR_SBIN, _BB_SUID_NEVER) + APPLET(iplink, iplink_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_IPROUTE - APPLET(iproute, iproute_main, _BB_DIR_SBIN, _BB_SUID_NEVER) + APPLET(iproute, iproute_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_IPTUNNEL - APPLET(iptunnel, iptunnel_main, _BB_DIR_SBIN, _BB_SUID_NEVER) + APPLET(iptunnel, iptunnel_main, _BB_DIR_BIN, _BB_SUID_NEVER) #endif #ifdef CONFIG_KILL APPLET(kill, kill_main, _BB_DIR_BIN, _BB_SUID_NEVER) |