Changeset 993

Timestamp:

10/23/06 18:34:57 (6 years ago)

Author:

markus

Message:

busybox upgrade to 1.2.1

Files:

• trunk/freewrt/package/busybox/Makefile (modified) (1 diff)
• trunk/freewrt/package/busybox/config/Config.in (modified) (23 diffs)
• trunk/freewrt/package/busybox/config/archival/Config.in (modified) (18 diffs)
• trunk/freewrt/package/busybox/config/console-tools/Config.in (modified) (2 diffs)
• trunk/freewrt/package/busybox/config/coreutils/Config.in (modified) (34 diffs)
• trunk/freewrt/package/busybox/config/debianutils/Config.in (modified) (3 diffs)
• trunk/freewrt/package/busybox/config/editors/Config.in (modified) (12 diffs)
• trunk/freewrt/package/busybox/config/findutils/Config.in (modified) (15 diffs)
• trunk/freewrt/package/busybox/config/init/Config.in (modified) (6 diffs)
• trunk/freewrt/package/busybox/config/loginutils/Config.in (modified) (3 diffs)
• trunk/freewrt/package/busybox/config/miscutils/Config.in (modified) (17 diffs)
• trunk/freewrt/package/busybox/config/modutils/Config.in (modified) (7 diffs)
• trunk/freewrt/package/busybox/config/networking/Config.in (modified) (41 diffs)
• trunk/freewrt/package/busybox/config/networking/udhcp/Config.in (modified) (5 diffs)
• trunk/freewrt/package/busybox/config/procps/Config.in (modified) (4 diffs)
• trunk/freewrt/package/busybox/config/shell/Config.in (modified) (28 diffs)
• trunk/freewrt/package/busybox/config/sysklogd/Config.in (modified) (5 diffs)
• trunk/freewrt/package/busybox/config/util-linux/Config.in (modified) (20 diffs)
• trunk/freewrt/package/busybox/patches/100-killall5.patch (modified) (5 diffs)
• trunk/freewrt/package/busybox/patches/110-telnetd.patch (modified) (5 diffs)
• trunk/freewrt/package/busybox/patches/140-unlink-passwd.patch (modified) (2 diffs)
• trunk/freewrt/package/busybox/patches/150-udhcp-release.patch (modified) (8 diffs)
• trunk/freewrt/package/busybox/patches/170-udhcp-options.patch (modified) (1 diff)
• trunk/freewrt/package/busybox/patches/180-telnetd_ipv6.patch (modified) (1 diff)
• trunk/freewrt/package/busybox/patches/190-ash_performance.patch (modified) (5 diffs)
• trunk/freewrt/package/busybox/patches/200-etc_crontabs.patch (modified) (2 diffs)
• trunk/freewrt/package/busybox/patches/210-passwd_limit.patch (modified) (1 diff)
• trunk/freewrt/package/busybox/patches/220-awk_bitops.patch (modified) (5 diffs)
• trunk/freewrt/package/busybox/patches/230-grep_C.patch (added)
• trunk/freewrt/package/busybox/patches/300-netmsg.patch (modified) (3 diffs)
• trunk/freewrt/package/busybox/patches/310-passwd_access.patch (modified) (3 diffs)
• trunk/freewrt/package/busybox/patches/320-httpd_address_binding.patch (modified) (4 diffs)
• trunk/freewrt/package/busybox/patches/330-httpd_user_agent.patch (modified) (3 diffs)
• trunk/freewrt/package/busybox/patches/340-lock_util.patch (modified) (3 diffs)
• trunk/freewrt/package/busybox/patches/350-ping-opt-srcaddr.patch (modified) (6 diffs)
• trunk/freewrt/package/busybox/patches/911-ipkg.patch (modified) (77 diffs)
• trunk/freewrt/package/busybox/patches/912-ipkg-no_warnings.patch (modified) (1 diff)
• trunk/freewrt/package/busybox/patches/913-libbb_hash.patch (modified) (10 diffs)
• trunk/freewrt/package/busybox/patches/914-ipkg-fixes.patch (modified) (1 diff)
• trunk/freewrt/package/busybox/patches/920-ifupdown-manual.patch (modified) (2 diffs)

trunk/freewrt/package/busybox/Makefile

@@ -8 +8 @@
-
-PKG_NAME:=              busybox
-RELEASE:=          5
-VERSION:=          1.1.3
-19a0b475169335f17e421cf644616fe7
+VERSION:=          1.2.1
+RELEASE:=          1
+362b3dc0f2023ddfda901dc1f1a74391
-PKG_INIT:=              60
-

trunk/freewrt/package/busybox/config/Config.in

@@ -4 +4 @@
-#
-
+#mainmenu "BusyBox Configuration"
-
-config BUSYBOX_HAVE_DOT_CONFIG
@@ -13 +14 @@
-menu "General Configuration"
-
+config BUSYBOX_CONFIG_NITPICK
+        bool "See lots more (probably unnecessary) configuration options."
+        default n
+        help
+          Some BusyBox applets have more configuration options than anyone
+          will ever care about.  To avoid drowining people in complexity, most
+          of the applet features that can be set to a sane default value are
+          hidden, unless you hit the above switch.
+
+          This is better than to telling people to edit the busybox source
+          code, but not by much.
+
+          See http://en.wikipedia.org/wiki/Fibber_McGee_and_Molly#The_Closet
+
+          You have been warned.
+
-choice
-        prompt "Buffer allocation policy"
-
+
+
-        help
-          There are 3 ways BusyBox can handle buffer allocations:
@@ -37 +55 @@
-endchoice
-
+config BUSYBOX_CONFIG_SHOW_USAGE
+        bool "Show terse applet usage messages"
+        default y
+        help
+          All BusyBox applets will show help messages when invoked with
+          wrong arguments. You can turn off printing these terse usage
+          messages if you say no here.
+          This will save you up to 7k.
+
-config BUSYBOX_CONFIG_FEATURE_VERBOSE_USAGE
-        bool "Show verbose applet usage messages"
-
+
+
-        help
-          All BusyBox applets will show more verbose help messages when
@@ -46 +74 @@
-          13k, but it can add much more depending on your configuration.
-
+config BUSYBOX_CONFIG_FEATURE_COMPRESS_USAGE
+        bool "Store applet usage messages in compressed form"
+        default y
+        depends on BUSYBOX_CONFIG_SHOW_USAGE && BUSYBOX_CONFIG_NITPICK
+        help
+          Store usage messages in compressed form, uncompress them on-the-fly
+          when <applet> --help is called.
+
+          If you have a really tiny busybox with few applets enabled (and
+          bunzip2 isn't one of them), the overhead of the decompressor might
+          be noticeable.  Also, if you run executables directly from ROM
+          and have very little memory, this might not be a win.  Otherwise,
+          you probably want this.
+
-config BUSYBOX_CONFIG_FEATURE_INSTALLER
-        bool "Support --install [-s] to install applet links at runtime"
@@ -62 +104 @@
-          busybox to support locale settings.
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-config BUSYBOX_CONFIG_FEATURE_DEVPTS
-        bool "Use the devpts filesystem for Unix98 PTYs"
- if BUSYBOX_CONFIG_FEATURE_DEVFS
+
-        help
-          Enable if you want BusyBox to use Unix98 PTY support. If enabled,
@@ -76 +121 @@
-          and /dev/pts/<number> for the slave side.  Otherwise, BSD style
-          /dev/ttyp<number> will be used. To use this option, you should have
-or devfs 
+
-
-config BUSYBOX_CONFIG_FEATURE_CLEAN_UP
-        bool "Clean up all memory before exiting (usually not needed)"
-        default n
+        depends on BUSYBOX_CONFIG_NITPICK
-        help
-          As a size optimization, busybox normally exits without explicitly
@@ -92 +138 @@
-config BUSYBOX_CONFIG_FEATURE_SUID
-        bool "Support for SUID/SGID handling"
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
@@ -101 +156 @@
-        depends on BUSYBOX_CONFIG_FEATURE_SUID
-        help
-
-
+
+
+
-
-          <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>)
@@ -129 +185 @@
-config BUSYBOX_CONFIG_FEATURE_SUID_CONFIG_QUIET
-        bool "Suppress warning message if /etc/busybox.conf is not readable"
-n
+y
-        depends on BUSYBOX_CONFIG_FEATURE_SUID_CONFIG
-        help
@@ -139 +195 @@
-        default n
-        help
- 
- 
-
- Linux Full Userland installed, this
-stuff will not compile. 
+
+
+
+Linux userland installed, this stuff
+will not compile.
-                http://www.nsa.gov/selinux/index.html
-
-
+
+
+
+
+
+
+
-
-          Most people will leave this set to 'N'.
+
+config BUSYBOX_CONFIG_BUSYBOX_EXEC_PATH
+        string "Path to BusyBox executable"
+        default "/proc/self/exe"
+        help
+          When Busybox applets need to run other busybox applets, BusyBox
+          sometimes needs to exec() itself.  When the /proc filesystem is
+          mounted, /proc/self/exe always points to the currently running
+          executable.  If you haven't got /proc, set this to wherever you
+          want to run BusyBox from.
-
-endmenu
@@ -168 +239 @@
-          Most people will leave this set to 'N'.
-
-# The busybox shared library feature is there so make standalone can produce
-# smaller applets.  Since make standalone isn't in yet, there's nothing using
-# this yet, and so it's disabled.
-config BUSYBOX_CONFIG_DISABLE_SHARED
-        bool
-        default n
-
-config BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
-        bool "Build shared libbusybox"
-        default n
-        depends on BUSYBOX_CONFIG_DISABLE_SHARED
-        help
-          Build a shared library libbusybox.so which contains all
-          libraries used inside busybox.
-
+          This is an experimental feature intended to support the upcoming
+          "make standalone" mode.  Enabling it against the one big busybox
+          binary serves no purpose (and increases the size).  You should
+          almost certainly say "no" to this right now.
+
-config BUSYBOX_CONFIG_FEATURE_FULL_LIBBUSYBOX
-        bool "Feature-complete libbusybox"
-
+BUSYBOX_
-        depends on BUSYBOX_CONFIG_BUILD_LIBBUSYBOX
-        help
@@ -204 +272 @@
-config BUSYBOX_CONFIG_FEATURE_SHARED_BUSYBOX
-        bool "Use shared libbusybox for busybox"
-n
-
+y
+BUSYBOX_
-        help
-          Use libbusybox.so also for busybox itself.
@@ -211 +279 @@
-
-config BUSYBOX_CONFIG_LFS
-
+ "Build with Large File Support (for accessing files > 2 GB)"
-        default y
-        select BUSYBOX_FDISK_SUPPORT_LARGE_DISKS
@@ -223 +291 @@
-
-config BUSYBOX_USING_CROSS_COMPILER
-
+ "Do you want to build BusyBox with a Cross Compiler?"
-        default y
-        help
@@ -230 +298 @@
-
-config BUSYBOX_CROSS_COMPILER_PREFIX
+        #string "Cross Compiler prefix"
-        string
-        default "mipsel-uclibc-"
@@ -240 +309 @@
-          which will ensure the correct compiler is used.
-
-config BUSYBOX_EXTRA_CFLAGS_OPTIONS
-        string
-        default "-Os "
-        help
-          Do you want to pass any extra CFLAGS options to the compiler as
-          you build BusyBox? If so, this is the option for you...  For example,
-          if you want to add some simple compiler switches (like -march=i686),
-          or check for warnings using -Werror, just those options here.
-
-config BUSYBOX_CONFIG_BUILD_AT_ONCE
-        bool "Compile all sources at once"
@@ -273 +333 @@
-
-config BUSYBOX_CONFIG_DEBUG
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-          Most people should answer N.
+
+config BUSYBOX_CONFIG_DEBUG_PESSIMIZE
+        bool "Disable compiler optimizations."
+        default n
+        depends on BUSYBOX_CONFIG_DEBUG
+        help
+          The compiler's optimization of source code can eliminate and reorder
+          code, resulting in an executable that's hard to understand when
+          stepping through it with a debugger.  This switches it off, resulting
+          in a much bigger executable that more closely matches the source
+          code.
-
-choice
@@ -330 +400 @@
-        default y
-        help
-a
+i
-          specifically, old-style numeric options ('command -1 <file>')
-          will not be supported in head, tail, and fold.  (Note: should
@@ -345 +415 @@
-          Disable use of /usr. Don't activate this option if you don't know
-          that you really want this behaviour.
+
+# we always want to use symlinks
+config BUSYBOX_CONFIG_INSTALL_APPLET_SYMLINKS
+        bool
+        default y
-
-#choice
@@ -351 +426 @@
-#       help
-#         Choose how you install applets links.
-
-
-
-
+
+
+
-#       help
-#         Install applets as soft-links to the busybox binary. This needs some
-#         free inodes on the filesystem, but might help with filesystem
-#         generators that can't cope with hard-links.
-
+
-#config BUSYBOX_CONFIG_INSTALL_APPLET_HARDLINKS
-#       bool "as hard-links"
@@ -365 +439 @@
-#         Install applets as hard-links to the busybox binary. This might count
-#         on a filesystem with few inodes.
-
+
-#config BUSYBOX_CONFIG_INSTALL_APPLET_DONT
-#       bool
@@ -373 +447 @@
-#         Do not install applets links. Usefull when using the -install feature
-#         or a standalone shell for rescue pruposes.
-
+
-#endchoice
-
-config BUSYBOX_PREFIX
-
+ "BusyBox installation prefix"
-        default "./_install"
-        help
@@ -404 +478 @@
-source package/busybox/config/networking/Config.in
-source package/busybox/config/procps/Config.in
+#source package/busybox/config/shell/Config.in
-source package/busybox/config/sysklogd/Config.in

trunk/freewrt/package/busybox/config/archival/Config.in

@@ -30 +30 @@
-
-config BUSYBOX_CONFIG_FEATURE_AR_LONG_FILENAMES
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_AR
@@ -41 +41 @@
-config BUSYBOX_CONFIG_BUNZIP2
-        bool "bunzip2"
-y
+n
-        help
-          bunzip2 is a compression utility using the Burrows-Wheeler block
@@ -90 +90 @@
-
-config BUSYBOX_CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_DPKG_DEB
@@ -107 +107 @@
-
-config BUSYBOX_CONFIG_FEATURE_GUNZIP_UNCOMPRESS
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_GUNZIP
@@ -151 +151 @@
-
-config BUSYBOX_CONFIG_FEATURE_TAR_CREATE
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_TAR
@@ -159 +159 @@
-
-config BUSYBOX_CONFIG_FEATURE_TAR_BZIP2
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_TAR
@@ -167 +167 @@
-
-config BUSYBOX_CONFIG_FEATURE_TAR_LZMA
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_TAR
@@ -175 +175 @@
-
-config BUSYBOX_CONFIG_FEATURE_TAR_FROM
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_TAR
@@ -183 +183 @@
-
-config BUSYBOX_CONFIG_FEATURE_TAR_GZIP
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_TAR
@@ -191 +191 @@
-
-config BUSYBOX_CONFIG_FEATURE_TAR_COMPRESS
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_TAR
@@ -198 +198 @@
-          when extracting .tar.Z archives.
-
-A
-  
-n
+I
+
+N
-        depends on BUSYBOX_CONFIG_TAR
-        help
@@ -208 +208 @@
-
-config BUSYBOX_CONFIG_FEATURE_TAR_GNU_EXTENSIONS
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_TAR
@@ -216 +216 @@
-
-config BUSYBOX_CONFIG_FEATURE_TAR_LONG_OPTIONS
-  
-
-
+
+
+ && BUSYBOX_CONFIG_GETOPT_LONG
-        help
-                Enable use of long options, increases size by about 400 Bytes
@@ -245 +245 @@
-
-config BUSYBOX_CONFIG_FEATURE_LZMA_FAST
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_UNLZMA
-        help
-
+s
-          a 2K bigger binary.
-
@@ -266 +266 @@
-
-config BUSYBOX_CONFIG_FEATURE_UNARCHIVE_TAPE
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_CPIO || BUSYBOX_CONFIG_TAR
@@ -276 +276 @@
-
-config BUSYBOX_CONFIG_FEATURE_DEB_TAR_GZ
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB
-        help
@@ -285 +285 @@
-
-config BUSYBOX_CONFIG_FEATURE_DEB_TAR_BZ2
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB
@@ -296 +296 @@
-
-config BUSYBOX_CONFIG_FEATURE_DEB_TAR_LZMA
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_DPKG || BUSYBOX_CONFIG_DPKG_DEB

trunk/freewrt/package/busybox/config/console-tools/Config.in

@@ -66 +66 @@
-          like the current tty while logged in via telnet.
-
+config BUSYBOX_CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS
+        bool "Enable long options"
+        default n
+        depends on BUSYBOX_CONFIG_SET_CONSOLE && BUSYBOX_CONFIG_GETOPT_LONG
+        help
+          Support long options for the setconsole applet.
+
-config BUSYBOX_CONFIG_SETKEYCODES
-        bool "setkeycodes"
@@ -73 +80 @@
-          map, allowing unusual keyboards to generate usable keycodes.
-
+config BUSYBOX_CONFIG_SETLOGCONS
+        bool "setlogcons"
+        default n
+        help
+          This program redirects the output console of kernel messages.
+
-endmenu

trunk/freewrt/package/busybox/config/coreutils/Config.in

@@ -27 +27 @@
-          output.  Enable this option if you wish to enable the 'cat' utility.
-
+config BUSYBOX_CONFIG_CATV
+        bool "catv"
+        default n
+        help
+          Display nonprinting characters as escape sequences (like some
+          implementations' cat -v option).
+
-config BUSYBOX_CONFIG_CHGRP
-        bool "chgrp"
@@ -53 +60 @@
-          The default command is `/bin/sh'.
-
+config BUSYBOX_CONFIG_CKSUM
+        bool "cksum"
+        default n
+        help
+          cksum is used to calculate the CRC32 checksum of a file.
+
-config BUSYBOX_CONFIG_CMP
-        bool "cmp"
@@ -88 +101 @@
-
-config BUSYBOX_CONFIG_FEATURE_DATE_ISOFMT
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_DATE
@@ -103 +116 @@
-          while optionally performing conversions on it.
-
+config BUSYBOX_CONFIG_FEATURE_DD_SIGNAL_HANDLING
+        bool "Enable DD signal handling for status reporting"
+        default y
+        depends on BUSYBOX_CONFIG_DD
+        help
+          sending a SIGUSR1 signal to a running `dd' process makes it 
+          print to standard error the number of records read and written 
+          so far, then to resume copying.
+
+          $ dd if=/dev/zero of=/dev/null& pid=$! $ kill -USR1 $pid; sleep 1; kill $pid 
+          10899206+0 records in 10899206+0 records out
+
+config BUSYBOX_CONFIG_FEATURE_DD_IBS_OBS
+        bool "Enable ibs, obs and conv options"
+        default n
+        depends on BUSYBOX_CONFIG_DD
+        help
+          Enables support for writing a certain number of bytes in and out,
+          at a time, and performing conversions on the data stream.
+
-config BUSYBOX_CONFIG_DF
-        bool "df"
@@ -110 +143 @@
-          on filesystems.
-
+config BUSYBOX_CONFIG_DIFF
+        bool "diff"
+        default n
+        help
+          diff compares two files or directories and outputs the
+          differences between them in a form that can be given to
+          the patch command.
+
+config BUSYBOX_CONFIG_FEATURE_DIFF_BINARY
+        bool "Enable checks for binary files"
+        default y
+        depends on BUSYBOX_CONFIG_DIFF
+        help
+          This option enables support for checking for binary files
+          before a comparison is carried out.
+
+config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
+        bool "Enable directory support"
+        default y
+        depends on BUSYBOX_CONFIG_DIFF
+        help
+          This option enables support for directory and subdirectory
+          comparison.
+
+config BUSYBOX_CONFIG_FEATURE_DIFF_MINIMAL
+        bool "Enable -d option to find smaller sets of changes"
+        default n
+        depends on BUSYBOX_CONFIG_DIFF
+        help
+          Enabling this option allows the use of -d to make diff
+          try hard to find the smallest possible set of changes.
+
-config BUSYBOX_CONFIG_DIRNAME
-        bool "dirname"
@@ -126 +191 @@
-config BUSYBOX_CONFIG_UNIX2DOS
-        bool
-n
+y
-        depends on BUSYBOX_CONFIG_DOS2UNIX
+        help
+          unix2dos is used to convert a text file from UNIX format to
+          DOS format, and vice versa.
-
-config BUSYBOX_CONFIG_DU
@@ -136 +204 @@
-          for specified files.
-
-
-  
+U
+
-        default y
-        depends on BUSYBOX_CONFIG_DU
@@ -151 +219 @@
-# this entry also appears in shell/Config.in, next to the echo builtin
-config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_ECHO
@@ -165 +233 @@
-          environment.
-
+config BUSYBOX_CONFIG_FEATURE_ENV_LONG_OPTIONS
+        bool "Enable long options"
+        default n
+        depends on BUSYBOX_CONFIG_ENV && BUSYBOX_CONFIG_GETOPT_LONG
+        help
+          Support long options for the env applet.
+
-config BUSYBOX_CONFIG_EXPR
-        bool "expr"
@@ -173 +248 @@
-
-config BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64
-    
+
-        default n
-        depends on BUSYBOX_CONFIG_EXPR
@@ -201 +276 @@
-
-config BUSYBOX_CONFIG_FEATURE_FANCY_HEAD
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_HEAD
@@ -226 +301 @@
-          Copy files and set attributes.
-
+config BUSYBOX_CONFIG_FEATURE_INSTALL_LONG_OPTIONS
+        bool "Enable long options"
+        default n
+        depends on BUSYBOX_CONFIG_INSTALL && BUSYBOX_CONFIG_GETOPT_LONG
+        help
+          Support long options for the install applet.
+
-config BUSYBOX_CONFIG_LENGTH
-        bool "length"
@@ -251 +333 @@
-
-config BUSYBOX_CONFIG_FEATURE_LS_FILETYPES
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_LS
@@ -258 +340 @@
-
-config BUSYBOX_CONFIG_FEATURE_LS_FOLLOWLINKS
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_LS
@@ -265 +347 @@
-
-config BUSYBOX_CONFIG_FEATURE_LS_RECURSIVE
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_LS
@@ -272 +354 @@
-
-config BUSYBOX_CONFIG_FEATURE_LS_SORTFILES
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_LS
@@ -279 +361 @@
-
-config BUSYBOX_CONFIG_FEATURE_LS_TIMESTAMPS
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_LS
@@ -286 +368 @@
-
-config BUSYBOX_CONFIG_FEATURE_LS_USERNAME
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_LS
@@ -293 +375 @@
-
-config BUSYBOX_CONFIG_FEATURE_LS_COLOR
-  
-
-
+
+
+ && BUSYBOX_CONFIG_GETOPT_LONG
-        help
-          This enables the --color option to ls.
-
-config BUSYBOX_CONFIG_FEATURE_LS_COLOR_IS_DEFAULT
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_FEATURE_LS_COLOR
@@ -322 +404 @@
-          mkdir is used to create directories with the specified names.
-
+config BUSYBOX_CONFIG_FEATURE_MKDIR_LONG_OPTIONS
+        bool "Enable long options"
+        default n
+        depends on BUSYBOX_CONFIG_MKDIR && BUSYBOX_CONFIG_GETOPT_LONG
+        help
+          Support long options for the mkdir applet.
+
-config BUSYBOX_CONFIG_MKFIFO
-        bool "mkfifo"
@@ -342 +431 @@
-          mv is used to move or rename files or directories.
-
+config BUSYBOX_CONFIG_FEATURE_MV_LONG_OPTIONS
+        bool "Enable long options"
+        default n
+        depends on BUSYBOX_CONFIG_MV && BUSYBOX_CONFIG_GETOPT_LONG
+        help
+          Support long options for the mv applet.
+
-config BUSYBOX_CONFIG_NICE
-        bool "nice"
@@ -417 +513 @@
-
-config BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_SLEEP
@@ -430 +526 @@
-
-config BUSYBOX_CONFIG_FEATURE_SORT_BIG
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_SORT
@@ -448 +544 @@
-
-config BUSYBOX_CONFIG_FEATURE_STAT_FORMAT
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_STAT
@@ -482 +578 @@
-
-config BUSYBOX_CONFIG_FEATURE_FANCY_TAIL
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_TAIL
@@ -497 +593 @@
-
-config BUSYBOX_CONFIG_FEATURE_TEE_USE_BLOCK_IO
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_TEE
@@ -508 +604 @@
-        help
-          test is used to check file types and compare values,
-The shells (ash
-and bash) have test builtin
+ The bash shell
+has test built in, ash can build it in optionally
-
-config BUSYBOX_CONFIG_FEATURE_TEST_64
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_TEST
@@ -533 +629 @@
-
-config BUSYBOX_CONFIG_FEATURE_TR_CLASSES
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_TR
@@ -541 +637 @@
-
-config BUSYBOX_CONFIG_FEATURE_TR_EQUIV
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_TR
@@ -611 +707 @@
-config BUSYBOX_CONFIG_WHO
-        bool "who"
-n
+y
-        select BUSYBOX_CONFIG_FEATURE_UTMP
-        help
@@ -634 +730 @@
-
-config BUSYBOX_CONFIG_FEATURE_PRESERVE_HARDLINKS
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_CP || BUSYBOX_CONFIG_MV
@@ -644 +740 @@
-
-config BUSYBOX_CONFIG_FEATURE_AUTOWIDTH
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_LS || BUSYBOX_CONFIG_MORE || BUSYBOX_CONFIG_TELNET
@@ -658 +754 @@
-
-config BUSYBOX_CONFIG_FEATURE_HUMAN_READABLE
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_DF || BUSYBOX_CONFIG_DU || BUSYBOX_CONFIG_LS
@@ -668 +764 @@
-
-config BUSYBOX_CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_MD5SUM || BUSYBOX_CONFIG_SHA1SUM

trunk/freewrt/package/busybox/config/debianutils/Config.in

@@ -26 +26 @@
-
-config BUSYBOX_CONFIG_FEATURE_READLINK_FOLLOW
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_READLINK
@@ -47 +47 @@
-          you can safely say N here.
-
+config BUSYBOX_CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS
+        bool "Enable long options"
+        default n
+        depends on BUSYBOX_CONFIG_RUN_PARTS && BUSYBOX_CONFIG_GETOPT_LONG
+        help
+          Support long options for the run-parts applet.
+
-config BUSYBOX_CONFIG_START_STOP_DAEMON
-        bool "start-stop-daemon"
@@ -54 +61 @@
-          termination of system-level processes, usually the ones
-          started during the startup of the system.
+
+config BUSYBOX_CONFIG_FEATURE_START_STOP_DAEMON_FANCY
+        bool "Support additional arguments"
+        default y
+        depends on BUSYBOX_CONFIG_START_STOP_DAEMON
+        help
+          Support additional arguments.
+          -o|--oknodo ignored since we exit with 0 anyway
+          -v|--verbose
+
+config BUSYBOX_CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS
+        bool "Enable long options"
+        default n
+        depends on BUSYBOX_CONFIG_START_STOP_DAEMON && BUSYBOX_CONFIG_GETOPT_LONG
+        help
+          Support long options for the start-stop-daemon applet.
-
-config BUSYBOX_CONFIG_WHICH

trunk/freewrt/package/busybox/config/editors/Config.in

@@ -14 +14 @@
-
-config BUSYBOX_CONFIG_FEATURE_AWK_MATH
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_AWK
@@ -20 +20 @@
-          Enable math functions of the Awk programming language.
-          NOTE: This will require libm to be present for linking.
+
+config BUSYBOX_CONFIG_ED
+        bool "ed"
+        default n
+        help
+          The original 1970's Unix text editor, from the days of teletypes.
+          Small, simple, evil.  Part of SUSv3.  If you're not already using
+          this, you don't need it.
-
-config BUSYBOX_CONFIG_PATCH
@@ -44 +52 @@
-
-config BUSYBOX_CONFIG_FEATURE_VI_COLON
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_VI
@@ -52 +60 @@
-
-config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_VI
@@ -60 +68 @@
-
-config BUSYBOX_CONFIG_FEATURE_VI_SEARCH
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_VI
@@ -68 +76 @@
-
-config BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_VI
@@ -77 +85 @@
-
-config BUSYBOX_CONFIG_FEATURE_VI_DOT_CMD
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_VI
@@ -84 +92 @@
-
-config BUSYBOX_CONFIG_FEATURE_VI_READONLY
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_VI
@@ -92 +100 @@
-
-config BUSYBOX_CONFIG_FEATURE_VI_SETOPTS
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_VI
@@ -99 +107 @@
-
-config BUSYBOX_CONFIG_FEATURE_VI_SET
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_VI
@@ -106 +114 @@
-
-config BUSYBOX_CONFIG_FEATURE_VI_WIN_RESIZE
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_VI
@@ -113 +121 @@
-
-config BUSYBOX_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_VI

trunk/freewrt/package/busybox/config/findutils/Config.in

@@ -12 +12 @@
-          find is used to search your system to find specified files.
-
+config BUSYBOX_CONFIG_FEATURE_FIND_PRINT0
+        bool "Enable -print0 option"
+        default y
+        depends on BUSYBOX_CONFIG_FIND
+        help
+          Causes output names to be separated by a null character
+          rather than a newline.  This allows names that contain
+          newlines and other whitespace to be more easily
+          interpreted by other programs.
+
-config BUSYBOX_CONFIG_FEATURE_FIND_MTIME
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_FIND
-        help
@@ -21 +31 @@
-
-config BUSYBOX_CONFIG_FEATURE_FIND_MMIN
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_FIND
-        help
@@ -29 +39 @@
-
-config BUSYBOX_CONFIG_FEATURE_FIND_PERM
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_FIND
@@ -36 +46 @@
-
-config BUSYBOX_CONFIG_FEATURE_FIND_TYPE
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_FIND
@@ -44 +54 @@
-
-config BUSYBOX_CONFIG_FEATURE_FIND_XDEV
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_FIND
@@ -52 +62 @@
-
-config BUSYBOX_CONFIG_FEATURE_FIND_NEWER
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_FIND
-        help
@@ -60 +70 @@
-
-config BUSYBOX_CONFIG_FEATURE_FIND_INUM
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_FIND
-        help
@@ -67 +77 @@
-
-config BUSYBOX_CONFIG_FEATURE_FIND_EXEC
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_FIND
@@ -81 +91 @@
-
-config BUSYBOX_CONFIG_FEATURE_GREP_EGREP_ALIAS
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_GREP
@@ -90 +100 @@
-
-config BUSYBOX_CONFIG_FEATURE_GREP_FGREP_ALIAS
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_GREP
@@ -99 +109 @@
-
-config BUSYBOX_CONFIG_FEATURE_GREP_CONTEXT
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_GREP
@@ -115 +125 @@
-
-config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_XARGS
@@ -123 +133 @@
-
-config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_QUOTES
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_XARGS
@@ -131 +141 @@
-
-config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_XARGS
@@ -139 +149 @@
-
-config BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_XARGS

trunk/freewrt/package/busybox/config/init/Config.in

@@ -12 +12 @@
-          init is the first program run when the system boots.
-
+config BUSYBOX_CONFIG_DEBUG_INIT
+        bool "debugging aid"
+        default n
+        depends on BUSYBOX_CONFIG_INIT
+        help
+          Turn this on to disable all the dangerous
+          rebooting stuff when debugging.
+
-config BUSYBOX_CONFIG_FEATURE_USE_INITTAB
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_INIT
@@ -20 +28 @@
-
-config BUSYBOX_CONFIG_FEATURE_INIT_SCTTY
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_INIT
@@ -31 +39 @@
-
-config BUSYBOX_CONFIG_FEATURE_EXTRA_QUIET
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_INIT
@@ -38 +46 @@
-
-config BUSYBOX_CONFIG_FEATURE_INIT_COREDUMPS
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_INIT
@@ -50 +58 @@
-
-config BUSYBOX_CONFIG_FEATURE_INITRD
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_INIT
@@ -73 +81 @@
-          used to allow or disallow other users to write to your terminal
-
-        default y
-        help
-          Stop all processes and (try to) power off the system.
-
-endmenu
-

trunk/freewrt/package/busybox/config/loginutils/Config.in

@@ -85 +85 @@
-
-config BUSYBOX_CONFIG_FEATURE_UTMP
-  
+
-        depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_WHO
-        default y
@@ -92 +92 @@
-
-config BUSYBOX_CONFIG_FEATURE_WTMP
-  
+
-        depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_LAST
-        default n
@@ -111 +111 @@
-
-config BUSYBOX_CONFIG_FEATURE_SECURETTY
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_LOGIN

trunk/freewrt/package/busybox/config/miscutils/Config.in

@@ -17 +17 @@
-        default n
-        help
-
+BUSYBOX_
-          busybox was built.
-
@@ -35 +35 @@
-          work properly.
-
+config BUSYBOX_CONFIG_DEBUG_CROND_OPTION
+        bool "Support debug option -d"
+        depends on BUSYBOX_CONFIG_CROND
+        default n
+        help
+          Support option -d to enter debug mode.
+
-config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_CROND
@@ -58 +65 @@
-
-config BUSYBOX_CONFIG_DEVFSD
-
-
-
+
+
+
+
+
-          Provides compatibility with old device names on a devfs systems.
-          You should set it to true if you have devfs enabled.
@@ -75 +84 @@
-        depends on BUSYBOX_CONFIG_DEVFSD
-        help
-
+
+
-
-config BUSYBOX_CONFIG_DEVFSD_FG_NP
@@ -92 +102 @@
-          Increases logging to stderr or syslog.
-
+config BUSYBOX_CONFIG_FEATURE_DEVFS
+        bool "  Use devfs names for all devices (obsolete)"
+        default n
+        help
+          This tells busybox to look for names like /dev/loop/0 instead of
+          /dev/loop0.  If your /dev directory has normal names instead of
+          devfs names, you don't want this.
+
+          This is obsolete and will be going away someday.  Consider it
+          deprecated.
+
-config BUSYBOX_CONFIG_EJECT
-        bool "eject"
@@ -113 +134 @@
-
-config BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_LESS
-        help
@@ -121 +142 @@
-
-config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_LESS
-        help
@@ -131 +152 @@
-
-config BUSYBOX_CONFIG_FEATURE_LESS_FLAGCS
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_LESS
@@ -139 +160 @@
-
-config BUSYBOX_CONFIG_FEATURE_LESS_MARKS
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_LESS
@@ -146 +167 @@
-
-config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_LESS
@@ -158 +179 @@
-          Get/Set hard drive parameters.  Primarily intended for ATA
-          drives.  Adds about 13k (or around 30k if you enable the
-BUSYBOX_
+
-
-config BUSYBOX_CONFIG_FEATURE_HDPARM_GET_IDENTITY
-  
-n
-
-
-Istdin
+
+y
+
+
+i
-          directly from drives about their capabilities and supported ATA
-
+
+
-
-config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_HDPARM
@@ -178 +200 @@
-
-config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_HDPARM
@@ -186 +208 @@
-
-config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_HDPARM
@@ -194 +216 @@
-
-config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_HDPARM
@@ -203 +225 @@
-
-config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_HDPARM
@@ -232 +254 @@
-          .
-          'table' reads device properties from a file or stdin, allowing
-k
+
-          User/group names are allowed as an alternative to uid/gid.
-
@@ -289 +311 @@
-        help
-          setsid runs a program in a new session
+
+config BUSYBOX_CONFIG_TASKSET
+        bool "taskset"
+        default n
+        help
+          Retrieve or set a processes's CPU affinity
+
+config BUSYBOX_CONFIG_TASKSET
+        bool "taskset"
+        default n
+        help
+          Retrieve or set a processes's CPU affinity (on linux)
-
-config BUSYBOX_CONFIG_TIME

trunk/freewrt/package/busybox/config/modutils/Config.in

@@ -54 +54 @@
-config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL
-        bool "Symbols in load map"
-n
+y
-        depends on BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP
-        help
@@ -85 +85 @@
-        default n
-        help
-a
+e
-          level.
-
@@ -93 +93 @@
-config BUSYBOX_CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS
-        bool "Multiple options parsing"
-n
+y
-        depends on BUSYBOX_CONFIG_MODPROBE
-        help
@@ -112 +112 @@
-config BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
-        # Simulate indentation
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_LSMOD
-        help
@@ -123 +123 @@
-config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
-        # Simulate indentation
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD
@@ -131 +131 @@
-config BUSYBOX_CONFIG_FEATURE_2_6_MODULES
-        # Simulate indentation
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE
@@ -141 +141 @@
-        bool
-        default n
-
+BUSYBOX_
-
-

trunk/freewrt/package/busybox/config/networking/Config.in

@@ -10 +10 @@
-        default n
-        help
-to busybox. This makes applets that talk IP
-able to work with IPv6
+in busybox.
+This adds IPv6 support in the networking applets
-
-config BUSYBOX_CONFIG_ARPING
@@ -35 +35 @@
-        default n
-        help
-to the ident port and returns a set fake
-value whatever it gets
+on the ident port and returns a predefined
+fake value on any query
-
-config BUSYBOX_CONFIG_FTPGET
@@ -50 +50 @@
-          Store a remote file via FTP.
-
+config BUSYBOX_CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS
+        bool "Enable long options in ftpget/ftpput"
+        default n
+        depends on BUSYBOX_CONFIG_GETOPT_LONG && (BUSYBOX_CONFIG_FTPGET || BUSYBOX_CONFIG_FTPPUT)
+        help
+          Support long options for the ftpget/ftpput applet.
+
-config BUSYBOX_CONFIG_HOSTNAME
-        bool "hostname"
@@ -62 +69 @@
-          Serve web pages via an HTTP server.
-
-USAGE_FROM_INETD_ONLY
-  Support using httpd only from inetd
+WITHOUT_INETD
+Support using httpd as a daemon (not from inetd)
-        default n
-        depends on BUSYBOX_CONFIG_HTTPD
-        help
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-config BUSYBOX_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
-  Support reloading the global config 
-y
-
+Support reloading the global config BUSYBOX_
+n
+ && BUSYBOX_CONFIG_FEATURE_HTTPD_WITHOUT_INETD
-        help
-          This option enables processing of SIGHUP to reload cached
@@ -96 +86 @@
-
-config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID
-  
-
-
+
+
+ && BUSYBOX_CONFIG_FEATURE_HTTPD_WITHOUT_INETD
-        help
-          This option allows the server to run as a specific user
@@ -104 +94 @@
-          Use of this option requires special privileges to change to a
-          different user.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_HTTPD
@@ -115 +120 @@
-
-config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_HTTPD
-        help
-          This option allows scripts and executables to be invoked
-url
+URL
-
-config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
-        help
-          This option enables support for running scripts through an 
-,
+
-          properly. You need to supply an addition line in your httpd 
-
+BUSYBOX_
-          *.php:/path/to/your/php
-
-config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
@@ -142 +147 @@
-
-config BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_HTTPD
-        help
-After set, t
+T
-          strings for display of the browser.  Output goes to stdout.
-          For example, httpd -e "<Hello World>" as
@@ -155 +160 @@
-        default n
-        help
-
+BUSYBOX_
-
-config BUSYBOX_CONFIG_FEATURE_IFCONFIG_STATUS
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_IFCONFIG
-        help
-
+BUSYBOX_
-          of the currently active interfaces.
-
-config BUSYBOX_CONFIG_FEATURE_IFCONFIG_SLIP
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_IFCONFIG
@@ -174 +179 @@
-
-config BUSYBOX_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_IFCONFIG
@@ -182 +187 @@
-
-config BUSYBOX_CONFIG_FEATURE_IFCONFIG_HW
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_IFCONFIG
-        help
@@ -191 +196 @@
-
-config BUSYBOX_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_IFCONFIG
-        help
-
+BUSYBOX_
-          automatically if the value '+' is used.
-
@@ -206 +211 @@
-          use of either "ifconfig" and "route" or the "ip" command to actually
-          configure network interfaces.  Therefore, you will probably also want
-BUSYBOX_CONFIG_IFCONFIG and BUSYBOX_
-BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP and the various BUSYBOX_
+CONFIG_IFCONFIG and 
+CONFIG_FEATURE_IFUPDOWN_IP and the various 
-          course you could use non-busybox versions of these programs, so
-          against my better judgement (since this will surely result in plenty
@@ -216 +221 @@
-
-config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_IFUPDOWN
@@ -224 +229 @@
-
-config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
@@ -237 +242 @@
-          utility or the  "ifup" and "ifdown" applets will not work.
-
+config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN
+        bool "Use busybox ifconfig BUSYBOX_and route applets"
+        default y
+        depends on BUSYBOX_CONFIG_IFUPDOWN && !BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IP
+        select BUSYBOX_CONFIG_IFCONFIG
+        select BUSYBOX_CONFIG_ROUTE
+        help
+          Use the busybox iproute "ifconfig" and "route" applets to
+          implement the "ifup" and "ifdown" utilities.
+
+          If leave this disabled, you must install the full-blown ifconfig
+          and route utilities, or the  "ifup" and "ifdown" applets will not
+          work.
+
-config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV4
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_IFUPDOWN
@@ -245 +264 @@
-
-config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPV6
-  
-
-
+
+
+ && BUSYBOX_CONFIG_FEATURE_IPV6
-        help
-          If you need support for IPv6, turn this option on.
-
-config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_IPX
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_IFUPDOWN
@@ -260 +279 @@
-
-config BUSYBOX_CONFIG_FEATURE_IFUPDOWN_MAPPING
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_IFUPDOWN
@@ -273 +292 @@
-          Internet superserver daemon
-
-
-  
-n
+U
+
+y
-        depends on BUSYBOX_CONFIG_INETD
-        help
-          Echo received data internal inetd service
-
-
-  
-n
+U
+
+y
-        depends on BUSYBOX_CONFIG_INETD
-        help
-          Internet /dev/null internal inetd service
-
-
-  
-n
+U
+
+y
-        depends on BUSYBOX_CONFIG_INETD
-        help
-          Return 32 bit time since 1900 internal inetd service
-
-
-  
-n
+U
+
+y
-        depends on BUSYBOX_CONFIG_INETD
-        help
-          Return human-readable time internal inetd service
-
-
-  
-n
+U
+
+y
-        depends on BUSYBOX_CONFIG_INETD
-        help
@@ -309 +328 @@
-
-config BUSYBOX_CONFIG_FEATURE_INETD_RPC
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_INETD
@@ -318 +337 @@
-config BUSYBOX_CONFIG_IP
-        bool "ip"
-y
+n
-        help
-          The "ip" applet is a TCP/IP interface configuration and routing
@@ -324 +343 @@
-          TCP/IP.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-config BUSYBOX_CONFIG_IPCALC
@@ -388 +413 @@
-
-config BUSYBOX_CONFIG_FEATURE_IPCALC_FANCY
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_IPCALC
-        help
-          Adds the options hostname, prefix and silent to the output of "ipcalc".
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-config BUSYBOX_CONFIG_NAMEIF
@@ -473 +481 @@
-
-config BUSYBOX_CONFIG_FEATURE_FANCY_PING
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_PING
@@ -488 +496 @@
-
-config BUSYBOX_CONFIG_FEATURE_FANCY_PING6
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_PING6
-        help
@@ -509 +517 @@
-
-config BUSYBOX_CONFIG_FEATURE_TELNET_TTYPE
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_TELNET
@@ -518 +526 @@
-
-config BUSYBOX_CONFIG_FEATURE_TELNET_AUTOLOGIN
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_TELNET
@@ -541 +549 @@
-          Note that for busybox telnetd to work you need several things:
-          First of all, your kernel needs:
-BUSYBOX_
-BUSYBOX_
+
+
-
-          Next, you need a /dev/pts directory on your root filesystem:
@@ -559 +567 @@
-                  mount -t devpts devpts /dev/pts
-
-BUSYBOX_
-BUSYBOX_
+
+
-          certain that Busybox has been installed setuid root:
-
@@ -570 +578 @@
-
-config BUSYBOX_CONFIG_FEATURE_TELNETD_INETD
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_TELNETD
@@ -586 +594 @@
-
-config BUSYBOX_CONFIG_FEATURE_TFTP_GET
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_TFTP
-        help
@@ -594 +602 @@
-
-config BUSYBOX_CONFIG_FEATURE_TFTP_PUT
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_TFTP
-        help
@@ -602 +610 @@
-
-config BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_TFTP
@@ -608 +616 @@
-          Allow the client to specify the desired block size for transfers.
-
-FEATURE_TFTP_DEBUG
-  
+DEBUG_TFTP
+
-        default n
-        depends on BUSYBOX_CONFIG_TFTP
@@ -624 +632 @@
-
-config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_VERBOSE
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_TRACEROUTE
@@ -632 +640 @@
-
-config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_TRACEROUTE
@@ -640 +648 @@
-
-config BUSYBOX_CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_TRACEROUTE
-        help
-          Add feature to allow for ICMP ECHO instead of UDP datagrams.
-
+source package/busybox/config/networking/udhcp/Config.in
-
-config BUSYBOX_CONFIG_VCONFIG
@@ -661 +670 @@
-
-config BUSYBOX_CONFIG_FEATURE_WGET_STATUSBAR
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_WGET
@@ -668 +677 @@
-
-config BUSYBOX_CONFIG_FEATURE_WGET_AUTHENTICATION
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_WGET
@@ -675 +684 @@
-
-config BUSYBOX_CONFIG_FEATURE_WGET_IP6_LITERAL
-  
-n
-
+
+y
+ && BUSYBOX_CONFIG_FEATURE_IPV6
-        help
-          Support IPv6 address literal notation in URLs.
-
-
+
+
+
+
+
+
-
-config BUSYBOX_CONFIG_ZCIP
@@ -695 +709 @@
-
-endmenu
-

trunk/freewrt/package/busybox/config/networking/udhcp/Config.in

@@ -6 +6 @@
-menu "udhcp Server/Client"
-
-
+APP_
-        bool "udhcp Server (udhcpd)"
-        default n
@@ -15 +15 @@
-          See http://udhcp.busybox.net for further details.
-
-
+APP_
-        bool "udhcp Client (udhcpc)"
-        default y
@@ -27 +27 @@
-          See http://udhcp.busybox.net for further details.
-
-
+APP_
-        bool "Lease display utility (dumpleases)"
-        default n
-
+APP_
-        help
-          dumpleases displays the leases written out by the udhcpd server.
@@ -41 +41 @@
-        bool "  Log udhcp messages to syslog (instead of stdout)"
-        default n
-UDHCPD || BUSYBOX_CONFIG
+APP_UDHCPD || BUSYBOX_CONFIG_APP
-        help
-          If selected, udhcpd will log all its messages to syslog, otherwise,
@@ -51 +51 @@
-        bool "  Compile udhcp with noisy debugging messages"
-        default n
-UDHCPD || BUSYBOX_CONFIG
+APP_UDHCPD || BUSYBOX_CONFIG_APP
-        help
-          If selected, udhcpd will output extra debugging output.  If using

trunk/freewrt/package/busybox/config/procps/Config.in

@@ -52 +52 @@
-
-config BUSYBOX_CONFIG_FEATURE_PIDOF_SINGLE
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_PIDOF
@@ -59 +59 @@
-
-config BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_PIDOF
@@ -74 +74 @@
-
-config BUSYBOX_CONFIG_FEATURE_PS_WIDE
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_PS
@@ -103 +103 @@
-
-config BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_TOP

trunk/freewrt/package/busybox/config/shell/Config.in

@@ -3 +3 @@
-comment "  built-in shells: ash, hush, lash, msh"
-        depends !FWRT_PACKAGE_BUSYBOX
+#
+# For a description of the syntax of this configuration file,
+# see scripts/kbuild/config-language.txt.
+#
+#
+#menu "Shells"
+#
+#choice
+#       prompt "Choose your default shell"
+#       default BUSYBOX_CONFIG_FEATURE_SH_IS_NONE
+#       help
+#         Choose a shell. The ash shell is the most bash compatible
+#         and full featured one.
+#
+#config BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
+#       select BUSYBOX_CONFIG_ASH
+#       bool "ash"
+#
+#config BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
+#       select BUSYBOX_CONFIG_HUSH
+#       bool "hush"
+#
+#config BUSYBOX_CONFIG_FEATURE_SH_IS_LASH
+#       select BUSYBOX_CONFIG_LASH
+#       bool "lash"
+#
+#config BUSYBOX_CONFIG_FEATURE_SH_IS_MSH
+#       select BUSYBOX_CONFIG_MSH
+#       bool "msh"
+#
+#config BUSYBOX_CONFIG_FEATURE_SH_IS_NONE
+#       bool "none"
+#
+#endchoice
-
-config BUSYBOX_CONFIG_ASH
-............................... default featured shell
+
-        default y
-        depends FWRT_PACKAGE_BUSYBOX
@@ -15 +49 @@
-          shell (by Herbert Xu), which was created by porting the 'ash' shell
-          (written by Kenneth Almquist) from NetBSD.
-          FreeWRT needs a working /bin/ash in all cases; if you do not select
-          busybox ash make sure you enable mksh to run as /bin/ash below.
-
-comment "Ash Shell Options"
@@ -22 +54 @@
-
-config BUSYBOX_CONFIG_ASH_JOB_CONTROL
-  Enable 
+
-        default y
-        depends on BUSYBOX_CONFIG_ASH
@@ -29 +61 @@
-
-config BUSYBOX_CONFIG_ASH_READ_NCHARS
-  Enable 
+
-        default n
-        depends on BUSYBOX_CONFIG_ASH
@@ -37 +69 @@
-
-config BUSYBOX_CONFIG_ASH_READ_TIMEOUT
-  Enable 
-y
+
+n
-        depends on BUSYBOX_CONFIG_ASH
-        help
@@ -46 +78 @@
-
-config BUSYBOX_CONFIG_ASH_ALIAS
-  Enable 
+
-        default y
-        depends on BUSYBOX_CONFIG_ASH
@@ -53 +85 @@
-
-config BUSYBOX_CONFIG_ASH_MATH_SUPPORT
-  Enable 
+
-        default y
-        depends on BUSYBOX_CONFIG_ASH
@@ -60 +92 @@
-
-config BUSYBOX_CONFIG_ASH_MATH_SUPPORT_64
-    
+
-        default n
-        depends on BUSYBOX_CONFIG_ASH_MATH_SUPPORT
@@ -69 +101 @@
-
-config BUSYBOX_CONFIG_ASH_GETOPTS
-  Enable getopts builtin
+Builtin getopt
-        default y
-        depends on BUSYBOX_CONFIG_ASH
@@ -75 +107 @@
-          Enable getopts builtin in the ash shell.
-
+config BUSYBOX_CONFIG_ASH_BUILTIN_ECHO
+        bool "Builtin version of 'echo'"
+        default y
+        select BUSYBOX_CONFIG_ECHO
+        depends on BUSYBOX_CONFIG_ASH
+        help
+          Enable support for echo, built in to ash.
+
+config BUSYBOX_CONFIG_ASH_BUILTIN_TEST
+        bool "Builtin version of 'test'"
+        default y
+        select BUSYBOX_CONFIG_TEST
+        depends on BUSYBOX_CONFIG_ASH
+        help
+          Enable support for test, built in to ash.
+
-config BUSYBOX_CONFIG_ASH_CMDCMD
-  Enable cmdcm
+'command' comman
-        default y
-        depends on BUSYBOX_CONFIG_ASH
@@ -84 +132 @@
-          even when there is an ash builtin command with the same name.
-
-config BUSYBOX_CONFIG_ASH_BUILTIN_ECHO
-        bool "  Enable builtin version of 'echo'"
-        default y
-        depends on BUSYBOX_CONFIG_ASH
-        help
-          Enable support for echo, built in to ash.
-
-# this entry also appears in coreutils/Config.in, next to the echo applet
-config BUSYBOX_CONFIG_FEATURE_FANCY_ECHO
-        bool "  Enable echo options (-n and -e)"
-        default y
-        depends on BUSYBOX_CONFIG_ASH_BUILTIN_ECHO
-        help
-          This adds options (-n and -e) to echo.
-
-config BUSYBOX_CONFIG_ASH_MAIL
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_ASH
@@ -107 +140 @@
-
-config BUSYBOX_CONFIG_ASH_OPTIMIZE_FOR_SIZE
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_ASH
@@ -114 +147 @@
-
-config BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT
-  Enable p
+P
-        default n
-        depends on BUSYBOX_CONFIG_ASH
@@ -125 +158 @@
-
-config BUSYBOX_CONFIG_ASH_EXPAND_PRMT
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_ASH
@@ -134 +167 @@
-
-config BUSYBOX_CONFIG_HUSH
-
-
-
+
+
-        select BUSYBOX_CONFIG_TRUE
-        select BUSYBOX_CONFIG_FALSE
@@ -152 +184 @@
-
-config BUSYBOX_CONFIG_LASH
-
-
-
+
+
-        select BUSYBOX_CONFIG_TRUE
-        select BUSYBOX_CONFIG_FALSE
@@ -168 +199 @@
-
-config BUSYBOX_CONFIG_MSH
-
-
-
+
+
-        select BUSYBOX_CONFIG_TRUE
-        select BUSYBOX_CONFIG_FALSE
@@ -182 +212 @@
-          It also uses only vfork, so it can be used on uClinux systems.
-
-  busybox 
+
-        depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH
-
-config BUSYBOX_CONFIG_FEATURE_SH_EXTRA_QUIET
-    
+
-        default n
-        depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH
@@ -193 +223 @@
-
-config BUSYBOX_CONFIG_FEATURE_SH_STANDALONE_SHELL
-    
+
-        default n
-        depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH
@@ -200 +230 @@
-          in preference to executables in the PATH whenever possible.  For
-          example, entering the command 'ifconfig' into the shell would cause
-
+BUSYBOX_
-          qualified executable name, such as '/sbin/ifconfig' will still
-
+BUSYBOX_
-          is generally used when creating a statically linked version of busybox
-          for use as a rescue shell, in the event that you screw up your system.
+
+          Note that this will *also* cause applets to take precedence
+          over shell builtins of the same name.  So turning this on will
+          eliminate any performance gained by turning on the builtin "echo"
+          and "test" commands in ash.
-
-          Note that when using this option, the shell will attempt to directly
@@ -212 +247 @@
-
-config BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING
-    c
+C
-        default y
-        depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH
@@ -219 +254 @@
-
-config BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING_VI
-    
+
-        default n
-        depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING
@@ -227 +262 @@
-
-config BUSYBOX_CONFIG_FEATURE_COMMAND_HISTORY
-    h
+H
-        default 15
-        depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING
@@ -234 +269 @@
-
-config BUSYBOX_CONFIG_FEATURE_COMMAND_SAVEHISTORY
-    h
+H
-        default n
-        depends on BUSYBOX_CONFIG_ASH && BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING
@@ -241 +276 @@
-
-config BUSYBOX_CONFIG_FEATURE_COMMAND_TAB_COMPLETION
-    t
+T
-        default y
-        depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING
@@ -248 +283 @@
-
-config BUSYBOX_CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION
-    u
+U
-        default n
-        depends on BUSYBOX_CONFIG_FEATURE_COMMAND_TAB_COMPLETION
@@ -255 +290 @@
-
-config BUSYBOX_CONFIG_FEATURE_SH_FANCY_PROMPT
-    
+
-        default y
-        depends on BUSYBOX_CONFIG_FEATURE_COMMAND_EDITING
@@ -261 +296 @@
-          Setting this option allows for prompts to use things like \w and
-          \$ and also using escape codes.
+
+#endmenu

trunk/freewrt/package/busybox/config/sysklogd/Config.in

@@ -22 +22 @@
-
-config BUSYBOX_CONFIG_FEATURE_ROTATE_LOGFILE
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_SYSLOGD
@@ -30 +30 @@
-
-config BUSYBOX_CONFIG_FEATURE_REMOTE_LOG
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_SYSLOGD
@@ -44 +44 @@
-
-config BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_SYSLOGD
@@ -66 +66 @@
-
-config BUSYBOX_CONFIG_LOGREAD
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_FEATURE_IPC_SYSLOG
@@ -76 +76 @@
-
-config BUSYBOX_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
-    
+
-        default n
-        depends on BUSYBOX_CONFIG_LOGREAD

trunk/freewrt/package/busybox/config/util-linux/Config.in

@@ -28 +28 @@
-
-config BUSYBOX_CONFIG_FEATURE_FBSET_FANCY
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_FBSET
@@ -38 +38 @@
-
-config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_FBSET
-        help
-          This option allows fbset to read the video mode database stored by
-n
+as
-          device to pre-defined video modes.
-
@@ -74 +74 @@
-
-config BUSYBOX_FDISK_SUPPORT_LARGE_DISKS
-
+ "support over 4GB disks"
-        default y
-        depends on BUSYBOX_CONFIG_FDISK
@@ -81 +81 @@
-
-config BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_FDISK
-        help
@@ -90 +90 @@
-
-config BUSYBOX_CONFIG_FEATURE_AIX_LABEL
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
@@ -98 +98 @@
-
-config BUSYBOX_CONFIG_FEATURE_SGI_LABEL
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
@@ -106 +106 @@
-
-config BUSYBOX_CONFIG_FEATURE_SUN_LABEL
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
@@ -114 +114 @@
-
-config BUSYBOX_CONFIG_FEATURE_OSF_LABEL
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
@@ -122 +122 @@
-
-config BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_FDISK && BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE
@@ -165 +165 @@
-
-config BUSYBOX_CONFIG_FEATURE_MINIX2
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_FSCK_MINIX || BUSYBOX_CONFIG_MKFS_MINIX
-        help
@@ -200 +200 @@
-          correct time when Linux is _not_ running.
-
-
-  
-
-
+_
+
+
+ && BUSYBOX_CONFIG_GETOPT_LONG
-        help
-          By default, the hwclock utility only uses short options.  If you
@@ -210 +210 @@
-
-config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
-  
-n
+
+y
-        depends on BUSYBOX_CONFIG_HWCLOCK
-        help
@@ -256 +256 @@
-
-config BUSYBOX_CONFIG_FEATURE_MDEV_CONF
-  
+
-        default n
-        depends on BUSYBOX_CONFIG_MDEV
-        help
-
+BUSYBOX_
-
-            hd[a-z][0-9]* 0:3 660
-
-          That's device name (with regex match), uid:gid, and permissions.
-
-          Optionally, that can be followed (on the same line) by an asterisk
-          and a command line to run after creating the corresponding device(s),
-          ala:
-
-            hdc root:cdrom 660  *ln -s hdc cdrom
-
-          Config file parsing stops on the first matching line.  If no config
-          entry is matched, devices are created with default 0:0 660.  (Make
-          the last line match .* to override this.)
+
+config BUSYBOX_CONFIG_FEATURE_MDEV_EXEC
+        bool "Support command execution at device addition/removal"
+        default n
+        depends on BUSYBOX_CONFIG_FEATURE_MDEV_CONF
+        help
+          This adds support for an optional field to /etc/mdev.conf, consisting
+          of a special character and a command line to run after creating the
+          corresponding device(s) and before removing, ala:
+
+            hdc root:cdrom 660  *ln -s $MDEV cdrom
+
+          The $MDEV environment variable is set to the name of the device.
+
+          The special characters and their meanings are:
+            @ Run after creating the device.
+            $ Run before removing the device.
+            * Run both after creating and before removing the device.
+
+          Commands are executed via system() so you need /bin/sh, meaning you
+          probably want to select a default shell in the Shells menu.
-
-config BUSYBOX_CONFIG_MKSWAP
@@ -289 +304 @@
-          the swap space using the 'swapon' utility.
-
+config BUSYBOX_CONFIG_FEATURE_MKSWAP_V0
+        bool "version 0 support"
+        default n
+        depends on BUSYBOX_CONFIG_MKSWAP
+#       depends on BUSYBOX_CONFIG_MKSWAP && BUSYBOX_CONFIG_DEPRECATED
+        help
+          Enable support for the old v0 style.
+          If your kernel is older than 2.1.117, then v0 support is the
+          only option.
+
-config BUSYBOX_CONFIG_MORE
-        bool "more"
@@ -300 +325 @@
-
-config BUSYBOX_CONFIG_FEATURE_USE_TERMIOS
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_MORE
@@ -322 +347 @@
-
-config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_MOUNT
@@ -404 +429 @@
-
-config BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_UMOUNT
@@ -414 +439 @@
-
-config BUSYBOX_CONFIG_FEATURE_MOUNT_LOOP
-  
+
-        default y
-        depends on BUSYBOX_CONFIG_MOUNT || BUSYBOX_CONFIG_UMOUNT
@@ -430 +455 @@
-
-config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT
-  
-
-BUSYBOX_CONFIG_MOUNT || BUSYBOX_
+
+
+CONFIG_MOUNT || 
-        help
-          Historically, Unix systems kept track of the currently mounted
@@ -446 +471 @@
-          features like separate per-process filesystem namespaces, requires
-          that your /etc directory be writeable, tends to get easily confused
-
+
+
+
+
+
-
-endmenu

trunk/freewrt/package/busybox/patches/100-killall5.patch

@@ -1 @@
-Nur busybox-1.1.1/include/applets.h busybox-1.1.1-owrt
-1.1/include/applets.h    2006-03-22 22:16:24.000000000 +01
-1.1-owrt/include/applets.h       2006-04-01 18:23:43
-4,6 +154
-iptunnel_main, 
-kill_main, 
-(killall, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER
-(killall5, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER
-klogd_main, 
-lash_main, 
-last_main, 
-Nur busybox-1.1.1/include/usage.h busybox-1.1.1-owrt
-1.1/include/usage.h      2006-03-22 22:16:24.000000000 +01
-1.1-owrt/include/usage.h 2006-04-01 18:22:53
-98,6 +1598
+ruN busybox-1.2.0-old/include/applets.h busybox-1.2.0-new
+2.0-old/include/applets.h        2006-07-01 00:42:10.000000000 +02
+2.0-new/include/applets.h        2006-07-31 00:29:34
+7,6 +157
+
+
+_ODDNAME(killall, kill, _BB_DIR_USR_BIN, _BB_SUID_NEVER, killall
+_ODDNAME(killall5, kill, _BB_DIR_USR_BIN, _BB_SUID_NEVER, killall5
+
+
+
+ruN busybox-1.2.0-old/include/usage.h busybox-1.2.0-new
+2.0-old/include/usage.h  2006-07-01 00:42:10.000000000 +02
+2.0-new/include/usage.h  2006-07-31 00:25:57
+03,6 +1503
- #define killall_example_usage \
-        "$ killall apache\n"
@@ -27 +27 @@
-        "[-c n] [-n]"
- #define klogd_full_usage \
-Nur busybox-1.1.1/procps/Config.in busybox-1.1.1-owrt
-1.1/procps/Config.in     2006-03-22 22:16:25.000000000 +01
-1.1-owrt/procps/Config.in        2006-04-01 18:22:53
+ruN busybox-1.2.0-old/procps/Config.in busybox-1.2.0-new
+2.0-old/procps/Config.in 2006-07-01 00:42:12.000000000 +02
+2.0-new/procps/Config.in 2006-07-31 00:25:57
-@@ -38,6 +38,11 @@
-          specified commands.  If no signal name is specified, SIGTERM is
@@ -42 +42 @@
-        bool "pidof"
-        default n
-Nur busybox-1.1.1/procps/kill.c busybox-1.1.1-owrt
-1.1/procps/kill.c        2006-03-22 22:16:25.000000000 +01
-1.1-owrt/procps/kill.c   2006-04-01 18:22:53
-34,6 +34
+ruN busybox-1.2.0-old/procps/kill.c busybox-1.2.0-new
+2.0-old/procps/kill.c    2006-07-01 00:42:12.000000000 +02
+2.0-new/procps/kill.c    2006-07-31 00:25:57
+20,6 +20
- 
- #define KILL 0
@@ -53 +53 @@
- int kill_main(int argc, char **argv)
- {
-48,6 +49
+34,6 +35
- #else
-        whichApp = KILL;
@@ -63 +63 @@
-        /* Parse any options */
-        if (argc < 2)
-26,6 +130
+12,6 +116
-                }
- 

trunk/freewrt/package/busybox/patches/110-telnetd.patch

@@ -1 @@
-ur busybox-1.1.0/networking/telnetd.c busybox-1.1.0-owrt
-1.0/networking/telnetd.c 2006-01-11 06:43:51.000000000 +01
-1.0-owrt/networking/telnetd.c    2006-01-14 17:41:20.000000000 +01
-5,6 +45
+Nur busybox-1.2.1.orig/networking/telnetd.c busybox-1.2.1
+2.1.orig/networking/telnetd.c    2006-07-01 00:42:02.000000000 +02
+2.1/networking/telnetd.c 2006-10-17 12:21:14.000000000 +02
+4,6 +44
- #include <arpa/telnet.h>
- #include <ctype.h>
@@ -10 +10 @@
- #include "busybox.h"
- 
-4,11 +395
+1,11 +392
-        struct in_addr bind_addr = { .s_addr = 0x0 };
- #endif /* CONFIG_FEATURE_TELNETD_INETD */
@@ -26 +26 @@
-        int maxlen, w, r;
- 
-3,6 +416
+0,6 +413
-                        case 'f':
-                                issuefile = optarg;
@@ -36 +36 @@
-                                loginpath = optarg;
-                                break;
-65,6 +471
+59,6 +465
-        sa.sin_addr = bind_addr;
- #endif
@@ -44 +44 @@
-+               strncpy(interface.ifr_ifrn.ifrn_name, interface_name, IFNAMSIZ);
-+               (void)setsockopt(master_fd, SOL_SOCKET,
-
+               
-+       }
-+
-if (bind(master_fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
-       bb_perror_msg_and_die("bind"
-}
+bb_xbind(master_fd, (struct sockaddr *) &sa, sizeof(sa));
+bb_xlisten(master_fd, 1
+bb_xdaemon(0, 0);

trunk/freewrt/package/busybox/patches/140-unlink-passwd.patch

@@ -1 @@
-
-
+
+
+
-@@ -54,11 +54,12 @@
-                snprintf(filename, sizeof filename, "%s", bb_path_passwd_file);
@@ -23 +24 @@
-        snprintf(buf, sizeof buf, "%s-", filename);
-        if (create_backup(buf, fp)) {
-19,6 +121
+20,6 +122
-                fclose(fp);
-                return 1;

trunk/freewrt/package/busybox/patches/150-udhcp-release.patch

@@ -1 @@
-1.1/include/usage.h busybox-1.1.1-owrt
-1.1/include/usage.h      2006-04-01 18:26:21
-1.1-owrt/include/usage.h 2006-04-01 18:27:45
-268,6 +3268
+2.1.orig/include/usage.h busybox-1.2.1
+2.1.orig/include/usage.h 2006-10-17 12:22:12
+2.1/include/usage.h      2006-10-17 12:25:18
+190,6 +3190
-        "\t-n,\t--now\tExit with failure if lease cannot be immediately negotiated\n" \
-        "\t-p,\t--pidfile=file\tStore process ID of daemon in file\n" \
@@ -10 +10 @@
-        "\t-s,\t--script=file\tRun file at dhcp events (default: /usr/share/udhcpc/default.script)\n" \
-        "\t-t,\t--retries=NUM\tSend up to NUM request packets\n"\
-1.1/networking/udhcp/dhcpc.c busybox-1.1.1-owrt
-1.1/networking/udhcp/dhcpc.c     2006-03-22 22:16:19.000000000 +01
-1.1-owrt/networking/udhcp/dhcpc.c        2006-04-01 18:28:19
-9,6 +49
+2.1.orig/networking/udhcp/dhcpc.c busybox-1.2.1
+2.1.orig/networking/udhcp/dhcpc.c        2006-07-01 00:42:02.000000000 +02
+2.1/networking/udhcp/dhcpc.c     2006-10-17 12:25:18
+7,6 +47
-        .abort_if_no_lease = 0,
-        .foreground = 0,
@@ -21 +21 @@
-        .interface = "eth0",
-        .pidfile = NULL,
-
-
-
-
-
-
-
-
-
+
-                {"now",         no_argument,            0, 'n'},
-                {"pidfile",     required_argument,      0, 'p'},
@@ -37 +29 @@
-                {"script",      required_argument,      0, 's'},
-                {"timeout",     required_argument,      0, 'T'},
-214,7 +217
+174,7 +176
-        /* get options */
-        while (1) {
@@ -46 +38 @@
- 
-                switch (c) {
-84,6 +287
+44,6 +246
-                case 'q':
-                        client_config.quit_after_lease = 1;
@@ -56 +48 @@
-                        requested_ip = inet_addr(optarg);
-                        break;
-527,8 +53
+488,8 +49
- 
-                                        state = BOUND;
@@ -69 +61 @@
-                                                client_background();
- 
-53,12 +56
+14,12 +52
-                        case SIGUSR1:
-                                perform_renew();
@@ -86 +78 @@
-                } else if (retval == -1 && errno == EINTR) {
-                        /* a signal was caught */
-1.1/networking/udhcp/dhcpc.h busybox-1.1.1-owrt
-1.1/networking/udhcp/dhcpc.h     2006-03-22 22:16:19.000000000 +01
-1.1-owrt/networking/udhcp/dhcpc.h        2006-04-01 18:27:45
-9,6 +19
+2.1.orig/networking/udhcp/dhcpc.h busybox-1.2.1
+2.1.orig/networking/udhcp/dhcpc.h        2006-07-01 00:42:02.000000000 +02
+2.1/networking/udhcp/dhcpc.h     2006-10-17 12:25:18
+8,6 +18
- struct client_config_t {
-        char foreground;                /* Do not fork */

trunk/freewrt/package/busybox/patches/170-udhcp-options.patch

@@ -1 @@
-00.orig/networking/udhcp/options.c busybox-1.00
-00.orig/networking/udhcp/options.c       2004-03-15 09:29:01.000000000 +01
-00/networking/udhcp/options.c    2005-09-14 13:27:23.7926098
-39,8 +39
+2.1.orig/networking/udhcp/options.c busybox-1.2.1
+2.1.orig/networking/udhcp/options.c      2006-07-01 00:42:02.000000000 +02
+2.1/networking/udhcp/options.c   2006-10-17 12:35:30.0000000
+41,8 +41
-        {"dhcptype",    OPTION_U8,                              0x35},
-        {"serverid",    OPTION_IP,                              0x36},

trunk/freewrt/package/busybox/patches/180-telnetd_ipv6.patch

@@ -1 @@
-urN busybox.old/networking/telnetd.c busybox.dev
-.old/networking/telnetd.c   2005-08-17 03:29:10
-.dev/networking/telnetd.c   2005-10-22 19:37:49.976396
-49,6 +49
+Nur busybox-1.2.1.orig/networking/telnetd.c busybox-1.2.1
+-1.2.1.orig/networking/telnetd.c    2006-10-17 12:23:28
+-1.2.1/networking/telnetd.c 2006-10-17 12:37:30.000000
+50,6 +50
- 
- #define BUFSIZE 4000

trunk/freewrt/package/busybox/patches/190-ash_performance.patch

@@ -1 @@
-urN busybox.old/shell/ash.c busybox.dev
-.old/shell/ash.c    2005-11-12 22:39:19.853826250 +01
-.dev/shell/ash.c    2005-11-12 22:39:42.771258500 +01
-414,6 +141
+Nur busybox-1.2.1.orig/shell/ash.c busybox-1.2.1
+-1.2.1.orig/shell/ash.c     2006-07-29 00:53:44.000000000 +02
+-1.2.1/shell/ash.c  2006-10-23 16:32:05.000000000 +02
+384,6 +138
- 
- #define NUMBUILTINS  (sizeof (builtincmd) / sizeof (struct builtincmd) )
@@ -16 +16 @@
- 
- struct cmdentry {
-50,6 +2057
-__attribute__((__noreturn__))
+37,6 +2044
+ATTRIBUTE_NORETURN
- static int decode_signal(const char *, int);
- 
@@ -36 +36 @@
-  * This routine is called when an error or an interrupt occurs in an
-  * interactive shell and control is returned to the main command loop.
-80,6 +3700
+94,6 +3714
-        clearredir(1);
-        envp = environment();
@@ -44 +44 @@
-                || find_applet_by_name(argv[0])
- #endif
-21,6 +3742
+36,6 +3757
- tryexec(char *cmd, char **argv, char **envp)
- {
@@ -61 +61 @@
-+       }
- #ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
-nt flg_bb = 0;
-char *name = cmd;
-9,6 +3952
+f(find_applet_by_name(cmd) != NULL) {
+       /* re-exec ourselves with the new arguments */
+8,6 +3951
-        }
- #endif

trunk/freewrt/package/busybox/patches/200-etc_crontabs.patch

@@ -1 @@
-urN busybox.old/miscutils/crond.c busybox.dev
-.old/miscutils/crond.c      2004-04-14 19:51:21
-.dev/miscutils/crond.c      2005-12-11 22:54:07.878256250 +01
-6,7 +36
+Nur busybox-1.2.1.orig/miscutils/crond.c busybox-1.2.1
+-1.2.1.orig/miscutils/crond.c       2006-07-01 00:42:09
+-1.2.1/miscutils/crond.c    2006-10-23 16:33:40.000000000 +02
+3,7 +33
- #define arysize(ary)    (sizeof(ary)/sizeof((ary)[0]))
- 
@@ -11 +11 @@
- #ifndef TMPDIR
- #define TMPDIR          "/var/spool/cron"
-urN busybox.old/miscutils/crontab.c busybox.dev
-.old/miscutils/crontab.c    2004-04-14 19:51:21
-.dev/miscutils/crontab.c    2005-12-11 22:54:28.647554250 +01
-8,7 +28
+Nur busybox-1.2.1.orig/miscutils/crontab.c busybox-1.2.1
+-1.2.1.orig/miscutils/crontab.c     2006-07-01 00:42:09
+-1.2.1/miscutils/crontab.c  2006-10-23 16:33:40.000000000 +02
+9,7 +29
- #include <sys/resource.h>
- 

trunk/freewrt/package/busybox/patches/210-passwd_limit.patch

@@ -1 @@
-urN busybox.old/loginutils/passwd.c busybox.dev
-.old/loginutils/passwd.c    2005-12-11 22:52:46.185150000 +01
-.dev/loginutils/passwd.c    2005-12-11 23:19:15.276596500 +01
-53,7 +353
+Nur busybox-1.2.1.orig/loginutils/passwd.c busybox-1.2.1
+-1.2.1.orig/loginutils/passwd.c     2006-10-23 16:31:36.000000000 +02
+-1.2.1/loginutils/passwd.c  2006-10-23 16:34:24.000000000 +02
+46,7 +346
-        } else {
-                orig[0] = '\0';

trunk/freewrt/package/busybox/patches/220-awk_bitops.patch

@@ -1 @@
-
-
-
+
+
+
+
- /* builtins */
- enum {
@@ -11 +12 @@
- 
- /* tokens and their corresponding info values */
-311,6 +312
+299,6 +300
-        "\5while"       NTC
-        "\4else"        NTC
@@ -20 +21 @@
-        "\3cos"         "\3exp"         "\3int"         "\3log"
-        "\4rand"        "\3sin"         "\4sqrt"        "\5srand"
-64,6 +367
+52,6 +355
-        ST_WHILE,
-        0,
@@ -29 +30 @@
-        OC_FBLTIN|Nx|F_co, OC_FBLTIN|Nx|F_ex, OC_FBLTIN|Nx|F_in, OC_FBLTIN|Nx|F_lg,
-        OC_FBLTIN|F_rn,    OC_FBLTIN|Nx|F_si, OC_FBLTIN|Nx|F_sq, OC_FBLTIN|Nx|F_sr,
-
-
+
-                s[n] = '\0';
-                setvar_p(res, s);
-+
+ 
-+               
-+        case B_an:
@@ -57 +57 @@
-+        case B_xo:
-+               setvar_i(res, (long)getvar_i(av[0]) ^ (long)getvar_i(av[1]));
- 
++
- 
-          case B_lo:
+                to_xxx = tolower;

trunk/freewrt/package/busybox/patches/300-netmsg.patch

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        help
-          A simple Unix utility which reads and writes data across network
@@ -26 +31 @@
- config CONFIG_NC_GAPING_SECURITY_HOLE
-        bool "gaping security hole"
-Nur busybox-1.1.1/networking/Makefile.in busybox-1.1.1-owrt
-1.1/networking/Makefile.in       2006-03-22 22:16:19.000000000 +01
-1.1-owrt/networking/Makefile.in  2006-04-01 18:35:32
+ruN busybox-1.2.0-old/networking/Makefile.in busybox-1.2.0-new
+2.0-old/networking/Makefile.in   2006-07-01 00:42:02.000000000 +02
+2.0-new/networking/Makefile.in   2006-07-31 11:18:01
-@@ -30,6 +30,7 @@
- NETWORKING-$(CONFIG_IPTUNNEL)     += iptunnel.o
@@ -37 +42 @@
- NETWORKING-$(CONFIG_NSLOOKUP)     += nslookup.o
- NETWORKING-$(CONFIG_PING)         += ping.o
-
-
-
-
+
+
+
+
+
+
+
+
+
-+#include <sys/types.h>
-+#include <sys/socket.h>

trunk/freewrt/package/busybox/patches/310-passwd_access.patch

@@ -1 @@
-urN busybox.old/networking/httpd.c busybox.dev
-.old/networking/httpd.c     2004-10-08 10:03:29
-.dev/networking/httpd.c     2006-02-04 01:54:19.688016250 +01
-67,12 +1467,22
+Nur busybox-1.2.1.orig/networking/httpd.c busybox-1.2.1
+-1.2.1.orig/networking/httpd.c      2006-07-01 00:42:02
+-1.2.1/networking/httpd.c   2006-10-23 16:36:05.000000000 +02
+32,12 +1432,26
-                {
-                        char *cipher;
@@ -17 +17 @@
-+                                                pp[3] == '$' && pp[4] &&
-+                                                (pwd = getpwnam(&pp[4])) != NULL) {
++                               if(pwd->pw_passwd && pwd->pw_passwd[0] == '!') {
++                                       prev = NULL;
++                                       continue;
++                               }
-+                               ppnew = malloc(5 + strlen(pwd->pw_passwd));
-+                               ppnew[0] = ':';
@@ -25 +29 @@
-                                                 pp[3] == '$' && pp[4]) {
-                                pp++;
-82,6 +1492
+47,6 +1461
-                                /* unauthorized */
-                                continue;

trunk/freewrt/package/busybox/patches/320-httpd_address_binding.patch

@@ -1 @@
-
-
-
+
+
+
+
- #include <sys/types.h>
- #include <sys/socket.h>    /* for connect and socket*/
- #include <netinet/in.h>    /* for sockaddr_in       */
-+#include <arpa/inet.h>
- #include <sys/time.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
- #endif
-   unsigned port;           /* server initial port and for
@@ -28 +18 @@
-        const char *found_mime_type;
-        const char *found_moved_temporarily;
-958,7 +96
+868,7 +87
-   /* inet_addr() returns a value that is already in network order */
-   memset(&lsocket, 0, sizeof(lsocket));
@@ -37 +27 @@
-+         else lsocket.sin_addr.s_addr = htons(INADDR_ANY);
-+  }
- 
-
-if (fd >= 0) {
-96,6 +2001
+
+bb_x
+/* tell the OS it's OK to reuse a previous address even though */
+17,6 +1922
-        USE_FEATURE_HTTPD_AUTH_MD5(m_opt_md5,)
-        USE_FEATURE_HTTPD_SETUID(u_opt_setuid,)
-SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
-SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
+USE_FEATURE_HTTPD_WITHOUT_INETD
+USE_FEATURE_HTTPD_WITHOUT_INETD
- };
- 
- static const char httpd_opts[]="c:d:h:"
-2003,7 +2009
+1924,7 +1930
-        USE_FEATURE_HTTPD_BASIC_AUTH("r:")
-        USE_FEATURE_HTTPD_AUTH_MD5("m:")
-        USE_FEATURE_HTTPD_SETUID("u:")
-SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
-SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
+USE_FEATURE_HTTPD_WITHOUT_INETD
+USE_FEATURE_HTTPD_WITHOUT_INETD
- 
- #define OPT_CONFIG_FILE (1<<c_opt_config_file)
- #define OPT_DECODE_URL  (1<<d_opt_decode_url)
-2024,6 +2030
-SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
-USE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
+1945,6 +1951
+USE_FEATURE_HTTPD_WITHOUT_INETD
+SKIP_FEATURE_HTTPD_WITHOUT_INETD
- 
-SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
-USE_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
+USE_FEATURE_HTTPD_WITHOUT_INETD
+SKIP_FEATURE_HTTPD_WITHOUT_INETD
- 
-#ifdef HTTPD_STANDALONE
-int main(int argc, char *argv[])
-2036,6 +2044
+int httpd_main(int argc, char *argv[])
+{
+1953,6 +1961
-   char *url_for_decode;
-   USE_FEATURE_HTTPD_ENCODE_URL_STR(const char *url_for_encode;)
-SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
-SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
-SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
+USE_FEATURE_HTTPD_WITHOUT_INETD
+USE_FEATURE_HTTPD_WITHOUT_INETD
+USE_FEATURE_HTTPD_WITHOUT_INETD
- 
-   USE_FEATURE_HTTPD_SETUID(const char *s_uid;)
-2050,6 +2059
+1967,6 +1976
- 
-ndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
+def CONFIG_FEATURE_HTTPD_WITHOUT_INETD
-   config->port = 80;
-+  config->address = "";
@@ -82 +72 @@
- 
-   config->ContentLength = -1;
-2061,6 +2071
+1978,6 +1988
-                        USE_FEATURE_HTTPD_AUTH_MD5(, &pass)
-                        USE_FEATURE_HTTPD_SETUID(, &s_uid)
-SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
-SKIP_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
+USE_FEATURE_HTTPD_WITHOUT_INETD
+USE_FEATURE_HTTPD_WITHOUT_INETD
-        );
- 
-   if(opt & OPT_DECODE_URL) {
-2082,6 +2093
-ndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
+1999,6 +2010
+def CONFIG_FEATURE_HTTPD_WITHOUT_INETD
-     if(opt & OPT_PORT)
-        config->port = bb_xgetlarg(s_port, 10, 1, 0xffff);

trunk/freewrt/package/busybox/patches/330-httpd_user_agent.patch

@@ -1 @@
-1.1/networking/httpd.c busybox-1.1.1-owrt
-1.1/networking/httpd.c   2006-04-01 19:42:36
-1.1-owrt/networking/httpd.c      2006-04-01 19:43:59
-247,6 +24
+2.1.orig/networking/httpd.c busybox-1.2.1
+2.1.orig/networking/httpd.c      2006-10-23 16:36:51
+2.1/networking/httpd.c   2006-10-23 16:37:01
+157,6 +15
-   const char *query;
- 
@@ -10 +10 @@
-   const char *configFile;
- 
-208,6 +1209
+111,6 +1112
-       addEnv("SERVER",         "PROTOCOL", "HTTP/1.0");
-       addEnv("GATEWAY_INTERFACE", "",      "CGI/1.1");
@@ -18 +18 @@
-       addEnvPort("REMOTE");
- #endif
-771,6 +1773
+676,6 +1678
-                  for(test = buf + 8; isspace(*test); test++)
-                          ;

trunk/freewrt/package/busybox/patches/340-lock_util.patch

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          Enables the 'hdparm -d' option to get/set using_dma flag.
-          This is dangerous stuff, so you should probably say N.
@@ -26 +31 @@
-        bool "makedevs"
-        default n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-+#include <sys/types.h>
-+#include <sys/file.h>
@@ -169 +168 @@
-+               return do_lock();
-+}
+diff -ruN busybox-1.2.0-old/miscutils/Makefile.in busybox-1.2.0-new/miscutils/Makefile.in
+--- busybox-1.2.0-old/miscutils/Makefile.in     2006-07-01 00:42:09.000000000 +0200
++++ busybox-1.2.0-new/miscutils/Makefile.in     2006-08-01 10:21:15.000000000 +0200
+@@ -20,6 +20,7 @@
+ MISCUTILS-$(CONFIG_EJECT)       += eject.o
+ MISCUTILS-$(CONFIG_HDPARM)      += hdparm.o
+ MISCUTILS-$(CONFIG_LAST)        += last.o
++MISCUTILS-$(CONFIG_LOCK)        += lock.o
+ MISCUTILS-${CONFIG_LESS}        += less.o
+ MISCUTILS-$(CONFIG_MAKEDEVS)    += makedevs.o
+ MISCUTILS-$(CONFIG_MOUNTPOINT)  += mountpoint.o

trunk/freewrt/package/busybox/patches/350-ping-opt-srcaddr.patch

@@ -1 @@
-1.3.orig/include/usage.h busybox-1.1.3
-1.3.orig/include/usage.h 2006-07-19 19:06:34
-1.3/include/usage.h      2006-07-19 19:07:15
-350,6 +2350
+2.1.orig/include/usage.h busybox-1.2.1
+2.1.orig/include/usage.h 2006-10-23 16:32:21
+2.1/include/usage.h      2006-10-23 16:37:36
+286,6 +2286
-        "Options:\n" \
-        "\t-c COUNT\tSend only COUNT pings\n" \
@@ -10 +10 @@
-        "\t\t\tand when finished"
- #endif
-1.3.orig/networking/ping.c busybox-1.1.3
-1.3.orig/networking/ping.c       2006-03-22 22:16:19.000000000 +01
-1.3/networking/ping.c    2006-07-14 13:51:55
-3,6 +153
+2.1.orig/networking/ping.c busybox-1.2.1
+2.1.orig/networking/ping.c       2006-07-01 00:42:02.000000000 +02
+2.1/networking/ping.c    2006-10-23 16:37:36
+5,6 +155
- #else /* ! CONFIG_FEATURE_FANCY_PING */
- /* full(er) version */
@@ -21 +21 @@
- static int datalen; /* intentionally uninitialized to work around gcc bug */
- 
-0,6 +331
+2,6 +333
- 
-        pingsock = create_icmp_socket();
@@ -33 +33 @@
- 
-        pingaddr.sin_family = AF_INET;
-49,10 +355
+51,10 +357
-        setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, (char *) &sockopt,
-                           sizeof(sockopt));
@@ -52 +52 @@
-        signal(SIGINT, pingstats);
- 
-88,6 +398
+90,6 +400
-        argc--;
-        argv++;
@@ -60 +60 @@
-        while (argc >= 1 && **argv == '-') {
-                thisarg = *argv;
-08,6 +419
+10,6 +421
-                        argv++;
-                        datalen = atoi(*argv);

trunk/freewrt/package/busybox/patches/911-ipkg.patch

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-@@ -121,6 +121,14 @@
-          gzip is used to compress files.
@@ -32 +17 @@
-        bool "rpm2cpio"
-        default n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        return(ar_handle->sub_archive->buffer);
- }
@@ -57 +31 @@
- {
-        char *name_ptr = archive_handle->file_header->name;
-544,6 +1548
+442,6 +1446
-        return;
- }
@@ -66 +40 @@
- {
-        const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name];
-1.2-orig/archival/ipkg.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/ipkg.c        2006-05-09 02:06:48
+2.0-orig/archival/ipkg.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/ipkg.c        2006-07-22 16:31:25
-@@ -0,0 +1,26 @@
-+/* ipkg.c - the itsy package management system
@@ -96 +70 @@
-+       return ipkg_op(argc, argv);
-+}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-@@ -0,0 +1,242 @@
-+/* args.c - parse command-line args
@@ -467 +316 @@
-+       bb_error_msg("version %s\n", IPKG_VERSION);
-+}
-1.2-orig/archival/libipkg/args.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/args.h        2006-05-09 02:12:03
+2.0-orig/archival/libipkg/args.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/args.h        2006-07-22 16:31:25
-@@ -0,0 +1,72 @@
-+/* args.h - parse command-line args
@@ -543 +392 @@
-+
-+#endif
-1.2-orig/archival/libipkg/conffile.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/conffile.c    2006-05-09 02:06:48
+2.0-orig/archival/libipkg/conffile.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/conffile.c    2006-07-22 16:31:25
-@@ -0,0 +1,64 @@
-+/* conffile.c - the itsy package management system
@@ -611 +460 @@
-+    return ret;
-+}
-1.2-orig/archival/libipkg/conffile.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/conffile.h    2006-05-09 02:06:48
+2.0-orig/archival/libipkg/conffile.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/conffile.h    2006-07-22 16:31:25
-@@ -0,0 +1,30 @@
-+/* conffile.h - the itsy package management system
@@ -645 +494 @@
-+#endif
-+
-1.2-orig/archival/libipkg/conffile_list.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/conffile_list.c       2006-05-09 02:06:48
+2.0-orig/archival/libipkg/conffile_list.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/conffile_list.c       2006-07-22 16:31:25
-@@ -0,0 +1,47 @@
-+/* conffile_list.c - the itsy package management system
@@ -696 +545 @@
-+}
-+
-1.2-orig/archival/libipkg/conffile_list.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/conffile_list.h       2006-05-09 02:06:48
+2.0-orig/archival/libipkg/conffile_list.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/conffile_list.h       2006-07-22 16:31:25
-@@ -0,0 +1,36 @@
-+/* conffile_list.h - the itsy package management system
@@ -736 +585 @@
-+#endif
-+
-1.2-orig/archival/libipkg/file_util.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/file_util.c   2006-05-09 02:06:48
+2.0-orig/archival/libipkg/file_util.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/file_util.c   2006-07-22 16:31:25
-@@ -0,0 +1,177 @@
-+/* file_util.c - convenience routines for common stat operations
@@ -917 +766 @@
-+}
-+
-1.2-orig/archival/libipkg/file_util.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/file_util.h   2006-05-09 02:06:48
+2.0-orig/archival/libipkg/file_util.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/file_util.h   2006-07-22 16:31:25
-@@ -0,0 +1,29 @@
-+/* file_util.h - convenience routines for common file operations
@@ -950 +799 @@
-+
-+#endif
-1.2-orig/archival/libipkg/hash_table.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/hash_table.c  2006-05-09 02:06:48
+2.0-orig/archival/libipkg/hash_table.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/hash_table.c  2006-07-22 16:31:25
-@@ -0,0 +1,155 @@
-+/* hash.c - hash tables for ipkg
@@ -1109 +958 @@
-+}
-+
-1.2-orig/archival/libipkg/hash_table.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/hash_table.h  2006-05-09 02:06:48
+2.0-orig/archival/libipkg/hash_table.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/hash_table.h  2006-07-22 16:31:25
-@@ -0,0 +1,44 @@
-+/* hash.h - hash tables for ipkg
@@ -1157 +1006 @@
-+
-+#endif /* _HASH_TABLE_H_ */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-@@ -0,0 +1,1431 @@
-+/* ipkg_cmd.c - the itsy package management system
@@ -2670 +2441 @@
-+
-+
-1.2-orig/archival/libipkg/ipkg_cmd.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_cmd.h    2006-05-09 02:06:48
+2.0-orig/archival/libipkg/ipkg_cmd.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_cmd.h    2006-07-22 16:31:25
-@@ -0,0 +1,46 @@
-+/* ipkg_cmd.h - the itsy package management system
@@ -2720 +2491 @@
-+
-+#endif
-1.2-orig/archival/libipkg/ipkg_conf.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_conf.c   2006-05-09 02:12:04
+2.0-orig/archival/libipkg/ipkg_conf.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_conf.c   2006-07-22 16:31:25
-@@ -0,0 +1,711 @@
-+/* ipkg_conf.c - the itsy package management system
@@ -3435 +3206 @@
-+     return root_filename;
-+}
-1.2-orig/archival/libipkg/ipkg_conf.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_conf.h   2006-05-09 02:06:48
+2.0-orig/archival/libipkg/ipkg_conf.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_conf.h   2006-07-22 16:31:25
-@@ -0,0 +1,107 @@
-+/* ipkg_conf.h - the itsy package management system
@@ -3546 +3317 @@
-+
-+#endif
-1.2-orig/archival/libipkg/ipkg_configure.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_configure.c      2006-05-09 02:06:48
+2.0-orig/archival/libipkg/ipkg_configure.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_configure.c      2006-07-22 16:31:25
-@@ -0,0 +1,40 @@
-+/* ipkg_configure.c - the itsy package management system
@@ -3590 +3361 @@
-+}
-+
-1.2-orig/archival/libipkg/ipkg_configure.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_configure.h      2006-05-09 02:06:48
+2.0-orig/archival/libipkg/ipkg_configure.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_configure.h      2006-07-22 16:31:25
-@@ -0,0 +1,25 @@
-+/* ipkg_configure.h - the itsy package management system
@@ -3619 +3390 @@
-+
-+#endif
-1.2-orig/archival/libipkg/ipkg_download.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_download.c       2006-05-09 02:12:04
+2.0-orig/archival/libipkg/ipkg_download.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_download.c       2006-07-22 16:31:25
-@@ -0,0 +1,195 @@
-+/* ipkg_download.c - the itsy package management system
@@ -3818 +3589 @@
-+     return 0;
-+}
-1.2-orig/archival/libipkg/ipkg_download.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_download.h       2006-05-09 02:06:48
+2.0-orig/archival/libipkg/ipkg_download.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_download.h       2006-07-22 16:31:25
-@@ -0,0 +1,30 @@
-+/* ipkg_download.h - the itsy package management system
@@ -3852 +3623 @@
-+
-+#endif
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-@@ -0,0 +1,79 @@
-+#ifndef IPKG_INCLUDES_H
@@ -3935 +3784 @@
-+
-+#endif /* IPKG_INCLUDES_H */
-1.2-orig/archival/libipkg/ipkg_install.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_install.c        2006-05-09 02:12:04
+2.0-orig/archival/libipkg/ipkg_install.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_install.c        2006-07-22 16:31:25
-@@ -0,0 +1,1942 @@
-+/* ipkg_install.c - the itsy package management system
@@ -5881 +5730 @@
-+
-+#endif
-1.2-orig/archival/libipkg/ipkg_install.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_install.h        2006-05-09 02:12:04
+2.0-orig/archival/libipkg/ipkg_install.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_install.h        2006-07-22 16:31:25
-@@ -0,0 +1,35 @@
-+/* ipkg_install.h - the itsy package management system
@@ -5920 +5769 @@
-+
-+#endif
-1.2-orig/archival/libipkg/ipkg_message.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_message.c        2006-05-09 02:06:48
+2.0-orig/archival/libipkg/ipkg_message.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_message.c        2006-07-22 16:31:25
-@@ -0,0 +1,61 @@
-+/* ipkg_message.c - the itsy package management system
@@ -5985 +5834 @@
-+}
-+#endif
-1.2-orig/archival/libipkg/ipkg_message.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_message.h        2006-05-09 02:06:48
+2.0-orig/archival/libipkg/ipkg_message.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_message.h        2006-07-22 16:31:25
-@@ -0,0 +1,32 @@
-+/* ipkg_message.h - the itsy package management system
@@ -6021 +5870 @@
-+
-+#endif /* _IPKG_MESSAGE_H_ */
-1.2-orig/archival/libipkg/ipkg_remove.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_remove.c 2006-05-09 02:12:04
+2.0-orig/archival/libipkg/ipkg_remove.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_remove.c 2006-07-22 16:31:25
-@@ -0,0 +1,383 @@
-+/* ipkg_remove.c - the itsy package management system
@@ -6408 +6257 @@
-+    return 0;
-+}
-1.2-orig/archival/libipkg/ipkg_remove.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_remove.h 2006-05-09 02:12:04
+2.0-orig/archival/libipkg/ipkg_remove.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_remove.h 2006-07-22 16:31:25
-@@ -0,0 +1,33 @@
-+/* ipkg_remove.h - the itsy package management system
@@ -6445 +6294 @@
-+
-+#endif
-1.2-orig/archival/libipkg/ipkg_upgrade.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_upgrade.c        2006-05-09 02:12:04
+2.0-orig/archival/libipkg/ipkg_upgrade.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_upgrade.c        2006-07-22 16:31:25
-@@ -0,0 +1,77 @@
-+/* ipkg_upgrade.c - the itsy package management system
@@ -6526 +6375 @@
-+     return ipkg_install_pkg(conf, new,1);
-+}
-1.2-orig/archival/libipkg/ipkg_upgrade.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_upgrade.h        2006-05-09 02:06:48
+2.0-orig/archival/libipkg/ipkg_upgrade.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_upgrade.h        2006-07-22 16:31:25
-@@ -0,0 +1,18 @@
-+/* ipkg_upgrade.c - the itsy package management system
@@ -6548 +6397 @@
-+
-+int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old);
-1.2-orig/archival/libipkg/ipkg_utils.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_utils.c  2006-05-09 02:06:48
+2.0-orig/archival/libipkg/ipkg_utils.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_utils.c  2006-07-22 16:31:25
-@@ -0,0 +1,181 @@
-+/* ipkg_utils.c - the itsy package management system
@@ -6733 +6582 @@
-+
-+       
-1.2-orig/archival/libipkg/ipkg_utils.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/ipkg_utils.h  2006-05-09 02:06:48
+2.0-orig/archival/libipkg/ipkg_utils.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/ipkg_utils.h  2006-07-22 16:31:25
-@@ -0,0 +1,29 @@
-+/* ipkg_utils.h - the itsy package management system
@@ -6766 +6615 @@
-+
-+#endif
-1.2-orig/archival/libipkg/libipkg.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/libipkg.c     2006-05-09 02:12:0
+2.0-orig/archival/libipkg/libipkg.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/libipkg.c     2006-07-22 16:31:2
-@@ -0,0 +1,527 @@
-+/* ipkglib.c - the itsy package management system
@@ -7297 +7146 @@
-+
-+#endif /* IPKG_LIB */
-1.2-orig/archival/libipkg/libipkg.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/libipkg.h     2006-05-09 02:06:48
+2.0-orig/archival/libipkg/libipkg.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/libipkg.h     2006-07-22 16:31:25
-@@ -0,0 +1,87 @@
-+/* ipkglib.h - the itsy package management system
@@ -7388 +7237 @@
-+
-+#endif
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-@@ -0,0 +1,48 @@
-+/* md5.c - wrappers to busybox md5 functions
@@ -7440 +7417 @@
-+}
-+
-1.2-orig/archival/libipkg/md5.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/md5.h 2006-05-09 02:06:48
+2.0-orig/archival/libipkg/md5.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/md5.h 2006-07-22 16:31:25
-@@ -0,0 +1,35 @@
-+/* md5.h - Compute MD5 checksum of files or strings according to the
@@ -7479 +7456 @@
-+#endif
-+
-1.2-orig/archival/libipkg/nv_pair.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/nv_pair.c     2006-05-09 02:06:48
+2.0-orig/archival/libipkg/nv_pair.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/nv_pair.c     2006-07-22 16:31:25
-@@ -0,0 +1,40 @@
-+/* nv_pair.c - the itsy package management system
@@ -7523 +7500 @@
-+
-+
-1.2-orig/archival/libipkg/nv_pair.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/nv_pair.h     2006-05-09 02:06:48
+2.0-orig/archival/libipkg/nv_pair.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/nv_pair.h     2006-07-22 16:31:25
-@@ -0,0 +1,32 @@
-+/* nv_pair.h - the itsy package management system
@@ -7559 +7536 @@
-+#endif
-+
-1.2-orig/archival/libipkg/nv_pair_list.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/nv_pair_list.c        2006-05-09 02:06:48
+2.0-orig/archival/libipkg/nv_pair_list.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/nv_pair_list.c        2006-07-22 16:31:25
-@@ -0,0 +1,98 @@
-+/* nv_pair_list.c - the itsy package management system
@@ -7661 +7638 @@
-+     return NULL;
-+}
-1.2-orig/archival/libipkg/nv_pair_list.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/nv_pair_list.h        2006-05-09 02:06:48
+2.0-orig/archival/libipkg/nv_pair_list.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/nv_pair_list.h        2006-07-22 16:31:25
-@@ -0,0 +1,60 @@
-+/* nv_pair_list.h - the itsy package management system
@@ -7725 +7702 @@
-+#endif
-+
-1.2-orig/archival/libipkg/pkg.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg.c 2006-05-09 02:12:0
+2.0-orig/archival/libipkg/pkg.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg.c 2006-07-22 16:31:2
-@@ -0,0 +1,1754 @@
-+/* pkg.c - the itsy package management system
@@ -9483 +9460 @@
-+     return 0;
-+}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-@@ -0,0 +1,1033 @@
-+/* pkg_depends.c - the itsy package management system
@@ -10756 +10497 @@
-+     return 0;
-+}
-1.2-orig/archival/libipkg/pkg_depends.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_depends.h 2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_depends.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_depends.h 2006-07-22 16:31:25
-@@ -0,0 +1,105 @@
-+/* pkg_depends.h - the itsy package management system
@@ -10865 +10606 @@
-+
-+#endif
-1.2-orig/archival/libipkg/pkg_dest.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_dest.c    2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_dest.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_dest.c    2006-07-22 16:31:25
-@@ -0,0 +1,92 @@
-+/* pkg_dest.c - the itsy package management system
@@ -10961 +10702 @@
-+    dest->root_dir = NULL;
-+}
-1.2-orig/archival/libipkg/pkg_dest.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_dest.h    2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_dest.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_dest.h    2006-07-22 16:31:25
-@@ -0,0 +1,38 @@
-+/* pkg_dest.h - the itsy package management system
@@ -11003 +10744 @@
-+#endif
-+
-1.2-orig/archival/libipkg/pkg_dest_list.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_dest_list.c       2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_dest_list.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_dest_list.c       2006-07-22 16:31:25
-@@ -0,0 +1,85 @@
-+/* pkg_dest_list.c - the itsy package management system
@@ -11092 +10833 @@
-+    return (pkg_dest_list_elt_t *) void_list_pop((void_list_t *) list);
-+}
-1.2-orig/archival/libipkg/pkg_dest_list.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_dest_list.h       2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_dest_list.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_dest_list.h       2006-07-22 16:31:25
-@@ -0,0 +1,50 @@
-+/* pkg_dest_list.h - the itsy package management system
@@ -11146 +10887 @@
-+#endif
-+
-1.2-orig/archival/libipkg/pkg_extract.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_extract.c 2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_extract.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_extract.c 2006-07-30 22:47:49
-@@ -0,0 +1,224 @@
-+/* pkg_extract.c - the itsy package management system
@@ -11192 +10933 @@
-+       archive->src_fd = bb_xopen(pkg->local_filename, O_RDONLY);
-+       archive->filter = filter_accept_list;
-archive->accept = llist_add_to(NULL
+llist_add_to(&(archive->accept)
-+       archive->buffer = path;
-+       archive->action_data = data_extract_all_prefix;
@@ -11229 +10970 @@
-+       archive->src_fd = bb_xopen(name, O_RDONLY);
-+       archive->filter = filter_accept_list;
-archive->accept = llist_add_to(NULL
+llist_add_to(&(archive->accept)
-+       archive->action_data = data_extract_to_buffer;
-+       while( get_header_tar_gz(archive) == EXIT_SUCCESS );
@@ -11374 +11115 @@
-+       return 0;
-+}
-1.2-orig/archival/libipkg/pkg_extract.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_extract.h 2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_extract.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_extract.h 2006-07-22 16:31:25
-@@ -0,0 +1,32 @@
-+/* pkg_extract.c - the itsy package management system
@@ -11410 +11151 @@
-+
-+#endif
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-@@ -0,0 +1,617 @@
-+/* ipkg_hash.c - the itsy package management system
@@ -12031 +12008 @@
-+
-+
-1.2-orig/archival/libipkg/pkg_hash.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_hash.h    2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_hash.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_hash.h    2006-07-22 16:31:25
-@@ -0,0 +1,61 @@
-+/* pkg_hash.h - the itsy package management system
@@ -12096 +12073 @@
-+#endif
-+
-1.2-orig/archival/libipkg/pkg_parse.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_parse.c   2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_parse.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_parse.c   2006-07-22 16:31:25
-@@ -0,0 +1,366 @@
-+/* pkg_parse.c - the itsy package management system
@@ -12466 +12443 @@
-+    return 0;
-+}
-1.2-orig/archival/libipkg/pkg_parse.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_parse.h   2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_parse.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_parse.h   2006-07-22 16:31:25
-@@ -0,0 +1,31 @@
-+/* pkg_parse.h - the itsy package management system
@@ -12501 +12478 @@
-+
-+#endif
-1.2-orig/archival/libipkg/pkg_src.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_src.c     2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_src.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_src.c     2006-07-22 16:31:25
-@@ -0,0 +1,43 @@
-+/* pkg_src.c - the itsy package management system
@@ -12548 +12525 @@
-+
-+
-1.2-orig/archival/libipkg/pkg_src.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_src.h     2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_src.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_src.h     2006-07-22 16:31:25
-@@ -0,0 +1,34 @@
-+/* pkg_src.h - the itsy package management system
@@ -12586 +12563 @@
-+
-+#endif
-1.2-orig/archival/libipkg/pkg_src_list.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_src_list.c        2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_src_list.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_src_list.c        2006-07-22 16:31:25
-@@ -0,0 +1,75 @@
-+/* pkg_src_list.c - the itsy package management system
@@ -12665 +12642 @@
-+    return (pkg_src_list_elt_t *) void_list_pop((void_list_t *) list);
-+}
-1.2-orig/archival/libipkg/pkg_src_list.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_src_list.h        2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_src_list.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_src_list.h        2006-07-22 16:31:25
-@@ -0,0 +1,57 @@
-+/* pkg_src_list.h - the itsy package management system
@@ -12726 +12703 @@
-+#endif
-+
-1.2-orig/archival/libipkg/pkg_vec.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_vec.c     2006-05-09 02:12:05
+2.0-orig/archival/libipkg/pkg_vec.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_vec.c     2006-07-22 16:31:26
-@@ -0,0 +1,230 @@
-+/* pkg_vec.c - the itsy package management system
@@ -12960 +12937 @@
-+}
-+
-1.2-orig/archival/libipkg/pkg_vec.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/pkg_vec.h     2006-05-09 02:06:48
+2.0-orig/archival/libipkg/pkg_vec.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/pkg_vec.h     2006-07-22 16:31:26
-@@ -0,0 +1,62 @@
-+/* pkg_vec.h - the itsy package management system
@@ -13026 +13003 @@
-+#endif
-+
-1.2-orig/archival/libipkg/sprintf_alloc.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/sprintf_alloc.h       2006-05-09 02:06:48
+2.0-orig/archival/libipkg/sprintf_alloc.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/sprintf_alloc.h       2006-07-22 16:31:26
-@@ -0,0 +1,25 @@
-+/* sprintf_alloca.c -- like sprintf with memory allocation
@@ -13055 +13032 @@
-+
-+#endif
-1.2-orig/archival/libipkg/str_list.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/str_list.c    2006-05-09 02:06:48
+2.0-orig/archival/libipkg/str_list.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/str_list.c    2006-07-22 16:31:26
-@@ -0,0 +1,76 @@
-+/* str_list.c - the itsy package management system
@@ -13135 +13112 @@
-+                                        (void_list_cmp_t)strcmp);
-+}
-1.2-orig/archival/libipkg/str_list.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/str_list.h    2006-05-09 02:06:48
+2.0-orig/archival/libipkg/str_list.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/str_list.h    2006-07-22 16:31:26
-@@ -0,0 +1,51 @@
-+/* str_list.h - the itsy package management system
@@ -13190 +13167 @@
-+
-+#endif
-1.2-orig/archival/libipkg/str_util.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/str_util.c    2006-05-09 02:06:48
+2.0-orig/archival/libipkg/str_util.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/str_util.c    2006-07-22 16:31:26
-@@ -0,0 +1,73 @@
-+/* str_utils.c - the itsy package management system
@@ -13267 +13244 @@
-+}
-+
-1.2-orig/archival/libipkg/str_util.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/str_util.h    2006-05-09 02:06:48
+2.0-orig/archival/libipkg/str_util.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/str_util.h    2006-07-22 16:31:26
-@@ -0,0 +1,28 @@
-+/* str_utils.h - the itsy package management system
@@ -13299 +13276 @@
-+
-+#endif
-1.2-orig/archival/libipkg/user.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/user.c        2006-05-09 02:06:48
+2.0-orig/archival/libipkg/user.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/user.c        2006-07-22 16:31:26
-@@ -0,0 +1,58 @@
-+/* user.c - the itsy package management system
@@ -13361 +13338 @@
-+     return response;
-+}
-1.2-orig/archival/libipkg/user.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/user.h        2006-05-09 02:06:48
+2.0-orig/archival/libipkg/user.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/user.h        2006-07-22 16:31:26
-@@ -0,0 +1,23 @@
-+/* user.c - the itsy package management system
@@ -13388 +13365 @@
-+char *get_user_response(const char *format, ...);
-+
-1.2-orig/archival/libipkg/void_list.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/void_list.c   2006-05-09 02:06:48
+2.0-orig/archival/libipkg/void_list.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/void_list.c   2006-07-22 16:31:26
-@@ -0,0 +1,194 @@
-+/* void_list.c - the itsy package management system
@@ -13586 +13563 @@
-+         return NULL;
-+}
-1.2-orig/archival/libipkg/void_list.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/void_list.h   2006-05-09 02:06:48
+2.0-orig/archival/libipkg/void_list.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/void_list.h   2006-07-22 16:31:26
-@@ -0,0 +1,59 @@
-+/* void_list.h - the itsy package management system
@@ -13649 +13626 @@
-+
-+#endif
-1.2-orig/archival/libipkg/xsystem.c busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/xsystem.c     2006-05-09 02:06:48
+2.0-orig/archival/libipkg/xsystem.c busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/xsystem.c     2006-07-22 16:31:26
-@@ -0,0 +1,64 @@
-+/* xsystem.c - system(3) with error messages
@@ -13717 +13694 @@
-+}
-+        
-1.2-orig/archival/libipkg/xsystem.h busybox-1.1.2
-1.2
-1.2+ipkg-0.99.162/archival/libipkg/xsystem.h     2006-05-09 02:06:48
+2.0-orig/archival/libipkg/xsystem.h busybox-1.2.0
+2.0
+2.0+ipkg-0.99.162/archival/libipkg/xsystem.h     2006-07-22 16:31:26
-@@ -0,0 +1,34 @@
-+/* xsystem.h - system(3) with error messages
@@ -13755 +13732 @@
-+#endif
-+        
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-@@ -58,6 +58,7 @@
- LIBUNARCHIVE-$(CONFIG_FEATURE_DEB_TAR_LZMA) += decompress_unlzma.o get_header_tar_lzma.o
@@ -13766 +13764 @@
- LIBUNARCHIVE-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o
- LIBUNARCHIVE-$(CONFIG_TAR) += get_header_tar.o
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 
- extern void data_skip(archive_handle_t *archive_handle);
@@ -13809 +13797 @@
- extern void data_extract_to_buffer(archive_handle_t *archive_handle);
- 
-1.2-orig/include/usage.h busybox-1.1.2
-1.2-orig/include/usage.h 2006-03-22 22:16:24.000000000 +01
-1.2+ipkg-0.99.162/include/usage.h        2006-05-09 02:06:48
-1013,6 +1013
+2.0-orig/include/usage.h busybox-1.2.0
+2.0-orig/include/usage.h 2006-07-01 00:42:10.000000000 +02
+2.0+ipkg-0.99.162/include/usage.h        2006-07-22 16:31:26
+982,6 +982
-        "$ ls -la /tmp/busybox*\n" \
-        "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
@@ -13895 +13883 @@
-        "[-d<delay>] [-n<nosync>] [-f<force>]"
- #define halt_full_usage \
+diff -ruN busybox-1.2.0-orig/Makefile busybox-1.2.0+ipkg-0.99.162/Makefile
+--- busybox-1.2.0-orig/Makefile 2006-07-01 00:42:13.000000000 +0200
++++ busybox-1.2.0+ipkg-0.99.162/Makefile        2006-07-22 16:31:25.000000000 +0200
+@@ -31,7 +31,7 @@
+ export srctree=$(top_srcdir)
+ vpath %/Config.in $(srctree)
+ 
+-DIRS:=applets archival archival/libunarchive coreutils console-tools \
++DIRS:=applets archival archival/libipkg archival/libunarchive coreutils console-tools \
+        debianutils editors findutils init miscutils modutils networking \
+        networking/libiproute networking/udhcp procps loginutils shell \
+        sysklogd util-linux e2fsprogs libpwdgrp coreutils/libcoreutils libbb

trunk/freewrt/package/busybox/patches/912-ipkg-no_warnings.patch

@@ +1 @@
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
-#
-# remove (numerous) compile warnings

trunk/freewrt/package/busybox/patches/913-libbb_hash.patch

@@ -1 @@
-
-
-
-
-
-
-
+
+
+
+
- 
- #include "busybox.h"
@@ -41 +38 @@
--       void (*update)(const void*, size_t, void*);
--       void (*final)(void*, void*);
-      
-
+
+ 
--               src_fd = STDIN_FILENO;
--       } else if(0 > (src_fd = open(filename, O_RDONLY))) {
@@ -49 +46 @@
--       }
--
-/ figure specific hash algorithims
-
+* figure specific hash algorithims */
+ 
--               md5_begin(&context.md5);
--               update = (void (*)(const void*, size_t, void*))md5_hash;
--               final = (void (*)(void*, void*))md5_end;
--               hash_len = 16;
-
+ 
--               sha1_begin(&context.sha1);
--               update = (void (*)(const void*, size_t, void*))sha1_hash;
@@ -61 +58 @@
--               hash_len = 20;
--       } else {
-
-
-
-
-
+
+
+
+
--               update(in_buf, count, &context);
--       }
--
-
+ 
--               final(in_buf, &context);
--               hash_value = hash_bin_to_hex(in_buf, hash_len);
--       }
-      
+
--       RELEASE_CONFIG_BUFFER(in_buf);
-      
-
+
+ 
--               close(src_fd);
--       }
-      
+
--       return hash_value;
--}
@@ -86 +82 @@
- static int hash_files(int argc, char **argv, hash_algo_t hash_algo)
- {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- void md5_hash(const void *data, size_t length, md5_ctx_t *ctx);
- void *md5_end(void *resbuf, md5_ctx_t *ctx);
- 
-+typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
-+
-+unsigned char *hash_bin_to_hex(unsigned char *hash_value, unsigned char hash_length);
-+int hash_fd(int fd, hash_algo_t hash_algo, uint8_t *hash_value);
-+uint8_t *hash_file(const char *filename, hash_algo_t hash_algo);
-+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-@@ -0,0 +1,100 @@
-+/*
@@ -159 +151 @@
-+       
-+       // figure specific hash algorithims
-
+ 
-+               md5_begin(&context.md5);
-+               update = (void (*)(const void*, size_t, void*))md5_hash;
-+               final = (void (*)(void*, void*))md5_end;
-
+ 
-+               sha1_begin(&context.sha1);
-+               update = (void (*)(const void*, size_t, void*))sha1_hash;
@@ -170 +162 @@
-+
-+
-
+ 
-+               update(in_buf, count, &context);
-+               result += count;
-+       }
-+
-
+ 
-+               final(hash_value, &context);
-+       }
@@ -190 +182 @@
-+       uint8_t *hash_value = NULL;
-+       
-
+ 
-+               hash_len = 16;
-
+ 
-+               hash_len = 20;
-+       } else {
@@ -198 +190 @@
-+       }
-+
-
+ 
-+               src_fd = STDIN_FILENO;
-
+ 
-+               bb_perror_msg("%s", filename);
-+               return NULL;
-+       }
-+
-
+ 
-+               hash_value = hash_bin_to_hex(hash_buf, hash_len);
-+       }
-+       
-
+ 
-+               close(src_fd);
-+       }
@@ -217 +209 @@
-+       return hash_value;
-+}
+diff -Nur busybox-1.2.1.orig/libbb/Makefile.in busybox-1.2.1/libbb/Makefile.in
+--- busybox-1.2.1.orig/libbb/Makefile.in        2006-07-01 00:42:08.000000000 +0200
++++ busybox-1.2.1/libbb/Makefile.in     2006-10-23 16:39:05.000000000 +0200
+@@ -11,6 +11,7 @@
+ 
+ LIBBB-n:=
+ LIBBB-y:= \
++       hash.c \
+        bb_asprintf.c ask_confirmation.c change_identity.c chomp.c \
+        compare_string_array.c concat_path_file.c copy_file.c copyfd.c \
+        crc32.c create_icmp_socket.c create_icmp6_socket.c \

trunk/freewrt/package/busybox/patches/914-ipkg-fixes.patch

@@ +1 @@
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
-#
-# fix ipkg bugs

trunk/freewrt/package/busybox/patches/920-ifupdown-manual.patch

@@ -1 @@
-1.3.orig/networking/ifupdown.c busybox-1.1.3
-1.3.orig/networking/ifupdown.c   2006-09-28 18:55:56
-1.3/networking/ifupdown.c        2006-09-28 18:56:40
-86,6 +486
+2.1.orig/networking/ifupdown.c busybox-1.2.1
+2.1.orig/networking/ifupdown.c   2006-07-01 00:42:02
+2.1/networking/ifupdown.c        2006-10-23 16:39:59
+53,6 +453
-        return ((result == 2) ? 2 : 0);
- }
@@ -19 +19 @@
- {
-        struct stat buf;
-69,6 +579
+36,6 +546
-        { "bootp", bootp_up, static_down, },
-        { "dhcp", dhcp_up, dhcp_down, },