Changeset 20661


Ignore:
Timestamp:
2010-04-03T02:58:46+02:00 (8 years ago)
Author:
nico
Message:

[package] busybox: update to v1.16.1 (based on v1.16.0 update patch from Peter Wagner)

Location:
trunk/package/busybox
Files:
28 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/busybox/Makefile

    r20657 r20661  
    99 
    1010PKG_NAME:=busybox 
    11 PKG_VERSION:=1.15.3 
     11PKG_VERSION:=1.16.1 
    1212PKG_RELEASE:=1 
    1313 
     
    1515PKG_SOURCE_URL:=http://www.busybox.net/downloads \ 
    1616                http://distfiles.gentoo.org/distfiles/ 
    17 PKG_MD5SUM:=6059ac9456de6fb18dc8ee4cd0ec9240 
     17PKG_MD5SUM:=319486ec65078d07fde26eb620fecde7 
    1818 
    1919include $(INCLUDE_DIR)/package.mk 
  • trunk/package/busybox/config/Config.in

    r18684 r20661  
    2929          some GNU extensions in libc. You probably only need this option 
    3030          if you plan to run busybox on desktop. 
     31 
     32config BUSYBOX_CONFIG_INCLUDE_SUSv2 
     33        bool "Enable obsolete features removed before SUSv3" 
     34        default y 
     35        help 
     36          This option will enable backwards compatibility with SuSv2, 
     37          specifically, old-style numeric options ('command -1 <file>') 
     38          will be supported in head, tail, and fold. (Note: should 
     39          affect renice too.) 
     40 
     41config BUSYBOX_CONFIG_USE_PORTABLE_CODE 
     42        bool "Avoid using GCC-specific code constructs" 
     43        default n 
     44        help 
     45          Use this option if you are trying to compile busybox with 
     46          compiler other than gcc. 
     47          If you do use gcc, this option may needlessly increase code size. 
    3148 
    3249choice 
     
    503520endchoice 
    504521 
    505 config BUSYBOX_CONFIG_INCLUDE_SUSv2 
    506         bool "Enable obsolete features removed before SUSv3?" 
    507         default y 
    508         help 
    509           This option will enable backwards compatibility with SuSv2, 
    510           specifically, old-style numeric options ('command -1 <file>') 
    511           will be supported in head, tail, and fold. (Note: should 
    512           affect renice too.) 
    513  
    514522### config PARSE 
    515 ###     bool "Uniform config file parser debugging applet: parse" 
     523###     bool "Uniform config file parser debugging applet: parse" 
    516524 
    517525endmenu 
  • trunk/package/busybox/config/archival/Config.in

    r18684 r20661  
    166166          It's probably the most widely used UNIX compression program. 
    167167 
     168config BUSYBOX_CONFIG_FEATURE_GZIP_LONG_OPTIONS 
     169        bool "Enable long options" 
     170        default n 
     171        depends on BUSYBOX_CONFIG_GZIP && BUSYBOX_CONFIG_LONG_OPTS 
     172        help 
     173          Enable use of long options, increases size by about 106 Bytes 
     174 
    168175config BUSYBOX_CONFIG_LZOP 
    169176        bool "lzop" 
     
    269276          listings (-t) and preserving permissions when unpacking (-p). 
    270277          +200 bytes. 
     278 
     279config BUSYBOX_CONFIG_FEATURE_TAR_NOPRESERVE_TIME 
     280        bool "Enable -m (do not preserve time) option" 
     281        default n 
     282        depends on BUSYBOX_CONFIG_TAR 
     283        help 
     284          With this option busybox supports GNU tar -m 
     285          (do not preserve time) option. 
    271286 
    272287endif #tar 
  • trunk/package/busybox/config/coreutils/Config.in

    r18684 r20661  
    5353          of files. 
    5454 
     55config BUSYBOX_CONFIG_FEATURE_CHOWN_LONG_OPTIONS 
     56        bool "Enable long options" 
     57        default n 
     58        depends on BUSYBOX_CONFIG_CHOWN && BUSYBOX_CONFIG_LONG_OPTS 
     59        help 
     60          Enable use of long options 
     61 
    5562config BUSYBOX_CONFIG_CHROOT 
    5663        bool "chroot" 
     
    7986          cp is used to copy files and directories. 
    8087 
     88config BUSYBOX_CONFIG_FEATURE_CP_LONG_OPTIONS 
     89        bool "Enable long options for cp" 
     90        default n 
     91        depends on BUSYBOX_CONFIG_CP && BUSYBOX_CONFIG_LONG_OPTS 
     92        help 
     93          Enable long options for cp. 
     94          Also add support for --parents option. 
     95 
    8196config BUSYBOX_CONFIG_CUT 
    8297        bool "cut" 
     
    100115          Enable option (-I) to output an ISO-8601 compliant 
    101116          date/time string. 
     117 
     118config BUSYBOX_CONFIG_FEATURE_DATE_COMPAT 
     119        bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format" 
     120        default n 
     121        depends on BUSYBOX_CONFIG_DATE 
     122        help 
     123          System time can be set by 'date -s DATE' and simply 'date DATE', 
     124          but formats of DATE string are different. 'date DATE' accepts 
     125          a rather weird MMDDhhmm[[YY]YY][.ss] format with completely 
     126          unnatural placement of year between minutes and seconds. 
     127          date -s (and other commands like touch -d) use more sensible 
     128          formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss). 
     129 
     130          With this option off, 'date DATE' is 'date -s DATE' support 
     131          the same format. With it on, 'date DATE' additionally supports 
     132          MMDDhhmm[[YY]YY][.ss] format. 
    102133 
    103134config BUSYBOX_CONFIG_DD 
     
    114145        depends on BUSYBOX_CONFIG_DD 
    115146        help 
    116           sending a SIGUSR1 signal to a running `dd' process makes it 
     147          Sending a SIGUSR1 signal to a running `dd' process makes it 
    117148          print to standard error the number of records read and written 
    118149          so far, then to resume copying. 
     
    120151          $ dd if=/dev/zero of=/dev/null& 
    121152          $ pid=$! kill -USR1 $pid; sleep 1; kill $pid 
    122           10899206+0 records in 10899206+0 records out 
     153          10899206+0 records in 
     154          10899206+0 records out 
     155 
     156config BUSYBOX_CONFIG_FEATURE_DD_THIRD_STATUS_LINE 
     157        bool "Enable the third status line upon signal" 
     158        default n 
     159        depends on BUSYBOX_CONFIG_DD && BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING 
     160        help 
     161          Displays a coreutils-like third status line with transferred bytes, 
     162          elapsed time and speed. 
    123163 
    124164config BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS 
     
    830870          Allow df, du, and ls to have human readable output. 
    831871 
    832 comment "Common options for md5sum, sha1sum" 
    833         depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM 
     872comment "Common options for md5sum, sha1sum, sha256sum, sha512sum" 
     873        depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM || BUSYBOX_CONFIG_SHA256SUM || BUSYBOX_CONFIG_SHA512SUM 
    834874 
    835875config BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK 
    836876        bool "Enable -c, -s and -w options" 
    837877        default y 
    838         depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM 
     878        depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM || BUSYBOX_CONFIG_SHA256SUM || BUSYBOX_CONFIG_SHA512SUM 
    839879        help 
    840880          Enabling the -c options allows files to be checked 
  • trunk/package/busybox/config/editors/Config.in

    r16063 r20661  
    3636          the patch command. 
    3737 
    38 config BUSYBOX_CONFIG_FEATURE_DIFF_BINARY 
    39         bool "Enable checks for binary files" 
     38config BUSYBOX_CONFIG_FEATURE_DIFF_LONG_OPTIONS 
     39        bool "Enable long options" 
    4040        default n 
    41         depends on BUSYBOX_CONFIG_DIFF 
     41        depends on BUSYBOX_CONFIG_DIFF && BUSYBOX_CONFIG_LONG_OPTS 
    4242        help 
    43           This option enables support for checking for binary files 
    44           before a comparison is carried out. 
     43          Enable use of long options. 
    4544 
    4645config BUSYBOX_CONFIG_FEATURE_DIFF_DIR 
     
    5150          This option enables support for directory and subdirectory 
    5251          comparison. 
    53  
    54 config BUSYBOX_CONFIG_FEATURE_DIFF_MINIMAL 
    55         bool "Enable -d option to find smaller sets of changes" 
    56         default n 
    57         depends on BUSYBOX_CONFIG_DIFF 
    58         help 
    59           Enabling this option allows the use of -d to make diff 
    60           try hard to find the smallest possible set of changes. 
    6152 
    6253config BUSYBOX_CONFIG_ED 
  • trunk/package/busybox/config/findutils/Config.in

    r18684 r20661  
    172172          Support the 'find -context' option for matching security context. 
    173173 
     174config BUSYBOX_CONFIG_FEATURE_FIND_LINKS 
     175        bool "Enable -links: link count matching" 
     176        default n 
     177        depends on BUSYBOX_CONFIG_FIND 
     178        help 
     179          Support the 'find -links' option for matching number of links. 
     180 
    174181config BUSYBOX_CONFIG_GREP 
    175182        bool "grep" 
  • trunk/package/busybox/config/libbb/Config.in

    r18684 r20661  
    112112          editing more robust in some cases. 
    113113          If you are not sure whether your terminals respond to this code 
    114           correctly, or want to save on code size (about 300 bytes), 
     114          correctly, or want to save on code size (about 400 bytes), 
    115115          then do not turn this option on. 
    116116 
     
    135135            cp: cannot stat '/vmlinuz/file': Path has non-directory component 
    136136          If this feature is not enabled, they will be, respectively: 
    137             cp: cannot remove '/does_not_exist/file': No such file or directory 
     137            cp: cannot create '/does_not_exist/file': No such file or directory 
    138138            cp: cannot stat '/vmlinuz/file': Not a directory 
    139           respectively. 
    140139          This will cost you ~60 bytes. 
    141140 
  • trunk/package/busybox/config/miscutils/Config.in

    r18684 r20661  
    138138 
    139139config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL 
    140         bool "Using /usr/sbin/sendmail?" 
     140        bool "Report command output via email (using sendmail)" 
    141141        default n 
    142142        depends on BUSYBOX_CONFIG_CROND 
    143143        help 
    144           Support calling /usr/sbin/sendmail for send cmd outputs. 
     144          Command output will be sent to corresponding user via email. 
    145145 
    146146config BUSYBOX_CONFIG_FEATURE_CROND_DIR 
     
    273273            "exit" - well you guessed it 
    274274 
     275config BUSYBOX_CONFIG_FLASHCP 
     276        bool "flashcp" 
     277        default n 
     278        help 
     279          The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7. 
     280          This utility is used to copy images into a MTD device. 
     281 
    275282config BUSYBOX_CONFIG_FLASH_LOCK 
    276283        bool "flash_lock" 
     
    619626          Prints a CD-ROM volume name. 
    620627 
     628config BUSYBOX_CONFIG_WALL 
     629        bool "wall" 
     630        default n 
     631        help 
     632          Write a message to all users that are logged in. 
     633 
    621634config BUSYBOX_CONFIG_WATCHDOG 
    622635        bool "watchdog" 
  • trunk/package/busybox/config/modutils/Config.in

    r18684 r20661  
    122122          to run ancient kernels. 
    123123 
     124config BUSYBOX_CONFIG_FEATURE_INSMOD_TRY_MMAP 
     125        bool "Try to load module from a mmap'ed area" 
     126        default n 
     127        depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE_SMALL 
     128        help 
     129          This option causes module loading code to try to mmap 
     130          module first. If it does not work (for example, 
     131          it does not work for compressed modules), module will be read 
     132          (and unpacked if needed) into a memory block allocated by malloc. 
     133 
     134          The only case when mmap works but malloc does not is when 
     135          you are trying to load a big module on a very memory-constrained 
     136          machine. Malloc will momentarily need 2x as much memory as mmap. 
     137 
     138          Choosing N saves about 250 bytes of code (on 32-bit x86). 
     139 
    124140config BUSYBOX_CONFIG_FEATURE_INSMOD_VERSION_CHECKING 
    125141        bool "Enable module version checking" 
  • trunk/package/busybox/config/networking/Config.in

    r20432 r20661  
    117117        help 
    118118          Enable all kinds of FTP upload commands (-w option) 
     119 
     120config BUSYBOX_CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST 
     121        bool "Enable workaround for RFC-violating clients" 
     122        default n 
     123        depends on BUSYBOX_CONFIG_FTPD 
     124        help 
     125          Some ftp-clients (among them KDE's Konqueror) issue illegal 
     126          "LIST -la" requests. This option works around those problems. 
     127          It might prevent you from listing files starting with "-" and 
     128          it increases the code size by ~40 bytes. 
     129          Most other ftp servers seem to behave similar to this. 
    119130 
    120131config BUSYBOX_CONFIG_FTPGET 
     
    668679          nslookup is a tool to query Internet name servers. 
    669680 
     681config BUSYBOX_CONFIG_NTPD 
     682        bool "ntpd" 
     683        default n 
     684        help 
     685          The NTP client/server daemon. 
     686 
     687config BUSYBOX_CONFIG_FEATURE_NTPD_SERVER 
     688        bool "Make ntpd usable as a NTP server" 
     689        default n 
     690        depends on BUSYBOX_CONFIG_NTPD 
     691        help 
     692          Make ntpd usable as a NTP server. If you disable this option 
     693          ntpd will be usable only as a NTP client. 
     694 
    670695config BUSYBOX_CONFIG_PING 
    671696        bool "ping" 
     
    795820          Selecting this will make telnetd able to run standalone. 
    796821 
     822config BUSYBOX_CONFIG_FEATURE_TELNETD_INETD_WAIT 
     823        bool "Support -w SEC option (inetd wait mode)" 
     824        default n 
     825        depends on BUSYBOX_CONFIG_FEATURE_TELNETD_STANDALONE 
     826        help 
     827          This option allows you to run telnetd in "inet wait" mode. 
     828          Example inetd.conf line (note "wait", not usual "nowait"): 
     829 
     830          telnet stream tcp wait root /bin/telnetd telnetd -w10 
     831 
     832          In this example, inetd passes _listening_ socket_ as fd 0 
     833          to telnetd when connection appears. 
     834          telnetd will wait for connections until all existing 
     835          connections are closed, and no new connections 
     836          appear during 10 seconds. Then it exits, and inetd continues 
     837          to listen for new connections. 
     838 
     839          This option is rarely used. "tcp nowait" is much more usual 
     840          way of running tcp services, including telnetd. 
     841          You most probably want to say N here. 
     842 
    797843config BUSYBOX_CONFIG_TFTP 
    798844        bool "tftp" 
     
    832878 
    833879config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE 
    834         bool "Enable \"blksize\" protocol option" 
     880        bool "Enable 'blksize' and 'tsize' protocol options" 
    835881        default n 
    836882        depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD 
    837883        help 
    838884          Allow tftp to specify block size, and tftpd to understand 
    839           "blksize" option. 
     885          "blksize" and "tsize" options. 
     886 
     887config BUSYBOX_CONFIG_FEATURE_TFTP_PROGRESS_BAR 
     888        bool "Enable tftp progress meter" 
     889        default n 
     890        depends on BUSYBOX_CONFIG_TFTP && BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE 
     891        help 
     892          Show progress bar. 
    840893 
    841894config BUSYBOX_CONFIG_TFTP_DEBUG 
     
    852905        help 
    853906          Utility to trace the route of IP packets. 
     907 
     908config BUSYBOX_CONFIG_TRACEROUTE6 
     909        bool "traceroute6" 
     910        default n 
     911        depends on BUSYBOX_CONFIG_FEATURE_IPV6 && BUSYBOX_CONFIG_TRACEROUTE 
     912        help 
     913          Utility to trace the route of IPv6 packets. 
    854914 
    855915config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE 
     
    881941        string "ifup udhcpc command line options" 
    882942        default "-R -n" 
    883         depends on BUSYBOX_CONFIG_IFUPDOWN && BUSYBOX_CONFIG_APP_UDHCPC 
     943        depends on BUSYBOX_CONFIG_IFUPDOWN && BUSYBOX_CONFIG_UDHCPC 
    884944        help 
    885945          Command line options to pass to udhcpc from ifup. 
  • trunk/package/busybox/config/networking/udhcp/Config.in

    r18684 r20661  
    44# 
    55 
    6 config BUSYBOX_CONFIG_APP_UDHCPD 
     6config BUSYBOX_CONFIG_UDHCPD 
    77        bool "udhcp server (udhcpd)" 
    88        default n 
     
    1111          while striving to be fully functional and RFC compliant. 
    1212 
    13 config BUSYBOX_CONFIG_APP_DHCPRELAY 
     13config BUSYBOX_CONFIG_DHCPRELAY 
    1414        bool "dhcprelay" 
    1515        default n 
    16         depends on BUSYBOX_CONFIG_APP_UDHCPD 
     16        depends on BUSYBOX_CONFIG_UDHCPD 
    1717        help 
    1818          dhcprelay listens for dhcp requests on one or more interfaces 
     
    2020          server. 
    2121 
    22 config BUSYBOX_CONFIG_APP_DUMPLEASES 
     22config BUSYBOX_CONFIG_DUMPLEASES 
    2323        bool "Lease display utility (dumpleases)" 
    2424        default n 
    25         depends on BUSYBOX_CONFIG_APP_UDHCPD 
     25        depends on BUSYBOX_CONFIG_UDHCPD 
    2626        help 
    2727          dumpleases displays the leases written out by the udhcpd server. 
     
    3232        bool "Rewrite the lease file at every new acknowledge" 
    3333        default n 
    34         depends on BUSYBOX_CONFIG_APP_UDHCPD 
     34        depends on BUSYBOX_CONFIG_UDHCPD 
    3535        help 
    3636          If selected, udhcpd will write a new file with leases every 
     
    4242        string "Absolute path to lease file" 
    4343        default "/var/run/udhcpd.leases" 
    44         depends on BUSYBOX_CONFIG_APP_UDHCPD 
     44        depends on BUSYBOX_CONFIG_UDHCPD 
    4545        help 
    4646          udhcpd stores addresses in a lease file. This is the absolute path 
    4747          of the file. Normally it is safe to leave it untouched. 
    4848 
    49 config BUSYBOX_CONFIG_APP_UDHCPC 
     49config BUSYBOX_CONFIG_UDHCPC 
    5050        bool "udhcp client (udhcpc)" 
    5151        default y 
     
    6060        bool "Verify that the offered address is free, using ARP ping" 
    6161        default n 
    62         depends on BUSYBOX_CONFIG_APP_UDHCPC 
     62        depends on BUSYBOX_CONFIG_UDHCPC 
    6363        help 
    6464          If selected, udhcpc will send ARP probes and make sure 
     
    7070        bool "Enable '-P port' option for udhcpd and udhcpc" 
    7171        default n 
    72         depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC 
     72        depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC 
    7373        help 
    7474          At the cost of ~300 bytes, enables -P port option. 
     
    7979        default 0 
    8080        range 0 9 
    81         depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC || BUSYBOX_CONFIG_APP_DHCPRELAY 
     81        depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC || BUSYBOX_CONFIG_DHCPRELAY 
    8282        help 
    8383          Verbosity can be increased with multiple -v options. 
     
    9090        bool "Support for RFC3397 domain search (experimental)" 
    9191        default y 
    92         depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC 
     92        depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC 
    9393        help 
    9494          If selected, both client and server will support passing of domain 
     
    9898        string "Absolute path to config script" 
    9999        default "/usr/share/udhcpc/default.script" 
    100         depends on BUSYBOX_CONFIG_APP_UDHCPC 
     100        depends on BUSYBOX_CONFIG_UDHCPC 
    101101        help 
    102102          This script is called after udhcpc receives an answer. See 
     
    108108        default 80 
    109109        range 0 924 
    110         depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC 
     110        depends on BUSYBOX_CONFIG_UDHCPD || BUSYBOX_CONFIG_UDHCPC 
    111111        help 
    112112          Some buggy DHCP servers send DHCP offer packets with option 
  • trunk/package/busybox/config/procps/Config.in

    r18684 r20661  
    189189          Enable 's' in top (gives lots of memory info). 
    190190 
     191config BUSYBOX_CONFIG_FEATURE_SHOW_THREADS 
     192        bool "Support for showing threads in ps/top" 
     193        default n 
     194        depends on BUSYBOX_CONFIG_PS || BUSYBOX_CONFIG_TOP 
     195        help 
     196          Enables ps -T option and 'h' command in top 
     197 
    191198config BUSYBOX_CONFIG_UPTIME 
    192199        bool "uptime" 
     
    204211          output to the screen. 
    205212 
    206  
    207213endmenu 
  • trunk/package/busybox/config/shell/Config.in

    r18712 r20661  
    1616        select BUSYBOX_CONFIG_ASH 
    1717        bool "ash" 
     18        depends on !BUSYBOX_CONFIG_NOMMU 
    1819 
    1920config BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH 
     
    3738        bool "ash" 
    3839        default y 
     40        depends on !BUSYBOX_CONFIG_NOMMU 
    3941        help 
    4042          Tha 'ash' shell adds about 60k in the default configuration and is 
     
    5860          Enable job control in the ash shell. 
    5961 
    60 config BUSYBOX_CONFIG_ASH_READ_NCHARS 
    61         bool "'read -n N' and 'read -s' support" 
    62         default n 
    63         depends on BUSYBOX_CONFIG_ASH 
    64         help 
    65           'read -n N' will return a value after N characters have been read. 
    66           'read -s' will read without echoing the user's input. 
    67  
    68 config BUSYBOX_CONFIG_ASH_READ_TIMEOUT 
    69         bool "'read -t S' support" 
    70         default y 
    71         depends on BUSYBOX_CONFIG_ASH 
    72         help 
    73           'read -t S' will return a value after S seconds have passed. 
    74           This implementation will allow fractional seconds, expressed 
    75           as a decimal fraction, e.g. 'read -t 2.5 foo'. 
    76  
    7762config BUSYBOX_CONFIG_ASH_ALIAS 
    7863        bool "alias support" 
     
    188173          Enable interactive mode (prompt and command editing). 
    189174          Without this, hush simply reads and executes commands 
    190           from stdin just like a shell script from the file. 
     175          from stdin just like a shell script from a file. 
    191176          No prompt, no PS1/PS2 magic shell variables. 
    192177 
     
    250235        help 
    251236          Enable support for export '-n' option in hush. It is a bash extension. 
     237 
     238config BUSYBOX_CONFIG_HUSH_RANDOM_SUPPORT 
     239        bool "Pseudorandom generator and $RANDOM variable" 
     240        default n 
     241        depends on BUSYBOX_CONFIG_HUSH 
     242        help 
     243          Enable pseudorandom generator and dynamic variable "$RANDOM". 
     244          Each read of "$RANDOM" will generate a new pseudorandom value. 
    252245 
    253246config BUSYBOX_CONFIG_LASH 
  • trunk/package/busybox/config/util-linux/Config.in

    r18684 r20661  
    214214          filesystem. 
    215215 
     216config BUSYBOX_CONFIG_MKFS_EXT2 
     217        bool "mkfs_ext2" 
     218        default n 
     219        help 
     220          Utility to create EXT2 filesystems. 
     221 
    216222config BUSYBOX_CONFIG_MKFS_MINIX 
    217223        bool "mkfs_minix" 
     
    233239          this. If you enabled 'mkfs_minix' then you almost certainly want to 
    234240          be using the version 2 filesystem support. 
     241 
     242config BUSYBOX_CONFIG_MKFS_REISER 
     243        bool "mkfs_reiser" 
     244        default n 
     245        help 
     246          Utility to create ReiserFS filesystems. 
    235247 
    236248config BUSYBOX_CONFIG_MKFS_VFAT 
     
    336348          file or block device, and to query the status of a loop device. This 
    337349          version does not currently support enabling data encryption. 
     350 
     351config BUSYBOX_CONFIG_LSPCI 
     352        bool "lspci" 
     353        default n 
     354        help 
     355          lspci is a utility for displaying information about PCI buses in the 
     356          system and devices connected to them. 
     357 
     358          This version uses sysfs (/sys/bus/pci/devices) only. 
     359 
     360config BUSYBOX_CONFIG_LSUSB 
     361        bool "lsusb" 
     362        default n 
     363        help 
     364          lsusb is a utility for displaying information about USB buses in the 
     365          system and devices connected to them. 
     366 
     367          This version uses sysfs (/sys/bus/usb/devices) only. 
    338368 
    339369config BUSYBOX_CONFIG_MDEV 
     
    446476          TODO 
    447477 
     478config BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS 
     479        bool "btrfs filesystem" 
     480        default n 
     481        depends on BUSYBOX_CONFIG_VOLUMEID 
     482        help 
     483          TODO 
     484 
    448485config BUSYBOX_CONFIG_FEATURE_VOLUMEID_REISERFS 
    449486        bool "Reiser filesystem" 
     
    690727          This allows for specifying a device by label or uuid, rather than by 
    691728          name. This feature utilizes the same functionality as blkid/findfs. 
     729          This also enables label or uuid support for swapon. 
    692730 
    693731config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS 
  • trunk/package/busybox/patches/000-autoconf.patch

    r18684 r20661  
    11--- a/applets/Kbuild 
    22+++ b/applets/Kbuild 
    3 @@ -27,13 +27,13 @@ HOSTCFLAGS_usage.o = -I$(srctree_slash)i 
    4   
     3@@ -28,13 +28,13 @@ HOSTCFLAGS_usage_pod.o = -I$(srctree_sla 
    54 applets/applets.o: include/usage_compressed.h include/applet_tables.h 
    65  
    7 -applets/usage:         .config $(srctree_slash)applets/usage_compressed 
    8 +applets/usage:         .config $(srctree_slash)applets/usage_compressed include/autoconf.h 
    9  applets/applet_tables: .config 
     6 applets/applet_tables: .config $(srctree_slash)include/applets.h 
     7-applets/usage:         .config $(srctree_slash)include/applets.h 
     8+applets/usage:         .config $(srctree_slash)include/applets.h include/autoconf.h 
     9 applets/usage_pod:     .config include/applet_tables.h $(srctree_slash)include/applets.h 
    1010  
    1111 quiet_cmd_gen_usage_compressed = GEN     include/usage_compressed.h 
  • trunk/package/busybox/patches/001-init_avoid_loop_opening_tty.patch

    r18485 r20661  
    11--- a/init/init.c 
    22+++ b/init/init.c 
    3 @@ -451,8 +451,11 @@ static void run_actions(int action_type) 
     3@@ -456,8 +456,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/110-wget_getopt_fix.patch

    r18684 r20661  
    11--- a/networking/wget.c 
    22+++ b/networking/wget.c 
    3 @@ -653,7 +653,7 @@ int wget_main(int argc UNUSED_PARAM, cha 
     3@@ -543,7 +543,7 @@ int wget_main(int argc UNUSED_PARAM, cha 
    44                // "tries\0"            Required_argument "t" 
    55                // "timeout\0"          Required_argument "T" 
     
    99                "header\0"           Required_argument "\xfe" 
    1010                "post-data\0"        Required_argument "\xfd" 
    11                 ; 
     11                /* Ignored (we don't do ssl) */ 
  • trunk/package/busybox/patches/250-ash_export-n.patch

    r19779 r20661  
    11--- a/shell/ash.c 
    22+++ b/shell/ash.c 
    3 @@ -12351,8 +12351,17 @@ exportcmd(int argc UNUSED_PARAM, char ** 
     3@@ -12340,8 +12340,17 @@ exportcmd(int argc UNUSED_PARAM, char ** 
    44        const char *p; 
    55        char **aptr; 
     
    2020                name = *aptr; 
    2121                if (name) { 
    22 @@ -12364,10 +12373,12 @@ exportcmd(int argc UNUSED_PARAM, char ** 
     22@@ -12353,10 +12362,12 @@ exportcmd(int argc UNUSED_PARAM, char ** 
    2323                                        vp = *findvar(hashvar(name), name); 
    2424                                        if (vp) { 
  • trunk/package/busybox/patches/300-netmsg.patch

    r18684 r20661  
    11--- a/include/applets.h 
    22+++ b/include/applets.h 
    3 @@ -278,6 +278,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_D 
     3@@ -282,6 +282,7 @@ IF_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_D 
    44 IF_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_DROP)) 
    55 IF_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_DROP)) 
     
    1111--- a/include/usage.h 
    1212+++ b/include/usage.h 
    13 @@ -3101,6 +3101,9 @@ 
     13@@ -3166,6 +3166,9 @@ 
    1414  
    1515 #endif 
     
    2323--- a/networking/Config.in 
    2424+++ b/networking/Config.in 
    25 @@ -617,6 +617,12 @@ config NC 
     25@@ -628,6 +628,12 @@ config NC 
    2626          A simple Unix utility which reads and writes data across network 
    2727          connections. 
     
    4545 lib-$(CONFIG_NETSTAT)      += netstat.o 
    4646 lib-$(CONFIG_NSLOOKUP)     += nslookup.o 
    47  lib-$(CONFIG_PING)         += ping.o 
     47 lib-$(CONFIG_NTPD)         += ntpd.o 
    4848--- /dev/null 
    4949+++ b/networking/netmsg.c 
  • trunk/package/busybox/patches/310-passwd_access.patch

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

    r18684 r20661  
    11--- a/include/applets.h 
    22+++ b/include/applets.h 
    3 @@ -233,6 +233,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, 
     3@@ -234,6 +234,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, 
    44 IF_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) 
    55 IF_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) 
     
    1111--- a/include/usage.h 
    1212+++ b/include/usage.h 
    13 @@ -2325,6 +2325,9 @@ 
     13@@ -2357,6 +2357,9 @@ 
    1414 #define loadkmap_example_usage \ 
    1515        "$ loadkmap < /etc/i18n/lang-keymap\n" 
     
    2323--- a/miscutils/Config.in 
    2424+++ b/miscutils/Config.in 
    25 @@ -456,6 +456,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA 
     25@@ -463,6 +463,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA 
    2626        help 
    2727          Enables the 'hdparm -d' option to get/set using_dma flag. 
     
    3737--- a/miscutils/Kbuild 
    3838+++ b/miscutils/Kbuild 
    39 @@ -26,6 +26,7 @@ lib-$(CONFIG_INOTIFYD)    += inotifyd.o 
     39@@ -27,6 +27,7 @@ lib-$(CONFIG_INOTIFYD)    += inotifyd.o 
    4040 lib-$(CONFIG_FEATURE_LAST_SMALL)+= last.o 
    4141 lib-$(CONFIG_FEATURE_LAST_FANCY)+= last_fancy.o 
  • trunk/package/busybox/patches/350-httpd_redir.patch

    r18684 r20661  
    11--- a/include/usage.h 
    22+++ b/include/usage.h 
    3 @@ -1693,6 +1693,7 @@ 
     3@@ -1727,6 +1727,7 @@ 
    44        IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \ 
    55        " [-h HOME]\n" \ 
     
    99        "Listen for incoming HTTP requests\n" \ 
    1010      "\nOptions:" \ 
    11 @@ -1710,6 +1711,8 @@ 
     11@@ -1744,6 +1745,8 @@ 
    1212      "\n       -m STRING       MD5 crypt STRING") \ 
    1313      "\n       -e STRING       HTML encode STRING" \ 
    1414      "\n       -d STRING       URL decode STRING" \ 
    15 +     "\n       -R PATH         Redirect target path" \ 
    16 +     "\n       -H HOST         Redirect target host" \ 
     15+     "\n       -R PATH         Redirect target path" \ 
     16+     "\n       -H HOST         Redirect target host" \ 
    1717  
    1818 #define hwclock_trivial_usage \ 
     
    2020--- a/networking/httpd.c 
    2121+++ b/networking/httpd.c 
    22 @@ -248,6 +248,8 @@ struct globals { 
     22@@ -250,6 +250,8 @@ struct globals { 
    2323  
    2424        const char *found_mime_type; 
     
    2929  
    3030        IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) 
    31 @@ -294,6 +296,8 @@ struct globals { 
     31@@ -296,6 +298,8 @@ struct globals { 
    3232 #define index_page        (G.index_page       ) 
    3333 #define found_mime_type   (G.found_mime_type  ) 
     
    3838 #define ip_a_d            (G.ip_a_d           ) 
    3939 #define g_realm           (G.g_realm          ) 
    40 @@ -993,8 +997,11 @@ static void send_headers(int responseNum 
     40@@ -997,8 +1001,11 @@ static void send_headers(int responseNum 
    4141        } 
    4242 #endif 
     
    5151                                (g_query ? g_query : "")); 
    5252        } 
    53 @@ -1924,8 +1931,12 @@ static void handle_incoming_and_exit(con 
     53@@ -1941,8 +1948,12 @@ static void handle_incoming_and_exit(con 
    5454        } while (*++tptr); 
    5555        *++urlp = '\0';       /* terminate after last character */ 
     
    6262-       if (urlp[-1] != '/') { 
    6363+       if (!redirect_path && (urlp[-1] != '/')) { 
    64                 if (is_directory(urlcopy + 1, 1, &sb)) { 
     64                if (is_directory(urlcopy + 1, 1, NULL)) { 
    6565                        found_moved_temporarily = urlcopy; 
    6666                } 
    67 @@ -2266,7 +2277,9 @@ static void sighup_handler(int sig UNUSE 
     67@@ -2283,7 +2294,9 @@ static void sighup_handler(int sig UNUSE 
    6868 } 
    6969  
     
    7676        h_opt_home_httpd, 
    7777        IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) 
    78 @@ -2315,12 +2328,13 @@ int httpd_main(int argc UNUSED_PARAM, ch 
     78@@ -2332,12 +2345,13 @@ int httpd_main(int argc UNUSED_PARAM, ch 
    7979        /* We do not "absolutize" path given by -h (home) opt. 
    8080         * If user gives relative path in -h, 
  • trunk/package/busybox/patches/410-httpd_cgi_headers.patch

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

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

    r18684 r20661  
    120120--- a/modutils/Config.in 
    121121+++ b/modutils/Config.in 
    122 @@ -210,7 +210,7 @@ config FEATURE_MODUTILS_SYMBOLS 
     122@@ -226,7 +226,7 @@ config FEATURE_MODUTILS_SYMBOLS 
    123123 config DEFAULT_MODULES_DIR 
    124124        string "Default directory containing modules" 
  • trunk/package/busybox/patches/480-mount_union.patch

    r18684 r20661  
    11--- a/util-linux/mount.c 
    22+++ b/util-linux/mount.c 
    3 @@ -69,6 +69,10 @@ 
    4  #define MS_DIRSYNC      128     // Directory modifications are synchronous 
     3@@ -77,6 +77,10 @@ 
     4 # include <rpc/pmap_clnt.h> 
    55 #endif 
    66  
     
    1212 #if defined(__dietlibc__) 
    1313 // 16.12.2006, Sampo Kellomaki (sampo@iki.fi) 
    14 @@ -185,6 +189,7 @@ static const int32_t mount_options[] = { 
     14@@ -194,6 +198,7 @@ static const int32_t mount_options[] = { 
    1515                /* "rslave"      */ MS_SLAVE|MS_RECURSIVE, 
    1616                /* "rprivate"    */ MS_SLAVE|MS_RECURSIVE, 
     
    2020  
    2121        // Always understood. 
    22 @@ -239,6 +244,7 @@ static const char mount_option_str[] = 
     22@@ -249,6 +254,7 @@ static const char mount_option_str[] = 
    2323                "rslave\0" 
    2424                "rprivate\0" 
  • trunk/package/busybox/patches/510-awk_include.patch

    r19779 r20661  
    1616  
    1717 /* I/O stream */ 
    18 @@ -1420,7 +1425,8 @@ static void parse_program(char *p) 
     18@@ -1424,7 +1429,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 @@ -1429,7 +1435,7 @@ static void parse_program(char *p) 
     28@@ -1433,7 +1439,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 @@ -2410,7 +2416,8 @@ static var *evaluate(node *op, var *res) 
     37@@ -2446,7 +2452,8 @@ static var *evaluate(node *op, var *res) 
    3838                        break; 
    3939  
     
    4444                                syntax_error(EMSG_UNDEF_FUNC); 
    4545  
    46                         X.v = R.v = nvalloc(op->r.f->nargs+1); 
    47 @@ -2427,7 +2434,10 @@ static var *evaluate(node *op, var *res) 
     46                        X.v = R.v = nvalloc(op->r.f->nargs + 1); 
     47@@ -2463,7 +2470,10 @@ static var *evaluate(node *op, var *res) 
    4848                        fnargs = X.v; 
    4949  
     
    5757  
    5858                        nvfree(fnargs); 
    59 @@ -2790,6 +2800,143 @@ static rstream *next_input_file(void) 
     59@@ -2829,6 +2839,143 @@ static rstream *next_input_file(void) 
    6060 #undef files_happen 
    6161 } 
     
    201201 int awk_main(int argc, char **argv) 
    202202 { 
    203 @@ -2855,6 +3002,9 @@ int awk_main(int argc, char **argv) 
     203@@ -2894,6 +3041,9 @@ int awk_main(int argc, char **argv) 
    204204                        *s1 = '='; 
    205205                } 
  • trunk/package/busybox/patches/902-telnetd_intr.patch

    r18684 r20661  
    11--- a/networking/telnetd.c 
    22+++ b/networking/telnetd.c 
    3 @@ -306,6 +306,7 @@ make_new_session( 
     3@@ -308,6 +308,7 @@ make_new_session( 
    44  
    55        /* Restore default signal handling ASAP */ 
Note: See TracChangeset for help on using the changeset viewer.