- patch from P.J. Day to rely on the automatic indenting provided by depends.

This commit is contained in:
Bernhard Reutner-Fischer 2006-04-18 11:11:40 +00:00
parent ba31d27249
commit ea46f456d4

View File

@ -62,15 +62,33 @@ config CONFIG_HTTPD
Serve web pages via an HTTP server. Serve web pages via an HTTP server.
config CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY config CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
bool " Support using httpd only from inetd" bool "Support using httpd only from inetd"
default n default n
depends on CONFIG_HTTPD depends on CONFIG_HTTPD
help help
This option disables uid and port options for the httpd applet This option disables uid and port options for the httpd applet
but requires inetd server daemon. but requires inetd server daemon.
config CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
bool "Support reloading the global config file using hup signal"
default n
depends on CONFIG_HTTPD && !CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
help
This option enables processing of SIGHUP to reload cached
configuration settings.
config CONFIG_FEATURE_HTTPD_SETUID
bool "Enable support -u <user> option"
default n
depends on CONFIG_HTTPD && !CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
help
This option allows the server to run as a specific user
rather than defaulting to the user that starts the server.
Use of this option requires special privileges to change to a
different user.
config CONFIG_FEATURE_HTTPD_BASIC_AUTH config CONFIG_FEATURE_HTTPD_BASIC_AUTH
bool " Enable Basic http Authentication" bool "Enable Basic http Authentication"
default y default y
depends on CONFIG_HTTPD depends on CONFIG_HTTPD
help help
@ -78,35 +96,15 @@ config CONFIG_FEATURE_HTTPD_BASIC_AUTH
authentication on a per url basis. authentication on a per url basis.
config CONFIG_FEATURE_HTTPD_AUTH_MD5 config CONFIG_FEATURE_HTTPD_AUTH_MD5
bool " Support MD5 crypted passwords for http Authentication" bool "Support MD5 crypted passwords for http Authentication"
default n default n
depends on CONFIG_FEATURE_HTTPD_BASIC_AUTH depends on CONFIG_FEATURE_HTTPD_BASIC_AUTH
help help
Enables basic per url authentication from /etc/httpd.conf Enables basic per url authentication from /etc/httpd.conf
using md5 passwords. using md5 passwords.
if !CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
config CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
bool " Support reloading the global config file using hup signal"
default n
depends on CONFIG_HTTPD
help
This option enables processing of SIGHUP to reload cached
configuration settings.
config CONFIG_FEATURE_HTTPD_SETUID
bool " Enable support -u <user> option"
default n
depends on CONFIG_HTTPD
help
This option allows the server to run as a specific user
rather than defaulting to the user that starts the server.
Use of this option requires special privileges to change to a
different user.
endif
config CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES config CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
bool " Support loading additional MIME types at run-time" bool "Support loading additional MIME types at run-time"
default n default n
depends on CONFIG_HTTPD depends on CONFIG_HTTPD
help help
@ -114,7 +112,7 @@ config CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
run-time to be specified in the configuration file. run-time to be specified in the configuration file.
config CONFIG_FEATURE_HTTPD_CGI config CONFIG_FEATURE_HTTPD_CGI
bool " Support Common Gateway Interface (CGI)" bool "Support Common Gateway Interface (CGI)"
default y default y
depends on CONFIG_HTTPD depends on CONFIG_HTTPD
help help
@ -122,7 +120,7 @@ config CONFIG_FEATURE_HTTPD_CGI
when specific urls are requested. when specific urls are requested.
config CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR config CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
bool " Enable support for running scripts through an interpreter" bool "Enable support for running scripts through an interpreter"
default n default n
depends on CONFIG_FEATURE_HTTPD_CGI depends on CONFIG_FEATURE_HTTPD_CGI
help help
@ -133,7 +131,7 @@ config CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
*.php:/path/to/your/php *.php:/path/to/your/php
config CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV config CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
bool " Support the REMOTE_PORT environment variable for CGI" bool "Support the REMOTE_PORT environment variable for CGI"
default n default n
depends on CONFIG_FEATURE_HTTPD_CGI depends on CONFIG_FEATURE_HTTPD_CGI
help help
@ -141,7 +139,7 @@ config CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
references that contain a unique port number. references that contain a unique port number.
config CONFIG_FEATURE_HTTPD_ENCODE_URL_STR config CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
bool " Enable the -e option for shell script CGI simplification." bool "Enable the -e option for shell script CGI simplification."
default y default y
depends on CONFIG_HTTPD depends on CONFIG_HTTPD
help help
@ -157,7 +155,7 @@ config CONFIG_IFCONFIG
Ifconfig is used to configure the kernel-resident network interfaces. Ifconfig is used to configure the kernel-resident network interfaces.
config CONFIG_FEATURE_IFCONFIG_STATUS config CONFIG_FEATURE_IFCONFIG_STATUS
bool " Enable status reporting output (+7k)" bool "Enable status reporting output (+7k)"
default y default y
depends on CONFIG_IFCONFIG depends on CONFIG_IFCONFIG
help help
@ -165,7 +163,7 @@ config CONFIG_FEATURE_IFCONFIG_STATUS
of the currently active interfaces. of the currently active interfaces.
config CONFIG_FEATURE_IFCONFIG_SLIP config CONFIG_FEATURE_IFCONFIG_SLIP
bool " Enable slip-specific options \"keepalive\" and \"outfill\"" bool "Enable slip-specific options \"keepalive\" and \"outfill\""
default n default n
depends on CONFIG_IFCONFIG depends on CONFIG_IFCONFIG
help help
@ -173,7 +171,7 @@ config CONFIG_FEATURE_IFCONFIG_SLIP
planning on using serial lines, leave this unchecked. planning on using serial lines, leave this unchecked.
config CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ config CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
bool " Enable options \"mem_start\", \"io_addr\", and \"irq\"" bool "Enable options \"mem_start\", \"io_addr\", and \"irq\""
default n default n
depends on CONFIG_IFCONFIG depends on CONFIG_IFCONFIG
help help
@ -181,7 +179,7 @@ config CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
and/or the interrupt line used by the specified device. and/or the interrupt line used by the specified device.
config CONFIG_FEATURE_IFCONFIG_HW config CONFIG_FEATURE_IFCONFIG_HW
bool " Enable option \"hw\" (ether only)" bool "Enable option \"hw\" (ether only)"
default y default y
depends on CONFIG_IFCONFIG depends on CONFIG_IFCONFIG
help help
@ -190,7 +188,7 @@ config CONFIG_FEATURE_IFCONFIG_HW
class. class.
config CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS config CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
bool " Set the broadcast automatically" bool "Set the broadcast automatically"
default n default n
depends on CONFIG_IFCONFIG depends on CONFIG_IFCONFIG
help help
@ -215,7 +213,7 @@ config CONFIG_IFUPDOWN
standalone utilities. standalone utilities.
config CONFIG_FEATURE_IFUPDOWN_IP config CONFIG_FEATURE_IFUPDOWN_IP
bool " Use ip applet" bool "Use ip applet"
default n default n
depends on CONFIG_IFUPDOWN depends on CONFIG_IFUPDOWN
help help
@ -223,7 +221,7 @@ config CONFIG_FEATURE_IFUPDOWN_IP
than the default of using the older 'ifconfig' and 'route' utilities. than the default of using the older 'ifconfig' and 'route' utilities.
config CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN config CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
bool " Use busybox ip applet" bool "Use busybox ip applet"
default y default y
depends on CONFIG_FEATURE_IFUPDOWN_IP depends on CONFIG_FEATURE_IFUPDOWN_IP
select CONFIG_IP select CONFIG_IP
@ -237,7 +235,7 @@ config CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
utility or the "ifup" and "ifdown" applets will not work. utility or the "ifup" and "ifdown" applets will not work.
config CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN config CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
bool " Use busybox ifconfig and route applets" bool "Use busybox ifconfig and route applets"
default y default y
depends on CONFIG_IFUPDOWN && !CONFIG_FEATURE_IFUPDOWN_IP depends on CONFIG_IFUPDOWN && !CONFIG_FEATURE_IFUPDOWN_IP
select CONFIG_IFCONFIG select CONFIG_IFCONFIG
@ -251,21 +249,21 @@ config CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
work. work.
config CONFIG_FEATURE_IFUPDOWN_IPV4 config CONFIG_FEATURE_IFUPDOWN_IPV4
bool " Enable support for IPv4" bool "Enable support for IPv4"
default y default y
depends on CONFIG_IFUPDOWN depends on CONFIG_IFUPDOWN
help help
If you want busybox to talk IPv4, leave this on. If you want busybox to talk IPv4, leave this on.
config CONFIG_FEATURE_IFUPDOWN_IPV6 config CONFIG_FEATURE_IFUPDOWN_IPV6
bool " Enable support for IPv6" bool "Enable support for IPv6"
default n default n
depends on CONFIG_IFUPDOWN && CONFIG_FEATURE_IPV6 depends on CONFIG_IFUPDOWN && CONFIG_FEATURE_IPV6
help help
If you need support for IPv6, turn this option on. If you need support for IPv6, turn this option on.
config CONFIG_FEATURE_IFUPDOWN_IPX config CONFIG_FEATURE_IFUPDOWN_IPX
bool " Enable support for IPX" bool "Enable support for IPX"
default n default n
depends on CONFIG_IFUPDOWN depends on CONFIG_IFUPDOWN
help help
@ -273,7 +271,7 @@ config CONFIG_FEATURE_IFUPDOWN_IPX
networks. networks.
config CONFIG_FEATURE_IFUPDOWN_MAPPING config CONFIG_FEATURE_IFUPDOWN_MAPPING
bool " Enable mapping support" bool "Enable mapping support"
default n default n
depends on CONFIG_IFUPDOWN depends on CONFIG_IFUPDOWN
help help
@ -287,42 +285,42 @@ config CONFIG_INETD
Internet superserver daemon Internet superserver daemon
config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO
bool " Support echo service" bool "Support echo service"
default y default y
depends on CONFIG_INETD depends on CONFIG_INETD
help help
Echo received data internal inetd service Echo received data internal inetd service
config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD
bool " Support discard service" bool "Support discard service"
default y default y
depends on CONFIG_INETD depends on CONFIG_INETD
help help
Internet /dev/null internal inetd service Internet /dev/null internal inetd service
config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME
bool " Support time service" bool "Support time service"
default y default y
depends on CONFIG_INETD depends on CONFIG_INETD
help help
Return 32 bit time since 1900 internal inetd service Return 32 bit time since 1900 internal inetd service
config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME
bool " Support daytime service" bool "Support daytime service"
default y default y
depends on CONFIG_INETD depends on CONFIG_INETD
help help
Return human-readable time internal inetd service Return human-readable time internal inetd service
config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN config CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN
bool " Support chargen service" bool "Support chargen service"
default y default y
depends on CONFIG_INETD depends on CONFIG_INETD
help help
Familiar character generator internal inetd service Familiar character generator internal inetd service
config CONFIG_FEATURE_INETD_RPC config CONFIG_FEATURE_INETD_RPC
bool " Support RPC services" bool "Support RPC services"
default n default n
depends on CONFIG_INETD depends on CONFIG_INETD
help help
@ -407,7 +405,7 @@ config CONFIG_IPCALC
resulting broadcast, network, and host range. resulting broadcast, network, and host range.
config CONFIG_FEATURE_IPCALC_FANCY config CONFIG_FEATURE_IPCALC_FANCY
bool " Fancy IPCALC, more options, adds 1 kbyte" bool "Fancy IPCALC, more options, adds 1 kbyte"
default y default y
depends on CONFIG_IPCALC depends on CONFIG_IPCALC
help help
@ -462,7 +460,7 @@ config CONFIG_PING
elicit an ICMP ECHO_RESPONSE from a host or gateway. elicit an ICMP ECHO_RESPONSE from a host or gateway.
config CONFIG_FEATURE_FANCY_PING config CONFIG_FEATURE_FANCY_PING
bool " Enable fancy ping output" bool "Enable fancy ping output"
default y default y
depends on CONFIG_PING depends on CONFIG_PING
help help
@ -477,7 +475,7 @@ config CONFIG_PING6
This will give you a ping that can talk IPv6. This will give you a ping that can talk IPv6.
config CONFIG_FEATURE_FANCY_PING6 config CONFIG_FEATURE_FANCY_PING6
bool " Enable fancy ping6 output" bool "Enable fancy ping6 output"
default y default y
depends on CONFIG_PING6 depends on CONFIG_PING6
help help
@ -498,7 +496,7 @@ config CONFIG_TELNET
used to test other simple protocols. used to test other simple protocols.
config CONFIG_FEATURE_TELNET_TTYPE config CONFIG_FEATURE_TELNET_TTYPE
bool " Pass TERM type to remote host" bool "Pass TERM type to remote host"
default y default y
depends on CONFIG_TELNET depends on CONFIG_TELNET
help help
@ -507,7 +505,7 @@ config CONFIG_FEATURE_TELNET_TTYPE
things like ANSI colors and other control sequences behave. things like ANSI colors and other control sequences behave.
config CONFIG_FEATURE_TELNET_AUTOLOGIN config CONFIG_FEATURE_TELNET_AUTOLOGIN
bool " Pass USER type to remote host" bool "Pass USER type to remote host"
default y default y
depends on CONFIG_TELNET depends on CONFIG_TELNET
help help
@ -559,7 +557,7 @@ config CONFIG_TELNETD
config CONFIG_FEATURE_TELNETD_INETD config CONFIG_FEATURE_TELNETD_INETD
bool " Support call from inetd only" bool "Support call from inetd only"
default n default n
depends on CONFIG_TELNETD depends on CONFIG_TELNETD
help help
@ -575,7 +573,7 @@ config CONFIG_TFTP
for a network-enabled bootloader. for a network-enabled bootloader.
config CONFIG_FEATURE_TFTP_GET config CONFIG_FEATURE_TFTP_GET
bool " Enable \"get\" command" bool "Enable \"get\" command"
default y default y
depends on CONFIG_TFTP depends on CONFIG_TFTP
help help
@ -583,7 +581,7 @@ config CONFIG_FEATURE_TFTP_GET
a client to retrieve a file from a TFTP server. a client to retrieve a file from a TFTP server.
config CONFIG_FEATURE_TFTP_PUT config CONFIG_FEATURE_TFTP_PUT
bool " Enable \"put\" command" bool "Enable \"put\" command"
default y default y
depends on CONFIG_TFTP depends on CONFIG_TFTP
help help
@ -591,14 +589,14 @@ config CONFIG_FEATURE_TFTP_PUT
a client to transfer a file to a TFTP server. a client to transfer a file to a TFTP server.
config CONFIG_FEATURE_TFTP_BLOCKSIZE config CONFIG_FEATURE_TFTP_BLOCKSIZE
bool " Enable \"blocksize\" command" bool "Enable \"blocksize\" command"
default n default n
depends on CONFIG_TFTP depends on CONFIG_TFTP
help help
Allow the client to specify the desired block size for transfers. Allow the client to specify the desired block size for transfers.
config CONFIG_FEATURE_TFTP_DEBUG config CONFIG_FEATURE_TFTP_DEBUG
bool " Enable debug" bool "Enable debug"
default n default n
depends on CONFIG_TFTP depends on CONFIG_TFTP
help help
@ -613,7 +611,7 @@ config CONFIG_TRACEROUTE
Utility to trace the route of IP packets Utility to trace the route of IP packets
config CONFIG_FEATURE_TRACEROUTE_VERBOSE config CONFIG_FEATURE_TRACEROUTE_VERBOSE
bool " Enable verbose output" bool "Enable verbose output"
default n default n
depends on CONFIG_TRACEROUTE depends on CONFIG_TRACEROUTE
help help
@ -621,7 +619,7 @@ config CONFIG_FEATURE_TRACEROUTE_VERBOSE
hostnames and ICMP response types. hostnames and ICMP response types.
config CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE config CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
bool " Enable loose source route" bool "Enable loose source route"
default n default n
depends on CONFIG_TRACEROUTE depends on CONFIG_TRACEROUTE
help help
@ -629,7 +627,7 @@ config CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
(8 maximum). (8 maximum).
config CONFIG_FEATURE_TRACEROUTE_USE_ICMP config CONFIG_FEATURE_TRACEROUTE_USE_ICMP
bool " Use ICMP instead of UDP" bool "Use ICMP instead of UDP"
default n default n
depends on CONFIG_TRACEROUTE depends on CONFIG_TRACEROUTE
help help
@ -651,21 +649,21 @@ config CONFIG_WGET
HTTPS, and FTP servers. HTTPS, and FTP servers.
config CONFIG_FEATURE_WGET_STATUSBAR config CONFIG_FEATURE_WGET_STATUSBAR
bool " Enable a nifty process meter (+2k)" bool "Enable a nifty process meter (+2k)"
default y default y
depends on CONFIG_WGET depends on CONFIG_WGET
help help
Enable the transfer progress bar for wget transfers. Enable the transfer progress bar for wget transfers.
config CONFIG_FEATURE_WGET_AUTHENTICATION config CONFIG_FEATURE_WGET_AUTHENTICATION
bool " Enable HTTP authentication" bool "Enable HTTP authentication"
default y default y
depends on CONFIG_WGET depends on CONFIG_WGET
help help
Support authenticated HTTP transfers. Support authenticated HTTP transfers.
config CONFIG_FEATURE_WGET_IP6_LITERAL config CONFIG_FEATURE_WGET_IP6_LITERAL
bool " Enable IPv6 literal addresses" bool "Enable IPv6 literal addresses"
default y default y
depends on CONFIG_WGET && CONFIG_FEATURE_IPV6 depends on CONFIG_WGET && CONFIG_FEATURE_IPV6
help help