Patch for the debian-cvs package, ip* applets in /bin, patch from Bastian Blank

This commit is contained in:
Glenn L McGrath 2003-01-14 21:41:12 +00:00
parent fc4a0fd82e
commit 147a3ca1a4
6 changed files with 20 additions and 6 deletions

6
debian/changelog vendored
View File

@ -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 busybox-cvs (0.60.99.cvs20030105-1) unstable; urgency=low
* Fix ip command build failure on ia64 (Closes: #172580 * Fix ip command build failure on ia64 (Closes: #172580

2
debian/config-deb vendored
View File

@ -191,9 +191,11 @@ CONFIG_REBOOT=y
# Networking Utilities # Networking Utilities
# #
# CONFIG_FEATURE_IPV6 is not set # CONFIG_FEATURE_IPV6 is not set
# CONFIG_ARPING is not set
# CONFIG_FTPGET is not set # CONFIG_FTPGET is not set
# CONFIG_FTPPUT is not set # CONFIG_FTPPUT is not set
CONFIG_HOSTNAME=y CONFIG_HOSTNAME=y
# CONFIG_HTTPD is not set
CONFIG_IFCONFIG=y CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_STATUS=y
# CONFIG_FEATURE_IFCONFIG_SLIP is not set # CONFIG_FEATURE_IFCONFIG_SLIP is not set

View File

@ -208,9 +208,12 @@ CONFIG_WATCHDOG=y
# Networking Utilities # Networking Utilities
# #
CONFIG_FEATURE_IPV6=y CONFIG_FEATURE_IPV6=y
CONFIG_ARPING=y
CONFIG_FTPGET=y CONFIG_FTPGET=y
CONFIG_FTPPUT=y CONFIG_FTPPUT=y
CONFIG_HOSTNAME=y CONFIG_HOSTNAME=y
CONFIG_HTTPD=y
CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
CONFIG_IFCONFIG=y CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_STATUS=y
CONFIG_FEATURE_IFCONFIG_SLIP=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_HW=y
CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
CONFIG_IFUPDOWN=y CONFIG_IFUPDOWN=y
# CONFIG_FEATURE_IFUPDOWN_IP is not set
CONFIG_FEATURE_IFUPDOWN_IPV4=y CONFIG_FEATURE_IFUPDOWN_IPV4=y
CONFIG_FEATURE_IFUPDOWN_IPV6=y CONFIG_FEATURE_IFUPDOWN_IPV6=y
CONFIG_FEATURE_IFUPDOWN_IPX=y CONFIG_FEATURE_IFUPDOWN_IPX=y

2
debian/config-udeb vendored
View File

@ -191,9 +191,11 @@ CONFIG_REBOOT=y
# Networking Utilities # Networking Utilities
# #
# CONFIG_FEATURE_IPV6 is not set # CONFIG_FEATURE_IPV6 is not set
# CONFIG_ARPING is not set
# CONFIG_FTPGET is not set # CONFIG_FTPGET is not set
# CONFIG_FTPPUT is not set # CONFIG_FTPPUT is not set
# CONFIG_HOSTNAME is not set # CONFIG_HOSTNAME is not set
# CONFIG_HTTPD is not set
# CONFIG_IFCONFIG is not set # CONFIG_IFCONFIG is not set
# CONFIG_IFUPDOWN is not set # CONFIG_IFUPDOWN is not set
CONFIG_IP=y CONFIG_IP=y

2
debian/rules vendored
View File

@ -46,7 +46,7 @@ clean:
rm -f build-arch-stamp build-indep-stamp debian/files~ rm -f build-arch-stamp build-indep-stamp debian/files~
$(MAKE) distclean $(MAKE) distclean
-rm -f busybox-deb busybox-static .config busybox.1 -rm -f busybox-deb busybox-static busybox.1
dh_clean dh_clean

View File

@ -267,22 +267,22 @@
APPLET(insmod, insmod_main, _BB_DIR_SBIN, _BB_SUID_NEVER) APPLET(insmod, insmod_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
#endif #endif
#ifdef CONFIG_IP #ifdef CONFIG_IP
APPLET(ip, ip_main, _BB_DIR_SBIN, _BB_SUID_NEVER) APPLET(ip, ip_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif #endif
#ifdef CONFIG_IPCALC #ifdef CONFIG_IPCALC
APPLET(ipcalc, ipcalc_main, _BB_DIR_BIN, _BB_SUID_NEVER) APPLET(ipcalc, ipcalc_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif #endif
#ifdef CONFIG_IPADDRESS #ifdef CONFIG_IPADDRESS
APPLET(ipaddr, ipaddr_main, _BB_DIR_SBIN, _BB_SUID_NEVER) APPLET(ipaddr, ipaddr_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif #endif
#ifdef CONFIG_IPLINK #ifdef CONFIG_IPLINK
APPLET(iplink, iplink_main, _BB_DIR_SBIN, _BB_SUID_NEVER) APPLET(iplink, iplink_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif #endif
#ifdef CONFIG_IPROUTE #ifdef CONFIG_IPROUTE
APPLET(iproute, iproute_main, _BB_DIR_SBIN, _BB_SUID_NEVER) APPLET(iproute, iproute_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif #endif
#ifdef CONFIG_IPTUNNEL #ifdef CONFIG_IPTUNNEL
APPLET(iptunnel, iptunnel_main, _BB_DIR_SBIN, _BB_SUID_NEVER) APPLET(iptunnel, iptunnel_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif #endif
#ifdef CONFIG_KILL #ifdef CONFIG_KILL
APPLET(kill, kill_main, _BB_DIR_BIN, _BB_SUID_NEVER) APPLET(kill, kill_main, _BB_DIR_BIN, _BB_SUID_NEVER)