Changeset 9130


Ignore:
Timestamp:
2007-10-05T02:27:49+02:00 (10 years ago)
Author:
nbd
Message:

Upgrade busybox to 1.7.2

  • clean up insmod crap
  • add some lineno/programname fixes for awx
  • clean up awk getopt stuff
  • remove unnecessary patches
Location:
trunk/package/busybox
Files:
11 added
14 deleted
28 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/busybox/Makefile

    r9103 r9130  
    1010 
    1111PKG_NAME:=busybox 
    12 PKG_VERSION:=1.4.2 
     12PKG_VERSION:=1.7.2 
    1313PKG_RELEASE:=3 
    1414 
     
    1616PKG_SOURCE_URL:=http://www.busybox.net/downloads \ 
    1717                http://distfiles.gentoo.org/distfiles/ 
    18 PKG_MD5SUM:=b4c61fb15642be9dde20e8493788c585 
     18PKG_MD5SUM:=c91ec9756e2000073a9dd8fa9fc3f89e 
    1919 
    2020include $(INCLUDE_DIR)/package.mk 
  • trunk/package/busybox/config/Config.in

    r8512 r9130  
    101101          Enable 'busybox --install [-s]' support.  This will allow you to use 
    102102          busybox at runtime to create hard links or symlinks for all the 
    103           applets that are compiled into busybox.  This feature requires the 
    104           /proc filesystem. 
     103          applets that are compiled into busybox. 
    105104 
    106105config BUSYBOX_CONFIG_LOCALE_SUPPORT 
     
    140139          Don't enable this unless you have a really good reason to clean 
    141140          things up manually. 
     141 
     142config BUSYBOX_CONFIG_FEATURE_PIDFILE 
     143        bool "Support writing pidfiles" 
     144        default y 
     145        help 
     146          This option makes some applets (e.g. crond, syslogd, inetd) write 
     147          a pidfile in /var/run. Some applications rely on them. 
    142148 
    143149config BUSYBOX_CONFIG_FEATURE_SUID 
     
    156162          and vlock. 
    157163 
    158 config BUSYBOX_CONFIG_FEATURE_SYSLOG 
    159         bool "Support for syslog" 
    160         default y 
    161         help 
    162           This option is auto-selected when you select any applet which may 
    163           send its output to syslog. You do not need to select it manually. 
    164  
    165164config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG 
    166165        bool "Runtime SUID/SGID configuration via /etc/busybox.conf" 
     
    202201          /etc/busybox.conf should be readable by the user needing the SUID, check 
    203202          this option to avoid users to be notified about missing permissions. 
    204  
    205 config BUSYBOX_CONFIG_FEATURE_HAVE_RPC 
    206         bool "RPC support" 
    207         default y 
    208         help 
    209           Select this if you have rpc support. 
    210           This automatically turns off all configuration options that rely 
    211           on RPC. 
    212203 
    213204config BUSYBOX_CONFIG_SELINUX 
     
    231222          Most people will leave this set to 'N'. 
    232223 
     224config BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS 
     225        bool "exec prefers applets" 
     226        default y 
     227        help 
     228          This is an experimental option which directs applets about to 
     229          call 'exec' to try and find an applicable busybox applet before 
     230          searching the PATH. This is typically done by exec'ing 
     231          /proc/self/exe. 
     232          This may affect shell, find -exec, xargs and similar applets. 
     233          They will use applets even if /bin/<applet> -> busybox link 
     234          is missing (or is not a link to busybox). However, this causes 
     235          problems in chroot jails without mounted /proc and with ps/top 
     236          (command name can be shown as 'exe' for applets started this way). 
     237 
    233238config BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH 
    234239        string "Path to BusyBox executable" 
     
    240245          executable.  If you haven't got /proc, set this to wherever you 
    241246          want to run BusyBox from. 
     247 
     248# These are auto-selected by other options 
     249 
     250config BUSYBOX_CONFIG_FEATURE_SYSLOG 
     251        bool "Support for logging to syslog" 
     252        default y 
     253        help 
     254          This option is auto-selected when you select any applet which may 
     255          send its output to syslog. You do not need to select it manually. 
     256 
     257config BUSYBOX_CONFIG_FEATURE_HAVE_RPC 
     258        bool "RPC support" 
     259        default y 
     260        help 
     261          This is automatically selected if any of enabled applets need it. 
     262          You do not need to select it manually. 
    242263 
    243264endmenu 
     
    299320 
    300321config BUSYBOX_CONFIG_LFS 
    301         bool "Support large files over 2 GB" 
     322        bool 
    302323        default y 
    303324        select BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS 
     
    344365          Most people should answer N. 
    345366 
    346 config BUSYBOX_CONFIG_DEBUG_PESSIMIZE 
    347         bool "Disable compiler optimizations." 
    348         default n 
    349         depends on BUSYBOX_CONFIG_DEBUG 
    350         help 
    351           The compiler's optimization of source code can eliminate and reorder 
    352           code, resulting in an executable that's hard to understand when 
    353           stepping through it with a debugger.  This switches it off, resulting 
    354           in a much bigger executable that more closely matches the source 
    355           code. 
     367config BUSYBOX_CONFIG_WERROR 
     368        bool "Abort compilation on any warning" 
     369        default n 
     370        help 
     371          Selecting this will add -Werror to gcc command line. 
     372 
     373          Most people should answer N. 
     374 
     375# Seems to be unused 
     376#config DEBUG_PESSIMIZE 
     377#       bool "Disable compiler optimizations." 
     378#       default n 
     379#       depends on DEBUG 
     380#       help 
     381#         The compiler's optimization of source code can eliminate and reorder 
     382#         code, resulting in an executable that's hard to understand when 
     383#         stepping through it with a debugger.  This switches it off, resulting 
     384#         in a much bigger executable that more closely matches the source 
     385#         code. 
    356386 
    357387choice 
    358388        prompt "Additional debugging library" 
    359389        default BUSYBOX_CONFIG_NO_DEBUG_LIB 
    360         depends on BUSYBOX_CONFIG_DEBUG 
    361390        help 
    362391          Using an additional debugging library will make BusyBox become 
     
    418447 
    419448choice 
    420        prompt "Applets links" 
    421        default BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS 
    422        help 
    423          Choose how you install applets links. 
     449        prompt "Applets links" 
     450        default BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS 
     451        help 
     452          Choose how you install applets links. 
    424453 
    425454config BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS 
    426        bool "as soft-links" 
    427        help 
    428          Install applets as soft-links to the busybox binary. This needs some 
    429          free inodes on the filesystem, but might help with filesystem 
    430          generators that can't cope with hard-links. 
     455        bool "as soft-links" 
     456        help 
     457          Install applets as soft-links to the busybox binary. This needs some 
     458          free inodes on the filesystem, but might help with filesystem 
     459          generators that can't cope with hard-links. 
    431460 
    432461config BUSYBOX_CONFIG_INSTALL_APPLET_HARDLINKS 
    433        bool "as hard-links" 
    434        help 
    435          Install applets as hard-links to the busybox binary. This might count 
    436          on a filesystem with few inodes. 
     462        bool "as hard-links" 
     463        help 
     464          Install applets as hard-links to the busybox binary. This might count 
     465          on a filesystem with few inodes. 
    437466 
    438467config BUSYBOX_CONFIG_INSTALL_APPLET_DONT 
    439        bool 
    440        prompt "not installed" 
    441        depends on BUSYBOX_CONFIG_FEATURE_INSTALLER || BUSYBOX_CONFIG_FEATURE_SH_STANDALONE_SHELL 
    442        help 
    443          Do not install applet links. Useful when using the -install feature 
    444          or a standalone shell for rescue pruposes. 
     468        bool "not installed" 
     469        depends on BUSYBOX_CONFIG_FEATURE_INSTALLER || BUSYBOX_CONFIG_FEATURE_SH_STANDALONE || BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS 
     470        help 
     471          Do not install applet links. Useful when using the -install feature 
     472          or a standalone shell for rescue purposes. 
    445473 
    446474endchoice 
     
    477505source package/busybox/config/sysklogd/Config.in 
    478506source package/busybox/config/runit/Config.in 
     507source package/busybox/config/selinux/Config.in 
     508source package/busybox/config/ipsvd/Config.in 
  • trunk/package/busybox/config/archival/Config.in

    r7954 r9130  
    143143          Mini RPM applet - queries and extracts RPM packages. 
    144144 
     145config BUSYBOX_CONFIG_FEATURE_RPM_BZ2 
     146        bool "Enable handling of rpms with bzip2-compressed data inside" 
     147        default n 
     148        depends on BUSYBOX_CONFIG_RPM 
     149        help 
     150          Enable handling of rpms with bzip2-compressed data inside. 
     151 
    145152config BUSYBOX_CONFIG_TAR 
    146153        bool "tar" 
     
    207214          the old GNU format; help to kill this old format by 
    208215          repacking your ancient archives with the new format. 
     216 
     217config BUSYBOX_CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY 
     218        bool "Enable untarring of tarballs with checksums produced by buggy Sun tar" 
     219        default n 
     220        depends on BUSYBOX_CONFIG_TAR 
     221        help 
     222          This option is required to unpack archives created by some old 
     223          version of Sun's tar (it was calculating checksum using signed arithmetic). 
     224          It is said to be fixed in newer Sun tar, but "old" tarballs still exist. 
    209225 
    210226config BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS 
  • trunk/package/busybox/config/console-tools/Config.in

    r6501 r9130  
    8686        bool "Enable long options" 
    8787        default n 
    88         depends on BUSYBOX_CONFIG_SET_CONSOLE && BUSYBOX_CONFIG_GETOPT_LONG 
     88        depends on BUSYBOX_CONFIG_SETCONSOLE && BUSYBOX_CONFIG_GETOPT_LONG 
    8989        help 
    9090          Support long options for the setconsole applet. 
  • trunk/package/busybox/config/coreutils/Config.in

    r6501 r9130  
    6666          cksum is used to calculate the CRC32 checksum of a file. 
    6767 
    68 config BUSYBOX_CONFIG_CMP 
    69         bool "cmp" 
    70         default n 
    71         help 
    72           cmp is used to compare two files and returns the result 
    73           to standard output. 
    74  
    7568config BUSYBOX_CONFIG_COMM 
    7669        bool "comm" 
     
    143136          on filesystems. 
    144137 
    145 config BUSYBOX_CONFIG_DIFF 
    146         bool "diff" 
    147         default n 
    148         help 
    149           diff compares two files or directories and outputs the 
    150           differences between them in a form that can be given to 
    151           the patch command. 
    152  
    153 config BUSYBOX_CONFIG_FEATURE_DIFF_BINARY 
    154         bool "Enable checks for binary files" 
    155         default n 
    156         depends on BUSYBOX_CONFIG_DIFF 
    157         help 
    158           This option enables support for checking for binary files 
    159           before a comparison is carried out. 
    160  
    161 config BUSYBOX_CONFIG_FEATURE_DIFF_DIR 
    162         bool "Enable directory support" 
    163         default n 
    164         depends on BUSYBOX_CONFIG_DIFF 
    165         help 
    166           This option enables support for directory and subdirectory 
    167           comparison. 
    168  
    169 config BUSYBOX_CONFIG_FEATURE_DIFF_MINIMAL 
    170         bool "Enable -d option to find smaller sets of changes" 
    171         default n 
    172         depends on BUSYBOX_CONFIG_DIFF 
    173         help 
    174           Enabling this option allows the use of -d to make diff 
    175           try hard to find the smallest possible set of changes. 
    176  
    177138config BUSYBOX_CONFIG_DIRNAME 
    178139        bool "dirname" 
     
    239200        help 
    240201          Support long options for the env applet. 
     202 
     203config BUSYBOX_CONFIG_EXPAND 
     204        bool "expand" 
     205        default n 
     206        help 
     207          By default, convert all tabs to spaces. 
     208 
     209config BUSYBOX_CONFIG_FEATURE_EXPAND_LONG_OPTIONS 
     210        bool "Enable long options" 
     211        default n 
     212        depends on BUSYBOX_CONFIG_EXPAND && BUSYBOX_CONFIG_GETOPT_LONG 
     213        help 
     214          Support long options for the expand applet. 
    241215 
    242216config BUSYBOX_CONFIG_EXPR 
     
    475449          pwd is used to print the current directory. 
    476450 
     451config BUSYBOX_CONFIG_READLINK 
     452        bool "readlink" 
     453        default n 
     454        help 
     455          This program reads a symbolic link and returns the name 
     456          of the file it points to 
     457 
     458config BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW 
     459        bool "Enable canonicalization by following all symlinks (-f)" 
     460        default n 
     461        depends on BUSYBOX_CONFIG_READLINK 
     462        help 
     463          Enable the readlink option (-f). 
     464 
    477465config BUSYBOX_CONFIG_REALPATH 
    478466        bool "realpath" 
     
    536524          The SuSv3 sort standard is available at: 
    537525          http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html 
     526 
     527config BUSYBOX_CONFIG_SPLIT 
     528        bool "split" 
     529        default n 
     530        help 
     531          split a file into pieces. 
     532 
     533config BUSYBOX_CONFIG_FEATURE_SPLIT_FANCY 
     534        bool "fancy extensions" 
     535        default n 
     536        depends on BUSYBOX_CONFIG_SPLIT 
     537        help 
     538          Add support for features not required by SUSv3. 
     539          Supports additional suffixes 'b' for 512 bytes, 
     540          'g' for 1GiB for the -b option. 
    538541 
    539542config BUSYBOX_CONFIG_STAT 
     
    666669          uname is used to print system information. 
    667670 
     671config BUSYBOX_CONFIG_UNEXPAND 
     672        bool "unexpand" 
     673        default n 
     674        help 
     675          By default, convert only leading sequences of blanks to tabs. 
     676 
     677config BUSYBOX_CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS 
     678        bool "Enable long options" 
     679        default n 
     680        depends on BUSYBOX_CONFIG_UNEXPAND && BUSYBOX_CONFIG_GETOPT_LONG 
     681        help 
     682          Support long options for the unexpand applet. 
     683 
    668684config BUSYBOX_CONFIG_UNIQ 
    669685        bool "uniq" 
     
    689705        help 
    690706          uuencode is used to uuencode a file. 
    691  
    692 config BUSYBOX_CONFIG_WATCH 
    693         bool "watch" 
    694         default n 
    695         select BUSYBOX_CONFIG_DATE 
    696         help 
    697           watch is used to execute a program periodically, showing 
    698           output to the screen. 
    699707 
    700708config BUSYBOX_CONFIG_WC 
  • trunk/package/busybox/config/debianutils/Config.in

    r8652 r9130  
    1717        help 
    1818          Display a dot to indicate pipe activity. 
    19  
    20 config BUSYBOX_CONFIG_READLINK 
    21         bool "readlink" 
    22         default n 
    23         help 
    24           This program reads a symbolic link and returns the name 
    25           of the file it points to 
    26  
    27 config BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW 
    28         bool "Enable canonicalization by following all symlinks (-f)" 
    29         default n 
    30         depends on BUSYBOX_CONFIG_READLINK 
    31         help 
    32           Enable the readlink option (-f). 
    3319 
    3420config BUSYBOX_CONFIG_RUN_PARTS 
     
    5339        help 
    5440          Support long options for the run-parts applet. 
     41 
     42config BUSYBOX_CONFIG_FEATURE_RUN_PARTS_FANCY 
     43        bool "Support additional arguments" 
     44        default n 
     45        depends on BUSYBOX_CONFIG_RUN_PARTS 
     46        help 
     47          Support additional options: 
     48          -l --list print the names of the all matching files (not 
     49                    limited to executables), but don't actually run them. 
    5550 
    5651config BUSYBOX_CONFIG_START_STOP_DAEMON 
  • trunk/package/busybox/config/editors/Config.in

    r6549 r9130  
    2727          Enable math functions of the Awk programming language. 
    2828          NOTE: This will require libm to be present for linking. 
     29 
     30config BUSYBOX_CONFIG_CMP 
     31        bool "cmp" 
     32        default n 
     33        help 
     34          cmp is used to compare two files and returns the result 
     35          to standard output. 
     36 
     37config BUSYBOX_CONFIG_DIFF 
     38        bool "diff" 
     39        default y 
     40        help 
     41          diff compares two files or directories and outputs the 
     42          differences between them in a form that can be given to 
     43          the patch command. 
     44 
     45config BUSYBOX_CONFIG_FEATURE_DIFF_BINARY 
     46        bool "Enable checks for binary files" 
     47        default n 
     48        depends on BUSYBOX_CONFIG_DIFF 
     49        help 
     50          This option enables support for checking for binary files 
     51          before a comparison is carried out. 
     52 
     53config BUSYBOX_CONFIG_FEATURE_DIFF_DIR 
     54        bool "Enable directory support" 
     55        default n 
     56        depends on BUSYBOX_CONFIG_DIFF 
     57        help 
     58          This option enables support for directory and subdirectory 
     59          comparison. 
     60 
     61config BUSYBOX_CONFIG_FEATURE_DIFF_MINIMAL 
     62        bool "Enable -d option to find smaller sets of changes" 
     63        default n 
     64        depends on BUSYBOX_CONFIG_DIFF 
     65        help 
     66          Enabling this option allows the use of -d to make diff 
     67          try hard to find the smallest possible set of changes. 
    2968 
    3069config BUSYBOX_CONFIG_ED 
     
    5796          learning curve.  If you are not already comfortable with 'vi' 
    5897          you may wish to use something else. 
     98 
     99config BUSYBOX_CONFIG_FEATURE_VI_MAX_LEN 
     100        int "Maximum line length in vi" 
     101        range 256 16384 
     102        default 1024 
     103        depends on BUSYBOX_CONFIG_VI 
     104        help 
     105          vi uses on-stack buffers for intermediate line buffers. 
     106          You may want to decrease this parameter if your target machine 
     107          benefits from smaller stack usage. 
    59108 
    60109config BUSYBOX_CONFIG_FEATURE_VI_COLON 
  • trunk/package/busybox/config/findutils/Config.in

    r6501 r9130  
    3131 
    3232config BUSYBOX_CONFIG_FEATURE_FIND_MMIN 
    33         bool "Enable modified time matching (-min) option" 
     33        bool "Enable modified time matching (-mmin) option" 
    3434        default n 
    3535        depends on BUSYBOX_CONFIG_FIND 
     
    5858        depends on BUSYBOX_CONFIG_FIND 
    5959        help 
    60           This option will allow find to restrict searches to a single 
    61           filesystem. 
     60          This option allows find to restrict searches to a single filesystem. 
     61 
     62config BUSYBOX_CONFIG_FEATURE_FIND_MAXDEPTH 
     63        bool "Enable -maxdepth N option" 
     64        default y 
     65        depends on BUSYBOX_CONFIG_FIND 
     66        help 
     67          This option enables -maxdepth N option. 
    6268 
    6369config BUSYBOX_CONFIG_FEATURE_FIND_NEWER 
     
    8389          Support the 'find -exec' option for executing commands based upon 
    8490          the files matched. 
     91 
     92config BUSYBOX_CONFIG_FEATURE_FIND_USER 
     93        bool "Enable username/uid matching (-user) option" 
     94        default y 
     95        depends on BUSYBOX_CONFIG_FIND 
     96        help 
     97          Support the 'find -user' option for searching by username or uid. 
     98 
     99config BUSYBOX_CONFIG_FEATURE_FIND_GROUP 
     100        bool "Enable group/gid matching (-group) option" 
     101        default y 
     102        depends on BUSYBOX_CONFIG_FIND 
     103        help 
     104          Support the 'find -group' option for searching by group name or gid. 
     105 
     106config BUSYBOX_CONFIG_FEATURE_FIND_NOT 
     107        bool "Enable the 'not' (!) operator" 
     108        default y 
     109        depends on BUSYBOX_CONFIG_FIND 
     110        help 
     111          Support the '!' operator to invert the test results. 
     112          If 'Enable full-blown desktop' is enabled, then will also support 
     113          the non-POSIX notation '-not'. 
     114 
     115config BUSYBOX_CONFIG_FEATURE_FIND_DEPTH 
     116        bool "Enable the -depth option" 
     117        default y 
     118        depends on BUSYBOX_CONFIG_FIND 
     119        help 
     120          Process each directory's contents before the directory itself. 
     121 
     122config BUSYBOX_CONFIG_FEATURE_FIND_PAREN 
     123        bool "Enable parens in options" 
     124        default y 
     125        depends on BUSYBOX_CONFIG_FIND 
     126        help 
     127          Enable usage of parens '(' to specify logical order of arguments. 
     128 
     129config BUSYBOX_CONFIG_FEATURE_FIND_SIZE 
     130        bool "Enable (-size) option allowing matching for file size" 
     131        default y 
     132        depends on BUSYBOX_CONFIG_FIND 
     133        help 
     134          Support the 'find -size' option for searching by file size. 
     135 
     136config BUSYBOX_CONFIG_FEATURE_FIND_PRUNE 
     137        bool "Enable (-prune) option allowing to exclude subdirectories" 
     138        default y 
     139        depends on BUSYBOX_CONFIG_FIND 
     140        help 
     141          If the file is a directory, dont descend into it. Useful for 
     142          exclusion .svn and CVS directories. 
     143 
     144config BUSYBOX_CONFIG_FEATURE_FIND_DELETE 
     145        bool "Enable -delete option allowing to delete files" 
     146        default n 
     147        depends on BUSYBOX_CONFIG_FIND && BUSYBOX_CONFIG_FEATURE_FIND_DEPTH 
     148        help 
     149          Support the 'find -delete' option for deleting files and direcotries. 
     150          WARNING: This option can do much harm if used wrong. Busybox will not 
     151          try to protect the user from doing stupid things. Use with care. 
     152 
     153config BUSYBOX_CONFIG_FEATURE_FIND_PATH 
     154        bool "Enable -path option allowing to match pathname patterns" 
     155        default y 
     156        depends on BUSYBOX_CONFIG_FIND 
     157        help 
     158          The -path option matches whole pathname instead of just filename. 
     159 
     160config BUSYBOX_CONFIG_FEATURE_FIND_REGEX 
     161        bool "Enable -regex: match pathname to regex" 
     162        default y 
     163        depends on BUSYBOX_CONFIG_FIND 
     164        help 
     165          The -regex option matches whole pathname against regular expression. 
     166 
     167config BUSYBOX_CONFIG_FEATURE_FIND_CONTEXT 
     168        bool "Enable (-context) option for matching security context" 
     169        default n 
     170        depends on BUSYBOX_CONFIG_FIND && BUSYBOX_CONFIG_SELINUX 
     171        help 
     172          Support the 'find -context' option for matching security context. 
    85173 
    86174config BUSYBOX_CONFIG_GREP 
  • trunk/package/busybox/config/init/Config.in

    r6501 r9130  
    3838          behavour, but is often what you want in an embedded system where 
    3939          the console is only accessed during development or for maintenance. 
     40 
     41config BUSYBOX_CONFIG_FEATURE_INIT_SYSLOG 
     42        bool "Enable init to write to syslog" 
     43        default y 
     44        depends on BUSYBOX_CONFIG_INIT 
    4045 
    4146config BUSYBOX_CONFIG_FEATURE_EXTRA_QUIET 
  • trunk/package/busybox/config/libbb/Config.in

    r6501 r9130  
    2727          3 (smallest)        5.1                4912 
    2828 
     29config BUSYBOX_CONFIG_FEATURE_FAST_TOP 
     30        bool "Faster /proc scanning code (+100 bytes)" 
     31        default y 
     32        help 
     33          This option makes top (and ps) ~20% faster (or 20% less CPU hungry), 
     34          but code size is slightly bigger. 
     35 
     36config BUSYBOX_CONFIG_FEATURE_ETC_NETWORKS 
     37        bool "Support for /etc/networks" 
     38        default n 
     39        help 
     40          Enable support for network names in /etc/networks. This is 
     41          a rarely used feature which allows you to use names 
     42          instead of IP/mask pairs in route command. 
     43 
     44config BUSYBOX_CONFIG_FEATURE_EDITING 
     45        bool "Command line editing" 
     46        default y 
     47        help 
     48          Enable line editing (mainly for shell command line). 
     49 
     50config BUSYBOX_CONFIG_FEATURE_EDITING_MAX_LEN 
     51        int "Maximum length of input" 
     52        range 128 8192 
     53        default 512 
     54        depends on BUSYBOX_CONFIG_FEATURE_EDITING 
     55        help 
     56          Line editing code uses on-stack buffers for storage. 
     57          You may want to decrease this parameter if your target machine 
     58          benefits from smaller stack usage. 
     59 
     60config BUSYBOX_CONFIG_FEATURE_EDITING_FANCY_KEYS 
     61        bool "Additional editing keys" 
     62        default y 
     63        depends on BUSYBOX_CONFIG_FEATURE_EDITING 
     64        help 
     65          Enable additonal editing keys (Ctrl-E, Ctrl-U etc). 
     66          Arrow keys, Home/End/Delete and Ctrl-W work even without this option. 
     67 
     68config BUSYBOX_CONFIG_FEATURE_EDITING_VI 
     69        bool "vi-style line editing commands" 
     70        default n 
     71        depends on BUSYBOX_CONFIG_FEATURE_EDITING 
     72        help 
     73          Enable vi-style line editing.  In shells, this mode can be 
     74          turned on and off with "set -o vi" and "set +o vi". 
     75 
     76config BUSYBOX_CONFIG_FEATURE_EDITING_HISTORY 
     77        int "History size" 
     78        range 0 99999 
     79        default 256 
     80        depends on BUSYBOX_CONFIG_FEATURE_EDITING 
     81        help 
     82          Specify command history size. 
     83 
     84config BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY 
     85        bool "History saving" 
     86        default n 
     87        depends on BUSYBOX_CONFIG_ASH && BUSYBOX_CONFIG_FEATURE_EDITING 
     88        help 
     89          Enable history saving in ash shell. 
     90 
     91config BUSYBOX_CONFIG_FEATURE_TAB_COMPLETION 
     92        bool "Tab completion" 
     93        default y 
     94        depends on BUSYBOX_CONFIG_FEATURE_EDITING 
     95        help 
     96          Enable tab completion. 
     97 
     98config BUSYBOX_CONFIG_FEATURE_USERNAME_COMPLETION 
     99        bool "Username completion" 
     100        default n 
     101        depends on BUSYBOX_CONFIG_FEATURE_TAB_COMPLETION 
     102        help 
     103          Enable username completion. 
     104 
     105config BUSYBOX_CONFIG_FEATURE_EDITING_FANCY_PROMPT 
     106        bool "Fancy shell prompts" 
     107        default y 
     108        depends on BUSYBOX_CONFIG_FEATURE_EDITING 
     109        help 
     110          Setting this option allows for prompts to use things like \w and 
     111          \$ and escape codes. 
     112 
     113config BUSYBOX_CONFIG_MONOTONIC_SYSCALL 
     114        bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" 
     115        default n 
     116        help 
     117          Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring 
     118          time intervals (time, ping, traceroute etc need this). 
     119          Probably requires Linux 2.6+. If not selected, gettimeofday 
     120          will be used instead (which gives wrong results if date/time 
     121          is reset). 
     122 
     123config BUSYBOX_CONFIG_IOCTL_HEX2STR_ERROR 
     124        bool "Use ioctl names rather than hex values in error messages" 
     125        default y 
     126        help 
     127          Use ioctl names rather than hex values in error messages 
     128          (e.g. VT_DISALLOCATE rather than 0x5608). If disabled this 
     129          saves about 1400 bytes. 
    29130endmenu 
  • trunk/package/busybox/config/loginutils/Config.in

    r6501 r9130  
    6060          Utility for creating a new group account. 
    6161 
     62config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP 
     63        bool "Support for adding users to groups" 
     64        default n 
     65        depends on BUSYBOX_CONFIG_ADDGROUP 
     66        help 
     67          If  called  with two non-option arguments, 
     68          addgroup will add an existing user to an 
     69          existing group. 
     70 
    6271config BUSYBOX_CONFIG_DELGROUP 
    6372        bool "delgroup" 
     
    6574        help 
    6675          Utility for deleting a group account. 
     76 
     77config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP 
     78        bool "Support for removing users from groups." 
     79        default n 
     80        depends on BUSYBOX_CONFIG_DELGROUP 
     81        help 
     82          If called with two non-option arguments, deluser 
     83          or delgroup will remove an user from a specified group. 
    6784 
    6885config BUSYBOX_CONFIG_ADDUSER 
     
    112129          work properly. 
    113130 
     131config BUSYBOX_CONFIG_PAM 
     132        bool "Support for PAM (Pluggable Authentication Modules)" 
     133        default n 
     134        depends on BUSYBOX_CONFIG_LOGIN 
     135        help 
     136          Use PAM in login(1) instead of direct access to password database. 
     137 
    114138config BUSYBOX_CONFIG_LOGIN_SCRIPTS 
    115139        bool "Support for login scripts" 
     
    120144          just prior to switching from root to logged-in user. 
    121145 
     146config BUSYBOX_CONFIG_FEATURE_NOLOGIN 
     147        bool "Support for /etc/nologin" 
     148        default n 
     149        depends on BUSYBOX_CONFIG_LOGIN 
     150        help 
     151          The file /etc/nologin is used by (some versions of) login(1). 
     152          If it exists, non-root logins are prohibited. 
     153 
    122154config BUSYBOX_CONFIG_FEATURE_SECURETTY 
    123155        bool "Support for /etc/securetty" 
     
    125157        depends on BUSYBOX_CONFIG_LOGIN 
    126158        help 
    127           The file  /etc/securetty is used by (some versions of) login(1). 
     159          The file /etc/securetty is used by (some versions of) login(1). 
    128160          The file contains the device names of tty lines (one per line, 
    129161          without leading /dev/) on which root is allowed to login. 
     
    150182          With this option passwd will refuse new passwords which are "weak". 
    151183 
     184config BUSYBOX_CONFIG_CRYPTPW 
     185        bool "cryptpw" 
     186        default n 
     187        help 
     188          Applet for crypting a string. 
     189 
     190config BUSYBOX_CONFIG_CHPASSWD 
     191       bool "chpasswd" 
     192       default n 
     193       help 
     194         chpasswd  reads  a  file  of user name and password pairs from 
     195         standard input and uses this information to update a group of 
     196         existing users. 
     197 
    152198config BUSYBOX_CONFIG_SU 
    153199        bool "su" 
  • trunk/package/busybox/config/miscutils/Config.in

    r7157 r9130  
    1919          The bbconfig applet will print the config file with which 
    2020          busybox was built. 
     21 
     22config BUSYBOX_CONFIG_CHRT 
     23        bool "chrt" 
     24        default n 
     25        help 
     26          manipulate real-time attributes of a process. 
     27          This requires sched_{g,s}etparam support in your libc. 
    2128 
    2229config BUSYBOX_CONFIG_CROND 
     
    257264          devices of a particluar type to be created per command. 
    258265          e.g. /dev/hda[0-9] 
    259           Device properties are passed as command line arguments. 
     266          Device properties are passed as command line arguments. 
    260267          . 
    261268          'table' reads device properties from a file or stdin, allowing 
    262269          a batch of unrelated devices to be made with one command. 
    263           User/group names are allowed as an alternative to uid/gid. 
     270          User/group names are allowed as an alternative to uid/gid. 
    264271 
    265272choice 
    266273        prompt "Choose makedevs behaviour" 
    267         depends BUSYBOX_CONFIG_MAKEDEVS 
     274        depends on BUSYBOX_CONFIG_MAKEDEVS 
    268275        default BUSYBOX_CONFIG_FEATURE_MAKEDEVS_TABLE 
    269276 
    270277config BUSYBOX_CONFIG_FEATURE_MAKEDEVS_LEAF 
    271         bool "leaf" 
     278        bool "leaf" 
    272279 
    273280config BUSYBOX_CONFIG_FEATURE_MAKEDEVS_TABLE 
     
    290297          files on the tape. 
    291298 
    292 config BUSYBOX_CONFIG_NMETER 
    293         bool "nmeter" 
    294         default n 
    295         help 
    296           nmeter prints various system parameters continuously. 
    297  
    298299config BUSYBOX_CONFIG_RAIDAUTORUN 
    299300        bool "raidautorun" 
     
    304305 
    305306config BUSYBOX_CONFIG_READAHEAD 
    306         bool "readahead" 
    307         default n 
    308         depends on LFS 
    309         help 
    310           Preload the files listed on the command line into RAM cache so that 
     307        bool "readahead" 
     308        default n 
     309        depends on BUSYBOX_CONFIG_LFS 
     310        help 
     311          Preload the files listed on the command line into RAM cache so that 
    311312          subsequent reads on these files will not block on disk I/O. 
    312313 
     
    321322 
    322323config BUSYBOX_CONFIG_RUNLEVEL 
    323         bool "runlevel" 
    324         default n 
    325         help 
    326           find the current and previous system runlevel. 
     324        bool "runlevel" 
     325        default n 
     326        help 
     327          find the current and previous system runlevel. 
    327328 
    328329          This applet uses utmp but does not rely on busybox supporing 
     
    330331 
    331332config BUSYBOX_CONFIG_RX 
    332         bool "rx" 
    333         default n 
    334         help 
    335           Receive files using the Xmodem protocol. 
     333        bool "rx" 
     334        default n 
     335        help 
     336          Receive files using the Xmodem protocol. 
    336337 
    337338config BUSYBOX_CONFIG_STRINGS 
     
    371372          When the command finishes, time writes a message to standard output 
    372373          giving timing statistics about this program run. 
     374 
     375config BUSYBOX_CONFIG_TTYSIZE 
     376        bool "ttysize" 
     377        default n 
     378        help 
     379          A replacement for "stty size". Unlike stty, can report only width, 
     380          only height, or both, in any order. It also does not complain on error, 
     381          but returns default 80x24. Usage in shell scripts: width=`ttysize w`. 
    373382 
    374383config BUSYBOX_CONFIG_WATCHDOG 
  • trunk/package/busybox/config/modutils/Config.in

    r6501 r9130  
    135135        # Simulate indentation 
    136136        bool "Support version 2.2.x to 2.4.x Linux kernels" 
    137         default y 
     137        default n 
    138138        depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE 
    139139        help 
  • trunk/package/busybox/config/networking/Config.in

    r6547 r9130  
    1313          This adds IPv6 support in the networking applets. 
    1414 
     15config BUSYBOX_CONFIG_VERBOSE_RESOLUTION_ERRORS 
     16        bool "Verbose resolution errors" 
     17        default y 
     18        help 
     19          Enable if you are not satisfied with simplistic 
     20          "can't resolve 'hostname.com'" and want to know more. 
     21          This may increase size of your executable a bit. 
     22 
    1523config BUSYBOX_CONFIG_ARP 
    1624        bool "arp" 
    1725        default n 
    1826        help 
    19           Manipulate the system ARP cache 
     27          Manipulate the system ARP cache. 
    2028 
    2129config BUSYBOX_CONFIG_ARPING 
     
    2331        default y 
    2432        help 
    25           Ping hosts by ARP packets 
     33          Ping hosts by ARP packets. 
    2634 
    2735config BUSYBOX_CONFIG_DNSD 
     
    6876        default n 
    6977        help 
    70           Show or set the system's host name 
     78          Show or set the system's host name. 
    7179 
    7280config BUSYBOX_CONFIG_HTTPD 
     
    7583        help 
    7684          Serve web pages via an HTTP server. 
     85 
     86config BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE 
     87        bool "Use sendfile system call" 
     88        default y 
     89        depends on BUSYBOX_CONFIG_HTTPD 
     90        help 
     91          When enabled, httpd will use the kernel sendfile() function 
     92          instead of read/write loop. 
    7793 
    7894config BUSYBOX_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP 
     
    133149          This option enables support for running scripts through an 
    134150          interpreter. Turn this on if you want PHP scripts to work 
    135           properly. You need to supply an addition line in your httpd 
     151          properly. You need to supply an additional line in your httpd 
    136152          config file: 
    137153          *.php:/path/to/your/php 
     
    155171          "&#60Hello&#32World&#62". 
    156172 
     173config BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES 
     174        bool "Enable support for custom error pages" 
     175        default y 
     176        depends on BUSYBOX_CONFIG_HTTPD 
     177        help 
     178          This option allows you to define custom error pages in 
     179          the configuration file instead of the default HTTP status 
     180          error pages. For instance, if you add the line: 
     181                E404:/path/e404.html 
     182          in the config file, the server will respond the specified 
     183          '/path/e404.html' file instead of the terse '404 NOT FOUND' 
     184          message. 
     185 
    157186config BUSYBOX_CONFIG_IFCONFIG 
    158187        bool "ifconfig" 
     
    205234        bool "ifupdown" 
    206235        default n 
    207         select BUSYBOX_CONFIG_RUN_PARTS 
    208236        help 
    209237          Activate or deactivate the specified interfaces.  This applet makes 
     
    216244          of support questions on the mailing list), I do not force you to 
    217245          enable these additional options.  It is up to you to supply either 
    218           "ifconfig" and "route" or the "ip" command, either via busybox or via 
    219           standalone utilities. 
     246          "ifconfig", "route" and "run-parts" or the "ip" command, either 
     247          via busybox or via standalone utilities. 
     248 
     249config BUSYBOX_CONFIG_IFUPDOWN_IFSTATE_PATH 
     250        string "Absolute path to ifstate file" 
     251        default "/var/run/ifstate" 
     252        help 
     253          ifupdown keeps state information in a file called ifstate. 
     254          Typically it is located in /var/run/ifstate, however 
     255          some distributions tend to put it in other places 
     256          (debian, for example, uses /etc/network/run/ifstate). 
     257          This config option defines location of ifstate. 
    220258 
    221259config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP 
     
    260298        depends on BUSYBOX_CONFIG_IFUPDOWN 
    261299        help 
    262           If you want busybox to talk IPv4, leave this on. 
     300          If you want ifup/ifdown to talk IPv4, leave this on. 
    263301 
    264302config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV6 
     
    269307          If you need support for IPv6, turn this option on. 
    270308 
    271 config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPX 
    272         bool "Enable support for IPX" 
    273         default n 
    274         depends on BUSYBOX_CONFIG_IFUPDOWN 
    275         help 
    276           If this option is selected you can use busybox to work with IPX 
    277           networks. 
     309### UNUSED 
     310### config FEATURE_IFUPDOWN_IPX 
     311###     bool "Enable support for IPX" 
     312###     default n 
     313###     depends on IFUPDOWN 
     314###     help 
     315###       If this option is selected you can use busybox to work with IPX 
     316###       networks. 
    278317 
    279318config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_MAPPING 
     
    285324          a weird network setup you don't need it. 
    286325 
     326config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP 
     327        bool "Enable support for external dhcp clients" 
     328        default n 
     329        depends on BUSYBOX_CONFIG_IFUPDOWN 
     330        help 
     331          This enables support for the external dhcp clients. Clients are 
     332          tried in the following order: dhcpcd, dhclient, pump and udhcpc. 
     333          Otherwise, if udhcpc applet is enabled, it is used. 
     334          Otherwise, ifup/ifdown will have no support for DHCP. 
     335 
    287336config BUSYBOX_CONFIG_INETD 
    288337        bool "inetd" 
     
    331380        default n 
    332381        depends on BUSYBOX_CONFIG_INETD 
    333         depends on BUSYBOX_CONFIG_FEATURE_HAVE_RPC 
     382        select BUSYBOX_CONFIG_FEATURE_HAVE_RPC 
    334383        help 
    335384          Support Sun-RPC based services 
     
    388437          ip route  -> iproute 
    389438          ip tunnel -> iptunnel 
     439          ip rule   -> iprule 
    390440 
    391441          Say N unless you desparately need the short form of the ip 
     
    467517 
    468518config BUSYBOX_CONFIG_NC_SERVER 
    469         bool "Netcat server options (-lp)" 
     519        bool "Netcat server options (-l)" 
    470520        default n 
    471521        depends on BUSYBOX_CONFIG_NC 
     
    488538          netstat prints information about the Linux networking subsystem. 
    489539 
     540config BUSYBOX_CONFIG_FEATURE_NETSTAT_WIDE 
     541        bool "  Enable wide netstat output" 
     542        default y 
     543        depends on BUSYBOX_CONFIG_NETSTAT 
     544        help 
     545          Add support for wide columns. Useful when displaying IPv6 addresses 
     546          (-W option). 
     547 
    490548config BUSYBOX_CONFIG_NSLOOKUP 
    491549        bool "nslookup" 
     
    501559          elicit an ICMP ECHO_RESPONSE from a host or gateway. 
    502560 
     561config BUSYBOX_CONFIG_PING6 
     562        bool "ping6" 
     563        default y 
     564        depends on BUSYBOX_CONFIG_FEATURE_IPV6 && BUSYBOX_CONFIG_PING 
     565        help 
     566          This will give you a ping that can talk IPv6. 
     567 
     568config BUSYBOX_CONFIG_PSCAN 
     569        bool "pscan" 
     570        default n 
     571        help 
     572          Simple network port scanner. 
     573 
    503574config BUSYBOX_CONFIG_FEATURE_FANCY_PING 
    504575        bool "Enable fancy ping output" 
     
    509580          same time provide full support for ICMP packets. 
    510581 
    511 config BUSYBOX_CONFIG_PING6 
    512         bool "ping6" 
    513         default y 
    514         depends on BUSYBOX_CONFIG_FEATURE_IPV6 
    515         help 
    516           This will give you a ping that can talk IPv6. 
    517  
    518 config BUSYBOX_CONFIG_FEATURE_FANCY_PING6 
    519         bool "Enable fancy ping6 output" 
    520         default y 
    521         depends on BUSYBOX_CONFIG_PING6 
    522         help 
    523           Make the output from the ping6 applet include statistics, and at the 
    524           same time provide full support for ICMP packets. 
    525  
    526582config BUSYBOX_CONFIG_ROUTE 
    527583        bool "route" 
     
    529585        help 
    530586          Route displays or manipulates the kernel's IP routing tables. 
     587 
     588config BUSYBOX_CONFIG_SLATTACH 
     589        bool "slattach" 
     590        default n 
     591        help 
     592          slattach is a small utility to attach network interfaces to serial lines. 
    531593 
    532594config BUSYBOX_CONFIG_TELNET 
     
    704766          Support authenticated HTTP transfers. 
    705767 
    706 config BUSYBOX_CONFIG_FEATURE_WGET_IP6_LITERAL 
    707         bool "Enable IPv6 literal addresses" 
    708         default y 
    709         depends on BUSYBOX_CONFIG_WGET && BUSYBOX_CONFIG_FEATURE_IPV6 
    710         help 
    711           Support IPv6 address literal notation in URLs. 
    712  
    713768config BUSYBOX_CONFIG_FEATURE_WGET_LONG_OPTIONS 
    714769        bool "Enable long options" 
  • trunk/package/busybox/config/networking/udhcp/Config.in

    r6501 r9130  
    3333          See http://udhcp.busybox.net for further details. 
    3434 
     35config BUSYBOX_CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY 
     36        bool "Rewrite the lease file at every new acknowledge" 
     37        default n 
     38        depends on BUSYBOX_CONFIG_APP_UDHCPD 
     39        help 
     40          If selected, udhcpd will write a new file with leases every 
     41          time a new lease has been accepted, thus eleminating the need 
     42          to send SIGUSR1 for the initial writing, or updating. Any timed 
     43          rewriting remains undisturbed 
     44 
    3545config BUSYBOX_CONFIG_APP_UDHCPC 
    3646        bool "udhcp Client (udhcpc)" 
     
    4252          The udhcp client negotiates a lease with the DHCP server and 
    4353          notifies a set of scripts when a lease is obtained or lost. 
    44  
    45           See http://udhcp.busybox.net for further details. 
    46  
    47 config BUSYBOX_CONFIG_FEATURE_UDHCP_SYSLOG 
    48         bool "Log udhcp messages to syslog" 
    49         default n 
    50         depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC 
    51         select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    52         help 
    53           If not daemonized, udhcpd prints its messages to stdout/stderr. 
    54           If this option is selected, it will also log them to syslog. 
    5554 
    5655          See http://udhcp.busybox.net for further details. 
     
    6665 
    6766          See http://udhcp.busybox.net for further details. 
     67 
     68config BUSYBOX_CONFIG_FEATURE_RFC3397 
     69        bool "Support for RFC3397 domain search (experimental)" 
     70        default y 
     71        depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC 
     72        help 
     73          If selected, both client and server will support passing of domain 
     74          search lists via option 119, specified in RFC3397. 
  • trunk/package/busybox/config/procps/Config.in

    r8946 r9130  
    4444        depends on BUSYBOX_CONFIG_KILL 
    4545 
     46config BUSYBOX_CONFIG_NMETER 
     47        bool "nmeter" 
     48        default n 
     49        help 
     50          Prints selected system stats continuously, one line per update. 
     51 
    4652config BUSYBOX_CONFIG_PIDOF 
    4753        bool "pidof" 
     
    7581config BUSYBOX_CONFIG_FEATURE_PS_WIDE 
    7682        bool "Enable argument for wide output (-w)" 
    77         default y 
     83        default n 
    7884        depends on BUSYBOX_CONFIG_PS 
    7985        help 
     
    103109 
    104110config BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE 
    105         bool "Support showing CPU usage percentage (add 2k bytes)" 
     111        bool "Show CPU per-process usage percentage (adds 2k bytes)" 
    106112        default y 
    107113        depends on BUSYBOX_CONFIG_TOP 
    108114        help 
    109           Make top display CPU usage. 
     115          Make top display CPU usage for each process. 
     116 
     117config BUSYBOX_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS 
     118        bool "Show CPU global usage percentage (adds 0.5k bytes)" 
     119        default y 
     120        depends on BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE 
     121        help 
     122          Makes top display "CPU: NN% usr NN% sys..." line. 
     123 
     124config BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS 
     125        bool "Show 1/10th of a percent in CPU/mem statistics (adds 0.3k bytes)" 
     126        default n 
     127        depends on BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE 
     128        help 
     129          Show 1/10th of a percent in CPU/mem statistics. 
    110130 
    111131config BUSYBOX_CONFIG_UPTIME 
     
    117137          on, and the system load averages for the past 1, 5, and 15 minutes. 
    118138 
     139config BUSYBOX_CONFIG_WATCH 
     140        bool "watch" 
     141        default n 
     142        #huh?? select DATE 
     143        help 
     144          watch is used to execute a program periodically, showing 
     145          output to the screen. 
     146 
    119147 
    120148endmenu 
  • trunk/package/busybox/config/shell/Config.in

    r6501 r9130  
    8888config BUSYBOX_CONFIG_ASH_MATH_SUPPORT_64 
    8989        bool "Extend Posix math support to 64 bit" 
    90         default n 
     90        default y 
    9191        depends on BUSYBOX_CONFIG_ASH_MATH_SUPPORT 
    9292        help 
     
    108108        depends on BUSYBOX_CONFIG_ASH 
    109109        help 
    110           Enable support for echo, built in to ash. 
     110          Enable support for echo, builtin to ash. 
    111111 
    112112config BUSYBOX_CONFIG_ASH_BUILTIN_TEST 
     
    116116        depends on BUSYBOX_CONFIG_ASH 
    117117        help 
    118           Enable support for test, built in to ash. 
     118          Enable support for test, builtin to ash. 
    119119 
    120120config BUSYBOX_CONFIG_ASH_CMDCMD 
     
    136136config BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE 
    137137        bool "Optimize for size instead of speed" 
    138         default y 
     138        default n 
    139139        depends on BUSYBOX_CONFIG_ASH 
    140140        help 
     
    154154config BUSYBOX_CONFIG_ASH_EXPAND_PRMT 
    155155        bool "Expand prompt string" 
    156         default n 
     156        default y 
    157157        depends on BUSYBOX_CONFIG_ASH 
    158158        help 
     
    177177          expansion, &> and >& redirection of stdout+stderr, etc. 
    178178 
     179config BUSYBOX_CONFIG_HUSH_HELP 
     180        bool "help builtin" 
     181        default n 
     182        depends on BUSYBOX_CONFIG_HUSH 
     183        help 
     184          Enable help builtin in hush. Code size + ~1 kbyte. 
     185 
     186config BUSYBOX_CONFIG_HUSH_INTERACTIVE 
     187        bool "Interactive mode" 
     188        default n 
     189        depends on BUSYBOX_CONFIG_HUSH 
     190        help 
     191          Enable interactive mode (prompt and command editing). 
     192          Without this, hush simply reads and executes commands 
     193          from stdin just like a shell script from the file. 
     194          No prompt, no PS1/PS2 magic shell variables. 
     195 
     196config BUSYBOX_CONFIG_HUSH_JOB 
     197        bool "Job control" 
     198        default n 
     199        depends on BUSYBOX_CONFIG_HUSH_INTERACTIVE 
     200        help 
     201          Enable job control: Ctrl-Z backgrounds, Ctrl-C interrupts current 
     202          command (not entire shell), fg/bg builtins work. Without this option, 
     203          "cmd &" still works by simply spawning a process and immediately 
     204          prompting for next command (or executing next command in a script), 
     205          but no separate process group is formed. 
     206 
     207config BUSYBOX_CONFIG_HUSH_TICK 
     208        bool "Process substitution" 
     209        default n 
     210        depends on BUSYBOX_CONFIG_HUSH 
     211        help 
     212          Enable process substitution `command` and $(command) in hush. 
     213 
     214config BUSYBOX_CONFIG_HUSH_IF 
     215        bool "Support if/then/elif/else/fi" 
     216        default n 
     217        depends on BUSYBOX_CONFIG_HUSH 
     218        help 
     219          Enable if/then/elif/else/fi in hush. 
     220 
     221config BUSYBOX_CONFIG_HUSH_LOOPS 
     222        bool "Support for, while and until loops" 
     223        default n 
     224        depends on BUSYBOX_CONFIG_HUSH 
     225        help 
     226          Enable for, while and until loops in hush. 
    179227 
    180228config BUSYBOX_CONFIG_LASH 
     
    217265          Remove the busybox introduction when starting a shell. 
    218266 
    219 config BUSYBOX_CONFIG_FEATURE_SH_STANDALONE_SHELL 
     267config BUSYBOX_CONFIG_FEATURE_SH_STANDALONE 
    220268        bool "Standalone shell" 
    221269        default n 
    222         depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH 
    223         help 
    224           This option causes the selected busybox shell to use busybox applets 
     270        depends on (BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH) && BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS 
     271        help 
     272          This option causes busybox shells to use busybox applets 
    225273          in preference to executables in the PATH whenever possible.  For 
    226274          example, entering the command 'ifconfig' into the shell would cause 
     
    231279          for use as a rescue shell, in the event that you screw up your system. 
    232280 
    233           Note that this will *also* cause applets to take precedence 
    234           over shell builtins of the same name.  So turning this on will 
    235           eliminate any performance gained by turning on the builtin "echo" 
    236           and "test" commands in ash. 
    237  
    238           Note that when using this option, the shell will attempt to directly 
    239           run '/bin/busybox'.  If you do not have the busybox binary sitting in 
    240           that exact location with that exact name, this option will not work at 
    241           all. 
    242  
    243 config BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING 
    244         bool "Command line editing" 
    245         default y 
    246         depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH 
    247         help 
    248           Enable command editing in shell. 
    249  
    250 config BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING_VI 
    251         bool "vi-style line editing commands" 
    252         default n 
    253         depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING 
    254         help 
    255           Enable vi-style line editing in the shell.  This mode can be 
    256           turned on and off with "set -o vi" and "set +o vi". 
    257  
    258 config BUSYBOX_CONFIG_FEATURE_COMMAND_HISTORY 
    259         int "History size" 
    260         range 0 99999 
    261         default 15 
    262         depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING 
    263         help 
    264           Specify command history size in shell. 
    265  
    266 config BUSYBOX_CONFIG_FEATURE_COMMAND_SAVEHISTORY 
    267         bool "History saving" 
    268         default n 
    269         depends on BUSYBOX_CONFIG_ASH && BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING 
    270         help 
    271           Enable history saving in ash shell. 
    272  
    273 config BUSYBOX_CONFIG_FEATURE_COMMAND_TAB_COMPLETION 
    274         bool "Tab completion" 
    275         default y 
    276         depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING 
    277         help 
    278           Enable tab completion in shell. 
    279  
    280 config BUSYBOX_CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION 
    281         bool "Username completion" 
    282         default n 
    283         depends on BUSYBOX_CONFIG_FEATURE_COMMAND_TAB_COMPLETION 
    284         help 
    285           Enable username completion in shell. 
    286  
    287 config BUSYBOX_CONFIG_FEATURE_SH_FANCY_PROMPT 
    288         bool "Fancy shell prompts" 
    289         default y 
    290         depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING 
    291         help 
    292           Setting this option allows for prompts to use things like \w and 
    293           \$ and also using escape codes. 
     281          This is implemented by re-execing /proc/self/exe (typically) 
     282          with right parameters. Some selected applets ("NOFORK" applets) 
     283          can even be executed without creating new process. 
     284          Instead, busybox will call <applet>_main() internally. 
     285 
     286          However, this causes problems in chroot jails without mounted /proc 
     287          and with ps/top (command name can be shown as 'exe' for applets 
     288          started this way). 
     289# untrue? 
     290#         Note that this will *also* cause applets to take precedence 
     291#         over shell builtins of the same name.  So turning this on will 
     292#         eliminate any performance gained by turning on the builtin "echo" 
     293#         and "test" commands in ash. 
     294# untrue? 
     295#         Note that when using this option, the shell will attempt to directly 
     296#         run '/bin/busybox'.  If you do not have the busybox binary sitting in 
     297#         that exact location with that exact name, this option will not work at 
     298#         all. 
     299 
     300config BUSYBOX_CONFIG_CTTYHACK 
     301        bool "cttyhack" 
     302        default n 
     303        help 
     304          One common problem reported on the mailing list is "can't access tty; 
     305          job control turned off" error message which typically appears when 
     306          one tries to use shell with stdin/stdout opened to /dev/console. 
     307          This device is special - it cannot be a controlling tty. 
     308 
     309          Proper solution is to use correct device instead of /dev/console. 
     310 
     311          cttyhack provides "quick and dirty" solution to this problem. 
     312          It analyzes stdin with various ioctls, trying to determine whether 
     313          it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line). 
     314          If it detects one, it closes stdin/out/err and reopens that device. 
     315          Then it executes given program. Usage example for /etc/inittab 
     316          (for busybox init): 
     317 
     318          ::respawn:/bin/cttyhack /bin/sh 
    294319 
    295320endmenu 
  • trunk/package/busybox/config/sysklogd/Config.in

    r6501 r9130  
    6060        int "    Circular buffer size in Kbytes (minimum 4KB)" 
    6161        default 16 
     62        range 4 2147483647 
    6263        depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG 
    6364        help 
     
    8990        bool "klogd" 
    9091        default y 
    91         depends on BUSYBOX_CONFIG_SYSLOGD 
    92         select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    9392        help 
    9493          klogd is a utility which intercepts and logs all 
  • trunk/package/busybox/config/util-linux/Config.in

    r6512 r9130  
    128128        bool "Support SUN disklabels" 
    129129        default n 
    130         depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE 
     130        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE 
    131131        help 
    132132          Enabling this option allows you to create or change SUN disklabels. 
     
    182182 
    183183comment "Minix filesystem support" 
    184     depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX 
     184        depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX 
    185185 
    186186config BUSYBOX_CONFIG_FEATURE_MINIX2 
     
    270270        default n 
    271271        help 
    272           mdev is a mini-udev implementation: call it with -s to populate 
    273           /dev from /sys, then "echo /sbin/mdev > /proc/sys/kernel/hotplug" to 
    274           have it handle hotplug events afterwards.  Device names are taken 
    275           from sysfs. 
     272          mdev is a mini-udev implementation for dynamically creating device 
     273          nodes in the /dev directory. 
     274 
     275          For more information, please see docs/mdev.txt 
    276276 
    277277config BUSYBOX_CONFIG_FEATURE_MDEV_CONF 
     
    280280        depends on BUSYBOX_CONFIG_MDEV 
    281281        help 
    282           The mdev config file contains lines that look like: 
    283  
    284             hd[a-z][0-9]* 0:3 660 
    285  
    286           That's device name (with regex match), uid:gid, and permissions. 
    287  
    288           Config file parsing stops on the first matching line.  If no config 
    289           entry is matched, devices are created with default 0:0 660.  (Make 
    290           the last line match .* to override this.) 
     282          Add support for the mdev config file to control ownership and 
     283          permissions of the device nodes. 
     284 
     285          For more information, please see docs/mdev.txt 
    291286 
    292287config BUSYBOX_CONFIG_FEATURE_MDEV_EXEC 
     
    295290        depends on BUSYBOX_CONFIG_FEATURE_MDEV_CONF 
    296291        help 
    297           This adds support for an optional field to /etc/mdev.conf, consisting 
    298           of a special character and a command line to run after creating the 
    299           corresponding device(s) and before removing, ala: 
    300  
    301             hdc root:cdrom 660  *ln -s $MDEV cdrom 
    302  
    303           The $MDEV environment variable is set to the name of the device. 
    304  
    305           The special characters and their meanings are: 
    306             @ Run after creating the device. 
    307             $ Run before removing the device. 
    308             * Run both after creating and before removing the device. 
    309  
    310           Commands are executed via system() so you need /bin/sh, meaning you 
    311           probably want to select a default shell in the Shells menu. 
     292          This adds support for an optional field to /etc/mdev.conf for 
     293          executing commands when devices are created/removed. 
     294 
     295          For more information, please see docs/mdev.txt 
     296 
     297config BUSYBOX_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE 
     298        bool "Support loading of firmwares" 
     299        default n 
     300        depends on BUSYBOX_CONFIG_MDEV 
     301        help 
     302          Some devices need to load firmware before they can be usable. 
     303 
     304          These devices will request userspace look up the files in 
     305          /lib/firmware/ and if it exists, send it to the kernel for 
     306          loading into the hardware. 
    312307 
    313308config BUSYBOX_CONFIG_MKSWAP 
     
    370365        default y 
    371366        depends on BUSYBOX_CONFIG_MOUNT 
    372         depends on BUSYBOX_CONFIG_FEATURE_HAVE_RPC 
     367        select BUSYBOX_CONFIG_FEATURE_HAVE_RPC 
    373368        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    374369        help 
     
    496491 
    497492          You can still use the 'losetup' utility (to manually associate files 
    498           with loop devices) if you need to do something advanced, such as 
     493          with loop devices) if you need to do something advanced, such as 
    499494          specify an offset or cryptographic options to the loopback device. 
    500495          (If you don't want umount to free the loop device, use "umount -D".) 
  • trunk/package/busybox/patches/000-autoconf.patch

    r7887 r9130  
    1 Index: busybox-1.4.2/applets/Kbuild 
     1Index: busybox-1.7.2/applets/Kbuild 
    22=================================================================== 
    3 --- busybox-1.4.2.orig/applets/Kbuild   2007-06-04 13:21:32.429046704 +0200 
    4 +++ busybox-1.4.2/applets/Kbuild        2007-06-04 13:21:32.495036672 +0200 
    5 @@ -10,6 +10,7 @@ 
     3--- busybox-1.7.2.orig/applets/Kbuild   2007-10-04 14:30:23.484330073 +0200 
     4+++ busybox-1.7.2/applets/Kbuild        2007-10-04 14:33:47.751970627 +0200 
     5@@ -20,6 +20,6 @@ 
     6 HOSTCFLAGS_usage.o = -I$(srctree)/include 
    67  
    7  # Generated file needs additional love 
    8   
    9 +applets/usage: include/autoconf.h 
    10  applets/applets.o: include/usage_compressed.h 
    11   
    12  hostprogs-y += usage 
     8 applets/applets.o:          include/usage_compressed.h 
     9-applets/usage:              .config $(srctree)/applets/usage_compressed 
     10-include/usage_compressed.h: applets/usage $(srctree)/applets/usage_compressed 
     11+applets/usage:              .config $(srctree)/applets/usage_compressed include/autoconf.h 
     12+include/usage_compressed.h: applets/usage $(srctree)/applets/usage_compressed include/autoconf.h 
     13        $(call cmd,gen_usage_compressed) 
  • trunk/package/busybox/patches/110-wget_getopt_fix.patch

    r7490 r9130  
    1 Index: busybox-1.4.2/networking/wget.c 
     1Index: busybox-1.7.2/networking/wget.c 
    22=================================================================== 
    3 --- busybox-1.4.2.orig/networking/wget.c        2007-06-04 13:21:32.408049896 +0200 
    4 +++ busybox-1.4.2/networking/wget.c     2007-06-04 13:21:32.681008400 +0200 
    5 @@ -136,7 +136,7 @@ 
    6                 { "directory-prefix", required_argument, NULL, 'P' }, 
    7                 { "proxy",            required_argument, NULL, 'Y' }, 
    8                 { "user-agent",       required_argument, NULL, 'U' }, 
    9 -               { "passive-ftp",      no_argument, NULL, 0xff }, 
    10 +               { "passive-ftp",      no_argument, NULL, 0xfd }, 
    11                 { "header",           required_argument, NULL, 0xfe }, 
    12                 { 0, 0, 0, 0 } 
    13         }; 
     3--- busybox-1.7.2.orig/networking/wget.c        2007-10-04 14:35:17.057059834 +0200 
     4+++ busybox-1.7.2/networking/wget.c     2007-10-04 14:35:27.013627222 +0200 
     5@@ -140,7 +140,7 @@ 
     6                "directory-prefix\0" Required_argument "P" 
     7                "proxy\0"            Required_argument "Y" 
     8                "user-agent\0"       Required_argument "U" 
     9-               "passive-ftp\0"      No_argument       "\xff" 
     10+               "passive-ftp\0"      No_argument       "\xfd" 
     11                "header\0"           Required_argument "\xfe" 
     12                ; 
     13        applet_long_options = wget_longopts; 
  • trunk/package/busybox/patches/243-udhcpc_changed_ifindex.patch

    r8025 r9130  
    1 Index: busybox-1.4.2/networking/udhcp/dhcpc.c 
     1Index: busybox-1.7.2/networking/udhcp/dhcpc.c 
    22=================================================================== 
    3 --- busybox-1.4.2.orig/networking/udhcp/dhcpc.c 2007-07-18 10:07:20.161035443 +0200 
    4 +++ busybox-1.4.2/networking/udhcp/dhcpc.c      2007-07-18 10:09:15.515609124 +0200 
    5 @@ -273,6 +273,12 @@ 
    6                 tv.tv_sec = timeout - uptime(); 
     3--- busybox-1.7.2.orig/networking/udhcp/dhcpc.c 2007-10-04 14:36:41.521873204 +0200 
     4+++ busybox-1.7.2/networking/udhcp/dhcpc.c      2007-10-04 14:38:28.231954268 +0200 
     5@@ -309,6 +309,12 @@ 
     6  jump_in: 
    77                tv.tv_usec = 0; 
    88  
     
    1313+               read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.arp); 
    1414+ 
    15                 if (listen_mode != LISTEN_NONE && fd < 0) { 
     15                if (listen_mode != LISTEN_NONE && sockfd < 0) { 
    1616                        if (listen_mode == LISTEN_KERNEL) 
    17                                 fd = listen_socket(INADDR_ANY, CLIENT_PORT, client_config.interface); 
     17                                sockfd = listen_socket(/*INADDR_ANY,*/ CLIENT_PORT, client_config.interface); 
  • trunk/package/busybox/patches/250-ash_export-n.patch

    r7490 r9130  
    1 Index: busybox-1.4.2/shell/ash.c 
     1Index: busybox-1.7.2/shell/ash.c 
    22=================================================================== 
    3 --- busybox-1.4.2.orig/shell/ash.c      2007-06-04 13:21:32.248074216 +0200 
    4 +++ busybox-1.4.2/shell/ash.c   2007-06-04 13:21:34.000807760 +0200 
    5 @@ -12237,9 +12237,18 @@ 
     3--- busybox-1.7.2.orig/shell/ash.c      2007-09-03 13:48:38.000000000 +0200 
     4+++ busybox-1.7.2/shell/ash.c   2007-10-04 14:47:41.607489342 +0200 
     5@@ -11310,8 +11310,18 @@ 
    66        const char *p; 
    77        char **aptr; 
    88        int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT; 
    99+       int mask = ~0; 
    10         int notp; 
     10+       int nopt; 
    1111  
    12 -       notp = nextopt("p") - 'p'; 
    13 +       while ((notp = nextopt("np"))) { 
    14 +               if (notp == 'n') { 
     12-       if (nextopt("p") != 'p') { 
     13+       while ((nopt = nextopt("np"))) { 
     14+               if (nopt == 'n') { 
    1515+                               mask = ~flag; 
    1616+               } else { /* p */ 
     
    1919+       } 
    2020+ 
    21 +       notp -= 'p'; 
    22         if (notp && ((name = *(aptr = argptr)))) { 
    23                 do { 
    24                         if ((p = strchr(name, '=')) != NULL) { 
    25 @@ -12247,10 +12256,11 @@ 
    26                         } else { 
    27                                 if ((vp = *findvar(hashvar(name), name))) { 
    28                                         vp->flags |= flag; 
    29 +                                       vp->flags &= mask; 
    30                                         continue; 
     21+       if (nopt != 'p') { 
     22                aptr = argptr; 
     23                name = *aptr; 
     24                if (name) { 
     25@@ -11323,10 +11333,11 @@ 
     26                                        vp = *findvar(hashvar(name), name); 
     27                                        if (vp) { 
     28                                                vp->flags |= flag; 
     29+                                               vp->flags &= mask; 
     30                                                continue; 
     31                                        } 
    3132                                } 
    32                         } 
    33 -                       setvar(name, p, flag); 
    34 +                       setvar(name, p, flag & mask); 
    35                 } while ((name = *++aptr) != NULL); 
    36         } else { 
    37                 showvars(argv[0], flag, 0); 
     33-                               setvar(name, p, flag); 
     34+                               setvar(name, p, flag & mask); 
     35                        } while ((name = *++aptr) != NULL); 
     36                        return 0; 
     37                } 
  • trunk/package/busybox/patches/310-passwd_access.patch

    r7490 r9130  
    22        Copyright (C) 2006 OpenWrt.org 
    33 
    4 Index: busybox-1.4.2/networking/httpd.c 
     4Index: busybox-1.7.2/networking/httpd.c 
    55=================================================================== 
    6 --- busybox-1.4.2.orig/networking/httpd.c       2007-06-04 13:21:32.190083032 +0200 
    7 +++ busybox-1.4.2/networking/httpd.c    2007-06-04 13:21:34.401746808 +0200 
    8 @@ -1402,12 +1402,26 @@ 
     6--- busybox-1.7.2.orig/networking/httpd.c       2007-09-30 01:54:12.000000000 +0200 
     7+++ busybox-1.7.2/networking/httpd.c    2007-10-04 14:59:20.287304836 +0200 
     8@@ -1527,12 +1527,26 @@ 
    99                        if (ENABLE_FEATURE_HTTPD_AUTH_MD5) { 
    1010                                char *cipher; 
     
    1313+                               struct passwd *pwd = NULL; 
    1414  
    15                                 if (strncmp(p, request, u-request) != 0) { 
    16                                         /* user uncompared */ 
     15                                if (strncmp(p, request, u - request) != 0) { 
     16                                        /* user doesn't match */ 
    1717                                        continue; 
    1818                                } 
     
    3030+                                       pp = ppnew; 
    3131+                               } 
    32                                 if (pp && pp[1] == '$' && pp[2] == '1' && 
    33                                                 pp[3] == '$' && pp[4]) { 
    34                                         pp++; 
    35 @@ -1417,6 +1431,10 @@ 
     32                                if (pp && pp[1] == '$' && pp[2] == '1' 
     33                                 && pp[3] == '$' && pp[4] 
     34                                ) { 
     35@@ -1543,6 +1557,10 @@ 
    3636                                        /* unauthorized */ 
    3737                                        continue; 
  • trunk/package/busybox/patches/350-httpd_redir.patch

    r7490 r9130  
    1 Index: busybox-1.4.2/include/usage.h 
     1Index: busybox-1.7.2/include/usage.h 
    22=================================================================== 
    3 --- busybox-1.4.2.orig/include/usage.h  2007-06-04 13:21:32.103096256 +0200 
    4 +++ busybox-1.4.2/include/usage.h       2007-06-04 13:21:35.005655000 +0200 
    5 @@ -1257,7 +1257,8 @@ 
    6         USE_FEATURE_HTTPD_BASIC_AUTH(" [-r <realm>]") \ 
     3--- busybox-1.7.2.orig/include/usage.h  2007-10-04 17:12:35.230910708 +0200 
     4+++ busybox-1.7.2/include/usage.h       2007-10-04 17:32:12.994027602 +0200 
     5@@ -1350,7 +1350,8 @@ 
     6        USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \ 
    77        USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \ 
    88        " [-h home]" \ 
    9 -       " [-d/-e <string>]" 
    10 +       " [-d/-e <string>]" \ 
     9-       " [-d/-e string]" 
     10+       " [-d/-e string]" \ 
    1111+       " [-R <path> [-H <host>]]" 
    1212 #define httpd_full_usage \ 
    13         "Listen for incoming http server requests" \ 
    14         "\n\nOptions:\n" \ 
    15 @@ -1273,7 +1274,9 @@ 
    16         "       -m PASS         Crypt PASS with md5 algorithm\n") \ 
    17         "       -h HOME         Specifies http HOME directory (default ./)\n" \ 
    18         "       -e STRING       HTML encode STRING\n" \ 
    19 -       "       -d STRING       URL decode STRING" 
    20 +       "       -d STRING       URL decode STRING\n" \ 
    21 +       "       -R PATH         Redirect target path\n" \ 
    22 +       "       -H HOST         Redirect target host" 
     13        "Listen for incoming HTTP requests" \ 
     14        "\n\nOptions:" \ 
     15@@ -1368,6 +1369,8 @@ 
     16        "\n     -h HOME         Home directory (default .)" \ 
     17        "\n     -e STRING       HTML encode STRING" \ 
     18        "\n     -d STRING       URL decode STRING" \ 
     19+       "\n     -R PATH         Redirect target path" \ 
     20+       "\n     -H HOST         Redirect target host" \ 
    2321  
    2422 #define hwclock_trivial_usage \ 
    25         "[-r|--show] [-s|--hctosys] [-w|--systohc] [-l|--localtime] [-u|--utc]" 
    26 Index: busybox-1.4.2/networking/httpd.c 
     23        "[-r|--show] [-s|--hctosys] [-w|--systohc]" \ 
     24Index: busybox-1.7.2/networking/httpd.c 
    2725=================================================================== 
    28 --- busybox-1.4.2.orig/networking/httpd.c       2007-06-04 13:21:34.588718384 +0200 
    29 +++ busybox-1.4.2/networking/httpd.c    2007-06-04 13:21:35.006654848 +0200 
    30 @@ -140,6 +140,8 @@ 
    31         USE_FEATURE_HTTPD_CGI(char *user_agent;) 
     26--- busybox-1.7.2.orig/networking/httpd.c       2007-10-04 17:13:12.509035065 +0200 
     27+++ busybox-1.7.2/networking/httpd.c    2007-10-04 17:32:33.711208213 +0200 
     28@@ -230,6 +230,8 @@ 
    3229  
    33         const char *configFile; 
    34 +       const char *redirectPath; 
    35 +       const char *redirectHost; 
     30        const char *found_mime_type; 
     31        const char *found_moved_temporarily; 
     32+       const char *redirect_path; 
     33+       const char *redirect_host; 
     34        Htaccess_IP *ip_a_d;    /* config allow/deny lines */ 
    3635  
    37         unsigned int rmt_ip; 
    38  #if ENABLE_FEATURE_HTTPD_CGI || DEBUG 
    39 @@ -880,8 +882,11 @@ 
     36        USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) 
     37@@ -264,6 +266,8 @@ 
     38 #define home_httpd        (G.home_httpd       ) 
     39 #define found_mime_type   (G.found_mime_type  ) 
     40 #define found_moved_temporarily (G.found_moved_temporarily) 
     41+#define redirect_path     (G.redirect_path    ) 
     42+#define redirect_host     (G.redirect_host    ) 
     43 #define ContentLength     (G.ContentLength    ) 
     44 #define last_mod          (G.last_mod         ) 
     45 #define ip_a_d            (G.ip_a_d           ) 
     46@@ -901,8 +905,11 @@ 
    4047        } 
    4148 #endif 
    4249        if (responseNum == HTTP_MOVED_TEMPORARILY) { 
    43 -               len += sprintf(buf+len, "Location: %s/%s%s\r\n", 
    44 +               len += sprintf(buf+len, "Location: %s%s%s%s%s%s\r\n", 
    45 +                               (config->redirectHost ? "http://" : ""), 
    46 +                               (config->redirectHost ? config->redirectHost : ""), 
    47                                 config->found_moved_temporarily, 
    48 +                               (config->redirectHost ? "" : "/"), 
    49                                 (config->query ? "?" : ""), 
    50                                 (config->query ? config->query : "")); 
     50-               len += sprintf(iobuf + len, "Location: %s/%s%s\r\n", 
     51+               len += sprintf(iobuf + len, "Location: %s%s%s%s%s%s\r\n", 
     52+                               (redirect_host ? "http://" : ""), 
     53+                               (redirect_host ? redirect_host : ""), 
     54                                found_moved_temporarily, 
     55+                               (redirect_host ? "" : "/"), 
     56                                (g_query ? "?" : ""), 
     57                                (g_query ? g_query : "")); 
    5158        } 
    52 @@ -1594,8 +1599,12 @@ 
    53                 *++purl = '\0';       /* so keep last character */ 
    54                 test = purl;          /* end ptr */ 
     59@@ -1730,8 +1737,12 @@ 
     60        *++urlp = '\0';       /* so keep last character */ 
     61        tptr = urlp;          /* end ptr */ 
    5562  
    56 +               /* redirect active */ 
    57 +               if (config->redirectPath && (strncmp(url, config->redirectPath, strlen(config->redirectPath)) != 0)) 
    58 +                       config->found_moved_temporarily = config->redirectPath; 
     63+       /* redirect active */ 
     64+       if (redirect_path && (strncmp(urlcopy, redirect_path, strlen(redirect_path)) != 0)) 
     65+               found_moved_temporarily = redirect_path; 
    5966+ 
    60                 /* If URL is directory, adding '/' */ 
    61 -               if (test[-1] != '/') { 
    62 +               if(!config->redirectPath && (test[-1] != '/')) { 
    63                         if (is_directory(url + 1, 1, &sb)) { 
    64                                 config->found_moved_temporarily = url; 
    65                         } 
    66 @@ -1897,7 +1906,9 @@ 
     67        /* If URL is a directory, add '/' */ 
     68-       if (tptr[-1] != '/') { 
     69+       if (!redirect_path && (tptr[-1] != '/')) { 
     70                if (is_directory(urlcopy + 1, 1, &sb)) { 
     71                        found_moved_temporarily = urlcopy; 
     72                } 
     73@@ -2004,7 +2015,9 @@ 
    6774 #endif 
    6875  
     
    7582        h_opt_home_httpd, 
    7683        USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) 
    77 @@ -1919,7 +1930,7 @@ 
    78         OPT_FOREGROUND  = 1 << p_opt_foreground, 
    79  }; 
    80   
    81 -static const char httpd_opts[] = "c:d:h:" 
    82 +static const char httpd_opts[] = "R:H:c:d:h:" 
    83         USE_FEATURE_HTTPD_ENCODE_URL_STR("e:") 
    84         USE_FEATURE_HTTPD_BASIC_AUTH("r:") 
    85         USE_FEATURE_HTTPD_AUTH_MD5("m:") 
    86 @@ -1951,6 +1962,7 @@ 
    87         config->ContentLength = -1; 
    88   
    89         opt = getopt32(argc, argv, httpd_opts, 
    90 +                       &(config->redirectPath), &(config->redirectHost), 
    91                         &(config->configFile), &url_for_decode, &home_httpd 
     84@@ -2053,12 +2066,13 @@ 
     85        /* We do not "absolutize" path given by -h (home) opt. 
     86         * If user gives relative path in -h, $SCRIPT_FILENAME can end up 
     87         * relative too. */ 
     88-       opt = getopt32(argv, "c:d:h:" 
     89+       opt = getopt32(argv, "R:H:c:d:h:" 
     90                        USE_FEATURE_HTTPD_ENCODE_URL_STR("e:") 
     91                        USE_FEATURE_HTTPD_BASIC_AUTH("r:") 
     92                        USE_FEATURE_HTTPD_AUTH_MD5("m:") 
     93                        USE_FEATURE_HTTPD_SETUID("u:") 
     94                        "p:ifv", 
     95+                       &redirect_path, &redirect_host, 
     96                        &configFile, &url_for_decode, &home_httpd 
    9297                        USE_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode) 
    93                         USE_FEATURE_HTTPD_BASIC_AUTH(, &(config->realm)) 
     98                        USE_FEATURE_HTTPD_BASIC_AUTH(, &g_realm) 
  • trunk/package/busybox/patches/401-darwin_includes.patch

    r7490 r9130  
    1 Index: busybox-1.4.2/include/platform.h 
     1Index: busybox-1.7.2/include/platform.h 
    22=================================================================== 
    3 --- busybox-1.4.2.orig/include/platform.h       2007-06-04 13:21:32.055103552 +0200 
    4 +++ busybox-1.4.2/include/platform.h    2007-06-04 13:21:35.387596936 +0200 
    5 @@ -128,9 +128,11 @@ 
     3--- busybox-1.7.2.orig/include/platform.h       2007-09-03 13:48:46.000000000 +0200 
     4+++ busybox-1.7.2/include/platform.h    2007-10-04 15:20:58.301274440 +0200 
     5@@ -137,9 +137,11 @@ 
    66 # include <netinet/in.h> 
    77 #endif 
     
    1515 /* ---- Compiler dependent settings ------------------------- */ 
    1616 #if (defined __digital__ && defined __unix__) 
    17 @@ -161,7 +163,7 @@ 
     17@@ -179,7 +181,7 @@ 
    1818 #define HAVE_STDINT_H 
    1919 #else 
     
    2121-#if __BIG_ENDIAN__ 
    2222+#if __BIG_ENDIAN__ && !__APPLE__ 
    23  typedef long int                intmax_t; 
    24  typedef unsigned long int       uintmax_t; 
     23 typedef long                intmax_t; 
     24 typedef unsigned long       uintmax_t; 
    2525 #else 
    26 Index: busybox-1.4.2/include/libbb.h 
     26Index: busybox-1.7.2/include/libbb.h 
    2727=================================================================== 
    28 --- busybox-1.4.2.orig/include/libbb.h  2007-06-04 13:21:32.062102488 +0200 
    29 +++ busybox-1.4.2/include/libbb.h       2007-06-04 13:21:35.388596784 +0200 
    30 @@ -17,7 +17,9 @@ 
    31  #include <errno.h> 
    32  #include <fcntl.h> 
    33  #include <inttypes.h> 
    34 +#ifndef __APPLE__ 
    35  #include <malloc.h> 
    36 +#endif 
    37  #include <netdb.h> 
    38  #include <setjmp.h> 
    39  #include <signal.h> 
    40 @@ -30,7 +32,9 @@ 
     28--- busybox-1.7.2.orig/include/libbb.h  2007-09-16 20:48:10.000000000 +0200 
     29+++ busybox-1.7.2/include/libbb.h       2007-10-04 15:20:22.275221430 +0200 
     30@@ -31,7 +31,9 @@ 
    4131 #include <sys/mman.h> 
    4232 #include <sys/socket.h> 
  • trunk/package/busybox/patches/410-httpd_cgi_headers.patch

    r7490 r9130  
    1 Index: busybox-1.4.2/networking/httpd.c 
     1Index: busybox-1.7.2/networking/httpd.c 
    22=================================================================== 
    3 --- busybox-1.4.2.orig/networking/httpd.c       2007-06-04 13:21:35.006654848 +0200 
    4 +++ busybox-1.4.2/networking/httpd.c    2007-06-04 13:21:35.585566840 +0200 
    5 @@ -1231,7 +1231,7 @@ 
    6                                  * "chopped up into small chunks" syndrome here */ 
    7                                 rbuf[count] = '\0'; 
    8                                 /* check to see if the user script added headers */ 
    9 -#define HTTP_200 "HTTP/1.0 200 OK\r\n\r\n" 
    10 +#define HTTP_200 "HTTP/1.0 200 OK\r\n" 
    11                                 if (memcmp(rbuf, HTTP_200, 4) != 0) { 
    12                                         /* there is no "HTTP", do it ourself */ 
    13                                         full_write(s, HTTP_200, sizeof(HTTP_200)-1); 
    14 @@ -1242,9 +1242,9 @@ 
    15                                  * echo -en "Location: http://www.busybox.net\r\n" 
    16                                  * echo -en "\r\n" 
    17                                  */ 
    18 -                               //if (!strstr(rbuf, "ontent-")) { 
    19 -                               //      full_write(s, "Content-type: text/plain\r\n\r\n", 28); 
    20 -                               //} 
    21 +                               if (!strstr(rbuf, "ontent-")) { 
    22 +                                       full_write(s, "Content-type: text/plain\r\n\r\n", 28); 
    23 +                               } 
    24                                 firstLine = 0; 
    25                         } 
    26                         if (full_write(s, rbuf, count) != count) 
     3--- busybox-1.7.2.orig/networking/httpd.c       2007-10-04 15:06:51.993046080 +0200 
     4+++ busybox-1.7.2/networking/httpd.c    2007-10-04 15:25:10.815664410 +0200 
     5@@ -1314,10 +1314,10 @@ 
     6                                                if (full_write(1, HTTP_200, sizeof(HTTP_200)-1) != sizeof(HTTP_200)-1) 
     7                                                        break; 
     8                                        } 
     9-                                       /* Commented out: 
     10-                                       if (!strstr(rbuf, "ontent-")) { 
     11-                                               full_write(s, "Content-type: text/plain\r\n\r\n", 28); 
     12+                                       if (!strstr(rbuf, "ontent-") && !strstr(rbuf, "ocation:")) { 
     13+                                               full_write(1, "Content-type: text/plain\r\n\r\n", 28); 
     14                                        } 
     15+                                       /* Previously commented out: 
     16                                         * Counter-example of valid CGI without Content-type: 
     17                                         * echo -en "HTTP/1.0 302 Found\r\n" 
     18                                         * echo -en "Location: http://www.busybox.net\r\n" 
  • trunk/package/busybox/patches/440-httpd_chdir.patch

    r7490 r9130  
    1 Index: busybox-1.4.2/networking/httpd.c 
     1Index: busybox-1.7.2/networking/httpd.c 
    22=================================================================== 
    3 --- busybox-1.4.2.orig/networking/httpd.c       2007-06-04 13:21:35.775537960 +0200 
    4 +++ busybox-1.4.2/networking/httpd.c    2007-06-04 13:21:36.144481872 +0200 
    5 @@ -102,6 +102,7 @@ 
    6  static const char default_path_httpd_conf[] = "/etc"; 
    7  static const char httpd_conf[] = "httpd.conf"; 
    8  static const char home[] = "./"; 
    9 +static const char *home_httpd = home; 
    10   
    11  #define TIMEOUT 60 
    12   
    13 @@ -1505,6 +1506,8 @@ 
     3--- busybox-1.7.2.orig/networking/httpd.c       2007-10-04 15:25:10.815664410 +0200 
     4+++ busybox-1.7.2/networking/httpd.c    2007-10-04 15:31:22.936870392 +0200 
     5@@ -1616,6 +1616,7 @@ 
    146 #if ENABLE_FEATURE_HTTPD_BASIC_AUTH 
    157        int credentials = -1;  /* if not required this is Ok */ 
    168 #endif 
    17 +        
    189+       xchdir(home_httpd); 
    1910  
    20         sa.sa_handler = handle_sigalrm; 
    21         sigemptyset(&sa.sa_mask); 
    22 @@ -1942,7 +1945,6 @@ 
    23  int httpd_main(int argc, char *argv[]) 
    24  { 
    25         unsigned opt; 
    26 -       const char *home_httpd = home; 
    27         char *url_for_decode; 
    28         USE_FEATURE_HTTPD_ENCODE_URL_STR(const char *url_for_encode;) 
    29         const char *s_port; 
     11        /* Allocation of iobuf is postponed until now 
     12         * (IOW, server process doesn't need to waste 8k) */ 
Note: See TracChangeset for help on using the changeset viewer.