Changeset 17782


Ignore:
Timestamp:
2009-09-28T14:38:46+02:00 (7 years ago)
Author:
nico
Message:

[package] busybox: update to v1.14.4 (closes: #5619)

Location:
trunk/package/busybox
Files:
36 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/busybox/Makefile

    r16063 r17782  
    99 
    1010PKG_NAME:=busybox 
    11 PKG_VERSION:=1.13.4 
     11PKG_VERSION:=1.14.4 
    1212PKG_RELEASE:=1 
    1313 
     
    1515PKG_SOURCE_URL:=http://www.busybox.net/downloads \ 
    1616                http://distfiles.gentoo.org/distfiles/ 
    17 PKG_MD5SUM:=8a5eb7f15d4077d18fa97bda7a4e5412 
     17PKG_MD5SUM:=ad6d0b271e60783a3c767c4ccbc7f98e 
    1818 
    1919include $(INCLUDE_DIR)/package.mk 
  • trunk/package/busybox/config/Config.in

    r16063 r17782  
    410410 
    411411          Native builds leave this empty. 
     412 
     413config BUSYBOX_CONFIG_EXTRA_CFLAGS 
     414        string "Additional CFLAGS" 
     415        default "" 
     416        help 
     417          Additional CFLAGS to pass to the compiler verbatim. 
    412418 
    413419endmenu 
  • trunk/package/busybox/config/archival/Config.in

    r16063 r17782  
    111111          format only. 
    112112 
     113config BUSYBOX_CONFIG_FEATURE_CPIO_P 
     114        bool "Support for passthrough mode" 
     115        default n 
     116        depends on BUSYBOX_CONFIG_FEATURE_CPIO_O 
     117        help 
     118          Passthrough mode. Rarely used. 
     119 
    113120config BUSYBOX_CONFIG_DPKG 
    114121        bool "dpkg" 
  • trunk/package/busybox/config/coreutils/Config.in

    r16063 r17782  
    190190        bool "Enable echo options (-n and -e)" 
    191191        default y 
    192         depends on BUSYBOX_CONFIG_ECHO || BUSYBOX_CONFIG_ASH_BUILTIN_ECHO 
     192        depends on BUSYBOX_CONFIG_ECHO || BUSYBOX_CONFIG_ASH_BUILTIN_ECHO || BUSYBOX_CONFIG_HUSH 
    193193        help 
    194194          This adds options (-n and -e) to echo. 
     
    509509        help 
    510510          Compute and check SHA1 message digest 
     511 
     512config BUSYBOX_CONFIG_SHA256SUM 
     513        bool "sha256sum" 
     514        default n 
     515        help 
     516          Compute and check SHA256 message digest 
     517 
     518config BUSYBOX_CONFIG_SHA512SUM 
     519        bool "sha512sum" 
     520        default n 
     521        help 
     522          Compute and check SHA512 message digest 
    511523 
    512524config BUSYBOX_CONFIG_SLEEP 
     
    755767        depends on BUSYBOX_CONFIG_WC 
    756768        help 
    757           Use "unsigned long long" in wc for count variables. 
     769          Use "unsigned long long" in wc for counter variables. 
    758770 
    759771config BUSYBOX_CONFIG_WHO 
  • trunk/package/busybox/config/init/Config.in

    r16063 r17782  
    3333        range 0 1024 
    3434        default 0 
     35        depends on BUSYBOX_CONFIG_FEATURE_KILL_REMOVED 
    3536        help 
    3637          With nonzero setting, init sends TERM, forks, child waits N 
    3738          seconds, sends KILL and exits. Setting it too high is unwise 
    38           (child will hang around for too long and can actually kill 
    39           wrong process!) 
     39          (child will hang around for too long and could actually kill 
     40          the wrong process!) 
    4041 
    4142config BUSYBOX_CONFIG_FEATURE_INIT_SCTTY 
  • trunk/package/busybox/config/loginutils/Config.in

    r16063 r17782  
    5959 
    6060config BUSYBOX_CONFIG_USE_BB_CRYPT 
    61         bool "Use internal DES and MD5 crypt functions" 
     61        bool "Use internal crypt functions" 
    6262        default n 
    6363        help 
     
    7979          In static build, it makes code _smaller_ by about 1.2k, 
    8080          and likely many kilobytes less of bss. 
     81 
     82config BUSYBOX_CONFIG_USE_BB_CRYPT_SHA 
     83        bool "Enable SHA256/512 crypt functions" 
     84        default n 
     85        depends on BUSYBOX_CONFIG_USE_BB_CRYPT 
     86        help 
     87          Enable this if you have passwords starting with "$5$" or "$6$" 
     88          in your /etc/passwd or /etc/shadow files. These passwords 
     89          are hashed using SHA256 and SHA512 algorithms. Support for them 
     90          was added to glibc in 2008. 
     91          With this option off, login will fail password check for any 
     92          user which has password encrypted with these algorithms. 
    8193 
    8294config BUSYBOX_CONFIG_ADDGROUP 
     
    231243        default n 
    232244        help 
    233           Applet for crypting a string. 
     245          Encrypts the given password with the crypt(3) libc function 
     246          using the given salt. Debian has this utility under mkpasswd 
     247          name. Busybox provides mkpasswd as an alias for cryptpw. 
    234248 
    235249config BUSYBOX_CONFIG_CHPASSWD 
     
    237251        default n 
    238252        help 
    239           chpasswd reads a file of user name and password pairs from 
    240           standard input and uses this information to update a group of 
    241           existing users. 
     253          Reads a file of user name and password pairs from standard input 
     254          and uses this information to update a group of existing users. 
    242255 
    243256config BUSYBOX_CONFIG_SU 
  • trunk/package/busybox/config/mailutils/Config.in

    r16063 r17782  
    5151          Barebones sendmail. 
    5252 
    53 config BUSYBOX_CONFIG_FEATURE_SENDMAIL_MAILX 
    54         bool "Allow to specify subject, attachments, their charset etc" 
    55         default n 
    56         depends on BUSYBOX_CONFIG_SENDMAIL 
    57         help 
    58           Allow to specify subject, attachments and their charset. 
    59           Allow to use custom connection helper. 
    60  
    61 config BUSYBOX_CONFIG_FEATURE_SENDMAIL_MAILXX 
    62         bool "Allow to specify Cc: addresses and some additional headers" 
    63         default n 
    64         depends on BUSYBOX_CONFIG_FEATURE_SENDMAIL_MAILX 
    65         help 
    66           Allow to specify Cc: addresses and some additional headers: 
    67           Errors-To: 
    68  
    6953endmenu 
  • trunk/package/busybox/config/miscutils/Config.in

    r16063 r17782  
    122122          Support calling /usr/sbin/sendmail for send cmd outputs. 
    123123 
     124config BUSYBOX_CONFIG_FEATURE_CROND_DIR 
     125        string "crond spool directory" 
     126        default "/var/spool/cron" 
     127        depends on BUSYBOX_CONFIG_CROND || BUSYBOX_CONFIG_CRONTAB 
     128        help 
     129          Location of crond spool. 
     130 
    124131config BUSYBOX_CONFIG_CRONTAB 
    125132        bool "crontab" 
     
    152159        select BUSYBOX_CONFIG_FEATURE_SYSLOG 
    153160        help 
    154           This is deprecated, and will be removed at the end of 2008. 
     161          This is deprecated and should NOT be used anymore. 
     162          Use linux >= 2.6 (optionally with hotplug) and mdev instead! 
     163          See docs/mdev.txt for detailed instructions on how to use mdev 
     164          instead. 
    155165 
    156166          Provides compatibility with old device names on a devfs systems. 
     
    161171          "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT". 
    162172 
    163            But only if they are written UPPERCASE!!!!!!!! 
     173          But only if they are written UPPERCASE!!!!!!!! 
    164174 
    165175config BUSYBOX_CONFIG_DEVFSD_MODLOAD 
     
    191201        default n 
    192202        help 
    193           This is obsolete and will be going away at the end of 2008.. 
    194  
    195           This tells busybox to look for names like /dev/loop/0 instead of 
     203          This is obsolete and should NOT be used anymore. 
     204          Use linux >= 2.6 (optionally with hotplug) and mdev instead! 
     205 
     206          For legacy systems -- if there is no way around devfsd -- this 
     207          tells busybox to look for names like /dev/loop/0 instead of 
    196208          /dev/loop0. If your /dev directory has normal names instead of 
    197209          devfs names, you don't want this. 
     
    239251            "exit" - well you guessed it 
    240252 
     253config BUSYBOX_CONFIG_FLASH_ERASEALL 
     254        bool "flash_eraseall" 
     255        default n 
     256        help 
     257          The flash_eraseall binary from mtd-utils as of git head c4c6a59eb. 
     258          This utility is used to erase the whole MTD device. 
     259 
     260config BUSYBOX_CONFIG_IONICE 
     261        bool "ionice" 
     262        default n 
     263        help 
     264          Set/set program io scheduling class and priority 
     265          Requires kernel >= 2.6.13 
     266 
    241267config BUSYBOX_CONFIG_INOTIFYD 
    242268        bool "inotifyd" 
     
    301327          The -m flag enables a simpler status line with a percentage. 
    302328 
     329config BUSYBOX_CONFIG_FEATURE_LESS_MARKS 
     330        bool "Enable marks" 
     331        default n 
     332        depends on BUSYBOX_CONFIG_LESS 
     333        help 
     334          Marks enable positions in a file to be stored for easy reference. 
     335 
     336config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP 
     337        bool "Enable regular expressions" 
     338        default n 
     339        depends on BUSYBOX_CONFIG_LESS 
     340        help 
     341          Enable regular expressions, allowing complex file searches. 
     342 
     343config BUSYBOX_CONFIG_FEATURE_LESS_WINCH 
     344        bool "Enable automatic resizing on window size changes" 
     345        default n 
     346        depends on BUSYBOX_CONFIG_LESS 
     347        help 
     348          Makes less track window size changes. 
     349 
    303350config BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD 
    304351        bool "Enable flag changes ('-' command)" 
     
    309356          less itself ('-' keyboard command). 
    310357 
    311 config BUSYBOX_CONFIG_FEATURE_LESS_MARKS 
    312         bool "Enable marks" 
    313         default n 
    314         depends on BUSYBOX_CONFIG_LESS 
    315         help 
    316           Marks enable positions in a file to be stored for easy reference. 
    317  
    318 config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP 
    319         bool "Enable regular expressions" 
    320         default n 
    321         depends on BUSYBOX_CONFIG_LESS 
    322         help 
    323           Enable regular expressions, allowing complex file searches. 
    324  
    325358config BUSYBOX_CONFIG_FEATURE_LESS_LINENUMS 
    326359        bool "Enable dynamic switching of line numbers" 
     
    329362        help 
    330363          Enable "-N" command. 
    331  
    332 config BUSYBOX_CONFIG_FEATURE_LESS_WINCH 
    333         bool "Enable automatic resizing on window size changes" 
    334         default n 
    335         depends on BUSYBOX_CONFIG_LESS 
    336         help 
    337           Makes less track window size changes. 
    338364 
    339365config BUSYBOX_CONFIG_HDPARM 
     
    389415 
    390416config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA 
    391         bool "Get/set using_dma flag (DANGEROUS)" 
     417        bool "Get/set using_dma flag" 
    392418        default n 
    393419        depends on BUSYBOX_CONFIG_HDPARM 
    394420        help 
    395421          Enables the 'hdparm -d' option to get/set using_dma flag. 
    396           This is dangerous stuff, so you should probably say N. 
    397422 
    398423config BUSYBOX_CONFIG_LOCK 
     
    536561          giving timing statistics about this program run. 
    537562 
     563config BUSYBOX_CONFIG_TIMEOUT 
     564        bool "timeout" 
     565        default n 
     566        help 
     567          Runs a program and watches it. If it does not terminate in 
     568          specified number of seconds, it is sent a signal. 
     569 
    538570config BUSYBOX_CONFIG_TTYSIZE 
    539571        bool "ttysize" 
  • trunk/package/busybox/config/modutils/Config.in

    r16063 r17782  
    55 
    66menu "Linux Module Utilities" 
    7  
    8 config BUSYBOX_CONFIG_DEFAULT_MODULES_DIR 
    9         string "Default directory containing modules" 
    10         default "/lib/modules" 
    11         help 
    12           Directory that contains kernel modules. 
    13           Defaults to "/lib/modules" 
    14  
    15 config BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE 
    16         string "Default name of modules.dep" 
    17         default "modules.dep" 
    18         help 
    19           Filename that contains kernel modules dependencies. 
    20           Defaults to "modules.dep" 
    217 
    228config BUSYBOX_CONFIG_MODPROBE_SMALL 
     
    5945        help 
    6046          Allow insmod and modprobe take module options from command line. 
    61           N.B. Very bloaty. 
    6247 
    6348config BUSYBOX_CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED 
     
    6752        help 
    6853          Check if the module is already loaded. 
    69           N.B. It's racy. 
    7054 
    7155config BUSYBOX_CONFIG_INSMOD 
     
    158142          occuring within kernel modules can be properly debugged. By enabling 
    159143          this feature, module symbols will always be added to the kernel symbol 
    160           table for properly debugging support. If you are not interested in 
     144          table for proper debugging support. If you are not interested in 
    161145          Oops messages from kernel modules, say N. 
    162146 
     
    194178        bool "Support tainted module checking with new kernels" 
    195179        default y 
    196         depends on !BUSYBOX_CONFIG_MODPROBE_SMALL 
     180        depends on (BUSYBOX_CONFIG_LSMOD || BUSYBOX_CONFIG_FEATURE_2_4_MODULES) && !BUSYBOX_CONFIG_MODPROBE_SMALL 
    197181        help 
    198182          Support checking for tainted modules. These are usually binary 
     
    228212          Say Y if unsure. 
    229213 
     214config BUSYBOX_CONFIG_DEFAULT_MODULES_DIR 
     215        string "Default directory containing modules" 
     216        default "/lib/modules" 
     217        depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL 
     218        help 
     219          Directory that contains kernel modules. 
     220          Defaults to "/lib/modules" 
     221 
     222config BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE 
     223        string "Default name of modules.dep" 
     224        default "modules.dep" 
     225        depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL 
     226        help 
     227          Filename that contains kernel modules dependencies. 
     228          Defaults to "modules.dep" 
     229 
    230230endmenu 
  • trunk/package/busybox/config/networking/Config.in

    r16063 r17782  
    1414 
    1515config BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS 
    16         bool "Preferentially use IPv4 addresses from DNS queries" 
     16        bool "Prefer IPv4 addresses from DNS queries" 
    1717        default y 
    1818        depends on BUSYBOX_CONFIG_FEATURE_IPV6 
     
    6767 
    6868config BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW 
    69         bool "Support show, showmac and showstp" 
     69        bool "Support show" 
    7070        default y 
    7171        depends on BUSYBOX_CONFIG_BRCTL && BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY 
    7272        help 
    7373          Add support for option which prints the current config: 
    74             showmacs, showstp, show 
     74            show 
    7575 
    7676config BUSYBOX_CONFIG_DNSD 
     
    9393          fakeidentd listens on the ident port and returns a predefined 
    9494          fake value on any query. 
     95 
     96config BUSYBOX_CONFIG_FTPD 
     97        bool "ftpd" 
     98        default n 
     99        help 
     100          simple FTP daemon. You have to run it via inetd. 
     101 
     102config BUSYBOX_CONFIG_FEATURE_FTP_WRITE 
     103        bool "Enable upload commands" 
     104        default n 
     105        depends on BUSYBOX_CONFIG_FTPD 
     106        help 
     107          Enable all kinds of FTP upload commands (-w option) 
    95108 
    96109config BUSYBOX_CONFIG_FTPGET 
     
    828841        bool "Enable debug" 
    829842        default n 
    830         depends on BUSYBOX_CONFIG_TFTP 
     843        depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD 
    831844        help 
    832845          Enable debug settings for tftp. This is useful if you're running 
     
    845858        depends on BUSYBOX_CONFIG_TRACEROUTE 
    846859        help 
    847           Add some verbosity to traceroute. This includes amongst other things 
     860          Add some verbosity to traceroute. This includes among other things 
    848861          hostnames and ICMP response types. 
    849862 
     
    861874        depends on BUSYBOX_CONFIG_TRACEROUTE 
    862875        help 
    863           Add feature to allow for ICMP ECHO instead of UDP datagrams. 
     876          Add option -I to use ICMP ECHO instead of UDP datagrams. 
    864877 
    865878source package/busybox/config/networking/udhcp/Config.in 
     879 
     880config BUSYBOX_CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS 
     881        string "ifup udhcpc command line options" 
     882        default "-R -n" 
     883        depends on BUSYBOX_CONFIG_IFUPDOWN && BUSYBOX_CONFIG_APP_UDHCPC 
     884        help 
     885          Command line options to pass to udhcpc from ifup. 
     886          Intended to alter options not available in /etc/network/interfaces. 
     887          (IE: --syslog --background etc...) 
    866888 
    867889config BUSYBOX_CONFIG_VCONFIG 
     
    918940          connection. 
    919941 
     942config BUSYBOX_CONFIG_TUNCTL 
     943        bool "tunctl" 
     944        default n 
     945        help 
     946          tunctl creates or deletes tun devices. 
     947 
     948config BUSYBOX_CONFIG_FEATURE_TUNCTL_UG 
     949        bool "Support owner:group assignment" 
     950        default n 
     951        depends on BUSYBOX_CONFIG_TUNCTL 
     952        help 
     953          Allow to specify owner and group of newly created interface. 
     954          340 bytes of pure bloat. Say no here. 
     955 
    920956config BUSYBOX_CONFIG_UDPSVD 
    921957        bool "udpsvd" 
  • trunk/package/busybox/config/shell/Config.in

    r16053 r17782  
    8585          Enable alias support in the ash shell. 
    8686 
    87 config BUSYBOX_CONFIG_ASH_MATH_SUPPORT 
    88         bool "Posix math support" 
    89         default y 
    90         depends on BUSYBOX_CONFIG_ASH 
    91         help 
    92           Enable math support in the ash shell. 
    93  
    94 config BUSYBOX_CONFIG_ASH_MATH_SUPPORT_64 
    95         bool "Extend Posix math support to 64 bit" 
    96         default y 
    97         depends on BUSYBOX_CONFIG_ASH_MATH_SUPPORT 
    98         help 
    99           Enable 64-bit math support in the ash shell. This will make 
    100           the shell slightly larger, but will allow computation with very 
    101           large numbers. 
    102  
    10387config BUSYBOX_CONFIG_ASH_GETOPTS 
    10488        bool "Builtin getopt to parse positional parameters" 
     
    153137 
    154138config BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT 
    155         bool "Pseudorandom generator and variable $RANDOM" 
     139        bool "Pseudorandom generator and $RANDOM variable" 
    156140        default n 
    157141        depends on BUSYBOX_CONFIG_ASH 
     
    160144          Each read of "$RANDOM" will generate a new pseudorandom value. 
    161145          You can reset the generator by using a specified start value. 
    162           After "unset RANDOM" then generator will switch off and this 
     146          After "unset RANDOM" the generator will switch off and this 
    163147          variable will no longer have special treatment. 
    164148 
     
    168152        depends on BUSYBOX_CONFIG_ASH 
    169153        help 
    170           "PS#" may be contain volatile content, such as backquote commands. 
     154          "PS#" may contain volatile content, such as backquote commands. 
    171155          This option recreates the prompt string from the environment 
    172156          variable each time it is displayed. 
     
    176160        default n 
    177161        help 
    178           hush is a very small shell (just 18k) and it has fairly complete 
    179           Bourne shell grammar. It even handles all the normal flow control 
    180           options such as if/then/elif/else/fi, for/in/do/done, while loops, 
    181           case/esac. 
    182  
    183           It uses only vfork, so it can be used on uClinux systems. 
    184  
    185           It does not handle select, functions, here documents ( << 
    186           word ), arithmetic expansion, aliases, brace expansion, tilde 
    187           expansion, &> and >& redirection of stdout+stderr, etc. 
     162          hush is a small shell (22k). It handles the normal flow control 
     163          constructs such as if/then/elif/else/fi, for/in/do/done, while loops, 
     164          case/esac. Redirections, here documents, $((arithmetic)) 
     165          and functions are supported. 
     166 
     167          It will compile and work on no-mmu systems. 
     168 
     169          It does not handle select, aliases, brace expansion, 
     170          tilde expansion, &>file and >&file redirection of stdout+stderr. 
    188171 
    189172config BUSYBOX_CONFIG_HUSH_HELP 
     
    235218        help 
    236219          Enable for, while and until loops in hush. 
    237           As of 2008-07, break and continue statements are not supported. 
    238220 
    239221config BUSYBOX_CONFIG_HUSH_CASE 
     
    244226          Enable case ... esac statement in hush. +400 bytes. 
    245227 
     228config BUSYBOX_CONFIG_HUSH_FUNCTIONS 
     229        bool "Support funcname() { commands; } syntax" 
     230        default n 
     231        depends on BUSYBOX_CONFIG_HUSH 
     232        help 
     233          Enable support for shell functions in hush. +800 bytes. 
     234 
    246235config BUSYBOX_CONFIG_LASH 
    247         bool "lash" 
     236        bool "lash (deprecated: aliased to hush)" 
    248237        default n 
    249238        select BUSYBOX_CONFIG_HUSH 
     
    252241 
    253242config BUSYBOX_CONFIG_MSH 
    254         bool "msh" 
    255         default n 
    256         help 
    257           The minix shell (adds just 30k) is quite complete and handles things 
    258           like for/do/done, case/esac and all the things you expect a Bourne 
    259           shell to do. It is not always pedantically correct about Bourne 
    260           shell grammar (try running the shell testscript "tests/sh.testcases" 
    261           on it and compare vs bash) but for most things it works quite well. 
    262           It uses only vfork, so it can be used on uClinux systems. 
     243        bool "msh (deprecated: please use hush)" 
     244        default n 
     245        help 
     246          msh is deprecated and will be removed, please migrate to hush. 
     247          If there is a feature msh has but hush does not, please let us know. 
     248 
     249#         The minix shell (adds just 30k) is quite complete and handles things 
     250#         like for/do/done, case/esac and all the things you expect a Bourne 
     251#         shell to do. It is not always pedantically correct about Bourne 
     252#         shell grammar (try running the shell testscript "tests/sh.testcases" 
     253#         on it and compare vs bash) but for most things it works quite well. 
     254#         It uses only vfork, so it can be used on uClinux systems. 
     255 
    263256 
    264257comment "Bourne Shell Options" 
    265258        depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH 
     259 
     260config BUSYBOX_CONFIG_SH_MATH_SUPPORT 
     261        bool "POSIX math support" 
     262        default y 
     263        depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_HUSH 
     264        help 
     265          Enable math support in the shell via $((...)) syntax. 
     266 
     267config BUSYBOX_CONFIG_SH_MATH_SUPPORT_64 
     268        bool "Extend POSIX math support to 64 bit" 
     269        default y 
     270        depends on BUSYBOX_CONFIG_SH_MATH_SUPPORT 
     271        help 
     272          Enable 64-bit math support in the shell. This will make the shell 
     273          slightly larger, but will allow computation with very large numbers. 
     274          This is not in POSIX, so do not rely on this in portable code. 
    266275 
    267276config BUSYBOX_CONFIG_FEATURE_SH_EXTRA_QUIET 
  • trunk/package/busybox/config/util-linux/Config.in

    r16063 r17782  
    55 
    66menu "Linux System Utilities" 
     7 
     8config BUSYBOX_CONFIG_ACPID 
     9        bool "acpid" 
     10        default n 
     11        help 
     12          acpid listens to ACPI events coming either in textual form from 
     13          /proc/acpi/event (though it is marked deprecated it is still widely 
     14          used and _is_ a standard) or in binary form from specified evdevs 
     15          (just use /dev/input/event*). 
     16 
     17          It parses the event to retrieve ACTION and a possible PARAMETER. 
     18          It then spawns /etc/acpi/<ACTION>[/<PARAMETER>] either via run-parts 
     19          (if the resulting path is a directory) or directly as an executable. 
     20 
     21          N.B. acpid relies on run-parts so have the latter installed. 
     22 
     23config BUSYBOX_CONFIG_FEATURE_ACPID_COMPAT 
     24        bool "Accept and ignore redundant options" 
     25        default n 
     26        depends on BUSYBOX_CONFIG_ACPID 
     27        help 
     28          Accept and ignore compatibility options -g -m -s -S -v. 
    729 
    830config BUSYBOX_CONFIG_BLKID 
     
    211233          this. If you enabled 'mkfs_minix' then you almost certainly want to 
    212234          be using the version 2 filesystem support. 
     235 
     236config BUSYBOX_CONFIG_MKFS_VFAT 
     237        bool "mkfs_vfat" 
     238        default n 
     239        help 
     240          Utility to create FAT32 filesystems. 
    213241 
    214242config BUSYBOX_CONFIG_GETOPT 
  • trunk/package/busybox/patches/001-init_avoid_loop_opening_tty.patch

    r16063 r17782  
    11--- a/init/init.c 
    22+++ b/init/init.c 
    3 @@ -497,12 +497,11 @@ static void run_actions(int action_type) 
    4         for (a = init_action_list; a; a = tmp) { 
    5                 tmp = a->next; 
    6                 if (a->action_type & action_type) { 
    7 -                       // Pointless: run() will error out if open of device fails. 
    8 -                       ///* a->terminal of "" means "init's console" */ 
    9 -                       //if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) { 
    10 -                       //      //message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/); 
    11 -                       //      delete_init_action(a); 
    12 -                       //} else 
    13 +                       /* a->terminal of "" means "init's console" */ 
    14 +                       if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) { 
    15 +                               //message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/); 
    16 +                               delete_init_action(a); 
    17 +                       } else 
    18                         if (a->action_type & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) { 
    19                                 waitfor(run(a)); 
    20                                 delete_init_action(a); 
     3@@ -451,8 +451,11 @@ static void run_actions(int action_type) 
     4                        /* Only run stuff with pid == 0. If pid != 0, 
     5                         * it is already running 
     6                         */ 
     7-                       if (a->pid == 0) 
     8+                       if (a->pid == 0) { 
     9+                               if (a->terminal && access(a->terminal, R_OK | W_OK)) 
     10+                                       continue; 
     11                                a->pid = run(a); 
     12+                       } 
     13                } 
     14        } 
     15 } 
  • trunk/package/busybox/patches/003-brctl_show_fix.patch

    r16053 r17782  
    11--- a/networking/brctl.c 
    22+++ b/networking/brctl.c 
    3 @@ -90,7 +90,7 @@ int brctl_main(int argc UNUSED_PARAM, ch 
     3@@ -104,7 +104,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                USE_FEATURE_BRCTL_FANCY(, 
    12 @@ -98,7 +98,7 @@ int brctl_main(int argc UNUSED_PARAM, ch 
     12@@ -112,7 +112,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

    r16063 r17782  
    11--- a/networking/wget.c 
    22+++ b/networking/wget.c 
    3 @@ -443,7 +443,7 @@ int wget_main(int argc UNUSED_PARAM, cha 
     3@@ -485,7 +485,7 @@ int wget_main(int argc UNUSED_PARAM, cha 
    44                // "tries\0"            Required_argument "t" 
    55                // "timeout\0"          Required_argument "T" 
     
    88+               "passive-ftp\0"      No_argument       "\xfd" 
    99                "header\0"           Required_argument "\xfe" 
     10                "post-data\0"        Required_argument "\xfd" 
    1011                ; 
    11  #endif 
  • trunk/package/busybox/patches/200-etc_crontabs.patch

    r12348 r17782  
    44  
    55  
    6  #ifndef CRONTABS 
    7 -#define CRONTABS        "/var/spool/cron/crontabs" 
     6 #define TMPDIR          CONFIG_FEATURE_CROND_DIR 
     7-#define CRONTABS        CONFIG_FEATURE_CROND_DIR "/crontabs" 
    88+#define CRONTABS        "/etc/crontabs" 
     9 #ifndef SENDMAIL 
     10 #define SENDMAIL        "sendmail" 
    911 #endif 
    10  #ifndef TMPDIR 
    11  #define TMPDIR          "/var/spool/cron" 
    1212--- a/miscutils/crontab.c 
    1313+++ b/miscutils/crontab.c 
    14 @@ -13,7 +13,7 @@ 
     14@@ -12,7 +12,7 @@ 
     15  
    1516 #include "libbb.h" 
    1617  
    17  #ifndef CRONTABS 
    18 -#define CRONTABS        "/var/spool/cron/crontabs" 
     18-#define CRONTABS        CONFIG_FEATURE_CROND_DIR "/crontabs" 
    1919+#define CRONTABS        "/etc/crontabs" 
    20  #endif 
    2120 #ifndef CRONUPDATE 
    2221 #define CRONUPDATE      "cron.update" 
     22 #endif 
  • trunk/package/busybox/patches/240-udhcpc_retries.patch

    r16063 r17782  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -353,7 +353,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
     3@@ -363,7 +363,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
    44  
    55                        switch (state) { 
     
    1010                                                xid = random_xid(); 
    1111  
    12 @@ -384,7 +384,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
     12@@ -394,7 +394,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
    1313                                continue; 
    1414                        case RENEW_REQUESTED: 
  • trunk/package/busybox/patches/241-udhcpc-oversized_packets.patch

    r16063 r17782  
    11--- a/networking/udhcp/packet.c 
    22+++ b/networking/udhcp/packet.c 
    3 @@ -114,6 +114,10 @@ uint16_t FAST_FUNC udhcp_checksum(void * 
     3@@ -120,6 +120,10 @@ uint16_t FAST_FUNC udhcp_checksum(void * 
    44        return ~sum; 
    55 } 
     
    1212 /* Construct a ip/udp header for a packet, send packet */ 
    1313 int FAST_FUNC udhcp_send_raw_packet(struct dhcpMessage *payload, 
    14 @@ -126,11 +130,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     14@@ -132,11 +136,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
    1515        int fd; 
    1616        int result = -1; 
     
    2525        fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP)); 
    2626        if (fd < 0) { 
    27 @@ -140,7 +140,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     27@@ -146,7 +146,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
    2828  
    2929        memset(&dest, 0, sizeof(dest)); 
     
    3434        dest.sll_family = AF_PACKET; 
    3535        dest.sll_protocol = htons(ETH_P_IP); 
    36 @@ -157,23 +157,18 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     36@@ -163,23 +163,18 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
    3737        packet.ip.daddr = dest_ip; 
    3838        packet.udp.source = htons(source_port); 
     
    6464        msg = "sendto"; 
    6565  ret_close: 
    66 @@ -225,8 +220,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s 
     66@@ -231,8 +226,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s 
    6767                goto ret_close; 
    6868        } 
  • trunk/package/busybox/patches/243-udhcpc_changed_ifindex.patch

    r16063 r17782  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -320,6 +320,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
    4         for (;;) { 
    5                 unsigned timestamp_before_wait; 
     3@@ -327,6 +327,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
     4                /* silence "uninitialized!" warning */ 
     5                unsigned timestamp_before_wait = timestamp_before_wait; 
    66  
    77+               /* When running on a bridge, the ifindex may have changed (e.g. if 
     
    1111+               udhcp_read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.arp); 
    1212+ 
    13                 if (listen_mode != LISTEN_NONE && sockfd < 0) { 
    14                         if (listen_mode == LISTEN_KERNEL) 
    15                                 sockfd = udhcp_listen_socket(/*INADDR_ANY,*/ CLIENT_PORT, client_config.interface); 
     13                //bb_error_msg("sockfd:%d, listen_mode:%d", sockfd, listen_mode); 
     14  
     15                /* Was opening raw or udp socket here 
  • trunk/package/busybox/patches/244-udhcpc_cidrroute.patch

    r16433 r17782  
    11--- a/networking/udhcp/options.c 
    22+++ b/networking/udhcp/options.c 
    3 @@ -46,6 +46,7 @@ const struct dhcp_option dhcp_options[]  
     3@@ -48,6 +48,7 @@ const struct dhcp_option dhcp_options[]  
    44 #if ENABLE_FEATURE_UDHCP_RFC3397 
    55        { OPTION_STR1035 | OPTION_LIST            , 0x77 }, /* search             */ 
     
    99        { OPTION_STRING                           , 0xfc }, /* wpad               */ 
    1010  
    11 @@ -95,6 +96,7 @@ const char dhcp_option_strings[] ALIGN1  
     11@@ -97,6 +98,7 @@ const char dhcp_option_strings[] ALIGN1  
    1212 #if ENABLE_FEATURE_UDHCP_RFC3397 
    1313        "search" "\0" 
  • trunk/package/busybox/patches/250-ash_export-n.patch

    r16063 r17782  
    11--- a/shell/ash.c 
    22+++ b/shell/ash.c 
    3 @@ -12159,8 +12159,17 @@ exportcmd(int argc UNUSED_PARAM, char ** 
     3@@ -12273,8 +12273,17 @@ exportcmd(int argc UNUSED_PARAM, char ** 
    44        const char *p; 
    55        char **aptr; 
     
    2020                name = *aptr; 
    2121                if (name) { 
    22 @@ -12172,10 +12181,12 @@ exportcmd(int argc UNUSED_PARAM, char ** 
     22@@ -12286,10 +12295,12 @@ exportcmd(int argc UNUSED_PARAM, char ** 
    2323                                        vp = *findvar(hashvar(name), name); 
    2424                                        if (vp) { 
  • trunk/package/busybox/patches/300-netmsg.patch

    r16063 r17782  
    11--- a/include/applets.h 
    22+++ b/include/applets.h 
    3 @@ -263,6 +263,7 @@ USE_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_ 
     3@@ -271,6 +271,7 @@ USE_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_ 
    44 USE_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_NEVER)) 
    55 USE_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_NEVER)) 
     
    1111--- a/include/usage.h 
    1212+++ b/include/usage.h 
    13 @@ -2849,6 +2849,9 @@ 
     13@@ -3010,6 +3010,9 @@ 
    1414  
    1515 #endif 
     
    2323--- a/networking/Config.in 
    2424+++ b/networking/Config.in 
    25 @@ -603,6 +603,12 @@ config NC 
     25@@ -600,6 +600,12 @@ config NC 
    2626          A simple Unix utility which reads and writes data across network 
    2727          connections. 
     
    3838--- a/networking/Kbuild 
    3939+++ b/networking/Kbuild 
    40 @@ -23,6 +23,7 @@ lib-$(CONFIG_IP)           += ip.o 
     40@@ -24,6 +24,7 @@ lib-$(CONFIG_IP)           += ip.o 
    4141 lib-$(CONFIG_IPCALC)       += ipcalc.o 
    4242 lib-$(CONFIG_NAMEIF)       += nameif.o 
  • trunk/package/busybox/patches/310-passwd_access.patch

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

    r16063 r17782  
    11--- a/include/applets.h 
    22+++ b/include/applets.h 
    3 @@ -223,6 +223,7 @@ USE_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN 
     3@@ -228,6 +228,7 @@ USE_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN 
    44 USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) 
    55 USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) 
     
    1111--- a/include/usage.h 
    1212+++ b/include/usage.h 
    13 @@ -2150,6 +2150,9 @@ 
     13@@ -2246,6 +2246,9 @@ 
    1414 #define loadkmap_example_usage \ 
    1515        "$ loadkmap < /etc/i18n/lang-keymap\n" 
     
    2323--- a/miscutils/Config.in 
    2424+++ b/miscutils/Config.in 
    25 @@ -395,6 +395,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA 
     25@@ -420,6 +420,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA 
     26        help 
    2627          Enables the 'hdparm -d' option to get/set using_dma flag. 
    27           This is dangerous stuff, so you should probably say N. 
    2828  
    2929+config LOCK 
     
    3838--- a/miscutils/Kbuild 
    3939+++ b/miscutils/Kbuild 
    40 @@ -21,6 +21,7 @@ lib-$(CONFIG_INOTIFYD)    += inotifyd.o 
     40@@ -23,6 +23,7 @@ lib-$(CONFIG_INOTIFYD)    += inotifyd.o 
    4141 lib-$(CONFIG_FEATURE_LAST_SMALL)+= last.o 
    4242 lib-$(CONFIG_FEATURE_LAST_FANCY)+= last_fancy.o 
  • trunk/package/busybox/patches/350-httpd_redir.patch

    r16063 r17782  
    11--- a/include/usage.h 
    22+++ b/include/usage.h 
    3 @@ -1558,7 +1558,8 @@ 
     3@@ -1638,7 +1638,8 @@ 
    44        USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \ 
    55        USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \ 
     
    1111        "Listen for incoming HTTP requests\n" \ 
    1212      "\nOptions:" \ 
    13 @@ -1576,6 +1577,8 @@ 
     13@@ -1656,6 +1657,8 @@ 
    1414      "\n       -h HOME         Home directory (default .)" \ 
    1515      "\n       -e STRING       HTML encode STRING" \ 
     
    3131  
    3232        USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) 
    33 @@ -295,6 +297,8 @@ struct globals { 
     33@@ -294,6 +296,8 @@ struct globals { 
    3434 #define index_page        (G.index_page       ) 
    3535 #define found_mime_type   (G.found_mime_type  ) 
     
    4040 #define ip_a_d            (G.ip_a_d           ) 
    4141 #define g_realm           (G.g_realm          ) 
    42 @@ -1003,8 +1007,11 @@ static void send_headers(int responseNum 
     42@@ -993,8 +997,11 @@ static void send_headers(int responseNum 
    4343        } 
    4444 #endif 
     
    5353                                (g_query ? g_query : "")); 
    5454        } 
    55 @@ -1939,8 +1946,12 @@ static void handle_incoming_and_exit(con 
     55@@ -1924,8 +1931,12 @@ static void handle_incoming_and_exit(con 
    5656        } while (*++tptr); 
    5757        *++urlp = '\0';       /* terminate after last character */ 
     
    6767                        found_moved_temporarily = urlcopy; 
    6868                } 
    69 @@ -2293,7 +2304,9 @@ static void sighup_handler(int sig) 
    70  #endif 
     69@@ -2266,7 +2277,9 @@ static void sighup_handler(int sig UNUSE 
     70 } 
    7171  
    7272 enum { 
     
    7878        h_opt_home_httpd, 
    7979        USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) 
    80 @@ -2342,12 +2355,13 @@ int httpd_main(int argc UNUSED_PARAM, ch 
     80@@ -2315,12 +2328,13 @@ int httpd_main(int argc UNUSED_PARAM, ch 
    8181        /* We do not "absolutize" path given by -h (home) opt. 
    8282         * If user gives relative path in -h, 
     
    9090                        "p:ifv", 
    9191+                       &redirect_path, &redirect_host, 
    92                         &configFile, &url_for_decode, &home_httpd 
     92                        &opt_c_configFile, &url_for_decode, &home_httpd 
    9393                        USE_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode) 
    9494                        USE_FEATURE_HTTPD_BASIC_AUTH(, &g_realm) 
  • trunk/package/busybox/patches/410-httpd_cgi_headers.patch

    r16063 r17782  
    11--- a/networking/httpd.c 
    22+++ b/networking/httpd.c 
    3 @@ -1259,10 +1259,10 @@ static NOINLINE void cgi_io_loop_and_exi 
     3@@ -1250,10 +1250,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

    r16063 r17782  
    11--- a/networking/httpd.c 
    22+++ b/networking/httpd.c 
    3 @@ -1824,6 +1824,7 @@ static void handle_incoming_and_exit(con 
     3@@ -1810,6 +1810,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

    r16107 r17782  
    101101 int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 
    102102 int insmod_main(int argc UNUSED_PARAM, char **argv) 
    103 @@ -25,9 +118,14 @@ int insmod_main(int argc UNUSED_PARAM, c 
     103@@ -33,9 +126,15 @@ int insmod_main(int argc UNUSED_PARAM, c 
    104104        if (!filename) 
    105105                bb_show_usage(); 
     
    112112+       rc = bb_init_module(g_filename, parse_cmdline_module_options(argv)); 
    113113        if (rc) 
    114                 bb_error_msg("cannot insert '%s': %s", filename, moderror(rc)); 
    115 - 
     114                bb_error_msg("can't insert '%s': %s", filename, moderror(rc)); 
    116115+       free (g_filename); 
     116  
    117117+done: 
    118118        return rc; 
    119119 } 
     120--- a/modutils/Config.in 
     121+++ b/modutils/Config.in 
     122@@ -211,7 +211,7 @@ config FEATURE_MODUTILS_SYMBOLS 
     123 config DEFAULT_MODULES_DIR 
     124        string "Default directory containing modules" 
     125        default "/lib/modules" 
     126-       depends on DEPMOD || MODPROBE || MODPROBE_SMALL 
     127+       depends on DEPMOD || INSMOD || MODPROBE || MODPROBE_SMALL 
     128        help 
     129          Directory that contains kernel modules. 
     130          Defaults to "/lib/modules" 
  • trunk/package/busybox/patches/480-mount_union.patch

    r17724 r17782  
    22+++ b/util-linux/mount.c 
    33@@ -42,6 +42,10 @@ 
    4  #define MS_DIRSYNC      128     /* Directory modifications are synchronous */ 
     4 #define MS_DIRSYNC      128     // Directory modifications are synchronous 
    55 #endif 
    66  
     
    1111  
    1212 #if defined(__dietlibc__) 
    13  /* 16.12.2006, Sampo Kellomaki (sampo@iki.fi) 
    14 @@ -152,6 +156,7 @@ 
     13 // 16.12.2006, Sampo Kellomaki (sampo@iki.fi) 
     14@@ -152,6 +156,7 @@ static const int32_t mount_options[] = { 
    1515                /* "rslave"      */ MS_SLAVE|MS_RECURSIVE, 
    1616                /* "rprivate"    */ MS_SLAVE|MS_RECURSIVE, 
     
    2020  
    2121        // Always understood. 
    22 @@ -206,6 +211,7 @@ 
    23                 "rslave" "\0" 
    24                 "rprivate" "\0" 
    25                 "runbindable" "\0" 
     22@@ -206,6 +211,7 @@ static const char mount_option_str[] = 
     23                "rslave\0" 
     24                "rprivate\0" 
     25                "runbindable\0" 
    2626+               "union" "\0" 
    2727        ) 
  • trunk/package/busybox/patches/510-awk_include.patch

    r16063 r17782  
    1616  
    1717 /* I/O stream */ 
    18 @@ -1423,7 +1428,8 @@ static void parse_program(char *p) 
     18@@ -1420,7 +1425,8 @@ static void parse_program(char *p) 
    1919                        next_token(TC_FUNCTION); 
    2020                        g_pos++; 
     
    2626                        while (next_token(TC_VARIABLE | TC_SEQTERM) & TC_VARIABLE) { 
    2727                                v = findvar(ahash, t_string); 
    28 @@ -1432,7 +1438,7 @@ static void parse_program(char *p) 
     28@@ -1429,7 +1435,7 @@ static void parse_program(char *p) 
    2929                                if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM) 
    3030                                        break; 
     
    3535                        clear_array(ahash); 
    3636  
    37 @@ -2397,7 +2403,8 @@ static var *evaluate(node *op, var *res) 
     37@@ -2408,7 +2414,8 @@ static var *evaluate(node *op, var *res) 
    3838                        break; 
    3939  
     
    4545  
    4646                        X.v = R.v = nvalloc(op->r.f->nargs+1); 
    47 @@ -2414,7 +2421,10 @@ static var *evaluate(node *op, var *res) 
     47@@ -2425,7 +2432,10 @@ static var *evaluate(node *op, var *res) 
    4848                        fnargs = X.v; 
    4949  
     
    5757  
    5858                        nvfree(fnargs); 
    59 @@ -2777,6 +2787,143 @@ static rstream *next_input_file(void) 
     59@@ -2788,6 +2798,143 @@ static rstream *next_input_file(void) 
    6060 #undef files_happen 
    6161 } 
     
    201201 int awk_main(int argc, char **argv) 
    202202 { 
    203 @@ -2842,6 +2989,9 @@ int awk_main(int argc, char **argv) 
     203@@ -2853,6 +3000,9 @@ int awk_main(int argc, char **argv) 
    204204                        *s1 = '='; 
    205205                } 
  • trunk/package/busybox/patches/524-udhcpc_renew.patch

    r14590 r17782  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -63,7 +63,6 @@ static void perform_renew(void) 
     3@@ -69,7 +69,6 @@ static void perform_renew(void) 
    44                state = RENEW_REQUESTED; 
    55                break; 
  • trunk/package/busybox/patches/530-watchdog_fix.patch

    r16150 r17782  
    1 --- a/miscutils/watchdog.c 
    2 +++ b/miscutils/watchdog.c 
    3 @@ -10,7 +10,8 @@ 
    4   */ 
    5   
    6  #include "libbb.h" 
    7 -#include "linux/watchdog.h" 
    8 +#include <linux/types.h> 
    9 +#include <linux/watchdog.h> 
    10   
    11  #define OPT_FOREGROUND  (1 << 0) 
    12  #define OPT_STIMER      (1 << 1) 
  • trunk/package/busybox/patches/801-brctl_zero_time.patch

    r13163 r17782  
    11--- a/networking/brctl.c 
    22+++ b/networking/brctl.c 
    3 @@ -34,8 +34,9 @@ static ALWAYS_INLINE void strtotimeval(s 
     3@@ -48,8 +48,9 @@ static ALWAYS_INLINE void strtotimeval(s 
    44 { 
    55        double secs; 
  • trunk/package/busybox/patches/802-brctl_linux24.patch

    r16053 r17782  
    11--- a/networking/brctl.c 
    22+++ b/networking/brctl.c 
    3 @@ -18,7 +18,7 @@ 
     3@@ -32,7 +32,7 @@ 
    44  
    55 /* Maximum number of ports supported per bridge interface.  */ 
     
    1010  
    1111 /* Use internal number parsing and not the "exact" conversion.  */ 
    12 @@ -155,6 +155,7 @@ int brctl_main(int argc UNUSED_PARAM, ch 
     12@@ -169,6 +169,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 @@ -183,9 +184,19 @@ int brctl_main(int argc UNUSED_PARAM, ch 
     20@@ -197,9 +198,19 @@ int brctl_main(int argc UNUSED_PARAM, ch 
    2121                br = *argv++; 
    2222  
     
    4141                } 
    4242  
    43 @@ -194,14 +205,27 @@ int brctl_main(int argc UNUSED_PARAM, ch 
     43@@ -208,14 +219,27 @@ int brctl_main(int argc UNUSED_PARAM, ch 
    4444  
    45                 strncpy(ifr.ifr_name, br, IFNAMSIZ); 
     45                strncpy_IFNAMSIZ(ifr.ifr_name, br); 
    4646                if (key == ARG_addif || key == ARG_delif) { /* addif or delif */ 
    4747+                       int ret; 
  • trunk/package/busybox/patches/803-id_getgrouplist.patch

    r16063 r17782  
    2020 #endif 
    2121 #endif 
    22 @@ -86,7 +88,11 @@ static int get_groups(const char *userna 
     22@@ -82,7 +84,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. 
     
    3232                 * malloc'ing -1 bytes won't be good, so: */ 
    3333                //if (*n < 0) 
    34 @@ -160,6 +166,7 @@ int id_main(int argc UNUSED_PARAM, char  
     34@@ -154,6 +160,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 @@ -187,6 +194,7 @@ int id_main(int argc UNUSED_PARAM, char  
     42@@ -181,6 +188,7 @@ int id_main(int argc UNUSED_PARAM, char  
    4343                } 
    4444                if (ENABLE_FEATURE_CLEAN_UP) 
  • trunk/package/busybox/patches/901-df_human_readable.patch

    r16723 r17782  
    1 --- a/coreutils/df.c 
    2 +++ b/coreutils/df.c 
    3 @@ -53,8 +53,8 @@ int df_main(int argc, char **argv) 
    4                 OPT_ALL   = (1 << 2) * ENABLE_FEATURE_DF_FANCY, 
    5                 OPT_INODE = (1 << 3) * ENABLE_FEATURE_DF_FANCY, 
    6                 OPT_BSIZE = (1 << 4) * ENABLE_FEATURE_DF_FANCY, 
    7 -               OPT_HUMAN = (1 << 5) * ENABLE_FEATURE_HUMAN_READABLE, 
    8 -               OPT_MEGA  = (1 << 6) * ENABLE_FEATURE_HUMAN_READABLE, 
    9 +               OPT_HUMAN = (1 << (2 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE, 
    10 +               OPT_MEGA  = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE, 
    11         }; 
    12         const char *disp_units_hdr = NULL; 
    13         char *chp; 
Note: See TracChangeset for help on using the changeset viewer.