Changeset 18684


Ignore:
Timestamp:
2009-12-07T17:56:04+01:00 (7 years ago)
Author:
florian
Message:

[package] update busybox to 1.15.2 (#5926)

Location:
trunk/package/busybox
Files:
35 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/busybox/Makefile

    r18528 r18684  
    99 
    1010PKG_NAME:=busybox 
    11 PKG_VERSION:=1.14.4 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=1.15.2 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://www.busybox.net/downloads \ 
    1616                http://distfiles.gentoo.org/distfiles/ 
    17 PKG_MD5SUM:=ad6d0b271e60783a3c767c4ccbc7f98e 
     17PKG_MD5SUM:=d5653e5b74b17dbb1eeecda8b8f22c0a 
    1818 
    1919include $(INCLUDE_DIR)/package.mk 
  • trunk/package/busybox/config/Config.in

    r17782 r18684  
    2929          some GNU extensions in libc. You probably only need this option 
    3030          if you plan to run busybox on desktop. 
    31  
    32 config BUSYBOX_CONFIG_FEATURE_ASSUME_UNICODE 
    33         bool "Assume that 1:1 char/glyph correspondence is not true" 
    34         default n 
    35         help 
    36           This makes various applets aware that one byte is not 
    37           one character on screen. 
    38  
    39           Busybox aims to eventually work correctly with Unicode displays. 
    40           Any older encodings are not guaranteed to work. 
    41           Probably by the time when busybox will be fully Unicode-clean, 
    42           other encodings will be mainly of historic interest. 
    4331 
    4432choice 
     
    114102          busybox to support locale settings. 
    115103 
    116 config BUSYBOX_CONFIG_GETOPT_LONG 
     104config BUSYBOX_CONFIG_FEATURE_ASSUME_UNICODE 
     105        bool "Support Unicode" 
     106        default n 
     107        help 
     108          This makes various applets aware that one byte is not 
     109          one character on screen. 
     110 
     111          Busybox aims to eventually work correctly with Unicode displays. 
     112          Any older encodings are not guaranteed to work. 
     113          Probably by the time when busybox will be fully Unicode-clean, 
     114          other encodings will be mainly of historic interest. 
     115 
     116config BUSYBOX_CONFIG_FEATURE_CHECK_UNICODE_IN_ENV 
     117        bool "Check $LANG environment variable" 
     118        default n 
     119        depends on BUSYBOX_CONFIG_FEATURE_ASSUME_UNICODE && !BUSYBOX_CONFIG_LOCALE_SUPPORT 
     120        help 
     121          With this option on, Unicode support is activated 
     122          only if LANG variable has the value of the form "xxxx.utf8" 
     123 
     124          Otherwise, Unicode support will be always enabled and active. 
     125 
     126config BUSYBOX_CONFIG_LONG_OPTS 
    117127        bool "Support for --long-options" 
    118128        default y 
  • trunk/package/busybox/config/archival/Config.in

    r17782 r18684  
    5454 
    5555config BUSYBOX_CONFIG_FEATURE_AR_LONG_FILENAMES 
    56         bool "Support for long filenames (not need for debs)" 
     56        bool "Support for long filenames (not needed for debs)" 
    5757        default n 
    5858        depends on BUSYBOX_CONFIG_AR 
    5959        help 
    60           By default the ar format can only store the first 15 characters of 
    61           the filename, this option removes that limitation. 
     60          By default the ar format can only store the first 15 characters 
     61          of the filename, this option removes that limitation. 
    6262          It supports the GNU ar long filename method which moves multiple long 
    6363          filenames into a the data section of a new ar entry. 
     
    166166          It's probably the most widely used UNIX compression program. 
    167167 
     168config BUSYBOX_CONFIG_LZOP 
     169        bool "lzop" 
     170        default n 
     171        help 
     172          Lzop compression/decompresion. 
     173 
     174config BUSYBOX_CONFIG_LZOP_COMPR_HIGH 
     175        bool "lzop complession levels 7,8,9 (not very useful)" 
     176        default n 
     177        depends on BUSYBOX_CONFIG_LZOP 
     178        help 
     179          High levels (7,8,9) of lzop compression. These levels 
     180          are actually slower than gzip at equivalent compression ratios 
     181          and take up 3.2K of code. 
     182 
    168183config BUSYBOX_CONFIG_RPM2CPIO 
    169184        bool "rpm2cpio" 
     
    197212 
    198213config BUSYBOX_CONFIG_FEATURE_TAR_AUTODETECT 
    199         bool "Autodetect gz/bz2 compressed tarballs" 
     214        bool "Autodetect compressed tarballs" 
    200215        default n 
    201216        depends on BUSYBOX_CONFIG_FEATURE_SEAMLESS_Z || BUSYBOX_CONFIG_FEATURE_SEAMLESS_GZ || BUSYBOX_CONFIG_FEATURE_SEAMLESS_BZ2 || BUSYBOX_CONFIG_FEATURE_SEAMLESS_LZMA 
    202217        help 
    203           With this option tar can automatically detect gzip/bzip2 compressed 
     218          With this option tar can automatically detect compressed 
    204219          tarballs. Currently it works only on files (not pipes etc). 
    205220 
     
    242257        bool "Enable long options" 
    243258        default n 
    244         depends on BUSYBOX_CONFIG_TAR && BUSYBOX_CONFIG_GETOPT_LONG 
     259        depends on BUSYBOX_CONFIG_TAR && BUSYBOX_CONFIG_LONG_OPTS 
    245260        help 
    246261          Enable use of long options, increases size by about 400 Bytes 
     
    284299        depends on BUSYBOX_CONFIG_UNLZMA 
    285300        help 
    286           This option reduces decompression time by about 33% at the cost of 
    287           a 2K bigger binary. 
     301          This option reduces decompression time by about 25% at the cost of 
     302          a 1K bigger binary. 
    288303 
    289304config BUSYBOX_CONFIG_UNZIP 
  • trunk/package/busybox/config/console-tools/Config.in

    r16063 r18684  
    9292        bool "Enable long options" 
    9393        default n 
    94         depends on BUSYBOX_CONFIG_SETCONSOLE && BUSYBOX_CONFIG_GETOPT_LONG 
     94        depends on BUSYBOX_CONFIG_SETCONSOLE && BUSYBOX_CONFIG_LONG_OPTS 
    9595        help 
    9696          Support long options for the setconsole applet. 
  • trunk/package/busybox/config/coreutils/Config.in

    r17838 r18684  
    205205        bool "Enable long options" 
    206206        default n 
    207         depends on BUSYBOX_CONFIG_ENV && BUSYBOX_CONFIG_GETOPT_LONG 
     207        depends on BUSYBOX_CONFIG_ENV && BUSYBOX_CONFIG_LONG_OPTS 
    208208        help 
    209209          Support long options for the env applet. 
     
    218218        bool "Enable long options" 
    219219        default n 
    220         depends on BUSYBOX_CONFIG_EXPAND && BUSYBOX_CONFIG_GETOPT_LONG 
     220        depends on BUSYBOX_CONFIG_EXPAND && BUSYBOX_CONFIG_LONG_OPTS 
    221221        help 
    222222          Support long options for the expand applet. 
     
    250250          Wrap text to fit a specific width. 
    251251 
     252config BUSYBOX_CONFIG_FSYNC 
     253        bool "fsync" 
     254        default n 
     255        help 
     256          fsync is used to flush file-related cached blocks to disk. 
     257 
    252258config BUSYBOX_CONFIG_HEAD 
    253259        bool "head" 
     
    286292        bool "Enable long options" 
    287293        default n 
    288         depends on BUSYBOX_CONFIG_INSTALL && BUSYBOX_CONFIG_GETOPT_LONG 
     294        depends on BUSYBOX_CONFIG_INSTALL && BUSYBOX_CONFIG_LONG_OPTS 
    289295        help 
    290296          Support long options for the install applet. 
     
    359365        bool "Allow use of color to identify file types" 
    360366        default y 
    361         depends on BUSYBOX_CONFIG_LS && BUSYBOX_CONFIG_GETOPT_LONG 
     367        depends on BUSYBOX_CONFIG_LS && BUSYBOX_CONFIG_LONG_OPTS 
    362368        help 
    363369          This enables the --color option to ls. 
     
    389395        bool "Enable long options" 
    390396        default n 
    391         depends on BUSYBOX_CONFIG_MKDIR && BUSYBOX_CONFIG_GETOPT_LONG 
     397        depends on BUSYBOX_CONFIG_MKDIR && BUSYBOX_CONFIG_LONG_OPTS 
    392398        help 
    393399          Support long options for the mkdir applet. 
     
    416422        bool "Enable long options" 
    417423        default n 
    418         depends on BUSYBOX_CONFIG_MV && BUSYBOX_CONFIG_GETOPT_LONG 
     424        depends on BUSYBOX_CONFIG_MV && BUSYBOX_CONFIG_LONG_OPTS 
    419425        help 
    420426          Support long options for the mv applet. 
     
    493499        bool "Enable long options" 
    494500        default n 
    495         depends on BUSYBOX_CONFIG_RMDIR && BUSYBOX_CONFIG_GETOPT_LONG 
     501        depends on BUSYBOX_CONFIG_RMDIR && BUSYBOX_CONFIG_LONG_OPTS 
    496502        help 
    497503          Support long options for the rmdir applet, including 
     
    630636 
    631637config BUSYBOX_CONFIG_FEATURE_FANCY_TAIL 
    632         bool "Enable extra tail options (-q, -s, and -v)" 
     638        bool "Enable extra tail options (-q, -s, -v, and -F)" 
    633639        default y 
    634640        depends on BUSYBOX_CONFIG_TAIL 
     
    662668        bool "Extend test to 64 bit" 
    663669        default y 
    664         depends on BUSYBOX_CONFIG_TEST || BUSYBOX_CONFIG_ASH_BUILTIN_TEST 
     670        depends on BUSYBOX_CONFIG_TEST || BUSYBOX_CONFIG_ASH_BUILTIN_TEST || BUSYBOX_CONFIG_HUSH 
    665671        help 
    666672          Enable 64-bit support in test. 
     
    727733        bool "Enable long options" 
    728734        default n 
    729         depends on BUSYBOX_CONFIG_UNEXPAND && BUSYBOX_CONFIG_GETOPT_LONG 
     735        depends on BUSYBOX_CONFIG_UNEXPAND && BUSYBOX_CONFIG_LONG_OPTS 
    730736        help 
    731737          Support long options for the unexpand applet. 
  • trunk/package/busybox/config/debianutils/Config.in

    r16063 r18684  
    3636        bool "Enable long options" 
    3737        default n 
    38         depends on BUSYBOX_CONFIG_RUN_PARTS && BUSYBOX_CONFIG_GETOPT_LONG 
     38        depends on BUSYBOX_CONFIG_RUN_PARTS && BUSYBOX_CONFIG_LONG_OPTS 
    3939        help 
    4040          Support long options for the run-parts applet. 
     
    7070        bool "Enable long options" 
    7171        default n 
    72         depends on BUSYBOX_CONFIG_START_STOP_DAEMON && BUSYBOX_CONFIG_GETOPT_LONG 
     72        depends on BUSYBOX_CONFIG_START_STOP_DAEMON && BUSYBOX_CONFIG_LONG_OPTS 
    7373        help 
    7474          Support long options for the start-stop-daemon applet. 
  • trunk/package/busybox/config/findutils/Config.in

    r16063 r18684  
    1313 
    1414config BUSYBOX_CONFIG_FEATURE_FIND_PRINT0 
    15         bool "Enable -print0 option" 
    16         default y 
    17         depends on BUSYBOX_CONFIG_FIND 
    18         help 
    19           Causes output names to be separated by a null character 
     15        bool "Enable -print0: NUL-terminated output" 
     16        default y 
     17        depends on BUSYBOX_CONFIG_FIND 
     18        help 
     19          Causes output names to be separated by a NUL character 
    2020          rather than a newline. This allows names that contain 
    2121          newlines and other whitespace to be more easily 
     
    2323 
    2424config BUSYBOX_CONFIG_FEATURE_FIND_MTIME 
    25         bool "Enable modified time matching (-mtime option)" 
     25        bool "Enable -mtime: modified time matching" 
    2626        default n 
    2727        depends on BUSYBOX_CONFIG_FIND 
     
    3131 
    3232config BUSYBOX_CONFIG_FEATURE_FIND_MMIN 
    33         bool "Enable modified time matching (-mmin option)" 
     33        bool "Enable -mmin: modified time matching by minutes" 
    3434        default n 
    3535        depends on BUSYBOX_CONFIG_FIND 
     
    3939 
    4040config BUSYBOX_CONFIG_FEATURE_FIND_PERM 
    41         bool "Enable permissions matching (-perm option)" 
     41        bool "Enable -perm: permissions matching" 
    4242        default y 
    4343        depends on BUSYBOX_CONFIG_FIND 
     
    4646 
    4747config BUSYBOX_CONFIG_FEATURE_FIND_TYPE 
    48         bool "Enable filetype matching (-type option)" 
     48        bool "Enable -type: file type matching (file/dir/link/...)" 
    4949        default y 
    5050        depends on BUSYBOX_CONFIG_FIND 
     
    5454 
    5555config BUSYBOX_CONFIG_FEATURE_FIND_XDEV 
    56         bool "Enable 'stay in filesystem' option (-xdev)" 
     56        bool "Enable -xdev: 'stay in filesystem'" 
    5757        default y 
    5858        depends on BUSYBOX_CONFIG_FIND 
     
    6161 
    6262config BUSYBOX_CONFIG_FEATURE_FIND_MAXDEPTH 
    63         bool "Enable -maxdepth N option" 
     63        bool "Enable -maxdepth N" 
    6464        default y 
    6565        depends on BUSYBOX_CONFIG_FIND 
     
    6868 
    6969config BUSYBOX_CONFIG_FEATURE_FIND_NEWER 
    70         bool "Enable -newer option for comparing file mtimes" 
     70        bool "Enable -newer: compare file modification times" 
    7171        default n 
    7272        depends on BUSYBOX_CONFIG_FIND 
     
    7676 
    7777config BUSYBOX_CONFIG_FEATURE_FIND_INUM 
    78         bool "Enable inode number matching (-inum option)" 
     78        bool "Enable -inum: inode number matching" 
    7979        default n 
    8080        depends on BUSYBOX_CONFIG_FIND 
     
    8383 
    8484config BUSYBOX_CONFIG_FEATURE_FIND_EXEC 
    85         bool "Enable -exec option allowing execution of commands" 
     85        bool "Enable -exec: execute commands" 
    8686        default y 
    8787        depends on BUSYBOX_CONFIG_FIND 
     
    9191 
    9292config BUSYBOX_CONFIG_FEATURE_FIND_USER 
    93         bool "Enable username/uid matching (-user option)" 
     93        bool "Enable -user: username/uid matching" 
    9494        default y 
    9595        depends on BUSYBOX_CONFIG_FIND 
     
    9898 
    9999config BUSYBOX_CONFIG_FEATURE_FIND_GROUP 
    100         bool "Enable group/gid matching (-group option)" 
     100        bool "Enable -group: group/gid matching" 
    101101        default y 
    102102        depends on BUSYBOX_CONFIG_FIND 
     
    114114 
    115115config BUSYBOX_CONFIG_FEATURE_FIND_DEPTH 
    116         bool "Enable the -depth option" 
     116        bool "Enable -depth" 
    117117        default y 
    118118        depends on BUSYBOX_CONFIG_FIND 
     
    128128 
    129129config BUSYBOX_CONFIG_FEATURE_FIND_SIZE 
    130         bool "Enable -size option allowing matching for file size" 
     130        bool "Enable -size: file size matching" 
    131131        default y 
    132132        depends on BUSYBOX_CONFIG_FIND 
     
    135135 
    136136config BUSYBOX_CONFIG_FEATURE_FIND_PRUNE 
    137         bool "Enable -prune option allowing to exclude subdirectories" 
     137        bool "Enable -prune: exclude subdirectories" 
    138138        default y 
    139139        depends on BUSYBOX_CONFIG_FIND 
     
    143143 
    144144config BUSYBOX_CONFIG_FEATURE_FIND_DELETE 
    145         bool "Enable -delete option allowing to delete files" 
     145        bool "Enable -delete: delete files/dirs" 
    146146        default n 
    147147        depends on BUSYBOX_CONFIG_FIND && BUSYBOX_CONFIG_FEATURE_FIND_DEPTH 
     
    152152 
    153153config BUSYBOX_CONFIG_FEATURE_FIND_PATH 
    154         bool "Enable -path option allowing to match pathname patterns" 
     154        bool "Enable -path: match pathname with shell pattern" 
    155155        default y 
    156156        depends on BUSYBOX_CONFIG_FIND 
     
    159159 
    160160config BUSYBOX_CONFIG_FEATURE_FIND_REGEX 
    161         bool "Enable -regex: match pathname to regex" 
     161        bool "Enable -regex: match pathname with regex" 
    162162        default y 
    163163        depends on BUSYBOX_CONFIG_FIND 
     
    166166 
    167167config BUSYBOX_CONFIG_FEATURE_FIND_CONTEXT 
    168         bool "Enable -context option for matching security context" 
     168        bool "Enable -context: security context matching" 
    169169        default n 
    170170        depends on BUSYBOX_CONFIG_FIND && BUSYBOX_CONFIG_SELINUX 
     
    179179 
    180180config BUSYBOX_CONFIG_FEATURE_GREP_EGREP_ALIAS 
    181         bool "Support extended regular expressions (egrep & grep -E)" 
     181        bool "Enable extended regular expressions (egrep & grep -E)" 
    182182        default y 
    183183        depends on BUSYBOX_CONFIG_GREP 
     
    194194          fgrep sees the search pattern as a normal string rather than 
    195195          regular expressions. 
    196           grep -F is always builtin, this just creates the fgrep alias. 
     196          grep -F always works, this just creates the fgrep alias. 
    197197 
    198198config BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT 
     
    209209        default y 
    210210        help 
    211           xargs is used to execute a specified command on 
     211          xargs is used to execute a specified command for 
    212212          every item from standard input. 
    213213 
    214214config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION 
    215         bool "Enable prompt and confirmation option -p" 
    216         default y 
    217         depends on BUSYBOX_CONFIG_XARGS 
    218         help 
    219           Support prompt the user about whether to run each command 
     215        bool "Enable -p: prompt and confirmation" 
     216        default y 
     217        depends on BUSYBOX_CONFIG_XARGS 
     218        help 
     219          Support -p: prompt the user whether to run each command 
    220220          line and read a line from the terminal. 
    221221 
    222222config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES 
    223         bool "Enable support single and double quotes and backslash" 
    224         default y 
    225         depends on BUSYBOX_CONFIG_XARGS 
    226         help 
    227           Default xargs unsupport single and double quotes 
    228           and backslash for can use aruments with spaces. 
     223        bool "Enable single and double quotes and backslash" 
     224        default y 
     225        depends on BUSYBOX_CONFIG_XARGS 
     226        help 
     227          Support quoting in the input. 
    229228 
    230229config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT 
    231         bool "Enable support options -x" 
    232         default y 
    233         depends on BUSYBOX_CONFIG_XARGS 
    234         help 
    235           Enable support exit if the size (see the -s or -n option) 
     230        bool "Enable -x: exit if -s or -n is exceeded" 
     231        default y 
     232        depends on BUSYBOX_CONFIG_XARGS 
     233        help 
     234          Support -x: exit if the command size (see the -s or -n option) 
    236235          is exceeded. 
    237236 
    238237config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM 
    239         bool "Enable null terminated option -0" 
    240         default y 
    241         depends on BUSYBOX_CONFIG_XARGS 
    242         help 
    243           Enable input filenames are terminated by a null character 
    244           instead of by whitespace, and the quotes and backslash 
     238        bool "Enable -0: NUL-terminated input" 
     239        default y 
     240        depends on BUSYBOX_CONFIG_XARGS 
     241        help 
     242          Support -0: input items are terminated by a NUL character 
     243          instead of whitespace, and the quotes and backslash 
    245244          are not special. 
    246245 
  • trunk/package/busybox/config/init/Config.in

    r17782 r18684  
    9494          Stop all processes and either halt, reboot, or power off the system. 
    9595 
     96config BUSYBOX_CONFIG_FEATURE_CALL_TELINIT 
     97        bool "Call telinit on shutdown and reboot" 
     98        default n 
     99        depends on BUSYBOX_CONFIG_HALT && !BUSYBOX_CONFIG_INIT 
     100        help 
     101          Call an external program (normally telinit) to facilitate 
     102          a switch to a proper runlevel. 
     103 
     104          This option is only available if you selected halt and friends, 
     105          but did not select init. 
     106 
     107config BUSYBOX_CONFIG_TELINIT_PATH 
     108        string "Path to telinit executable" 
     109        default "/sbin/telinit" 
     110        depends on BUSYBOX_CONFIG_FEATURE_CALL_TELINIT 
     111        help 
     112          When busybox halt and friends have to call external telinit 
     113          to facilitate proper shutdown, this path is to be used when 
     114          locating telinit executable. 
     115 
    96116config BUSYBOX_CONFIG_MESG 
    97117        bool "mesg" 
  • trunk/package/busybox/config/libbb/Config.in

    r16053 r18684  
    1414 
    1515config BUSYBOX_CONFIG_MD5_SIZE_VS_SPEED 
    16         int "MD5: Trade Bytes for Speed" 
     16        int "MD5: Trade bytes for speed (0:fast, 3:slow)" 
    1717        default 2 
    1818        range 0 3 
     
    103103          \$ and escape codes. 
    104104 
     105config BUSYBOX_CONFIG_FEATURE_EDITING_ASK_TERMINAL 
     106        bool "Query cursor position from terminal" 
     107        default n 
     108        depends on BUSYBOX_CONFIG_FEATURE_EDITING 
     109        help 
     110          Allow usage of "ESC [ 6 n" sequence. Terminal answers back with 
     111          current cursor position. This information is used to make line 
     112          editing more robust in some cases. 
     113          If you are not sure whether your terminals respond to this code 
     114          correctly, or want to save on code size (about 300 bytes), 
     115          then do not turn this option on. 
     116 
     117config BUSYBOX_CONFIG_FEATURE_NON_POSIX_CP 
     118        bool "Non-POSIX, but safer, copying to special nodes" 
     119        default y 
     120        help 
     121          With this option, "cp file symlink" will delete symlink 
     122          and create a regular file. This does not conform to POSIX, 
     123          but prevents a symlink attack. 
     124          Similarly, "cp file device" will not send file's data 
     125          to the device. 
     126 
    105127config BUSYBOX_CONFIG_FEATURE_VERBOSE_CP_MESSAGE 
    106128        bool "Give more precise messages when copy fails (cp, mv etc)" 
     
    152174          Support for printing infiniband addresses in 
    153175          network applets. 
     176 
    154177endmenu 
  • trunk/package/busybox/config/loginutils/Config.in

    r17782 r18684  
    9898          Utility for creating a new group account. 
    9999 
     100config BUSYBOX_CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS 
     101        bool "Enable long options" 
     102        default n 
     103        depends on BUSYBOX_CONFIG_ADDGROUP && BUSYBOX_CONFIG_LONG_OPTS 
     104        help 
     105          Support long options for the addgroup applet. 
     106 
    100107config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP 
    101108        bool "Support for adding users to groups" 
     
    142149        bool "Enable long options" 
    143150        default n 
    144         depends on BUSYBOX_CONFIG_ADDUSER && BUSYBOX_CONFIG_GETOPT_LONG 
     151        depends on BUSYBOX_CONFIG_ADDUSER && BUSYBOX_CONFIG_LONG_OPTS 
    145152        help 
    146153          Support long options for the adduser applet. 
     154 
     155config BUSYBOX_CONFIG_FIRST_SYSTEM_ID 
     156        int "First valid system uid or gid for adduser and addgroup" 
     157        depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP 
     158        range 0 64900 
     159        default 100 
     160        help 
     161          First valid system uid or gid for adduser and addgroup 
     162 
     163config BUSYBOX_CONFIG_LAST_SYSTEM_ID 
     164        int "Last valid system uid or gid for adduser and addgroup" 
     165        depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP 
     166        range 0 64900 
     167        default 999 
     168        help 
     169          Last valid system uid or gid for adduser and addgroup 
    147170 
    148171config BUSYBOX_CONFIG_DELUSER 
  • trunk/package/busybox/config/miscutils/Config.in

    r17782 r18684  
    1919          The bbconfig applet will print the config file with which 
    2020          busybox was built. 
     21 
     22config BUSYBOX_CONFIG_BEEP 
     23        bool "beep" 
     24        default n 
     25        help 
     26          The beep applets beeps in a given freq/Hz. 
     27 
     28config BUSYBOX_CONFIG_FEATURE_BEEP_FREQ 
     29        int "default frequency" 
     30        range 0 2147483647 
     31        default 4000 
     32        depends on BUSYBOX_CONFIG_BEEP 
     33        help 
     34          Frequency for default beep. 
     35 
     36config BUSYBOX_CONFIG_FEATURE_BEEP_LENGTH_MS 
     37        int "default length" 
     38        range 0 2147483647 
     39        default 30 
     40        depends on BUSYBOX_CONFIG_BEEP 
     41        help 
     42          Length in ms for default beep. 
    2143 
    2244config BUSYBOX_CONFIG_CHAT 
     
    251273            "exit" - well you guessed it 
    252274 
     275config BUSYBOX_CONFIG_FLASH_LOCK 
     276        bool "flash_lock" 
     277        default n 
     278        help 
     279          The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This 
     280          utility locks part or all of the flash device. 
     281 
     282config BUSYBOX_CONFIG_FLASH_UNLOCK 
     283        bool "flash_unlock" 
     284        default n 
     285        help 
     286          The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This 
     287          utility unlocks part or all of the flash device. 
     288 
    253289config BUSYBOX_CONFIG_FLASH_ERASEALL 
    254290        bool "flash_eraseall" 
     
    577613          Usage in shell scripts: width=`ttysize w`. 
    578614 
     615config BUSYBOX_CONFIG_VOLNAME 
     616        bool "volname" 
     617        default n 
     618        help 
     619          Prints a CD-ROM volume name. 
     620 
    579621config BUSYBOX_CONFIG_WATCHDOG 
    580622        bool "watchdog" 
  • trunk/package/busybox/config/modutils/Config.in

    r17782 r18684  
    9191          level. 
    9292 
    93           Note that in the state, modprobe does not understand multiple 
    94           module options from the configuration file. See option below. 
    95  
    9693config BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST 
    97         bool 
    98         prompt "Blacklist support" 
     94        bool "Blacklist support" 
    9995        default n 
    10096        depends on BUSYBOX_CONFIG_MODPROBE 
  • trunk/package/busybox/config/networking/Config.in

    r17782 r18684  
    1212          Enable IPv6 support in busybox. 
    1313          This adds IPv6 support in the networking applets. 
     14 
     15config BUSYBOX_CONFIG_FEATURE_UNIX_LOCAL 
     16        bool "Enable Unix domain socket support (usually not needed)" 
     17        default n 
     18        help 
     19          Enable Unix domain socket support in all busybox networking 
     20          applets.  Address of the form local:/path/to/unix/socket 
     21          will be recognized. 
     22 
     23          This extension is almost never used in real world usage. 
     24          You most likely want to say N. 
    1425 
    1526config BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS 
     
    122133        bool "Enable long options in ftpget/ftpput" 
    123134        default n 
    124         depends on BUSYBOX_CONFIG_GETOPT_LONG && (BUSYBOX_CONFIG_FTPGET || BUSYBOX_CONFIG_FTPPUT) 
     135        depends on BUSYBOX_CONFIG_LONG_OPTS && (BUSYBOX_CONFIG_FTPGET || BUSYBOX_CONFIG_FTPPUT) 
    125136        help 
    126137          Support long options for the ftpget/ftpput applet. 
     
    154165          When enabled, httpd will use the kernel sendfile() function 
    155166          instead of read/write loop. 
    156  
    157 config BUSYBOX_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP 
    158         bool "Support reloading of global config file on HUP signal" 
    159         default y 
    160         depends on BUSYBOX_CONFIG_HTTPD 
    161         help 
    162           This option enables processing of SIGHUP to reload cached 
    163           configuration settings. 
    164167 
    165168config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID 
     
    188191          Enables basic per URL authentication from /etc/httpd.conf 
    189192          using md5 passwords. 
    190  
    191 config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES 
    192         bool "Support loading additional MIME types at run-time" 
    193         default y 
    194         depends on BUSYBOX_CONFIG_HTTPD 
    195         help 
    196           This option enables support for additional MIME types at 
    197           run-time to be specified in the configuration file. 
    198193 
    199194config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI 
     
    312307          Userspace application to bind several interfaces 
    313308          to a logical interface (use with kernel bonding driver). 
     309 
     310config BUSYBOX_CONFIG_IFPLUGD 
     311        bool "ifplugd" 
     312        default n 
     313        help 
     314          Network interface plug detection daemon. 
    314315 
    315316config BUSYBOX_CONFIG_IFUPDOWN 
     
    578579        bool "Enable long options" 
    579580        default n 
    580         depends on BUSYBOX_CONFIG_IPCALC && BUSYBOX_CONFIG_GETOPT_LONG 
     581        depends on BUSYBOX_CONFIG_IPCALC && BUSYBOX_CONFIG_LONG_OPTS 
    581582        help 
    582583          Support long options for the ipcalc applet. 
     
    843844        depends on BUSYBOX_CONFIG_TFTP || BUSYBOX_CONFIG_TFTPD 
    844845        help 
    845           Enable debug settings for tftp. This is useful if you're running 
    846           into problems with tftp as the protocol doesn't help you much when 
    847           you run into problems. 
     846          Make tftp[d] print debugging messages on stderr. 
     847          This is useful if you are diagnosing a bug in tftp[d]. 
    848848 
    849849config BUSYBOX_CONFIG_TRACEROUTE 
     
    851851        default y 
    852852        help 
    853           Utility to trace the route of IP packets 
     853          Utility to trace the route of IP packets. 
    854854 
    855855config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE 
     
    917917        bool "Enable long options" 
    918918        default y 
    919         depends on BUSYBOX_CONFIG_WGET && BUSYBOX_CONFIG_GETOPT_LONG 
     919        depends on BUSYBOX_CONFIG_WGET && BUSYBOX_CONFIG_LONG_OPTS 
    920920        help 
    921921          Support long options for the wget applet. 
  • trunk/package/busybox/config/networking/udhcp/Config.in

    r16063 r18684  
    7676 
    7777config BUSYBOX_CONFIG_UDHCP_DEBUG 
    78         bool "Compile udhcp with noisy debugging messages" 
    79         default n 
    80         depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC 
     78        int "Maximum verbosity level for udhcp applets (0..9)" 
     79        default 0 
     80        range 0 9 
     81        depends on BUSYBOX_CONFIG_APP_UDHCPD || BUSYBOX_CONFIG_APP_UDHCPC || BUSYBOX_CONFIG_APP_DHCPRELAY 
    8182        help 
    82           If selected, udhcpd will output extra debugging output. 
     83          Verbosity can be increased with multiple -v options. 
     84          This options controls how high it can be cranked up. 
     85 
     86          Bigger values result in bigger code. Levels above 1 
     87          are very verbose and useful for debugging only. 
    8388 
    8489config BUSYBOX_CONFIG_FEATURE_UDHCP_RFC3397 
  • trunk/package/busybox/config/procps/Config.in

    r16063 r18684  
    9292 
    9393config BUSYBOX_CONFIG_FEATURE_PS_WIDE 
    94         bool "Enable argument for wide output (-w)" 
     94        bool "Enable wide output option (-w)" 
    9595        default n 
    9696        depends on BUSYBOX_CONFIG_PS 
    9797        help 
    9898          Support argument 'w' for wide output. 
    99           If given once, 132 chars are printed and given more than 
    100           one, the length is unlimited. 
     99          If given once, 132 chars are printed, and if given more 
     100          than once, the length is unlimited. 
    101101 
    102102config BUSYBOX_CONFIG_FEATURE_PS_TIME 
     
    106106        help 
    107107          Support -o time and -o etime output specifiers. 
     108 
     109config BUSYBOX_CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS 
     110        bool "Enable additional ps columns" 
     111        default n 
     112        depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP 
     113        help 
     114          Support -o rgroup, -o ruser, -o nice output specifiers. 
    108115 
    109116config BUSYBOX_CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS 
  • trunk/package/busybox/config/selinux/Config.in

    r16063 r18684  
    1717        bool "Enable long options" 
    1818        default n 
    19         depends on BUSYBOX_CONFIG_CHCON && BUSYBOX_CONFIG_GETOPT_LONG 
     19        depends on BUSYBOX_CONFIG_CHCON && BUSYBOX_CONFIG_LONG_OPTS 
    2020        help 
    2121          Support long options for the chcon applet. 
     
    6868        bool "Enable long options" 
    6969        default n 
    70         depends on BUSYBOX_CONFIG_RUNCON && BUSYBOX_CONFIG_GETOPT_LONG 
     70        depends on BUSYBOX_CONFIG_RUNCON && BUSYBOX_CONFIG_LONG_OPTS 
    7171        help 
    7272          Support long options for the runcon applet. 
  • trunk/package/busybox/config/shell/Config.in

    r17782 r18684  
    2525####    bool "lash" 
    2626 
    27 config BUSYBOX_CONFIG_FEATURE_SH_IS_MSH 
    28         select BUSYBOX_CONFIG_MSH 
    29         bool "msh" 
     27####config FEATURE_SH_IS_MSH 
     28####    select MSH 
     29####    bool "msh" 
    3030 
    3131config BUSYBOX_CONFIG_FEATURE_SH_IS_NONE 
     
    4444          (written by Kenneth Almquist) from NetBSD. 
    4545 
    46 comment "Ash Shell Options" 
    47         depends on BUSYBOX_CONFIG_ASH 
    48  
    4946config BUSYBOX_CONFIG_ASH_BASH_COMPAT 
    5047        bool "bash-compatible extensions" 
     
    170167          tilde expansion, &>file and >&file redirection of stdout+stderr. 
    171168 
     169config BUSYBOX_CONFIG_HUSH_BASH_COMPAT 
     170        bool "bash-compatible extensions" 
     171        default y 
     172        depends on BUSYBOX_CONFIG_HUSH 
     173        help 
     174          Enable bash-compatible extensions. 
     175 
    172176config BUSYBOX_CONFIG_HUSH_HELP 
    173177        bool "help builtin" 
     
    233237          Enable support for shell functions in hush. +800 bytes. 
    234238 
     239config BUSYBOX_CONFIG_HUSH_LOCAL 
     240        bool "Support local builtin" 
     241        default n 
     242        depends on BUSYBOX_CONFIG_HUSH_FUNCTIONS 
     243        help 
     244          Enable support for local variables in functions. 
     245 
     246config BUSYBOX_CONFIG_HUSH_EXPORT_N 
     247        bool "Support export '-n' option" 
     248        default n 
     249        depends on BUSYBOX_CONFIG_HUSH 
     250        help 
     251          Enable support for export '-n' option in hush. It is a bash extension. 
     252 
    235253config BUSYBOX_CONFIG_LASH 
    236254        bool "lash (deprecated: aliased to hush)" 
     
    243261        bool "msh (deprecated: please use hush)" 
    244262        default n 
     263        select BUSYBOX_CONFIG_HUSH 
    245264        help 
    246265          msh is deprecated and will be removed, please migrate to hush. 
     
    254273#         It uses only vfork, so it can be used on uClinux systems. 
    255274 
    256  
    257 comment "Bourne Shell Options" 
    258         depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH 
    259275 
    260276config BUSYBOX_CONFIG_SH_MATH_SUPPORT 
  • trunk/package/busybox/config/util-linux/Config.in

    r17782 r18684  
    251251          wisely leave this disabled. 
    252252 
     253config BUSYBOX_CONFIG_FEATURE_GETOPT_LONG 
     254        bool "Support option -l" 
     255        default n if BUSYBOX_CONFIG_LONG_OPTS 
     256        depends on BUSYBOX_CONFIG_GETOPT 
     257        help 
     258          Enable support for long options (option -l). 
     259 
    253260config BUSYBOX_CONFIG_HEXDUMP 
    254261        bool "hexdump" 
     
    287294        bool "Support long options (--hctosys,...)" 
    288295        default n 
    289         depends on BUSYBOX_CONFIG_HWCLOCK && BUSYBOX_CONFIG_GETOPT_LONG 
     296        depends on BUSYBOX_CONFIG_HWCLOCK && BUSYBOX_CONFIG_LONG_OPTS 
    290297        help 
    291298          By default, the hwclock utility only uses short options. If you 
     
    400407          the swap space using the 'swapon' utility. 
    401408 
    402 config BUSYBOX_CONFIG_FEATURE_MKSWAP_V0 
    403         bool "Version 0 support" 
     409config BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID 
     410        bool "UUID support" 
    404411        default n 
    405412        depends on BUSYBOX_CONFIG_MKSWAP 
    406 #       depends on MKSWAP && BUSYBOX_CONFIG_DEPRECATED 
    407         help 
    408           Enable support for the old v0 style. 
    409           If your kernel is older than 2.1.117, then v0 support is the 
    410           only option. 
     413        help 
     414          Generate swap spaces with universally unique identifiers. 
    411415 
    412416config BUSYBOX_CONFIG_MORE 
     
    764768        help 
    765769          The script makes typescript of terminal session. 
     770 
     771config BUSYBOX_CONFIG_SCRIPTREPLAY 
     772        bool "scriptreplay" 
     773        default n 
     774        help 
     775          This program replays a typescript, using timing information 
     776          given by script -t. 
    766777 
    767778config BUSYBOX_CONFIG_SETARCH 
  • trunk/package/busybox/patches/000-autoconf.patch

    r14590 r18684  
    11--- a/applets/Kbuild 
    22+++ b/applets/Kbuild 
    3 @@ -18,13 +18,13 @@ HOSTCFLAGS_usage.o = -I$(srctree)/includ 
     3@@ -27,13 +27,13 @@ HOSTCFLAGS_usage.o = -I$(srctree_slash)i 
    44  
    55 applets/applets.o: include/usage_compressed.h include/applet_tables.h 
    66  
    7 -applets/usage:         .config $(srctree)/applets/usage_compressed 
    8 +applets/usage:         .config $(srctree)/applets/usage_compressed include/autoconf.h 
     7-applets/usage:         .config $(srctree_slash)applets/usage_compressed 
     8+applets/usage:         .config $(srctree_slash)applets/usage_compressed include/autoconf.h 
    99 applets/applet_tables: .config 
    1010  
    1111 quiet_cmd_gen_usage_compressed = GEN     include/usage_compressed.h 
    12        cmd_gen_usage_compressed = $(srctree)/applets/usage_compressed include/usage_compressed.h applets 
     12       cmd_gen_usage_compressed = $(srctree_slash)applets/usage_compressed include/usage_compressed.h applets 
    1313  
    14 -include/usage_compressed.h: applets/usage $(srctree)/applets/usage_compressed 
    15 +include/usage_compressed.h: applets/usage $(srctree)/applets/usage_compressed include/autoconf.h 
     14-include/usage_compressed.h: applets/usage $(srctree_slash)applets/usage_compressed 
     15+include/usage_compressed.h: applets/usage $(srctree_slash)applets/usage_compressed include/autoconf.h 
    1616        $(call cmd,gen_usage_compressed) 
    1717  
  • trunk/package/busybox/patches/003-brctl_show_fix.patch

    r17782 r18684  
    55                "setpathcost\0" "setportprio\0" "setbridgeprio\0" 
    66        ) 
    7 -       USE_FEATURE_BRCTL_SHOW("showmacs\0" "show\0"); 
    8 +       USE_FEATURE_BRCTL_SHOW("show\0"); 
     7-       IF_FEATURE_BRCTL_SHOW("showmacs\0" "show\0"); 
     8+       IF_FEATURE_BRCTL_SHOW("show\0"); 
    99  
    1010        enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif 
    11                 USE_FEATURE_BRCTL_FANCY(, 
     11                IF_FEATURE_BRCTL_FANCY(, 
    1212@@ -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 
    1515                ) 
    16 -               USE_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show) 
    17 +               USE_FEATURE_BRCTL_SHOW(, ARG_show) 
     16-               IF_FEATURE_BRCTL_SHOW(, ARG_showmacs, ARG_show) 
     17+               IF_FEATURE_BRCTL_SHOW(, ARG_show) 
    1818        }; 
    1919  
     
    2121--- a/networking/Config.in 
    2222+++ b/networking/Config.in 
    23 @@ -66,12 +66,12 @@ config FEATURE_BRCTL_FANCY 
     23@@ -77,12 +77,12 @@ config FEATURE_BRCTL_FANCY 
    2424          This adds about 600 bytes. 
    2525  
  • trunk/package/busybox/patches/110-wget_getopt_fix.patch

    r17782 r18684  
    11--- a/networking/wget.c 
    22+++ b/networking/wget.c 
    3 @@ -485,7 +485,7 @@ int wget_main(int argc UNUSED_PARAM, cha 
     3@@ -653,7 +653,7 @@ int wget_main(int argc UNUSED_PARAM, cha 
    44                // "tries\0"            Required_argument "t" 
    55                // "timeout\0"          Required_argument "T" 
  • trunk/package/busybox/patches/240-udhcpc_retries.patch

    r17782 r18684  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -363,7 +363,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
     3@@ -380,7 +380,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
    44  
    55                        switch (state) { 
     
    99                                        if (packet_num == 0) 
    1010                                                xid = random_xid(); 
    11   
    12 @@ -394,7 +394,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
     11                                        /* broadcast */ 
     12@@ -409,7 +409,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
     13                                packet_num = 0; 
    1314                                continue; 
    14                         case RENEW_REQUESTED: 
    1515                        case REQUESTING: 
    1616-                               if (packet_num < discover_retries) { 
    1717+                               if (!discover_retries || packet_num < discover_retries) { 
    18                                         /* send request packet */ 
    19                                         if (state == RENEW_REQUESTED) /* unicast */ 
    20                                                 send_renew(xid, server_addr, requested_ip); 
     18                                        /* send broadcast select packet */ 
     19                                        send_select(xid, server_addr, requested_ip); 
     20                                        timeout = discover_timeout; 
  • trunk/package/busybox/patches/241-udhcpc-oversized_packets.patch

    r17782 r18684  
    11--- a/networking/udhcp/packet.c 
    22+++ b/networking/udhcp/packet.c 
    3 @@ -120,6 +120,10 @@ uint16_t FAST_FUNC udhcp_checksum(void * 
     3@@ -164,6 +164,11 @@ uint16_t FAST_FUNC udhcp_checksum(void * 
    44        return ~sum; 
    55 } 
    66  
    7 +int udhcp_get_payload_len(struct dhcpMessage *payload) 
     7+int udhcp_get_payload_len(struct dhcp_packet *dhcp_pkt) 
    88+{ 
    9 +       return sizeof(struct dhcpMessage) - DHCP_OPTIONS_BUFSIZE + end_option(payload->options) + sizeof(payload->options[0]); 
     9+       return sizeof(struct dhcp_packet) - DHCP_OPTIONS_BUFSIZE + end_option(dhcp_pkt->options) + sizeof(dhcp_pkt->options[0]); 
    1010+} 
    11   
     11+ 
    1212 /* Construct a ip/udp header for a packet, send packet */ 
    13  int FAST_FUNC udhcp_send_raw_packet(struct dhcpMessage *payload, 
    14 @@ -132,11 +136,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     13 int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, 
     14                uint32_t source_ip, int source_port, 
     15@@ -175,11 +180,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
    1516        int fd; 
    1617        int result = -1; 
     
    1819- 
    1920-       enum { 
    20 -               IP_UPD_DHCP_SIZE = sizeof(struct udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, 
    21 -               UPD_DHCP_SIZE    = IP_UPD_DHCP_SIZE - offsetof(struct udp_dhcp_packet, udp), 
     21-               IP_UPD_DHCP_SIZE = sizeof(struct ip_udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, 
     22-               UPD_DHCP_SIZE    = IP_UPD_DHCP_SIZE - offsetof(struct ip_udp_dhcp_packet, udp), 
    2223-       }; 
    23 +       int p_len = udhcp_get_payload_len(payload); 
     24+       int p_len = udhcp_get_payload_len(dhcp_pkt); 
    2425  
    2526        fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP)); 
    2627        if (fd < 0) { 
    27 @@ -146,7 +146,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     28@@ -189,7 +190,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
    2829  
    2930        memset(&dest, 0, sizeof(dest)); 
    3031        memset(&packet, 0, sizeof(packet)); 
    31 -       packet.data = *payload; /* struct copy */ 
    32 +       memcpy(&(packet.data), payload, p_len); 
     32-       packet.data = *dhcp_pkt; /* struct copy */ 
     33+       memcpy(&(packet.data), dhcp_pkt, p_len); 
    3334  
    3435        dest.sll_family = AF_PACKET; 
    3536        dest.sll_protocol = htons(ETH_P_IP); 
    36 @@ -163,23 +163,18 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
     37@@ -206,24 +207,19 @@ int FAST_FUNC udhcp_send_raw_packet(stru 
    3738        packet.ip.daddr = dest_ip; 
    3839        packet.udp.source = htons(source_port); 
     
    5960-        * packet.data.options[end_option(packet.data.options)] 
    6061-        */ 
     62        udhcp_dump_packet(dhcp_pkt); 
    6163-       result = sendto(fd, &packet, IP_UPD_DHCP_SIZE, 0, 
    6264+       result = sendto(fd, &packet, p_len, 0, 
     
    6466        msg = "sendto"; 
    6567  ret_close: 
    66 @@ -231,8 +226,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s 
     68@@ -245,10 +241,6 @@ int FAST_FUNC udhcp_send_kernel_packet(s 
     69        int result = -1; 
     70        const char *msg; 
     71  
     72-       enum { 
     73-               DHCP_SIZE = sizeof(struct dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, 
     74-       }; 
     75- 
     76        fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); 
     77        if (fd < 0) { 
     78                msg = "socket(%s)"; 
     79@@ -274,9 +266,8 @@ int FAST_FUNC udhcp_send_kernel_packet(s 
    6780                goto ret_close; 
    6881        } 
    6982  
    7083-       /* Currently we send full-sized DHCP packets (see above) */ 
    71 -       result = safe_write(fd, payload, DHCP_SIZE); 
    72 +       result = safe_write(fd, payload, udhcp_get_payload_len(payload)); 
     84        udhcp_dump_packet(dhcp_pkt); 
     85-       result = safe_write(fd, dhcp_pkt, DHCP_SIZE); 
     86+       result = safe_write(fd, dhcp_pkt, udhcp_get_payload_len(dhcp_pkt)); 
    7387        msg = "write"; 
    7488  ret_close: 
  • trunk/package/busybox/patches/242-udhcpc_msgs.patch

    r16063 r18684  
    44 int FAST_FUNC send_discover(uint32_t xid, uint32_t requested) 
    55 { 
    6         struct dhcpMessage packet; 
     6        struct dhcp_packet packet; 
    77+       static int msgs = 0; 
    88  
  • trunk/package/busybox/patches/243-udhcpc_changed_ifindex.patch

    r17782 r18684  
    11--- a/networking/udhcp/dhcpc.c 
    22+++ b/networking/udhcp/dhcpc.c 
    3 @@ -327,6 +327,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
     3@@ -342,6 +342,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c 
    44                /* silence "uninitialized!" warning */ 
    55                unsigned timestamp_before_wait = timestamp_before_wait; 
     
    99+                * bridge changed). 
    1010+                * Workaround: refresh it here before processing the next packet */ 
    11 +               udhcp_read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.arp); 
     11+               udhcp_read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.client_mac); 
    1212+ 
    1313                //bb_error_msg("sockfd:%d, listen_mode:%d", sockfd, listen_mode); 
  • trunk/package/busybox/patches/244-udhcpc_cidrroute.patch

    r17782 r18684  
    1 --- a/networking/udhcp/options.c 
    2 +++ b/networking/udhcp/options.c 
    3 @@ -48,6 +48,7 @@ const struct dhcp_option dhcp_options[]  
    4  #if ENABLE_FEATURE_UDHCP_RFC3397 
    5         { OPTION_STR1035 | OPTION_LIST            , 0x77 }, /* search             */ 
    6  #endif 
    7 +       { OPTION_U8 | OPTION_LIST |     OPTION_REQ, 0x79 }, /* cidr_static_routes */ 
    8         /* MSIE's "Web Proxy Autodiscovery Protocol" support */ 
    9         { OPTION_STRING                           , 0xfc }, /* wpad               */ 
    10   
    11 @@ -97,6 +98,7 @@ const char dhcp_option_strings[] ALIGN1  
    12  #if ENABLE_FEATURE_UDHCP_RFC3397 
    13         "search" "\0" 
    14  #endif 
    15 +       "cidrroute" "\0"   /* cidr_static_routes */ 
    16         /* MSIE's "Web Proxy Autodiscovery Protocol" support */ 
    17         "wpad" "\0" 
    18         ; 
  • trunk/package/busybox/patches/250-ash_export-n.patch

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

    r17782 r18684  
    11--- a/include/applets.h 
    22+++ b/include/applets.h 
    3 @@ -271,6 +271,7 @@ USE_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_ 
    4  USE_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_NEVER)) 
    5  USE_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_NEVER)) 
    6  USE_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 
    7 +USE_NETMSG(APPLET(netmsg, _BB_DIR_BIN, _BB_SUID_ALWAYS)) 
    8  USE_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_NEVER)) 
    9  USE_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_NEVER)) 
    10  USE_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 
     3@@ -278,6 +278,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)) 
    1111--- a/include/usage.h 
    1212+++ b/include/usage.h 
    13 @@ -3010,6 +3010,9 @@ 
     13@@ -3101,6 +3101,9 @@ 
    1414  
    1515 #endif 
     
    1919+ 
    2020 #define netstat_trivial_usage \ 
    21         "[-laentuwxr"USE_FEATURE_NETSTAT_WIDE("W")USE_FEATURE_NETSTAT_PRG("p")"]" 
     21        "[-laentuwxr"IF_FEATURE_NETSTAT_WIDE("W")IF_FEATURE_NETSTAT_PRG("p")"]" 
    2222 #define netstat_full_usage "\n\n" \ 
    2323--- a/networking/Config.in 
    2424+++ b/networking/Config.in 
    25 @@ -600,6 +600,12 @@ config NC 
     25@@ -617,6 +617,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 @@ -24,6 +24,7 @@ lib-$(CONFIG_IP)           += ip.o 
     40@@ -25,6 +25,7 @@ lib-$(CONFIG_IP)           += ip.o 
    4141 lib-$(CONFIG_IPCALC)       += ipcalc.o 
    4242 lib-$(CONFIG_NAMEIF)       += nameif.o 
  • trunk/package/busybox/patches/340-lock_util.patch

    r17925 r18684  
    11--- a/include/applets.h 
    22+++ b/include/applets.h 
    3 @@ -228,6 +228,7 @@ USE_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN 
    4  USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) 
    5  USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) 
    6  USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER)) 
    7 +USE_LOCK(APPLET(lock, _BB_DIR_BIN, _BB_SUID_NEVER)) 
    8  USE_LOGGER(APPLET(logger, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) 
    9  USE_LOGIN(APPLET(login, _BB_DIR_BIN, _BB_SUID_ALWAYS)) 
    10  USE_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER, logname)) 
     3@@ -233,6 +233,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)) 
    1111--- a/include/usage.h 
    1212+++ b/include/usage.h 
    13 @@ -2246,6 +2246,9 @@ 
     13@@ -2325,6 +2325,9 @@ 
    1414 #define loadkmap_example_usage \ 
    1515        "$ loadkmap < /etc/i18n/lang-keymap\n" 
     
    1919+ 
    2020 #define logger_trivial_usage \ 
    21         "[OPTION]... [MESSAGE]" 
     21        "[OPTIONS] [MESSAGE]" 
    2222 #define logger_full_usage "\n\n" \ 
    2323--- a/miscutils/Config.in 
    2424+++ b/miscutils/Config.in 
    25 @@ -420,6 +420,11 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA 
     25@@ -456,6 +456,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 @@ -23,6 +23,7 @@ lib-$(CONFIG_INOTIFYD)    += inotifyd.o 
     39@@ -26,6 +26,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

    r17782 r18684  
    11--- a/include/usage.h 
    22+++ b/include/usage.h 
    3 @@ -1638,7 +1638,8 @@ 
    4         USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \ 
    5         USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \ 
    6         " [-h home]" \ 
    7 -       " [-d/-e string]" 
    8 +       " [-d/-e string]" \ 
     3@@ -1693,6 +1693,7 @@ 
     4        IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \ 
     5        " [-h HOME]\n" \ 
     6        "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING" 
    97+       " [-R <path> [-H <host>]]" 
    108 #define httpd_full_usage "\n\n" \ 
    119        "Listen for incoming HTTP requests\n" \ 
    1210      "\nOptions:" \ 
    13 @@ -1656,6 +1657,8 @@ 
    14       "\n       -h HOME         Home directory (default .)" \ 
     11@@ -1710,6 +1711,8 @@ 
     12      "\n       -m STRING       MD5 crypt STRING") \ 
    1513      "\n       -e STRING       HTML encode STRING" \ 
    1614      "\n       -d STRING       URL decode STRING" \ 
     
    1917  
    2018 #define hwclock_trivial_usage \ 
    21         USE_FEATURE_HWCLOCK_LONG_OPTIONS( \ 
     19        IF_FEATURE_HWCLOCK_LONG_OPTIONS( \ 
    2220--- a/networking/httpd.c 
    2321+++ b/networking/httpd.c 
     
    3028        Htaccess_IP *ip_a_d;    /* config allow/deny lines */ 
    3129  
    32         USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) 
     30        IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) 
    3331@@ -294,6 +296,8 @@ struct globals { 
    3432 #define index_page        (G.index_page       ) 
     
    7775        d_opt_decode_url, 
    7876        h_opt_home_httpd, 
    79         USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) 
     77        IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) 
    8078@@ -2315,12 +2328,13 @@ int httpd_main(int argc UNUSED_PARAM, ch 
    8179        /* We do not "absolutize" path given by -h (home) opt. 
     
    8482-       opt = getopt32(argv, "c:d:h:" 
    8583+       opt = getopt32(argv, "R:H:c:d:h:" 
    86                         USE_FEATURE_HTTPD_ENCODE_URL_STR("e:") 
    87                         USE_FEATURE_HTTPD_BASIC_AUTH("r:") 
    88                         USE_FEATURE_HTTPD_AUTH_MD5("m:") 
    89                         USE_FEATURE_HTTPD_SETUID("u:") 
     84                        IF_FEATURE_HTTPD_ENCODE_URL_STR("e:") 
     85                        IF_FEATURE_HTTPD_BASIC_AUTH("r:") 
     86                        IF_FEATURE_HTTPD_AUTH_MD5("m:") 
     87                        IF_FEATURE_HTTPD_SETUID("u:") 
    9088                        "p:ifv", 
    9189+                       &redirect_path, &redirect_host, 
    9290                        &opt_c_configFile, &url_for_decode, &home_httpd 
    93                         USE_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode) 
    94                         USE_FEATURE_HTTPD_BASIC_AUTH(, &g_realm) 
     91                        IF_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode) 
     92                        IF_FEATURE_HTTPD_BASIC_AUTH(, &g_realm) 
  • trunk/package/busybox/patches/430-uniq_memleak.patch

    r16053 r18684  
    99                        } 
    1010  
    11                         ++dups;  /* note: testing for overflow seems excessive. */ 
     11                        free((char*)s1); 
  • trunk/package/busybox/patches/470-insmod_search.patch

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

    r17782 r18684  
    11--- a/util-linux/mount.c 
    22+++ b/util-linux/mount.c 
    3 @@ -42,6 +42,10 @@ 
     3@@ -69,6 +69,10 @@ 
    44 #define MS_DIRSYNC      128     // Directory modifications are synchronous 
    55 #endif 
     
    1212 #if defined(__dietlibc__) 
    1313 // 16.12.2006, Sampo Kellomaki (sampo@iki.fi) 
    14 @@ -152,6 +156,7 @@ static const int32_t mount_options[] = { 
     14@@ -185,6 +189,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 @@ static const char mount_option_str[] = 
     22@@ -239,6 +244,7 @@ static const char mount_option_str[] = 
    2323                "rslave\0" 
    2424                "rprivate\0" 
  • trunk/package/busybox/patches/524-udhcpc_renew.patch

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

    r18088 r18684  
    1 diff --git a/networking/telnetd.c b/networking/telnetd.c 
    2 index 2a0ace5..c281feb 100644 
    31--- a/networking/telnetd.c 
    42+++ b/networking/telnetd.c 
    5 @@ -308,6 +308,7 @@ make_new_session( 
     3@@ -306,6 +306,7 @@ make_new_session( 
    64  
    75        /* Restore default signal handling ASAP */ 
Note: See TracChangeset for help on using the changeset viewer.