Changeset 28513


Ignore:
Timestamp:
2011-10-22T01:08:45+02:00 (6 years ago)
Author:
nico
Message:

[package] busybox: update to 1.19.2 (thanks to Peter Wagner)

Location:
trunk/package/busybox
Files:
8 added
50 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/busybox/Makefile

    r27288 r28513  
    99 
    1010PKG_NAME:=busybox 
    11 PKG_VERSION:=1.18.5 
     11PKG_VERSION:=1.19.2 
    1212PKG_RELEASE:=1 
    1313PKG_FLAGS:=essential 
     
    1616PKG_SOURCE_URL:=http://www.busybox.net/downloads \ 
    1717                http://distfiles.gentoo.org/distfiles/ 
    18 PKG_MD5SUM:=96dd43cc7cee4017a6bf31b7da82a1f5 
     18PKG_MD5SUM:=50267054345f1a0b77fe65f6e0e5ba29 
    1919 
    2020PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc 
  • trunk/package/busybox/config/Config.in

    r26455 r28513  
    126126        bool "Don't use /usr" 
    127127        default n 
    128         depends on BUSYBOX_CONFIG_FEATURE_INSTALLER 
    129128        help 
    130129          Disable use of /usr. busybox --install and "make install" 
     
    249248        depends on BUSYBOX_CONFIG_UNICODE_SUPPORT 
    250249        help 
    251           With this option on, invalid UTF-8 bytes are not substituted 
    252           with the selected substitution character. 
     250          With this option on, on line-editing input (such as used by shells) 
     251          invalid UTF-8 bytes are not substituted with the selected 
     252          substitution character. 
    253253          For example, this means that entering 'l', 's', ' ', 0xff, [Enter] 
    254254          at shell prompt will list file named 0xff (single char name 
     
    284284          things up manually. 
    285285 
     286config BUSYBOX_CONFIG_FEATURE_UTMP 
     287        bool "Support utmp file" 
     288        default n 
     289        help 
     290          The file /var/run/utmp is used to track who is currently logged in. 
     291          With this option on, certain applets (getty, login, telnetd etc) 
     292          will create and delete entries there. 
     293          "who" applet requires this option. 
     294 
    286295config BUSYBOX_CONFIG_FEATURE_WTMP 
    287296        bool "Support wtmp file" 
    288297        default n 
    289         select BUSYBOX_CONFIG_FEATURE_UTMP 
     298        depends on BUSYBOX_CONFIG_FEATURE_UTMP 
    290299        help 
    291300          The file /var/run/wtmp is used to track when users have logged into 
     
    295304          "last" applet requires this option. 
    296305 
    297 config BUSYBOX_CONFIG_FEATURE_UTMP 
    298         bool "Support utmp file" 
    299         default n 
    300         help 
    301           The file /var/run/utmp is used to track who is currently logged in. 
    302           With this option on, certain applets (getty, login, telnetd etc) 
    303           will create and delete entries there. 
    304           "who" applet requires this option. 
    305  
    306306config BUSYBOX_CONFIG_FEATURE_PIDFILE 
    307307        bool "Support writing pidfiles" 
     
    328328          one that needs it. 
    329329 
    330           The applets currently marked to need the suid bit are: 
    331  
    332           crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su, 
    333           traceroute, vlock. 
     330          The applets which require root rights (need suid bit or 
     331          to be run by root) and will refuse to execute otherwise: 
     332          crontab, login, passwd, su, vlock, wall. 
     333 
     334          The applets which will use root rights if they have them 
     335          (via suid bit, or because run by root), but would try to work 
     336          without root right nevertheless: 
     337          findfs, ping[6], traceroute[6], mount. 
     338 
     339          Note that if you DONT select this option, but DO make busybox 
     340          suid root, ALL applets will run under root, which is a huge 
     341          security hole (think "cp /some/file /etc/passwd"). 
    334342 
    335343config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG 
    336344        bool "Runtime SUID/SGID configuration via /etc/busybox.conf" 
    337         default n if BUSYBOX_CONFIG_FEATURE_SUID 
     345        default n 
    338346        depends on BUSYBOX_CONFIG_FEATURE_SUID 
    339347        help 
     
    342350          The format of this file is as follows: 
    343351 
    344           <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>) 
     352          APPLET = [Ssx-][Ssx-][x-] [USER.GROUP] 
     353 
     354          s: USER or GROUP is allowed to execute APPLET. 
     355             APPLET will run under USER or GROUP 
     356             (reagardless of who's running it). 
     357          S: USER or GROUP is NOT allowed to execute APPLET. 
     358             APPLET will run under USER or GROUP. 
     359             This option is not very sensical. 
     360          x: USER/GROUP/others are allowed to execute APPLET. 
     361             No UID/GID change will be done when it is run. 
     362          -: USER/GROUP/others are not allowed to execute APPLET. 
    345363 
    346364          An example might help: 
     
    352370 
    353371          mount = sx- root.disk # applet mount can be run by root and members 
    354                                 # of group disk and runs with euid=0 
     372                                # of group disk (but not anyone else) 
     373                                # and runs with euid=0 (egid is not changed) 
    355374 
    356375          cp = --- # disable applet cp for everyone 
     
    378397        bool "Support NSA Security Enhanced Linux" 
    379398        default n 
    380         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     399        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    381400        help 
    382401          Enable support for SELinux in applets ls, ps, and id. Also provide 
     
    459478        depends on !BUSYBOX_CONFIG_STATIC 
    460479        help 
    461           (TODO: what is it and why/when is it useful?) 
     480          Hardened code option. PIE binaries are loaded at a different 
     481          address at each invocation. This has some overhead, 
     482          particularly on x86-32 which is short on registers. 
     483 
    462484          Most people will leave this set to 'N'. 
    463485 
     
    556578        bool 
    557579        default y 
    558         select BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS 
    559580        help 
    560581          If you want to build BusyBox with large file support, then enable 
     
    660681endchoice 
    661682 
    662 ### config PARSE 
    663 ###     bool "Uniform config file parser debugging applet: parse" 
    664  
    665683endmenu 
    666684 
     
    693711config BUSYBOX_CONFIG_INSTALL_APPLET_DONT 
    694712        bool "not installed" 
    695         depends on BUSYBOX_CONFIG_FEATURE_INSTALLER || BUSYBOX_CONFIG_FEATURE_SH_STANDALONE || BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS 
    696713        help 
    697714          Do not install applet links. Useful when you plan to use 
  • trunk/package/busybox/config/archival/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    67menu "Archival Utilities" 
    78 
     9 
     10 
    811config BUSYBOX_CONFIG_FEATURE_SEAMLESS_XZ 
    912        bool "Make tar, rpm, modprobe etc understand .xz data" 
     
    3841config BUSYBOX_CONFIG_AR 
    3942        bool "ar" 
    40         default n 
     43        default n  # needs to be improved to be able to replace binutils ar 
    4144        help 
    4245          ar is an archival utility program used to create, modify, and 
     
    193196 
    194197config BUSYBOX_CONFIG_LZOP_COMPR_HIGH 
    195         bool "lzop complession levels 7,8,9 (not very useful)" 
     198        bool "lzop compression levels 7,8,9 (not very useful)" 
    196199        default n 
    197200        depends on BUSYBOX_CONFIG_LZOP 
  • trunk/package/busybox/config/console-tools/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    1112        bool "chvt" 
    1213        default n 
    13         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     14        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    1415        help 
    1516          This program is used to change to another terminal. 
     
    1920        bool "fgconsole" 
    2021        default n 
    21         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     22        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    2223        help 
    2324          This program prints active (foreground) console number. 
     
    3233        bool "deallocvt" 
    3334        default n 
    34         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     35        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    3536        help 
    3637          This program deallocates unused virtual consoles. 
     
    3940        bool "dumpkmap" 
    4041        default n 
    41         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     42        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    4243        help 
    4344          This program dumps the kernel's keyboard translation table to 
     
    4748        bool "kbd_mode" 
    4849        default n 
    49         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     50        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    5051        help 
    5152          This program reports and sets keyboard mode. 
     
    5455        bool "loadfont" 
    5556        default n 
    56         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     57        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    5758        help 
    5859          This program loads a console font from standard input. 
     
    6162        bool "loadkmap" 
    6263        default n 
    63         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     64        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    6465        help 
    6566          This program loads a keyboard translation table from 
     
    6970        bool "openvt" 
    7071        default n 
    71         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     72        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    7273        help 
    7374          This program is used to start a command on an unused 
     
    101102        bool "setconsole" 
    102103        default n 
    103         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     104        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    104105        help 
    105106          This program redirects the system console to another device, 
     
    116117        bool "setfont" 
    117118        default n 
    118         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     119        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    119120        help 
    120121          Allows to load console screen map. Useful for i18n. 
     
    129130config BUSYBOX_CONFIG_DEFAULT_SETFONT_DIR 
    130131        string "Default directory for console-tools files" 
    131         default "" 
     132        default n 
    132133        depends on BUSYBOX_CONFIG_SETFONT 
    133134        help 
     
    138139        bool "setkeycodes" 
    139140        default n 
    140         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     141        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    141142        help 
    142143          This program loads entries into the kernel's scancode-to-keycode 
     
    146147        bool "setlogcons" 
    147148        default n 
    148         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     149        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    149150        help 
    150151          This program redirects the output console of kernel messages. 
     
    153154        bool "showkey" 
    154155        default n 
    155         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     156        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    156157        help 
    157158          Shows keys pressed. 
  • trunk/package/busybox/config/coreutils/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    3435          date/time string. 
    3536 
     37# defaults to "no": stat's nanosecond field is a bit non-portable 
    3638config BUSYBOX_CONFIG_FEATURE_DATE_NANO 
    3739        bool "Support %[num]N nanosecond format specifier" 
    3840        default n 
    39         depends on BUSYBOX_CONFIG_DATE && BUSYBOX_CONFIG_PLATFORM_LINUX 
     41        depends on BUSYBOX_CONFIG_DATE  # syscall(__NR_clock_gettime) 
     42        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    4043        help 
    4144          Support %[num]N format specifier. Adds ~250 bytes of code. 
     
    5659          the same format. With it on, 'date DATE' additionally supports 
    5760          MMDDhhmm[[YY]YY][.ss] format. 
    58  
     61config BUSYBOX_CONFIG_ID 
     62        bool "id" 
     63        default y 
     64        help 
     65          id displays the current user and group ID names. 
     66config BUSYBOX_CONFIG_GROUPS 
     67        bool "groups" 
     68        default n 
     69        help 
     70          Print the group names associated with current user id. 
    5971config BUSYBOX_CONFIG_TEST 
    6072        bool "test" 
     
    7183        help 
    7284          Enable 64-bit support in test. 
    73  
     85config BUSYBOX_CONFIG_TOUCH 
     86        bool "touch" 
     87        default y 
     88        help 
     89          touch is used to create or change the access and/or 
     90          modification timestamp of specified files. 
    7491config BUSYBOX_CONFIG_TR 
    7592        bool "tr" 
     
    102119        help 
    103120          Base64 encode and decode 
     121config BUSYBOX_CONFIG_WHO 
     122      bool "who" 
     123      default n 
     124      depends on BUSYBOX_CONFIG_FEATURE_UTMP 
     125      help 
     126        who is used to show who is logged on. 
     127config BUSYBOX_CONFIG_USERS 
     128      bool "users" 
     129      default n 
     130      depends on BUSYBOX_CONFIG_FEATURE_UTMP 
     131      help 
     132        Print users currently logged on. 
    104133 
    105134config BUSYBOX_CONFIG_CAL 
     
    372401          the current host. 
    373402 
    374 config BUSYBOX_CONFIG_ID 
    375         bool "id" 
    376         default y 
    377         help 
    378           id displays the current user and group ID names. 
    379  
    380403config BUSYBOX_CONFIG_INSTALL 
    381404        bool "install" 
     
    391414          Support long options for the install applet. 
    392415 
    393 config BUSYBOX_CONFIG_LENGTH 
    394         bool "length" 
    395         default y 
    396         help 
    397           length is used to print out the length of a specified string. 
     416####config LENGTH 
     417####    bool "length" 
     418####    default y 
     419####    help 
     420####      length is used to print out the length of a specified string. 
    398421 
    399422config BUSYBOX_CONFIG_LN 
     
    687710        bool "stat" 
    688711        default n 
    689         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     712        select BUSYBOX_CONFIG_PLATFORM_LINUX # statfs() 
    690713        help 
    691714          display file or filesystem status. 
     
    757780          Enable this option for a faster tee, at expense of size. 
    758781 
    759 config BUSYBOX_CONFIG_TOUCH 
    760         bool "touch" 
    761         default y 
    762         help 
    763           touch is used to create or change the access and/or 
    764           modification timestamp of specified files. 
    765  
    766782config BUSYBOX_CONFIG_TRUE 
    767783        bool "true" 
     
    833849        help 
    834850          Use "unsigned long long" in wc for counter variables. 
    835  
    836 config BUSYBOX_CONFIG_WHO 
    837         bool "who" 
    838         default n 
    839         depends on BUSYBOX_CONFIG_FEATURE_UTMP 
    840         help 
    841           who is used to show who is logged on. 
    842851 
    843852config BUSYBOX_CONFIG_WHOAMI 
  • trunk/package/busybox/config/debianutils/Config.in

    r22665 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    56 
    67menu "Debian Utilities" 
     8 
     9 
    710 
    811config BUSYBOX_CONFIG_MKTEMP 
  • trunk/package/busybox/config/e2fsprogs/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    56 
    67menu "Linux Ext2 FS Progs" 
     8 
     9 
    710 
    811config BUSYBOX_CONFIG_CHATTR 
     
    3235        bool "lsattr" 
    3336        default n 
    34         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     37        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    3538        help 
    3639          lsattr lists the file attributes on a second extended file system. 
     
    4548config BUSYBOX_CONFIG_TUNE2FS 
    4649        bool "tune2fs" 
    47         default n 
     50        default n  # off: it is too limited compared to upstream version 
    4851        help 
    4952          tune2fs allows the system administrator to adjust various tunable 
  • trunk/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in

    r16053 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    56 
    67menu "Linux Ext2 FS Progs" 
     8 
     9 
    710 
    811config BUSYBOX_CONFIG_CHATTR 
  • trunk/package/busybox/config/editors/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    1112        help 
    1213          Apply a unified diff formatted patch. 
    13  
    14 config BUSYBOX_CONFIG_AWK 
    15         bool "awk" 
    16         default y 
    17         help 
    18           Awk is used as a pattern scanning and processing language. This is 
    19           the BusyBox implementation of that programming language. 
    20  
    21 config BUSYBOX_CONFIG_FEATURE_AWK_LIBM 
    22         bool "Enable math functions (requires libm)" 
    23         default y 
    24         depends on BUSYBOX_CONFIG_AWK 
    25         help 
    26           Enable math functions of the Awk programming language. 
    27           NOTE: This will require libm to be present for linking. 
    28  
    29 config BUSYBOX_CONFIG_CMP 
    30         bool "cmp" 
    31         default y 
    32         help 
    33           cmp is used to compare two files and returns the result 
    34           to standard output. 
    35  
    36 config BUSYBOX_CONFIG_DIFF 
    37         bool "diff" 
    38         default n 
    39         help 
    40           diff compares two files or directories and outputs the 
    41           differences between them in a form that can be given to 
    42           the patch command. 
    43  
    44 config BUSYBOX_CONFIG_FEATURE_DIFF_LONG_OPTIONS 
    45         bool "Enable long options" 
    46         default n 
    47         depends on BUSYBOX_CONFIG_DIFF && BUSYBOX_CONFIG_LONG_OPTS 
    48         help 
    49           Enable use of long options. 
    50  
    51 config BUSYBOX_CONFIG_FEATURE_DIFF_DIR 
    52         bool "Enable directory support" 
    53         default n 
    54         depends on BUSYBOX_CONFIG_DIFF 
    55         help 
    56           This option enables support for directory and subdirectory 
    57           comparison. 
    58  
    59 config BUSYBOX_CONFIG_ED 
    60         bool "ed" 
    61         default n 
    62         help 
    63           The original 1970's Unix text editor, from the days of teletypes. 
    64           Small, simple, evil. Part of SUSv3. If you're not already using 
    65           this, you don't need it. 
    66  
    67 config BUSYBOX_CONFIG_SED 
    68         bool "sed" 
    69         default y 
    70         help 
    71           sed is used to perform text transformations on a file 
    72           or input from a pipeline. 
    73  
    7414config BUSYBOX_CONFIG_VI 
    7515        bool "vi" 
     
    12464          busybox vi. 
    12565 
     66config BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH 
     67        bool "Enable regex in search and replace" 
     68        default n   # Uses GNU regex, which may be unavailable. FIXME 
     69        depends on BUSYBOX_CONFIG_FEATURE_VI_SEARCH 
     70        help 
     71          Use extended regex search. 
     72 
    12673config BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS 
    12774        bool "Catch signals" 
     
    176123          If terminal size can't be retrieved and $LINES/$COLUMNS are not set, 
    177124          this option makes vi perform a last-ditch effort to find it: 
    178           vi positions cursor to 999,999 and asks terminal to report real 
    179           cursor position using "ESC [ 6 n" escape sequence, then reads stdin. 
     125          position cursor to 999,999 and ask terminal to report real 
     126          cursor position using "ESC [ 6 n" escape sequence, then read stdin. 
    180127 
    181128          This is not clean but helps a lot on serial lines and such. 
     
    189136          and it makes the applet a tiny bit larger. 
    190137 
     138config BUSYBOX_CONFIG_AWK 
     139        bool "awk" 
     140        default y 
     141        help 
     142          Awk is used as a pattern scanning and processing language. This is 
     143          the BusyBox implementation of that programming language. 
     144 
     145config BUSYBOX_CONFIG_FEATURE_AWK_LIBM 
     146        bool "Enable math functions (requires libm)" 
     147        default y 
     148        depends on BUSYBOX_CONFIG_AWK 
     149        help 
     150          Enable math functions of the Awk programming language. 
     151          NOTE: This will require libm to be present for linking. 
     152 
     153config BUSYBOX_CONFIG_CMP 
     154        bool "cmp" 
     155        default y 
     156        help 
     157          cmp is used to compare two files and returns the result 
     158          to standard output. 
     159 
     160config BUSYBOX_CONFIG_DIFF 
     161        bool "diff" 
     162        default n 
     163        help 
     164          diff compares two files or directories and outputs the 
     165          differences between them in a form that can be given to 
     166          the patch command. 
     167 
     168config BUSYBOX_CONFIG_FEATURE_DIFF_LONG_OPTIONS 
     169        bool "Enable long options" 
     170        default n 
     171        depends on BUSYBOX_CONFIG_DIFF && BUSYBOX_CONFIG_LONG_OPTS 
     172        help 
     173          Enable use of long options. 
     174 
     175config BUSYBOX_CONFIG_FEATURE_DIFF_DIR 
     176        bool "Enable directory support" 
     177        default n 
     178        depends on BUSYBOX_CONFIG_DIFF 
     179        help 
     180          This option enables support for directory and subdirectory 
     181          comparison. 
     182 
     183config BUSYBOX_CONFIG_ED 
     184        bool "ed" 
     185        default n 
     186        help 
     187          The original 1970's Unix text editor, from the days of teletypes. 
     188          Small, simple, evil. Part of SUSv3. If you're not already using 
     189          this, you don't need it. 
     190 
     191config BUSYBOX_CONFIG_SED 
     192        bool "sed" 
     193        default y 
     194        help 
     195          sed is used to perform text transformations on a file 
     196          or input from a pipeline. 
     197 
    191198config BUSYBOX_CONFIG_FEATURE_ALLOW_EXEC 
    192199        bool "Allow vi and awk to execute shell commands" 
  • trunk/package/busybox/config/findutils/Config.in

    r20661 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    6162 
    6263config BUSYBOX_CONFIG_FEATURE_FIND_MAXDEPTH 
    63         bool "Enable -maxdepth N" 
    64         default y 
    65         depends on BUSYBOX_CONFIG_FIND 
    66         help 
    67           This option enables -maxdepth N option. 
     64        bool "Enable -mindepth N and -maxdepth N" 
     65        default y 
     66        depends on BUSYBOX_CONFIG_FIND 
     67        help 
     68          This option enables -mindepth N and -maxdepth N option. 
    6869 
    6970config BUSYBOX_CONFIG_FEATURE_FIND_NEWER 
     
    7374        help 
    7475          Support the 'find -newer' option for finding any files which have 
    75           a modified time that is more recent than the specified FILE. 
     76          modification time that is more recent than the specified FILE. 
    7677 
    7778config BUSYBOX_CONFIG_FEATURE_FIND_INUM 
     
    178179        help 
    179180          Support the 'find -links' option for matching number of links. 
    180  
    181181config BUSYBOX_CONFIG_GREP 
    182182        bool "grep" 
     
    211211          context surrounding our matching lines. 
    212212          Print the specified number of context lines (-C). 
    213  
    214213config BUSYBOX_CONFIG_XARGS 
    215214        bool "xargs" 
  • trunk/package/busybox/config/init/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    169170          used to allow or disallow other users to write to your terminal 
    170171 
     172config BUSYBOX_CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP 
     173        bool "Enable writing to tty only by group, not by everybody" 
     174        default n 
     175        depends on BUSYBOX_CONFIG_MESG 
     176        help 
     177          Usually, ttys are owned by group "tty", and "write" tool is 
     178          setgid to this group. This way, "mesg y" only needs to enable 
     179          "write by owning group" bit in tty mode. 
     180 
     181          If you set this option to N, "mesg y" will enable writing 
     182          by anybody at all. This is not recommended. 
     183 
    171184endmenu 
  • trunk/package/busybox/config/libbb/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    56 
    67menu "Busybox Library Tuning" 
     8 
     9config BUSYBOX_CONFIG_FEATURE_SYSTEMD 
     10        bool "Enable systemd support" 
     11        default n 
     12        help 
     13          If you plan to use busybox daemons on a system where daemons 
     14          are controlled by systemd, enable this option. 
     15          If you don't use systemd, it is still safe to enable it, 
     16          but the downside is increased code size. 
     17config BUSYBOX_CONFIG_FEATURE_RTMINMAX 
     18        bool "Support RTMIN[+n] and RTMAX[-n] signal names" 
     19        default n 
     20        help 
     21          Support RTMIN[+n] and RTMAX[-n] signal names 
     22          in kill, killall etc. This costs ~250 bytes. 
    723 
    824config BUSYBOX_CONFIG_PASSWORD_MINLEN 
     
    7995config BUSYBOX_CONFIG_FEATURE_EDITING_HISTORY 
    8096        int "History size" 
    81         range 0 99999 
     97        # Don't allow way too big values here, code uses fixed "char *history[N]" struct member 
     98        range 0 9999 
    8299        default 256 
    83100        depends on BUSYBOX_CONFIG_FEATURE_EDITING 
    84101        help 
    85           Specify command history size. 
     102          Specify command history size (0 - disable). 
    86103 
    87104config BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY 
     
    91108        help 
    92109          Enable history saving in shells. 
     110 
     111config BUSYBOX_CONFIG_FEATURE_REVERSE_SEARCH 
     112        bool "Reverse history search" 
     113        default n 
     114        depends on BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY 
     115        help 
     116          Enable readline-like Ctrl-R combination for reverse history search. 
     117          Increases code by about 0.5k. 
    93118 
    94119config BUSYBOX_CONFIG_FEATURE_TAB_COMPLETION 
     
    134159          but prevents a symlink attack. 
    135160          Similarly, "cp file device" will not send file's data 
    136           to the device. 
     161          to the device. (To do that, use "cat file >device") 
    137162 
    138163config BUSYBOX_CONFIG_FEATURE_VERBOSE_CP_MESSAGE 
     
    155180        default 4 
    156181        help 
    157           Size of buffer used by cp, mv, install etc. 
     182          Size of buffer used by cp, mv, install, wget etc. 
    158183          Buffers which are 4 kb or less will be allocated on stack. 
    159184          Bigger buffers will be allocated with mmap, with fallback to 4 kb 
    160185          stack buffer if mmap fails. 
    161186 
     187config BUSYBOX_CONFIG_FEATURE_SKIP_ROOTFS 
     188        bool "Skip rootfs in mount table" 
     189        default n 
     190        help 
     191          Ignore rootfs entry in mount table. 
     192 
     193          In Linux, kernel has a special filesystem, rootfs, which is initially 
     194          mounted on /. It contains initramfs data, if kernel is configured 
     195          to have one. Usually, another file system is mounted over / early 
     196          in boot process, and therefore most tools which manipulate 
     197          mount table, such as df, will skip rootfs entry. 
     198 
     199          However, some systems do not mount anything on /. 
     200          If you need to configure busybox for one of these systems, 
     201          you may find useful to turn this option off to make df show 
     202          initramfs statistic. 
     203 
     204          Otherwise, choose Y. 
     205 
    162206config BUSYBOX_CONFIG_MONOTONIC_SYSCALL 
    163207        bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" 
    164208        default n 
    165         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     209        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    166210        help 
    167211          Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring 
  • trunk/package/busybox/config/loginutils/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    192193        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    193194        help 
    194           getty lets you log in on a tty, it is normally invoked by init. 
     195          getty lets you log in on a tty. It is normally invoked by init. 
     196 
     197          Note that you can save a few bytes by disabling it and 
     198          using login applet directly. 
     199          If you need to reset tty attributes before calling login, 
     200          this script approximates getty: 
     201 
     202          exec </dev/$1 >/dev/$1 2>&1 || exit 1 
     203          reset 
     204          stty sane; stty ispeed 38400; stty ospeed 38400 
     205          printf "%s login: " "`hostname`" 
     206          read -r login 
     207          exec /bin/login "$login" 
    195208 
    196209config BUSYBOX_CONFIG_LOGIN 
  • trunk/package/busybox/config/mailutils/Config.in

    r17782 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12menu "Mail Utilities" 
     3 
     4 
    25 
    36config BUSYBOX_CONFIG_MAKEMIME 
  • trunk/package/busybox/config/miscutils/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    910        bool "conspy" 
    1011        default n 
    11         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     12        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    1213        help 
    1314          A text-mode VNC like program for Linux virtual terminals. 
     
    1516          or        conspy -nd NUM  screenshot of console num 
    1617          or        conspy -cs NUM  poor man's GNU screen like 
     18config BUSYBOX_CONFIG_LESS 
     19        bool "less" 
     20        default y 
     21        help 
     22          'less' is a pager, meaning that it displays text files. It possesses 
     23          a wide array of features, and is an improvement over 'more'. 
     24 
     25config BUSYBOX_CONFIG_FEATURE_LESS_MAXLINES 
     26        int "Max number of input lines less will try to eat" 
     27        default 9999999 
     28        depends on BUSYBOX_CONFIG_LESS 
     29 
     30config BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS 
     31        bool "Enable bracket searching" 
     32        default n 
     33        depends on BUSYBOX_CONFIG_LESS 
     34        help 
     35          This option adds the capability to search for matching left and right 
     36          brackets, facilitating programming. 
     37 
     38config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS 
     39        bool "Enable extra flags" 
     40        default n 
     41        depends on BUSYBOX_CONFIG_LESS 
     42        help 
     43          The extra flags provided do the following: 
     44 
     45          The -M flag enables a more sophisticated status line. 
     46          The -m flag enables a simpler status line with a percentage. 
     47 
     48config BUSYBOX_CONFIG_FEATURE_LESS_MARKS 
     49        bool "Enable marks" 
     50        default n 
     51        depends on BUSYBOX_CONFIG_LESS 
     52        help 
     53          Marks enable positions in a file to be stored for easy reference. 
     54 
     55config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP 
     56        bool "Enable regular expressions" 
     57        default n 
     58        depends on BUSYBOX_CONFIG_LESS 
     59        help 
     60          Enable regular expressions, allowing complex file searches. 
     61 
     62config BUSYBOX_CONFIG_FEATURE_LESS_WINCH 
     63        bool "Enable automatic resizing on window size changes" 
     64        default n 
     65        depends on BUSYBOX_CONFIG_LESS 
     66        help 
     67          Makes less track window size changes. 
     68 
     69config BUSYBOX_CONFIG_FEATURE_LESS_ASK_TERMINAL 
     70        bool "Use 'tell me cursor position' ESC sequence to measure window" 
     71        default n 
     72        depends on BUSYBOX_CONFIG_FEATURE_LESS_WINCH 
     73        help 
     74          Makes less track window size changes. 
     75          If terminal size can't be retrieved and $LINES/$COLUMNS are not set, 
     76          this option makes less perform a last-ditch effort to find it: 
     77          position cursor to 999,999 and ask terminal to report real 
     78          cursor position using "ESC [ 6 n" escape sequence, then read stdin. 
     79 
     80          This is not clean but helps a lot on serial lines and such. 
     81 
     82config BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD 
     83        bool "Enable flag changes ('-' command)" 
     84        default n 
     85        depends on BUSYBOX_CONFIG_LESS 
     86        help 
     87          This enables the ability to change command-line flags within 
     88          less itself ('-' keyboard command). 
     89 
     90config BUSYBOX_CONFIG_FEATURE_LESS_LINENUMS 
     91        bool "Enable dynamic switching of line numbers" 
     92        default n 
     93        depends on BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD 
     94        help 
     95          Enables "-N" command. 
    1796config BUSYBOX_CONFIG_NANDWRITE 
    1897        bool "nandwrite" 
    1998        default n 
    20         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     99        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    21100        help 
    22101          Write to the specified MTD device, with bad blocks awareness 
     
    25104        bool "nanddump" 
    26105        default n 
    27         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     106        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    28107        help 
    29108          Dump the content of raw NAND chip 
     109config BUSYBOX_CONFIG_SETSERIAL 
     110        bool "setserial" 
     111        default n 
     112        select BUSYBOX_CONFIG_PLATFORM_LINUX 
     113        help 
     114          Retrieve or set Linux serial port. 
    30115config BUSYBOX_CONFIG_UBIATTACH 
    31116        bool "ubiattach" 
    32117        default n 
    33         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     118        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    34119        help 
    35120          Attach MTD device to an UBI device. 
     
    38123        bool "ubidetach" 
    39124        default n 
    40         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     125        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    41126        help 
    42127          Detach MTD device from an UBI device. 
     128 
     129config BUSYBOX_CONFIG_UBIMKVOL 
     130        bool "ubimkvol" 
     131        default n 
     132        select BUSYBOX_CONFIG_PLATFORM_LINUX 
     133        help 
     134          Create a UBI volume. 
     135 
     136config BUSYBOX_CONFIG_UBIRMVOL 
     137        bool "ubirmvol" 
     138        default n 
     139        select BUSYBOX_CONFIG_PLATFORM_LINUX 
     140        help 
     141          Delete a UBI volume. 
     142 
     143config BUSYBOX_CONFIG_UBIRSVOL 
     144        bool "ubirsvol" 
     145        default n 
     146        select BUSYBOX_CONFIG_PLATFORM_LINUX 
     147        help 
     148          Resize a UBI volume. 
     149 
     150config BUSYBOX_CONFIG_UBIUPDATEVOL 
     151        bool "ubiupdatevol" 
     152        default n 
     153        select BUSYBOX_CONFIG_PLATFORM_LINUX 
     154        help 
     155          Update a UBI volume. 
    43156 
    44157config BUSYBOX_CONFIG_ADJTIMEX 
    45158        bool "adjtimex" 
    46159        default n 
    47         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     160        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    48161        help 
    49162          Adjtimex reads and optionally sets adjustment parameters for 
     
    74187        bool "beep" 
    75188        default n 
    76         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     189        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    77190        help 
    78191          The beep applets beeps in a given freq/Hz. 
     
    229342        bool "devfsd (obsolete)" 
    230343        default n 
    231         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     344        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    232345        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    233346        help 
     
    273386        bool "Use devfs names for all devices (obsolete)" 
    274387        default n 
    275         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     388        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    276389        help 
    277390          This is obsolete and should NOT be used anymore. 
     
    293406        bool "eject" 
    294407        default n 
    295         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     408        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    296409        help 
    297410          Used to eject cdroms. (defaults to /dev/cdrom) 
     
    308421        bool "fbsplash" 
    309422        default n 
    310         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     423        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    311424        help 
    312425          Shows splash image and progress bar on framebuffer device. 
     
    329442config BUSYBOX_CONFIG_FLASHCP 
    330443        bool "flashcp" 
    331         default n 
     444        default n  # doesn't build on Ubuntu 8.04 
    332445        help 
    333446          The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7. 
     
    336449config BUSYBOX_CONFIG_FLASH_LOCK 
    337450        bool "flash_lock" 
    338         default n 
     451        default n  # doesn't build on Ubuntu 8.04 
    339452        help 
    340453          The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This 
     
    343456config BUSYBOX_CONFIG_FLASH_UNLOCK 
    344457        bool "flash_unlock" 
    345         default n 
     458        default n  # doesn't build on Ubuntu 8.04 
    346459        help 
    347460          The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This 
     
    350463config BUSYBOX_CONFIG_FLASH_ERASEALL 
    351464        bool "flash_eraseall" 
    352         default n 
     465        default n  # doesn't build on Ubuntu 8.04 
    353466        help 
    354467          The flash_eraseall binary from mtd-utils as of git head c4c6a59eb. 
     
    358471        bool "ionice" 
    359472        default n 
    360         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     473        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    361474        help 
    362475          Set/set program io scheduling class and priority 
     
    365478config BUSYBOX_CONFIG_INOTIFYD 
    366479        bool "inotifyd" 
    367         default n 
     480        default n  # doesn't build on Knoppix 5 
    368481        help 
    369482          Simple inotify daemon. Reports filesystem changes. Requires 
     
    395508endchoice 
    396509 
    397 config BUSYBOX_CONFIG_LESS 
    398         bool "less" 
    399         default y 
    400         help 
    401           'less' is a pager, meaning that it displays text files. It possesses 
    402           a wide array of features, and is an improvement over 'more'. 
    403  
    404 config BUSYBOX_CONFIG_FEATURE_LESS_MAXLINES 
    405         int "Max number of input lines less will try to eat" 
    406         default 9999999 
    407         depends on BUSYBOX_CONFIG_LESS 
    408  
    409 config BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS 
    410         bool "Enable bracket searching" 
    411         default n 
    412         depends on BUSYBOX_CONFIG_LESS 
    413         help 
    414           This option adds the capability to search for matching left and right 
    415           brackets, facilitating programming. 
    416  
    417 config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS 
    418         bool "Enable extra flags" 
    419         default n 
    420         depends on BUSYBOX_CONFIG_LESS 
    421         help 
    422           The extra flags provided do the following: 
    423  
    424           The -M flag enables a more sophisticated status line. 
    425           The -m flag enables a simpler status line with a percentage. 
    426  
    427 config BUSYBOX_CONFIG_FEATURE_LESS_MARKS 
    428         bool "Enable marks" 
    429         default n 
    430         depends on BUSYBOX_CONFIG_LESS 
    431         help 
    432           Marks enable positions in a file to be stored for easy reference. 
    433  
    434 config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP 
    435         bool "Enable regular expressions" 
    436         default n 
    437         depends on BUSYBOX_CONFIG_LESS 
    438         help 
    439           Enable regular expressions, allowing complex file searches. 
    440  
    441 config BUSYBOX_CONFIG_FEATURE_LESS_WINCH 
    442         bool "Enable automatic resizing on window size changes" 
    443         default n 
    444         depends on BUSYBOX_CONFIG_LESS 
    445         help 
    446           Makes less track window size changes. 
    447  
    448 config BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD 
    449         bool "Enable flag changes ('-' command)" 
    450         default n 
    451         depends on BUSYBOX_CONFIG_LESS 
    452         help 
    453           This enables the ability to change command-line flags within 
    454           less itself ('-' keyboard command). 
    455  
    456 config BUSYBOX_CONFIG_FEATURE_LESS_LINENUMS 
    457         bool "Enable dynamic switching of line numbers" 
    458         default n 
    459         depends on BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD 
    460         help 
    461           Enables "-N" command. 
    462  
    463510config BUSYBOX_CONFIG_HDPARM 
    464511        bool "hdparm" 
    465512        default n 
    466         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     513        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    467514        help 
    468515          Get/Set hard drive parameters. Primarily intended for ATA 
     
    587634        bool "raidautorun" 
    588635        default n 
    589         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     636        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    590637        help 
    591638          raidautorun tells the kernel md driver to 
     
    595642        bool "readahead" 
    596643        default n 
    597         depends on BUSYBOX_CONFIG_LFS && BUSYBOX_CONFIG_PLATFORM_LINUX 
     644        depends on BUSYBOX_CONFIG_LFS 
     645        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    598646        help 
    599647          Preload the files listed on the command line into RAM cache so that 
     
    611659config BUSYBOX_CONFIG_RFKILL 
    612660        bool "rfkill" 
    613         default n 
    614         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     661        default n  # doesn't build on Ubuntu 9.04 
     662        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    615663        help 
    616664          Enable/disable wireless devices. 
     
    624672        bool "runlevel" 
    625673        default n 
     674        depends on BUSYBOX_CONFIG_FEATURE_UTMP 
    626675        help 
    627676          find the current and previous system runlevel. 
     
    633682        bool "rx" 
    634683        default n 
    635         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     684        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    636685        help 
    637686          Receive files using the Xmodem protocol. 
     
    652701config BUSYBOX_CONFIG_TASKSET 
    653702        bool "taskset" 
    654         default n 
     703        default n  # doesn't build on some non-x86 targets (m68k) 
    655704        help 
    656705          Retrieve or set a processes's CPU affinity. 
     
    699748        bool "wall" 
    700749        default n 
     750        depends on BUSYBOX_CONFIG_FEATURE_UTMP 
    701751        help 
    702752          Write a message to all users that are logged in. 
     
    705755        bool "watchdog" 
    706756        default y 
    707         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     757        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    708758        help 
    709759          The watchdog utility is used with hardware or software watchdog 
  • trunk/package/busybox/config/modutils/Config.in

    r26455 r28513  
    66 
    77menu "Linux Module Utilities" 
    8 depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    98 
    109config BUSYBOX_CONFIG_MODINFO 
     
    1716        bool "Simplified modutils" 
    1817        default n 
     18        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    1919        help 
    2020          Simplified modutils. 
     
    5151        default n 
    5252        depends on BUSYBOX_CONFIG_MODPROBE_SMALL 
     53        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    5354        help 
    5455          Allow insmod and modprobe take module options from command line. 
     
    6566        default y 
    6667        depends on !BUSYBOX_CONFIG_MODPROBE_SMALL 
     68        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    6769        help 
    6870          insmod is used to load specified modules in the running kernel. 
     
    7274        default y 
    7375        depends on !BUSYBOX_CONFIG_MODPROBE_SMALL 
     76        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    7477        help 
    7578          rmmod is used to unload specified modules from the kernel. 
     
    7982        default y 
    8083        depends on !BUSYBOX_CONFIG_MODPROBE_SMALL 
     84        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    8185        help 
    8286          lsmod is used to display a list of loaded modules. 
     
    8690        default y 
    8791        depends on BUSYBOX_CONFIG_LSMOD 
     92        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    8893        help 
    8994          This option makes output format of lsmod adjusted to 
     
    95100        default n 
    96101        depends on !BUSYBOX_CONFIG_MODPROBE_SMALL 
     102        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    97103        help 
    98104          Handle the loading of modules, and their dependencies on a high 
     
    103109        default n 
    104110        depends on BUSYBOX_CONFIG_MODPROBE 
     111        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    105112        help 
    106113          Say 'y' here to enable support for the 'blacklist' command in 
     
    114121        default n 
    115122        depends on !BUSYBOX_CONFIG_MODPROBE_SMALL 
     123        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    116124        help 
    117125          depmod generates modules.dep (and potentially modules.alias 
     
    125133        default n 
    126134        depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_LSMOD 
     135        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    127136        help 
    128137          Support module loading for 2.2.x and 2.4.x Linux kernels. 
     
    134143        default n 
    135144        depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE_SMALL 
     145        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    136146        help 
    137147          This option causes module loading code to try to mmap 
     
    150160        default n 
    151161        depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && (BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE) 
     162        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    152163        help 
    153164          Support checking of versions for modules. This is used to 
     
    158169        default n 
    159170        depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && (BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE) 
     171        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    160172        help 
    161173          By adding module symbols to the kernel symbol table, Oops messages 
     
    169181        default n 
    170182        depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && (BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE) 
     183        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    171184        help 
    172185          This is a special uClinux only memory optimization that lets insmod 
     
    179192        default n 
    180193        depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && BUSYBOX_CONFIG_INSMOD 
     194        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    181195        help 
    182196          Enabling this, one would be able to get a load map 
     
    190204        default n 
    191205        depends on BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP && !BUSYBOX_CONFIG_MODPROBE_SMALL 
     206        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    192207        help 
    193208          Without this option, -m will only output section 
     
    199214        default y 
    200215        depends on (BUSYBOX_CONFIG_LSMOD || BUSYBOX_CONFIG_FEATURE_2_4_MODULES) && !BUSYBOX_CONFIG_MODPROBE_SMALL 
     216        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    201217        help 
    202218          Support checking for tainted modules. These are usually binary 
     
    209225        default n 
    210226        depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE 
     227        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    211228        help 
    212229          Generate and parse modules.alias containing aliases for bus 
     
    225242        default n 
    226243        depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE 
     244        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    227245        help 
    228246          Generate and parse modules.symbols containing aliases for 
  • trunk/package/busybox/config/networking/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    67menu "Networking Utilities" 
    78 
     9config BUSYBOX_CONFIG_NAMEIF 
     10        bool "nameif" 
     11        default n 
     12        select BUSYBOX_CONFIG_PLATFORM_LINUX 
     13        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
     14        help 
     15          nameif is used to rename network interface by its MAC address. 
     16          Renamed interfaces MUST be in the down state. 
     17          It is possible to use a file (default: /etc/mactab) 
     18          with list of new interface names and MACs. 
     19          Maximum interface name length: IFNAMSIZ = 16 
     20          File fields are separated by space or tab. 
     21          File format: 
     22          # Comment 
     23          new_interface_name    XX:XX:XX:XX:XX:XX 
     24 
     25config BUSYBOX_CONFIG_FEATURE_NAMEIF_EXTENDED 
     26        bool "Extended nameif" 
     27        default n 
     28        depends on BUSYBOX_CONFIG_NAMEIF 
     29        help 
     30          This extends the nameif syntax to support the bus_info, driver, 
     31          phyaddr selectors. The syntax is compatible to the normal nameif. 
     32          File format: 
     33            new_interface_name  driver=asix bus=usb-0000:00:08.2-3 
     34            new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5 
     35            new_interface_name  phy_address=2 00:80:C8:38:91:B5 
     36            new_interface_name  mac=00:80:C8:38:91:B5 
     37            new_interface_name  00:80:C8:38:91:B5 
    838config BUSYBOX_CONFIG_NBDCLIENT 
    939        bool "nbd-client" 
     
    1141        help 
    1242          Network block device client 
    13  
    1443config BUSYBOX_CONFIG_NC 
    1544        bool "nc" 
     
    3766config BUSYBOX_CONFIG_NC_110_COMPAT 
    3867        bool "Netcat 1.10 compatibility (+2.5k)" 
    39         default n 
     68        default n  # off specially for Rob 
    4069        depends on BUSYBOX_CONFIG_NC 
    4170        help 
     
    4473          -s ADDR, -n, -u, -v, -o FILE, -z options, but loses 
    4574          busybox-specific extensions: -f FILE and -ll. 
     75config BUSYBOX_CONFIG_PING 
     76        bool "ping" 
     77        default y 
     78        select BUSYBOX_CONFIG_PLATFORM_LINUX 
     79        help 
     80          ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to 
     81          elicit an ICMP ECHO_RESPONSE from a host or gateway. 
     82 
     83config BUSYBOX_CONFIG_PING6 
     84        bool "ping6" 
     85        default n 
     86        depends on BUSYBOX_CONFIG_FEATURE_IPV6 && BUSYBOX_CONFIG_PING 
     87        help 
     88          This will give you a ping that can talk IPv6. 
     89 
     90config BUSYBOX_CONFIG_FEATURE_FANCY_PING 
     91        bool "Enable fancy ping output" 
     92        default y 
     93        depends on BUSYBOX_CONFIG_PING 
     94        help 
     95          Make the output from the ping applet include statistics, and at the 
     96          same time provide full support for ICMP packets. 
     97config BUSYBOX_CONFIG_WHOIS 
     98        bool "whois" 
     99        default n 
     100        help 
     101          whois is a client for the whois directory service 
    46102 
    47103config BUSYBOX_CONFIG_FEATURE_IPV6 
     
    89145        bool "arp" 
    90146        default n 
    91         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     147        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    92148        help 
    93149          Manipulate the system ARP cache. 
     
    96152        bool "arping" 
    97153        default y 
    98         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     154        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    99155        help 
    100156          Ping hosts by ARP packets. 
     
    103159        bool "brctl" 
    104160        default y 
    105         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     161        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    106162        help 
    107163          Manage ethernet bridges. 
     
    136192        bool "ether-wake" 
    137193        default n 
    138         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     194        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    139195        help 
    140196          Send a magic packet to wake up sleeping machines. 
     
    319375        bool "ifconfig" 
    320376        default y 
    321         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     377        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    322378        help 
    323379          Ifconfig is used to configure the kernel-resident network interfaces. 
     
    367423        bool "ifenslave" 
    368424        default n 
    369         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     425        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    370426        help 
    371427          Userspace application to bind several interfaces 
     
    375431        bool "ifplugd" 
    376432        default n 
    377         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     433        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    378434        help 
    379435          Network interface plug detection daemon. 
     
    417473        bool "Use busybox ip applet" 
    418474        default n 
    419         depends on BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP && BUSYBOX_CONFIG_PLATFORM_LINUX 
     475        depends on BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP 
     476        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    420477        select BUSYBOX_CONFIG_IP 
    421478        select BUSYBOX_CONFIG_FEATURE_IP_ADDRESS 
     
    536593        bool "ip" 
    537594        default n 
    538         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     595        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    539596        help 
    540597          The "ip" applet is a TCP/IP interface configuration and routing 
     
    649706          Support long options for the ipcalc applet. 
    650707 
    651 config BUSYBOX_CONFIG_NAMEIF 
    652         bool "nameif" 
    653         default n 
    654         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    655         select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    656         help 
    657           nameif is used to rename network interface by its MAC address. 
    658           Renamed interfaces MUST be in the down state. 
    659           It is possible to use a file (default: /etc/mactab) 
    660           with list of new interface names and MACs. 
    661           Maximum interface name length: IFNAMSIZ = 16 
    662           File fields are separated by space or tab. 
    663           File format: 
    664           # Comment 
    665           new_interface_name    XX:XX:XX:XX:XX:XX 
    666  
    667 config BUSYBOX_CONFIG_FEATURE_NAMEIF_EXTENDED 
    668         bool "Extended nameif" 
    669         default n 
    670         depends on BUSYBOX_CONFIG_NAMEIF 
    671         help 
    672           This extends the nameif syntax to support the bus_info and driver 
    673           checks. The syntax is compatible to the normal nameif. 
    674           File format: 
    675             new_interface_name  driver=asix bus=usb-0000:00:08.2-3 
    676             new_interface_name  bus=usb-0000:00:08.2-3 00:80:C8:38:91:B5 
    677             new_interface_name  mac=00:80:C8:38:91:B5 
    678             new_interface_name  00:80:C8:38:91:B5 
    679  
    680708config BUSYBOX_CONFIG_NETMSG 
    681709        bool "netmsg" 
     
    687715        bool "netstat" 
    688716        default y 
    689         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     717        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    690718        help 
    691719          netstat prints information about the Linux networking subsystem. 
     
    716744        bool "ntpd" 
    717745        default n 
    718         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     746        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    719747        help 
    720748          The NTP client/server daemon. 
     
    728756          ntpd will be usable only as a NTP client. 
    729757 
    730 config BUSYBOX_CONFIG_PING 
    731         bool "ping" 
    732         default y 
    733         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    734         help 
    735           ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to 
    736           elicit an ICMP ECHO_RESPONSE from a host or gateway. 
    737  
    738 config BUSYBOX_CONFIG_PING6 
    739         bool "ping6" 
    740         default y 
    741         depends on BUSYBOX_CONFIG_FEATURE_IPV6 && BUSYBOX_CONFIG_PING 
    742         help 
    743           This will give you a ping that can talk IPv6. 
    744  
    745 config BUSYBOX_CONFIG_FEATURE_FANCY_PING 
    746         bool "Enable fancy ping output" 
    747         default y 
    748         depends on BUSYBOX_CONFIG_PING 
    749         help 
    750           Make the output from the ping applet include statistics, and at the 
    751           same time provide full support for ICMP packets. 
    752  
    753758config BUSYBOX_CONFIG_PSCAN 
    754759        bool "pscan" 
     
    760765        bool "route" 
    761766        default y 
    762         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     767        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    763768        help 
    764769          Route displays or manipulates the kernel's IP routing tables. 
     
    767772        bool "slattach" 
    768773        default n 
    769         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     774        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    770775        help 
    771776          slattach is a small utility to attach network interfaces to serial 
     
    954959        bool "traceroute" 
    955960        default y 
    956         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     961        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    957962        help 
    958963          Utility to trace the route of IP packets. 
     
    991996        bool "tunctl" 
    992997        default n 
    993         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     998        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    994999        help 
    9951000          tunctl creates or deletes tun devices. 
     
    10241029        bool "vconfig" 
    10251030        default y 
    1026         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     1031        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    10271032        help 
    10281033          Creates, removes, and configures VLAN interfaces 
     
    10711076        bool "zcip" 
    10721077        default n 
    1073         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     1078        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    10741079        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    10751080        help 
  • trunk/package/busybox/config/networking/udhcp/Config.in

    r26455 r28513  
    1010        bool "udhcp server (udhcpd)" 
    1111        default n 
    12         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     12        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    1313        help 
    1414          udhcpd is a DHCP server geared primarily toward embedded systems, 
     
    4141          time a new lease has been accepted, thus eliminating the need 
    4242          to send SIGUSR1 for the initial writing or updating. Any timed 
    43           rewriting remains undisturbed 
     43          rewriting remains undisturbed. 
     44 
     45config BUSYBOX_CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC 
     46        bool "Select IP address based on client MAC" 
     47        default n 
     48        depends on BUSYBOX_CONFIG_UDHCPD 
     49        help 
     50          If selected, udhcpd will base its selection of IP address to offer 
     51          on the client's hardware address. Otherwise udhcpd uses the next 
     52          consecutive free address. 
     53 
     54          This reduces the frequency of IP address changes for clients 
     55          which let their lease expire, and makes consecutive DHCPOFFERS 
     56          for the same client to (almost always) contain the same 
     57          IP address. 
    4458 
    4559config BUSYBOX_CONFIG_DHCPD_LEASES_FILE 
     
    5468        bool "udhcp client (udhcpc)" 
    5569        default y 
    56         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     70        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    5771        help 
    5872          udhcpc is a DHCP client geared primarily toward embedded systems, 
     
    87101        help 
    88102          Verbosity can be increased with multiple -v options. 
    89           This options controls how high it can be cranked up. 
     103          This option controls how high it can be cranked up. 
    90104 
    91105          Bigger values result in bigger code. Levels above 1 
     
    100114          search lists via option 119, specified in RFC 3397, 
    101115          and SIP servers option 120, specified in RFC 3361. 
     116 
     117config BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q 
     118        bool "Support for 802.1Q VLAN parameters" 
     119        default n 
     120        depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC 
     121        help 
     122          If selected, both client and server will support passing of VLAN 
     123          ID and priority via options 132 and 133 as per 802.1Q. 
    102124 
    103125config BUSYBOX_CONFIG_UDHCPC_DEFAULT_SCRIPT 
  • trunk/package/busybox/config/printutils/Config.in

    r16063 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    56 
    67menu "Print Utilities" 
     8 
     9 
    710 
    811config BUSYBOX_CONFIG_LPD 
  • trunk/package/busybox/config/procps/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    1617        help 
    1718          Per-processor statistics 
     19config BUSYBOX_CONFIG_NMETER 
     20        bool "nmeter" 
     21        default n 
     22        help 
     23          Prints selected system stats continuously, one line per update. 
    1824config BUSYBOX_CONFIG_PMAP 
    1925       bool "pmap" 
     
    2632        help 
    2733          Analyze power consumption on Intel-based laptops 
     34config BUSYBOX_CONFIG_PSTREE 
     35        bool "pstree" 
     36        default n 
     37        help 
     38          Display a tree of processes. 
     39config BUSYBOX_CONFIG_PWDX 
     40        bool "pwdx" 
     41        default n 
     42        help 
     43          Report current working directory of a process 
    2844config BUSYBOX_CONFIG_SMEMCAP 
    2945        bool "smemcap" 
     
    3248          smemcap is a tool for capturing process data for smem, 
    3349          a memory usage statistic tool. 
     50config BUSYBOX_CONFIG_UPTIME 
     51        bool "uptime" 
     52        default y 
     53        select BUSYBOX_CONFIG_PLATFORM_LINUX #sysinfo() 
     54        help 
     55          uptime gives a one line display of the current time, how long 
     56          the system has been running, how many users are currently logged 
     57          on, and the system load averages for the past 1, 5, and 15 minutes. 
     58 
     59config BUSYBOX_CONFIG_FEATURE_UPTIME_UTMP_SUPPORT 
     60        bool "Support for showing the number of users" 
     61        default n 
     62        depends on BUSYBOX_CONFIG_UPTIME && BUSYBOX_CONFIG_FEATURE_UTMP 
     63        help 
     64          Makes uptime display the number of users currently logged on. 
    3465 
    3566config BUSYBOX_CONFIG_FREE 
    3667        bool "free" 
    3768        default y 
    38         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     69        select BUSYBOX_CONFIG_PLATFORM_LINUX #sysinfo() 
    3970        help 
    4071          free displays the total amount of free and used physical and swap 
     
    72103        depends on BUSYBOX_CONFIG_KILL 
    73104 
    74 config BUSYBOX_CONFIG_NMETER 
    75         bool "nmeter" 
    76         default n 
    77         help 
    78           Prints selected system stats continuously, one line per update. 
    79  
    80105config BUSYBOX_CONFIG_PGREP 
    81106        bool "pgrep" 
     
    131156        bool "Enable time and elapsed time output" 
    132157        default n 
    133         depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP && BUSYBOX_CONFIG_PLATFORM_LINUX 
     158        depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP 
     159        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    134160        help 
    135161          Support -o time and -o etime output specifiers. 
     
    218244 
    219245config BUSYBOX_CONFIG_FEATURE_SHOW_THREADS 
    220         bool "Support for showing threads in ps/top" 
    221         default n 
    222         depends on BUSYBOX_CONFIG_PS || BUSYBOX_CONFIG_TOP 
    223         help 
    224           Enables ps -T option and 'h' command in top 
    225  
    226 config BUSYBOX_CONFIG_UPTIME 
    227         bool "uptime" 
    228         default y 
    229         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
    230         help 
    231           uptime gives a one line display of the current time, how long 
    232           the system has been running, how many users are currently logged 
    233           on, and the system load averages for the past 1, 5, and 15 minutes. 
     246        bool "Support for showing threads in ps/pstree/top" 
     247        default n 
     248        depends on BUSYBOX_CONFIG_PS || BUSYBOX_CONFIG_TOP || BUSYBOX_CONFIG_PSTREE 
     249        help 
     250          Enables the ps -T option, showing of threads in pstree, 
     251          and 'h' command in top. 
    234252 
    235253config BUSYBOX_CONFIG_WATCH 
  • trunk/package/busybox/config/runit/Config.in

    r22665 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    56 
    67menu "Runit Utilities" 
     8 
     9 
    710 
    811config BUSYBOX_CONFIG_RUNSV 
  • trunk/package/busybox/config/selinux/Config.in

    r22665 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    67menu "SELinux Utilities" 
    78        depends on BUSYBOX_CONFIG_SELINUX 
     9 
     10 
    811 
    912config BUSYBOX_CONFIG_CHCON 
  • trunk/package/busybox/config/shell/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    2425          Enable bash-compatible extensions. 
    2526 
     27config BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT 
     28        bool "Idle timeout variable" 
     29        default n 
     30        depends on BUSYBOX_CONFIG_ASH 
     31        help 
     32          Enables bash-like auto-logout after $TMOUT seconds of idle time. 
     33 
    2634config BUSYBOX_CONFIG_ASH_JOB_CONTROL 
    2735        bool "Job control" 
     
    3240 
    3341config BUSYBOX_CONFIG_ASH_ALIAS 
    34         bool "alias support" 
     42        bool "Alias support" 
    3543        default y 
    3644        depends on BUSYBOX_CONFIG_ASH 
     
    4351        depends on BUSYBOX_CONFIG_ASH 
    4452        help 
    45           Enable getopts builtin in the ash shell. 
     53          Enable support for getopts builtin in ash. 
    4654 
    4755config BUSYBOX_CONFIG_ASH_BUILTIN_ECHO 
     
    5058        depends on BUSYBOX_CONFIG_ASH 
    5159        help 
    52           Enable support for echo, builtin to ash. 
     60          Enable support for echo builtin in ash. 
    5361 
    5462config BUSYBOX_CONFIG_ASH_BUILTIN_PRINTF 
     
    5765        depends on BUSYBOX_CONFIG_ASH 
    5866        help 
    59           Enable support for printf, builtin to ash. 
     67          Enable support for printf builtin in ash. 
    6068 
    6169config BUSYBOX_CONFIG_ASH_BUILTIN_TEST 
     
    6472        depends on BUSYBOX_CONFIG_ASH 
    6573        help 
    66           Enable support for test, builtin to ash. 
     74          Enable support for test builtin in ash. 
    6775 
    6876config BUSYBOX_CONFIG_ASH_CMDCMD 
     
    8088        depends on BUSYBOX_CONFIG_ASH 
    8189        help 
    82           Enable "check for new mail" in the ash shell. 
     90          Enable "check for new mail" function in the ash shell. 
    8391 
    8492config BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE 
     
    113121        default n 
    114122        help 
    115           One common problem reported on the mailing list is "can't access tty; 
    116           job control turned off" error message which typically appears when 
    117           one tries to use shell with stdin/stdout opened to /dev/console. 
     123          One common problem reported on the mailing list is the "can't 
     124          access tty; job control turned off" error message, which typically 
     125          appears when one tries to use a shell with stdin/stdout on 
     126          /dev/console. 
    118127          This device is special - it cannot be a controlling tty. 
    119128 
    120           Proper solution is to use correct device instead of /dev/console. 
    121  
    122           cttyhack provides "quick and dirty" solution to this problem. 
     129          The proper solution is to use the correct device instead of 
     130          /dev/console. 
     131 
     132          cttyhack provides a "quick and dirty" solution to this problem. 
    123133          It analyzes stdin with various ioctls, trying to determine whether 
    124134          it is a /dev/ttyN or /dev/ttySN (virtual terminal or serial line). 
    125           If it detects one, it closes stdin/out/err and reopens that device. 
    126           Then it executes given program. Opening the device will make 
     135          On Linux it also checks sysfs for a pointer to the active console. 
     136          If cttyhack is able to find the real console device, it closes 
     137          stdin/out/err and reopens that device. 
     138          Then it executes the given program. Opening the device will make 
    127139          that device a controlling tty. This may require cttyhack 
    128140          to be a session leader. 
     
    396408        depends on (BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH) && BUSYBOX_CONFIG_FEATURE_PREFER_APPLETS 
    397409        help 
    398           This option causes busybox shells [currently only ash] 
    399           to not execute typical fork/exec/wait sequence, but call <applet>_main 
    400           directly, if possible. (Sometimes it is not possible: for example, 
     410          This option causes busybox shells to not execute typical 
     411          fork/exec/wait sequence, but call <applet>_main directly, 
     412          if possible. (Sometimes it is not possible: for example, 
    401413          this is not possible in pipes). 
    402414 
     
    406418          This may significantly speed up some shell scripts. 
    407419 
    408           This feature is relatively new. Use with care. 
     420          This feature is relatively new. Use with care. Report bugs 
     421          to project mailing list. 
     422 
     423config BUSYBOX_CONFIG_FEATURE_SH_HISTFILESIZE 
     424        bool "Use $HISTFILESIZE" 
     425        default n 
     426        depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH 
     427        help 
     428          This option makes busybox shells to use $HISTFILESIZE variable 
     429          to set shell history size. Note that its max value is capped 
     430          by "History size" setting in library tuning section. 
     431 
    409432 
    410433endmenu 
  • trunk/package/busybox/config/sysklogd/Config.in

    r26455 r28513  
    5353          Option -D instructs syslogd to drop consecutive messages 
    5454          which are totally the same. 
     55 
     56config BUSYBOX_CONFIG_FEATURE_SYSLOGD_CFG 
     57        bool "Support syslog.conf" 
     58        default n 
     59        depends on BUSYBOX_CONFIG_SYSLOGD 
     60        help 
     61          Supports restricted syslogd config. See docs/syslog.conf.txt 
    5562 
    5663config BUSYBOX_CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE 
     
    121128        bool "Use the klogctl() interface" 
    122129        default y 
    123         depends on BUSYBOX_CONFIG_KLOGD && BUSYBOX_CONFIG_PLATFORM_LINUX 
     130        depends on BUSYBOX_CONFIG_KLOGD 
     131        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    124132        help 
    125133          The klogd applet supports two interfaces for reading 
  • trunk/package/busybox/config/util-linux/Config.in

    r26455 r28513  
     1# DO NOT EDIT. This file is generated from Config.src 
    12# 
    23# For a description of the syntax of this configuration file, 
     
    2021        bool "acpid" 
    2122        default n 
    22         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     23        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    2324        help 
    2425          acpid listens to ACPI events coming either in textual form from 
     
    4344        bool "blkid" 
    4445        default n 
    45         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     46        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    4647        select BUSYBOX_CONFIG_VOLUMEID 
    4748        help 
     
    5051          With all submodules selected, it will add ~8k to busybox. 
    5152 
     53config BUSYBOX_CONFIG_FEATURE_BLKID_TYPE 
     54        bool "Print filesystem type" 
     55        default n 
     56        depends on BUSYBOX_CONFIG_BLKID 
     57        help 
     58          Show TYPE="filesystem type" 
     59 
    5260config BUSYBOX_CONFIG_DMESG 
    5361        bool "dmesg" 
    5462        default y 
    55         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     63        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    5664        help 
    5765          dmesg is used to examine or control the kernel ring buffer. When the 
     
    8795        bool "fbset" 
    8896        default n 
    89         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     97        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    9098        help 
    9199          fbset is used to show or change the settings of a Linux frame buffer 
     
    116124        bool "fdflush" 
    117125        default n 
    118         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     126        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    119127        help 
    120128          fdflush is only needed when changing media on slightly-broken 
     
    129137        bool "fdformat" 
    130138        default n 
    131         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     139        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    132140        help 
    133141          fdformat is used to low-level format a floppy disk. 
     
    136144        bool "fdisk" 
    137145        default n 
    138         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     146        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    139147        help 
    140148          The fdisk utility is used to divide hard disks into one or more 
     
    147155        default y 
    148156        depends on BUSYBOX_CONFIG_FDISK 
     157        depends on !BUSYBOX_CONFIG_LFS   # with LFS no special code is needed 
    149158        help 
    150159          Enable this option to support large disks > 4GB. 
     
    212221        bool "findfs" 
    213222        default n 
    214         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     223        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    215224        select BUSYBOX_CONFIG_VOLUMEID 
    216225        help 
     
    228237        bool "freeramdisk" 
    229238        default n 
    230         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     239        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    231240        help 
    232241          Linux allows you to create ramdisks. This utility allows you to 
     
    251260        bool "mkfs_ext2" 
    252261        default n 
    253         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     262        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    254263        help 
    255264          Utility to create EXT2 filesystems. 
     
    258267        bool "mkfs_minix" 
    259268        default n 
    260         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     269        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    261270        help 
    262271          The minix filesystem is a nice, small, compact, read-write filesystem 
     
    276285        bool "mkfs_reiser" 
    277286        default n 
    278         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     287        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    279288        help 
    280289          Utility to create ReiserFS filesystems. 
     
    284293        bool "mkfs_vfat" 
    285294        default n 
    286         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     295        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    287296        help 
    288297          Utility to create FAT32 filesystems. 
     
    333342        bool "hwclock" 
    334343        default y 
    335         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     344        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    336345        help 
    337346          The hwclock utility is used to read and set the hardware clock 
     
    351360config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS 
    352361        bool "Use FHS /var/lib/hwclock/adjtime" 
    353         default n 
     362        default n  # util-linux-ng in Fedora 13 still uses /etc/adjtime 
    354363        depends on BUSYBOX_CONFIG_HWCLOCK 
    355364        help 
     
    372381        bool "ipcs" 
    373382        default n 
    374         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     383        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    375384        help 
    376385          The ipcs utility is used to provide information on the currently 
     
    380389        bool "losetup" 
    381390        default n 
    382         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     391        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    383392        help 
    384393          losetup is used to associate or detach a loop device with a regular 
     
    389398        bool "lspci" 
    390399        default n 
     400        #select PLATFORM_LINUX 
    391401        help 
    392402          lspci is a utility for displaying information about PCI buses in the 
     
    398408        bool "lsusb" 
    399409        default n 
     410        #select PLATFORM_LINUX 
    400411        help 
    401412          lsusb is a utility for displaying information about USB buses in the 
     
    407418        bool "mdev" 
    408419        default n 
    409         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     420        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    410421        help 
    411422          mdev is a mini-udev implementation for dynamically creating device 
     
    495506        bool "mount" 
    496507        default y 
    497         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     508        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    498509        help 
    499510          All files and filesystems in Unix are arranged into one big directory 
     
    578589        bool "pivot_root" 
    579590        default y 
    580         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     591        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    581592        help 
    582593          The pivot_root utility swaps the mount points for the root filesystem 
     
    590601config BUSYBOX_CONFIG_RDATE 
    591602        bool "rdate" 
    592         default y 
     603        default n 
    593604        help 
    594605          The rdate utility allows you to synchronize the date and time of your 
     
    606617        bool "readprofile" 
    607618        default n 
     619        #select PLATFORM_LINUX 
    608620        help 
    609621          This allows you to parse /proc/profile for basic profiling. 
     
    612624        bool "rtcwake" 
    613625        default n 
    614         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     626        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    615627        help 
    616628          Enter a system sleep state until specified wakeup time. 
     
    632644        bool "setarch" 
    633645        default n 
    634         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     646        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    635647        help 
    636648          The linux32 utility is used to create a 32bit environment for the 
     
    642654        bool "swaponoff" 
    643655        default n 
    644         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     656        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    645657        help 
    646658          This option enables both the 'swapon' and the 'swapoff' utilities. 
     
    661673        bool "switch_root" 
    662674        default y 
    663         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     675        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    664676        help 
    665677          The switch_root utility is used from initramfs to select a new 
     
    681693        bool "umount" 
    682694        default y 
    683         depends on BUSYBOX_CONFIG_PLATFORM_LINUX 
     695        select BUSYBOX_CONFIG_PLATFORM_LINUX 
    684696        help 
    685697          When you want to remove a mounted filesystem from its current mount 
     
    802814### config FEATURE_VOLUMEID_UFS 
    803815###     bool "ufs filesystem" 
    804 ###     default n 
     816###     default y 
    805817###     depends on VOLUMEID 
    806818###     help 
     
    886898### config FEATURE_VOLUMEID_MINIX 
    887899###     bool "minix filesystem" 
    888 ###     default n 
     900###     default y 
    889901###     depends on VOLUMEID 
    890902###     help 
     
    894906### config FEATURE_VOLUMEID_MAC 
    895907###     bool "mac filesystem" 
    896 ###     default n 
     908###     default y 
    897909###     depends on VOLUMEID 
    898910###     help 
     
    901913### config FEATURE_VOLUMEID_MSDOS 
    902914###     bool "msdos filesystem" 
    903 ###     default n 
     915###     default y 
    904916###     depends on VOLUMEID 
    905917###     help 
     
    915927### config FEATURE_VOLUMEID_HIGHPOINTRAID 
    916928###     bool "highpoint raid" 
    917 ###     default n 
     929###     default y 
    918930###     depends on VOLUMEID 
    919931###     help 
     
    922934### config FEATURE_VOLUMEID_ISWRAID 
    923935###     bool "intel raid" 
    924 ###     default n 
     936###     default y 
    925937###     depends on VOLUMEID 
    926938###     help 
     
    929941### config FEATURE_VOLUMEID_LSIRAID 
    930942###     bool "lsi raid" 
    931 ###     default n 
     943###     default y 
    932944###     depends on VOLUMEID 
    933945###     help 
     
    936948### config FEATURE_VOLUMEID_VIARAID 
    937949###     bool "via raid" 
    938 ###     default n 
     950###     default y 
    939951###     depends on VOLUMEID 
    940952###     help 
     
    943955### config FEATURE_VOLUMEID_SILICONRAID 
    944956###     bool "silicon raid" 
    945 ###     default n 
     957###     default y 
    946958###     depends on VOLUMEID 
    947959###     help 
     
    950962### config FEATURE_VOLUMEID_NVIDIARAID 
    951963###     bool "nvidia raid" 
    952 ###     default n 
     964###     default y 
    953965###     depends on VOLUMEID 
    954966###     help 
     
    957969### config FEATURE_VOLUMEID_PROMISERAID 
    958970###     bool "promise raid" 
    959 ###     default n 
     971###     default y 
    960972###     depends on VOLUMEID 
    961973###     help 
  • trunk/package/busybox/patches/001-init_avoid_loop_opening_tty.patch

    r26738 r28513  
    11--- a/init/init.c 
    22+++ b/init/init.c 
    3 @@ -572,8 +572,11 @@ static void run_actions(int action_type) 
     3@@ -573,8 +573,11 @@ static void run_actions(int action_type) 
    44                        /* Only run stuff with pid == 0. If pid != 0, 
    55                         * it is already running 
  • trunk/package/busybox/patches/003-brctl_show_fix.patch

    r26738 r28513  
    11--- a/networking/brctl.c 
    22+++ b/networking/brctl.c 
    3 @@ -105,7 +105,7 @@ int brctl_main(int argc UNUSED_PARAM, ch 
     3@@ -129,7 +129,7 @@ int brctl_main(int argc UNUSED_PARAM, ch 
    44                "setageing\0" "setfd\0" "sethello\0" "setmaxage\0" 
    55                "setpathcost\0" "setportprio\0" "setbridgeprio\0" 
     
    1010        enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif 
    1111                IF_FEATURE_BRCTL_FANCY(, 
    12 @@ -113,7 +113,7 @@ int brctl_main(int argc UNUSED_PARAM, ch 
     12@@ -137,7 +137,7 @@ int brctl_main(int argc UNUSED_PARAM, ch 
    1313                   ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage, 
    1414                   ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio 
  • trunk/package/busybox/patches/110-wget_getopt_fix.patch

    r26738 r28513  
    11--- a/networking/wget.c 
    22+++ b/networking/wget.c 
    3 @@ -597,7 +597,7 @@ int wget_main(int argc UNUSED_PARAM, cha 
     3@@ -872,7 +872,7 @@ int wget_main(int argc UNUSED_PARAM, cha 
    44                /* Ignored: */ 
    55                // "tries\0"            Required_argument "t" 
  • trunk/package/busybox/patches/200-etc_crontabs.patch

    r26738 r28513  
    11--- a/miscutils/crond.c 
    22+++ b/miscutils/crond.c 
    3 @@ -24,7 +24,7 @@ 
     3@@ -37,7 +37,7 @@ 
    44  
    55  
     
    1212--- a/miscutils/crontab.c 
    1313+++ b/miscutils/crontab.c 
    14 @@ -12,7 +12,7 @@ 
     14@@ -22,7 +22,7 @@ 
    1515  
    1616 #include "libbb.h" 
  • trunk/package/busybox/patches/240-udhcpc_retries.patch

    r26738 r28513  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -1196,7 +1196,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
     3@@ -1257,7 +1257,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
    44  
    55                        switch (state) { 
     
    1010                                                xid = random_xid(); 
    1111                                        /* broadcast */ 
    12 @@ -1225,7 +1225,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
     12@@ -1286,7 +1286,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
    1313                                packet_num = 0; 
    1414                                continue; 
  • trunk/package/busybox/patches/241-udhcpc-oversized_packets.patch

    r26738 r28513  
    11--- a/networking/udhcp/packet.c 
    22+++ b/networking/udhcp/packet.c 
    3 @@ -165,6 +165,11 @@ uint16_t FAST_FUNC udhcp_checksum(void * 
     3@@ -158,6 +158,11 @@ uint16_t FAST_FUNC udhcp_checksum(void * 
    44        return ~sum; 
    55 } 
     
    1313 int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, 
    1414                uint32_t source_nip, int source_port, 
    15 @@ -173,10 +178,10 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     15@@ -166,10 +171,10 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
    1616 { 
    1717        struct sockaddr_ll dest_sll; 
     
    2525        fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP)); 
    2626        if (fd < 0) { 
    27 @@ -185,8 +190,8 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     27@@ -178,8 +183,8 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
    2828        } 
    2929  
     
    3636        dest_sll.sll_family = AF_PACKET; 
    3737        dest_sll.sll_protocol = htons(ETH_P_IP); 
    38 @@ -199,36 +204,24 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     38@@ -192,36 +197,24 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
    3939                goto ret_close; 
    4040        } 
     
    7979        msg = "sendto"; 
    8080  ret_close: 
    81 @@ -246,7 +239,6 @@ int FAST_FUNC udhcp_send_kernel_packet(s 
     81@@ -239,7 +232,6 @@ int FAST_FUNC udhcp_send_kernel_packet(s 
    8282                uint32_t dest_nip, int dest_port) 
    8383 { 
     
    8787        int result = -1; 
    8888        const char *msg; 
    89 @@ -277,9 +269,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s 
     89@@ -270,9 +262,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s 
    9090        } 
    9191  
  • trunk/package/busybox/patches/242-udhcpc_msgs.patch

    r26738 r28513  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -436,6 +436,7 @@ static int raw_bcast_from_client_config_ 
     3@@ -540,6 +540,7 @@ static int raw_bcast_from_client_config_ 
    44 static NOINLINE int send_discover(uint32_t xid, uint32_t requested) 
    55 { 
     
    99        /* Fill in: op, htype, hlen, cookie, chaddr fields, 
    1010         * random xid field (we override it below), 
    11 @@ -453,6 +454,7 @@ static NOINLINE int send_discover(uint32 
     11@@ -557,6 +558,7 @@ static NOINLINE int send_discover(uint32 
    1212         */ 
    1313        add_client_options(&packet); 
  • trunk/package/busybox/patches/243-udhcpc_changed_ifindex.patch

    r26738 r28513  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -1144,6 +1144,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
     3@@ -1205,6 +1205,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
    44                /* silence "uninitialized!" warning */ 
    55                unsigned timestamp_before_wait = timestamp_before_wait; 
  • trunk/package/busybox/patches/244-udhcpc_add_6rd_option.patch

    r26737 r28513  
    11--- a/networking/udhcp/common.c 
    22+++ b/networking/udhcp/common.c 
    3 @@ -56,6 +56,8 @@ const struct dhcp_optflag dhcp_optflags[ 
     3@@ -60,6 +60,8 @@ const struct dhcp_optflag dhcp_optflags[ 
     4        { OPTION_U8                               , 0x85 }, /* DHCP_VLAN_PRIORITY */ 
    45 #endif 
    5         { OPTION_STATIC_ROUTES                    , 0x79 }, /* DHCP_STATIC_ROUTES */ 
    66        { OPTION_STATIC_ROUTES                    , 0xf9 }, /* DHCP_MS_STATIC_ROUTES */ 
    77+       { OPTION_6RD                              , 0xd4 }, /* DHCP_6RD (RFC)     */ 
     
    1010  
    1111        /* Options below have no match in dhcp_option_strings[], 
    12 @@ -119,6 +121,8 @@ const char dhcp_option_strings[] ALIGN1  
    13  // is not handled yet by "string->option" conversion code: 
    14         "staticroutes" "\0"/* DHCP_STATIC_ROUTES  */ 
     12@@ -127,6 +129,8 @@ const char dhcp_option_strings[] ALIGN1  
     13        "vlanpriority" "\0"/* DHCP_VLAN_PRIORITY  */ 
     14 #endif 
    1515        "msstaticroutes""\0"/* DHCP_MS_STATIC_ROUTES */ 
    1616+       "ip6rd" "\0"       /* DHCP_6RD (RFC)      */ 
     
    1919        ; 
    2020  
    21 @@ -146,6 +150,7 @@ const uint8_t dhcp_option_lengths[] ALIG 
     21@@ -154,6 +158,7 @@ const uint8_t dhcp_option_lengths[] ALIG 
    2222        [OPTION_S32] =     4, 
    2323        /* Just like OPTION_STRING, we use minimum length here */ 
     
    3939--- a/networking/udhcp/dhcpc.c 
    4040+++ b/networking/udhcp/dhcpc.c 
    41 @@ -45,6 +45,7 @@ static const uint8_t len_of_option_as_st 
     41@@ -100,6 +100,7 @@ static const uint8_t len_of_option_as_st 
    4242        [OPTION_IP              ] = sizeof("255.255.255.255 "), 
    4343        [OPTION_IP_PAIR         ] = sizeof("255.255.255.255 ") * 2, 
     
    4747 #if ENABLE_FEATURE_UDHCP_RFC3397 
    4848        [OPTION_DNS_STRING      ] = 1, /* unused */ 
    49 @@ -68,6 +69,23 @@ static int sprint_nip(char *dest, const  
     49@@ -123,6 +124,23 @@ static int sprint_nip(char *dest, const  
    5050        return sprintf(dest, "%s%u.%u.%u.%u", pre, ip[0], ip[1], ip[2], ip[3]); 
    5151 } 
     
    7171 static int mton(uint32_t mask) 
    7272 { 
    73 @@ -177,6 +195,70 @@ static NOINLINE char *xmalloc_optname_op 
     73@@ -232,6 +250,70 @@ static NOINLINE char *xmalloc_optname_op 
    7474  
    7575                        return ret; 
  • trunk/package/busybox/patches/250-ash_export-n.patch

    r26738 r28513  
    11--- a/shell/ash.c 
    22+++ b/shell/ash.c 
    3 @@ -12532,8 +12532,17 @@ exportcmd(int argc UNUSED_PARAM, char ** 
     3@@ -12611,8 +12611,17 @@ exportcmd(int argc UNUSED_PARAM, char ** 
    44        const char *p; 
    55        char **aptr; 
     
    2020                name = *aptr; 
    2121                if (name) { 
    22 @@ -12545,10 +12554,12 @@ exportcmd(int argc UNUSED_PARAM, char ** 
     22@@ -12624,10 +12633,12 @@ exportcmd(int argc UNUSED_PARAM, char ** 
    2323                                        vp = *findvar(hashvar(name), name); 
    2424                                        if (vp) { 
  • trunk/package/busybox/patches/300-netmsg.patch

    r26738 r28513  
    11--- a/include/applets.src.h 
    22+++ b/include/applets.src.h 
    3 @@ -256,6 +256,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_D 
    4  IF_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_DROP)) 
    5  IF_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_DROP)) 
    6  IF_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_DROP)) 
    7 +IF_NETMSG(APPLET(netmsg, _BB_DIR_BIN, _BB_SUID_REQUIRE)) 
    8  IF_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_DROP)) 
    9  IF_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_DROP)) 
    10  IF_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_DROP)) 
    11 --- a/include/usage.src.h 
    12 +++ b/include/usage.src.h 
    13 @@ -1,3 +1,4 @@ 
    14 + 
    15  /* vi: set sw=8 ts=8: */ 
    16  /* 
    17   * This file suffers from chronically incorrect tabification 
    18 @@ -2706,6 +2707,9 @@ INSERT 
    19         " or\n" \ 
    20         "$ nameif -c /etc/my_mactab_file\n" \ 
    21   
    22 +#define netmsg_trivial_usage NOUSAGE_STR 
    23 +#define netmsg_full_usage "" 
    24 + 
    25  #define nmeter_trivial_usage \ 
    26         "format_string" 
    27  #define nmeter_full_usage "\n\n" \ 
     3@@ -266,6 +266,7 @@ IF_MT(APPLET(mt, BB_DIR_BIN, BB_SUID_DRO 
     4 IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP)) 
     5 IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP)) 
     6 IF_NC(APPLET(nc, BB_DIR_USR_BIN, BB_SUID_DROP)) 
     7+IF_NETMSG(APPLET(netmsg, BB_DIR_BIN, BB_SUID_REQUIRE)) 
     8 IF_NETSTAT(APPLET(netstat, BB_DIR_BIN, BB_SUID_DROP)) 
     9 IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP)) 
     10 IF_NOHUP(APPLET(nohup, BB_DIR_USR_BIN, BB_SUID_DROP)) 
    2811--- a/networking/Config.src 
    2912+++ b/networking/Config.src 
    30 @@ -640,6 +640,12 @@ config FEATURE_NAMEIF_EXTENDED 
    31             new_interface_name  mac=00:80:C8:38:91:B5 
    32             new_interface_name  00:80:C8:38:91:B5 
     13@@ -612,6 +612,12 @@ config FEATURE_IPCALC_LONG_OPTIONS 
     14        help 
     15          Support long options for the ipcalc applet. 
    3316  
    3417+config NETMSG 
     
    5336--- /dev/null 
    5437+++ b/networking/netmsg.c 
    55 @@ -0,0 +1,63 @@ 
     38@@ -0,0 +1,65 @@ 
    5639+/* 
    5740+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> 
     
    6851+#include "busybox.h" 
    6952+ 
     53+//usage:#define netmsg_trivial_usage NOUSAGE_STR 
     54+//usage:#define netmsg_full_usage "" 
    7055+ 
    7156+#ifndef CONFIG_NETMSG 
  • trunk/package/busybox/patches/310-passwd_access.patch

    r26738 r28513  
    44--- a/networking/httpd.c 
    55+++ b/networking/httpd.c 
    6 @@ -1742,21 +1742,32 @@ static int check_user_passwd(const char  
     6@@ -1772,21 +1772,32 @@ static int check_user_passwd(const char  
    77  
    88                if (ENABLE_FEATURE_HTTPD_AUTH_MD5) { 
  • trunk/package/busybox/patches/340-lock_util.patch

    r26738 r28513  
    11--- a/include/applets.src.h 
    22+++ b/include/applets.src.h 
    3 @@ -213,6 +213,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, 
    4  IF_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) 
    5  IF_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) 
    6  IF_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_DROP)) 
    7 +IF_LOCK(APPLET(lock, _BB_DIR_BIN, _BB_SUID_DROP)) 
    8  IF_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_DROP)) 
    9  IF_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_REQUIRE)) 
    10  IF_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_DROP, logname)) 
    11 --- a/include/usage.src.h 
    12 +++ b/include/usage.src.h 
    13 @@ -2089,6 +2089,9 @@ INSERT 
    14  #define loadkmap_example_usage \ 
    15         "$ loadkmap < /etc/i18n/lang-keymap\n" 
    16   
    17 +#define lock_trivial_usage NOUSAGE_STR 
    18 +#define lock_full_usage "" 
    19 + 
    20  #define logger_trivial_usage \ 
    21         "[OPTIONS] [MESSAGE]" 
    22  #define logger_full_usage "\n\n" \ 
     3@@ -218,6 +218,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN,  
     4 IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP)) 
     5 IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP)) 
     6 IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP)) 
     7+IF_LOCK(APPLET(lock, BB_DIR_BIN, BB_SUID_DROP)) 
     8 IF_LOGGER(APPLET(logger, BB_DIR_USR_BIN, BB_SUID_DROP)) 
     9 /* Needs to be run by root or be suid root - needs to change uid and gid: */ 
     10 IF_LOGIN(APPLET(login, BB_DIR_BIN, BB_SUID_REQUIRE)) 
    2311--- a/miscutils/Config.src 
    2412+++ b/miscutils/Config.src 
    25 @@ -485,6 +485,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA 
     13@@ -419,6 +419,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA 
    2614        help 
    2715          Enables the 'hdparm -d' option to get/set using_dma flag. 
     
    4735--- /dev/null 
    4836+++ b/miscutils/lock.c 
    49 @@ -0,0 +1,132 @@ 
     37@@ -0,0 +1,135 @@ 
    5038+/* 
    5139+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> 
     
    6149+#include <stdio.h> 
    6250+#include "busybox.h" 
     51+ 
     52+//usage:#define lock_trivial_usage NOUSAGE_STR 
     53+//usage:#define lock_full_usage "" 
    6354+ 
    6455+static int unlock = 0; 
  • trunk/package/busybox/patches/350-httpd_redir.patch

    r26738 r28513  
    1 --- a/include/usage.src.h 
    2 +++ b/include/usage.src.h 
    3 @@ -1623,7 +1623,8 @@ INSERT 
    4         IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]") \ 
    5         IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \ 
    6         " [-h HOME]\n" \ 
    7 -       "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING" 
    8 +       "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING" \ 
    9 +       " [-R <path> [-H <host>]]" 
    10  #define httpd_full_usage "\n\n" \ 
    11         "Listen for incoming HTTP requests\n" \ 
    12       "\nOptions:" \ 
    13 @@ -1641,6 +1642,8 @@ INSERT 
    14       "\n       -m STRING       MD5 crypt STRING") \ 
    15       "\n       -e STRING       HTML encode STRING" \ 
    16       "\n       -d STRING       URL decode STRING" \ 
    17 +     "\n       -R PATH         Redirect target path" \ 
    18 +     "\n       -H HOST         Redirect target host" \ 
    19   
    20  #define hwclock_trivial_usage \ 
    21         IF_FEATURE_HWCLOCK_LONG_OPTIONS( \ 
    221--- a/networking/httpd.c 
    232+++ b/networking/httpd.c 
    24 @@ -243,6 +243,8 @@ struct globals { 
     3@@ -105,6 +105,7 @@ 
     4 //usage:       IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") 
     5 //usage:       " [-h HOME]\n" 
     6 //usage:       "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING" 
     7+//usage:       " [-R <path> [-H <host>]]" 
     8 //usage:#define httpd_full_usage "\n\n" 
     9 //usage:       "Listen for incoming HTTP requests\n" 
     10 //usage:     "\n       -i              Inetd mode" 
     11@@ -121,6 +122,8 @@ 
     12 //usage:     "\n       -m STRING       MD5 crypt STRING") 
     13 //usage:     "\n       -e STRING       HTML encode STRING" 
     14 //usage:     "\n       -d STRING       URL decode STRING" 
     15+//usage:     "\n       -R PATH         Redirect target path" 
     16+//usage:     "\n       -H HOST         Redirect target host" 
     17  
     18 #include "libbb.h" 
     19 #if ENABLE_FEATURE_HTTPD_USE_SENDFILE 
     20@@ -272,6 +275,8 @@ struct globals { 
    2521  
    2622        const char *found_mime_type; 
     
    3127  
    3228        IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) 
    33 @@ -293,6 +295,8 @@ struct globals { 
     29@@ -322,6 +327,8 @@ struct globals { 
    3430 #define index_page        (G.index_page       ) 
    3531 #define found_mime_type   (G.found_mime_type  ) 
     
    4036 #define ip_a_d            (G.ip_a_d           ) 
    4137 #define g_realm           (G.g_realm          ) 
    42 @@ -999,8 +1003,11 @@ static void send_headers(int responseNum 
     38@@ -1028,8 +1035,11 @@ static void send_headers(int responseNum 
    4339        } 
    4440 #endif 
     
    5349                                (g_query ? g_query : "")); 
    5450        } 
    55 @@ -1967,8 +1974,12 @@ static void handle_incoming_and_exit(con 
     51@@ -1997,8 +2007,12 @@ static void handle_incoming_and_exit(con 
    5652        } while (*++tptr); 
    5753        *++urlp = '\0';       /* terminate after last character */ 
     
    6763                        found_moved_temporarily = urlcopy; 
    6864                } 
    69 @@ -2325,7 +2336,9 @@ static void sighup_handler(int sig UNUSE 
     65@@ -2355,7 +2369,9 @@ static void sighup_handler(int sig UNUSE 
    7066 } 
    7167  
     
    7874        h_opt_home_httpd, 
    7975        IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) 
    80 @@ -2374,12 +2387,13 @@ int httpd_main(int argc UNUSED_PARAM, ch 
     76@@ -2404,12 +2420,13 @@ int httpd_main(int argc UNUSED_PARAM, ch 
    8177        /* We do not "absolutize" path given by -h (home) opt. 
    8278         * If user gives relative path in -h, 
  • trunk/package/busybox/patches/410-httpd_cgi_headers.patch

    r26738 r28513  
    11--- a/networking/httpd.c 
    22+++ b/networking/httpd.c 
    3 @@ -1261,10 +1261,10 @@ static NOINLINE void cgi_io_loop_and_exi 
     3@@ -1294,10 +1294,10 @@ static NOINLINE void cgi_io_loop_and_exi 
    44                                                if (full_write(STDOUT_FILENO, HTTP_200, sizeof(HTTP_200)-1) != sizeof(HTTP_200)-1) 
    55                                                        break; 
  • trunk/package/busybox/patches/440-httpd_chdir.patch

    r26738 r28513  
    11--- a/networking/httpd.c 
    22+++ b/networking/httpd.c 
    3 @@ -1853,6 +1853,7 @@ static void handle_incoming_and_exit(con 
     3@@ -1886,6 +1886,7 @@ static void handle_incoming_and_exit(con 
    44        char *header_ptr = header_ptr; 
    55        Htaccess_Proxy *proxy_entry; 
  • trunk/package/busybox/patches/470-insmod_search.patch

    r27189 r28513  
     1--- a/modutils/Config.src 
     2+++ b/modutils/Config.src 
     3@@ -247,7 +247,7 @@ config FEATURE_MODUTILS_SYMBOLS 
     4 config DEFAULT_MODULES_DIR 
     5        string "Default directory containing modules" 
     6        default "/lib/modules" 
     7-       depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO 
     8+       depends on DEPMOD || INSMOD || MODPROBE || MODPROBE_SMALL || MODINFO 
     9        help 
     10          Directory that contains kernel modules. 
     11          Defaults to "/lib/modules" 
    112--- a/modutils/insmod.c 
    213+++ b/modutils/insmod.c 
     
    108119 /* 2.6 style insmod has no options and required filename 
    109120  * (not module name - .ko can't be omitted) */ 
    110 @@ -59,9 +159,15 @@ int insmod_main(int argc UNUSED_PARAM, c 
     121@@ -58,9 +158,15 @@ int insmod_main(int argc UNUSED_PARAM, c 
    111122        if (!filename) 
    112123                bb_show_usage(); 
    113124  
    114 -       rc = bb_init_module(filename, parse_cmdline_module_options(argv)); 
     125-       rc = bb_init_module(filename, parse_cmdline_module_options(argv, /*quote_spaces:*/ 0)); 
    115126+       rc = find_module(filename); 
    116127+       if (rc || (g_filename == NULL)) 
    117 +                       goto done; 
     128+               goto done; 
    118129+ 
    119 +       rc = bb_init_module(g_filename, parse_cmdline_module_options(argv)); 
     130+       rc = bb_init_module(g_filename, parse_cmdline_module_options(argv, /*quote_spaces:*/ 0)); 
    120131        if (rc) 
    121132                bb_error_msg("can't insert '%s': %s", filename, moderror(rc)); 
     
    125136        return rc; 
    126137 } 
    127 --- a/modutils/Config.src 
    128 +++ b/modutils/Config.src 
    129 @@ -229,7 +229,7 @@ config FEATURE_MODUTILS_SYMBOLS 
    130  config DEFAULT_MODULES_DIR 
    131         string "Default directory containing modules" 
    132         default "/lib/modules" 
    133 -       depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO 
    134 +       depends on DEPMOD || INSMOD || MODPROBE || MODPROBE_SMALL || MODINFO 
    135         help 
    136           Directory that contains kernel modules. 
    137           Defaults to "/lib/modules" 
  • trunk/package/busybox/patches/480-mount_union.patch

    r20661 r28513  
    11--- a/util-linux/mount.c 
    22+++ b/util-linux/mount.c 
    3 @@ -77,6 +77,10 @@ 
     3@@ -136,6 +136,10 @@ 
    44 # include <rpc/pmap_clnt.h> 
    55 #endif 
     
    1212 #if defined(__dietlibc__) 
    1313 // 16.12.2006, Sampo Kellomaki (sampo@iki.fi) 
    14 @@ -194,6 +198,7 @@ static const int32_t mount_options[] = { 
     14@@ -254,6 +258,7 @@ static const int32_t mount_options[] = { 
    1515                /* "rslave"      */ MS_SLAVE|MS_RECURSIVE, 
    16                 /* "rprivate"    */ MS_SLAVE|MS_RECURSIVE, 
     16                /* "rprivate"    */ MS_PRIVATE|MS_RECURSIVE, 
    1717                /* "runbindable" */ MS_UNBINDABLE|MS_RECURSIVE, 
    1818+               /* "union"       */ MS_UNION, 
     
    2020  
    2121        // Always understood. 
    22 @@ -249,6 +254,7 @@ static const char mount_option_str[] = 
    23                 "rslave\0" 
    24                 "rprivate\0" 
    25                 "runbindable\0" 
    26 +               "union" "\0" 
     22@@ -310,6 +315,7 @@ static const char mount_option_str[] = 
     23                "make-rslave\0" 
     24                "make-rprivate\0" 
     25                "make-runbindable\0" 
     26+               "make-union\0" 
    2727        ) 
    2828  
  • trunk/package/busybox/patches/490-mount_disable_check.patch

    r25506 r28513  
    11--- a/util-linux/mount.c 
    22+++ b/util-linux/mount.c 
    3 @@ -69,9 +69,6 @@ 
     3@@ -128,9 +128,6 @@ 
    44 #if ENABLE_FEATURE_MOUNT_NFS 
    55 /* This is just a warning of a common mistake.  Possibly this should be a 
  • trunk/package/busybox/patches/510-awk_include.patch

    r26738 r28513  
    66 /* 
    77  * awk implementation for busybox 
    8 @@ -74,9 +75,14 @@ typedef struct chain_s { 
     8@@ -81,9 +82,14 @@ typedef struct chain_s { 
    99 } chain; 
    1010  
     
    2121  
    2222 /* I/O stream */ 
    23 @@ -1466,7 +1472,8 @@ static void parse_program(char *p) 
     23@@ -1473,7 +1479,8 @@ static void parse_program(char *p) 
    2424                        next_token(TC_FUNCTION); 
    2525                        g_pos++; 
     
    3131                        while (next_token(TC_VARIABLE | TC_SEQTERM) & TC_VARIABLE) { 
    3232                                v = findvar(ahash, t_string); 
    33 @@ -1475,7 +1482,7 @@ static void parse_program(char *p) 
     33@@ -1482,7 +1489,7 @@ static void parse_program(char *p) 
    3434                                if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM) 
    3535                                        break; 
     
    4040                        clear_array(ahash); 
    4141  
    42 @@ -2573,7 +2580,8 @@ static var *evaluate(node *op, var *res) 
     42@@ -2580,7 +2587,8 @@ static var *evaluate(node *op, var *res) 
    4343                        var *vbeg, *v; 
    4444                        const char *sv_progname; 
     
    5050  
    5151                        vbeg = v = nvalloc(op->r.f->nargs + 1); 
    52 @@ -2590,7 +2598,10 @@ static var *evaluate(node *op, var *res) 
     52@@ -2597,7 +2605,10 @@ static var *evaluate(node *op, var *res) 
    5353                        fnargs = vbeg; 
    5454                        sv_progname = g_progname; 
     
    6262                        g_progname = sv_progname; 
    6363                        nvfree(fnargs); 
    64 @@ -2984,6 +2995,143 @@ static rstream *next_input_file(void) 
     64@@ -2991,6 +3002,143 @@ static rstream *next_input_file(void) 
    6565 #undef files_happen 
    6666 } 
     
    206206 int awk_main(int argc, char **argv) 
    207207 { 
    208 @@ -3049,6 +3197,9 @@ int awk_main(int argc, char **argv) 
     208@@ -3056,6 +3204,9 @@ int awk_main(int argc, char **argv) 
    209209                        *s1 = '='; 
    210210                } 
  • trunk/package/busybox/patches/524-udhcpc_renew.patch

    r26738 r28513  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -874,7 +874,6 @@ static void perform_renew(void) 
     3@@ -983,7 +983,6 @@ static void perform_renew(void) 
    44                state = RENEW_REQUESTED; 
    55                break; 
  • trunk/package/busybox/patches/802-brctl_linux24.patch

    r22659 r28513  
    11--- a/networking/brctl.c 
    22+++ b/networking/brctl.c 
    3 @@ -32,7 +32,7 @@ 
     3@@ -56,7 +56,7 @@ 
    44  
    55 /* Maximum number of ports supported per bridge interface.  */ 
     
    1010  
    1111 /* Use internal number parsing and not the "exact" conversion.  */ 
    12 @@ -169,6 +169,7 @@ int brctl_main(int argc UNUSED_PARAM, ch 
     12@@ -193,6 +193,7 @@ int brctl_main(int argc UNUSED_PARAM, ch 
    1313                                printf(bi.stp_enabled ? "\tyes" : "\tno"); 
    1414  
     
    1818                                                        (unsigned long) ifidx, MAX_PORTS); 
    1919                                xioctl(fd, SIOCDEVPRIVATE, &ifr); 
    20 @@ -197,9 +198,19 @@ int brctl_main(int argc UNUSED_PARAM, ch 
     20@@ -221,9 +222,19 @@ int brctl_main(int argc UNUSED_PARAM, ch 
    2121                br = *argv++; 
    2222  
     
    4141                } 
    4242  
    43 @@ -208,14 +219,27 @@ int brctl_main(int argc UNUSED_PARAM, ch 
     43@@ -232,14 +243,27 @@ int brctl_main(int argc UNUSED_PARAM, ch 
    4444  
    4545                strncpy_IFNAMSIZ(ifr.ifr_name, br); 
  • trunk/package/busybox/patches/803-id_getgrouplist.patch

    r26738 r28513  
    66--- a/coreutils/id.c 
    77+++ b/coreutils/id.c 
    8 @@ -19,10 +19,12 @@ 
     8@@ -63,10 +63,12 @@ 
    99  
    1010 /* This is a NOEXEC applet. Be very careful! */ 
     
    2020 #endif 
    2121 #endif 
    22 @@ -84,7 +86,11 @@ static int get_groups(const char *userna 
     22@@ -128,7 +130,11 @@ static int get_groups(const char *userna 
    2323                /* If the user is a member of more than 
    2424                 * *n groups, then -1 is returned. Otherwise >= 0. 
     
    3131                /* I guess *n < 0 might indicate error. Anyway, 
    3232                 * malloc'ing -1 bytes won't be good, so: */ 
    33                 //if (*n < 0) 
    34 @@ -156,6 +162,7 @@ int id_main(int argc UNUSED_PARAM, char  
     33                if (*n < 0) 
     34@@ -210,6 +216,7 @@ int id_main(int argc UNUSED_PARAM, char  
    3535                        if (egid != rgid) 
    3636                                status |= print_group(egid, " "); 
     
    4040                 * to not run get_groups() twice. That might be slow 
    4141                 * ("user database in remote SQL server" case) */ 
    42 @@ -183,6 +190,7 @@ int id_main(int argc UNUSED_PARAM, char  
     42@@ -236,6 +243,7 @@ int id_main(int argc UNUSED_PARAM, char  
    4343                } 
    4444                if (ENABLE_FEATURE_CLEAN_UP) 
  • trunk/package/busybox/patches/902-telnetd_intr.patch

    r22660 r28513  
    11--- a/networking/telnetd.c 
    22+++ b/networking/telnetd.c 
    3 @@ -313,6 +313,7 @@ make_new_session( 
     3@@ -330,6 +330,7 @@ make_new_session( 
    44  
    55        /* Restore default signal handling ASAP */ 
     
    77+       signal(SIGINT, SIG_DFL); 
    88  
    9         if (ENABLE_FEATURE_UTMP) { 
    10                 len_and_sockaddr *lsa = get_peer_lsa(sock); 
     9        pid = getpid(); 
     10  
  • trunk/package/busybox/patches/910-insmod-q-flag.patch

    r26738 r28513  
    11--- a/modutils/insmod.c 
    22+++ b/modutils/insmod.c 
    3 @@ -133,7 +133,7 @@ int insmod_main(int argc, char **argv) M 
     3@@ -139,7 +139,7 @@ int insmod_main(int argc, char **argv) M 
    44 int insmod_main(int argc UNUSED_PARAM, char **argv) 
    55 { 
     
    1010        /* Compat note: 
    1111         * 2.6 style insmod has no options and required filename 
    12 @@ -143,10 +143,8 @@ int insmod_main(int argc UNUSED_PARAM, c 
     12@@ -149,10 +149,8 @@ int insmod_main(int argc UNUSED_PARAM, c 
    1313         * or in $MODPATH. 
    1414         */ 
     
    2323        filename = *++argv; 
    2424        if (!filename) 
    25 @@ -157,7 +155,7 @@ int insmod_main(int argc UNUSED_PARAM, c 
    26                         goto done; 
     25@@ -163,7 +161,7 @@ int insmod_main(int argc UNUSED_PARAM, c 
     26                goto done; 
    2727  
    28         rc = bb_init_module(g_filename, parse_cmdline_module_options(argv)); 
     28        rc = bb_init_module(g_filename, parse_cmdline_module_options(argv, /*quote_spaces:*/ 0)); 
    2929-       if (rc) 
    3030+       if (rc && !(opt & INSMOD_OPT_SILENT)) 
Note: See TracChangeset for help on using the changeset viewer.