changeset 411:7748d0b4b38d

Update Busybox to 1.12.1.
author Rob Landley <rob@landley.net>
date Sun, 12 Oct 2008 03:08:39 -0500
parents add8c7af89ec
children 01009efaac95
files download.sh sources/patches/busybox-1.11.1-defconfig.patch sources/patches/busybox-1.11.1-mdevshutup.patch sources/patches/busybox-1.11.1-tar.patch sources/patches/busybox-1.12.1-defconfig.patch sources/patches/busybox-svn22557.patch
diffstat 6 files changed, 46 insertions(+), 144 deletions(-) [+]
line wrap: on
line diff
--- a/download.sh	Sun Oct 12 03:07:31 2008 -0500
+++ b/download.sh	Sun Oct 12 03:08:39 2008 -0500
@@ -51,8 +51,8 @@
 
 # Required for native build environment
 
-URL=http://www.busybox.net/downloads/busybox-1.11.1.tar.bz2 \
-SHA1=73b041364d377125949dd8f5c191bcbb3daee6e9 \
+URL=http://www.busybox.net/downloads/busybox-1.12.1.tar.bz2 \
+SHA1=e405e2d6587714626c8eb7d181f63208f3997845 \
 download || dienow
 
 URL=ftp://ftp.gnu.org/gnu/make/make-3.81.tar.bz2 \
--- a/sources/patches/busybox-1.11.1-defconfig.patch	Sun Oct 12 03:07:31 2008 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
---- busybox-1.11.1/scripts/defconfig	2008-06-25 07:51:53.000000000 -0500
-+++ busybox-new/scripts/defconfig	2008-08-02 16:14:25.000000000 -0500
-@@ -315,7 +315,7 @@
- CONFIG_FEATURE_DIFF_DIR=y
- CONFIG_FEATURE_DIFF_MINIMAL=y
- CONFIG_ED=y
--CONFIG_PATCH=y
-+CONFIG_PATCH=n
- CONFIG_SED=y
- CONFIG_VI=y
- CONFIG_FEATURE_VI_MAX_LEN=4096
-@@ -447,7 +447,7 @@
- # Options common to multiple modutils
- #
- CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
--CONFIG_FEATURE_2_4_MODULES=y
-+CONFIG_FEATURE_2_4_MODULES=n
- CONFIG_FEATURE_2_6_MODULES=y
- CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
- CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-@@ -571,7 +571,7 @@
- CONFIG_EJECT=y
- CONFIG_FEATURE_EJECT_SCSI=y
- CONFIG_FBSPLASH=y
--CONFIG_INOTIFYD=y
-+CONFIG_INOTIFYD=n
- CONFIG_LAST=y
- CONFIG_FEATURE_LAST_SMALL=y
- # CONFIG_FEATURE_LAST_FANCY is not set
-@@ -602,8 +602,8 @@
- CONFIG_RX=y
- CONFIG_SETSID=y
- CONFIG_STRINGS=y
--CONFIG_TASKSET=y
--CONFIG_FEATURE_TASKSET_FANCY=y
-+# CONFIG_TASKSET is not set
-+# CONFIG_FEATURE_TASKSET_FANCY is not set
- CONFIG_TIME=y
- CONFIG_TTYSIZE=y
- CONFIG_WATCHDOG=y
-@@ -762,10 +762,10 @@
- #
- # Shells
- #
--CONFIG_FEATURE_SH_IS_ASH=y
-+# CONFIG_FEATURE_SH_IS_ASH is not set
- # CONFIG_FEATURE_SH_IS_HUSH is not set
- # CONFIG_FEATURE_SH_IS_MSH is not set
--# CONFIG_FEATURE_SH_IS_NONE is not set
-+CONFIG_FEATURE_SH_IS_NONE=y
- CONFIG_ASH=y
- 
- #
--- a/sources/patches/busybox-1.11.1-mdevshutup.patch	Sun Oct 12 03:07:31 2008 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- busybox-1.11.1/util-linux/mdev.c	2008-08-06 12:30:46.000000000 -0500
-+++ busybox-new/util-linux/mdev.c	2008-08-06 12:30:58.000000000 -0500
-@@ -86,7 +86,7 @@
- 		unsigned lineno = 0;
- 
- 		/* If we have config file, look up user settings */
--		fp = fopen_or_warn("/etc/mdev.conf", "r");
-+		fp = fopen("/etc/mdev.conf", "r");
- 		if (!fp)
- 			goto end_parse;
- 
--- a/sources/patches/busybox-1.11.1-tar.patch	Sun Oct 12 03:07:31 2008 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
---- busybox-1.11.1/archival/libunarchive/get_header_tar.c	Wed Jun 25 14:51:17 2008
-+++ busybox-1.11.1-tar/archival/libunarchive/get_header_tar.c	Sun Jul 20 19:11:45 2008
-@@ -261,26 +261,31 @@
- 	case '0':
- #if ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
- 		if (last_char_is(file_header->name, '/')) {
--			file_header->mode |= S_IFDIR;
--		} else
-+			goto set_dir;
-+		}
- #endif
- 		file_header->mode |= S_IFREG;
- 		break;
- 	case '2':
- 		file_header->mode |= S_IFLNK;
-+		/* have seen tarballs with size field containing
-+		 * the size of the link target's name */
-+ size0:
-+		file_header->size = 0;
- 		break;
- 	case '3':
- 		file_header->mode |= S_IFCHR;
--		break;
-+		goto size0; /* paranoia */
- 	case '4':
- 		file_header->mode |= S_IFBLK;
--		break;
-+		goto size0;
- 	case '5':
-+ set_dir:
- 		file_header->mode |= S_IFDIR;
--		break;
-+		goto size0;
- 	case '6':
- 		file_header->mode |= S_IFIFO;
--		break;
-+		goto size0;
- #if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
- 	case 'L':
- 		/* free: paranoia: tar with several consecutive longnames */
---- busybox-1.11.1/archival/libunarchive/seek_by_jump.c	Wed Jun 25 14:51:17 2008
-+++ busybox-1.11.1-tar/archival/libunarchive/seek_by_jump.c	Sun Jul 20 19:11:45 2008
-@@ -8,7 +8,9 @@
- 
- void seek_by_jump(const archive_handle_t *archive_handle, unsigned amount)
- {
--	if (lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1) {
-+	if (amount
-+	 && lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1
-+	) {
- 		if (errno == ESPIPE)
- 			seek_by_read(archive_handle, amount);
- 		else
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sources/patches/busybox-1.12.1-defconfig.patch	Sun Oct 12 03:08:39 2008 -0500
@@ -0,0 +1,44 @@
+--- busybox-1.11.1/scripts/defconfig	2008-06-25 07:51:53.000000000 -0500
++++ busybox-new/scripts/defconfig	2008-08-02 16:14:25.000000000 -0500
+@@ -315,7 +315,7 @@
+ CONFIG_FEATURE_DIFF_DIR=y
+ CONFIG_FEATURE_DIFF_MINIMAL=y
+ CONFIG_ED=y
+-CONFIG_PATCH=y
++CONFIG_PATCH=n
+ CONFIG_SED=y
+ CONFIG_VI=y
+ CONFIG_FEATURE_VI_MAX_LEN=4096
+@@ -571,7 +571,7 @@
+ CONFIG_EJECT=y
+ CONFIG_FEATURE_EJECT_SCSI=y
+ CONFIG_FBSPLASH=y
+-CONFIG_INOTIFYD=y
++CONFIG_INOTIFYD=n
+ CONFIG_LAST=y
+ CONFIG_FEATURE_LAST_SMALL=y
+ # CONFIG_FEATURE_LAST_FANCY is not set
+@@ -602,8 +602,8 @@
+ CONFIG_RX=y
+ CONFIG_SETSID=y
+ CONFIG_STRINGS=y
+-CONFIG_TASKSET=y
+-CONFIG_FEATURE_TASKSET_FANCY=y
++# CONFIG_TASKSET is not set
++# CONFIG_FEATURE_TASKSET_FANCY is not set
+ CONFIG_TIME=y
+ CONFIG_TTYSIZE=y
+ CONFIG_WATCHDOG=y
+@@ -762,10 +762,10 @@
+ #
+ # Shells
+ #
+-CONFIG_FEATURE_SH_IS_ASH=y
++# CONFIG_FEATURE_SH_IS_ASH is not set
+ # CONFIG_FEATURE_SH_IS_HUSH is not set
+ # CONFIG_FEATURE_SH_IS_MSH is not set
+-# CONFIG_FEATURE_SH_IS_NONE is not set
++CONFIG_FEATURE_SH_IS_NONE=y
+ CONFIG_ASH=y
+ 
+ #
--- a/sources/patches/busybox-svn22557.patch	Sun Oct 12 03:07:31 2008 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
- ------------------------------------------------------------------------
-r22557 | vda | 2008-06-28 19:32:35 -0500 (Sat, 28 Jun 2008) | 3 lines
-
-wget: "support" -t and -T by ignoring them
-
-
- ------------------------------------------------------------------------
-Index: networking/wget.c
-===================================================================
---- busybox/networking/wget.c	(revision 22556)
-+++ busybox/networking/wget.c	(revision 22557)
-@@ -449,9 +449,11 @@
- #endif
- 	/* server.allocated = target.allocated = NULL; */
- 	opt_complementary = "-1" USE_FEATURE_WGET_LONG_OPTIONS(":\xfe::");
--	opt = getopt32(argv, "csqO:P:Y:U:",
-+	opt = getopt32(argv, "csqO:P:Y:U:" /*ignored:*/ "t:T:",
- 				&fname_out, &dir_prefix,
--				&proxy_flag, &user_agent
-+				&proxy_flag, &user_agent,
-+				NULL, /* -t RETRIES */
-+				NULL /* -T NETWORK_READ_TIMEOUT */
- 				USE_FEATURE_WGET_LONG_OPTIONS(, &headers_llist)
- 				);
- 	if (strcmp(proxy_flag, "off") == 0) {