Commit 6ed87eac authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

busybox: bump 1.16.x version

parent dff1d590
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -7,9 +7,10 @@
	New packages: cgilua, copas, coxpcall, luafilesystem,
	luasocket, rings, wsapi, xavante

	Updated/fixed packages: cdrkit, file, gawk, gstreamer, intltool,
	ipsec-tools, iptables, libidn, lmbench, netperf, openssl, php,
	qt, sqlite, tn5250, usbutils, xkeyboard-config
	Updated/fixed packages: busybox, cdrkit, file, gawk,
	gstreamer, intltool, ipsec-tools, iptables, libidn, lmbench,
	netperf, openssl, php, qt, sqlite, tn5250, usbutils,
	xkeyboard-config

	Removed packages: modutils

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ config BR2_BUSYBOX_VERSION
	default "1.13.4"	if BR2_BUSYBOX_VERSION_1_13_X
	default "1.14.4"	if BR2_BUSYBOX_VERSION_1_14_X
	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X
	default "1.16.1"	if BR2_BUSYBOX_VERSION_1_16_X
	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X

config BR2_PACKAGE_BUSYBOX_FULLINSTALL
	bool "Run BusyBox's own full installation"
+0 −15
Original line number Diff line number Diff line
diff -urpN busybox-1.16.1/shell/ash.c busybox-1.16.1-ash/shell/ash.c
--- busybox-1.16.1/shell/ash.c	2010-03-28 19:44:04.000000000 +0200
+++ busybox-1.16.1-ash/shell/ash.c	2010-04-26 14:18:36.000000000 +0200
@@ -5424,7 +5424,11 @@ rmescapes(char *str, int flag)
 		size_t fulllen = len + strlen(p) + 1;
 
 		if (flag & RMESCAPE_GROW) {
+			int strloc = str - (char *)stackblock();
 			r = makestrspace(fulllen, expdest);
+			/* p and str may be invalidated by makestrspace */
+			str = (char *)stackblock() + strloc;
+			p = str + len;
 		} else if (flag & RMESCAPE_HEAP) {
 			r = ckmalloc(fulllen);
 		} else {
+0 −51
Original line number Diff line number Diff line
diff -urpN busybox-1.16.1/archival/cpio.c busybox-1.16.1-cpio/archival/cpio.c
--- busybox-1.16.1/archival/cpio.c	2010-03-20 03:58:07.000000000 +0100
+++ busybox-1.16.1-cpio/archival/cpio.c	2010-04-27 08:15:37.000000000 +0200
@@ -424,7 +424,7 @@ int cpio_main(int argc UNUSED_PARAM, cha
 	if (archive_handle->cpio__blocks != (off_t)-1
 	 && !(opt & CPIO_OPT_QUIET)
 	) {
-		printf("%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
+		fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
 	}
 
 	return EXIT_SUCCESS;
diff -urpN busybox-1.16.1/testsuite/cpio.tests busybox-1.16.1-cpio/testsuite/cpio.tests
--- busybox-1.16.1/testsuite/cpio.tests	2010-03-28 19:59:59.000000000 +0200
+++ busybox-1.16.1-cpio/testsuite/cpio.tests	2010-04-27 08:15:37.000000000 +0200
@@ -32,7 +32,7 @@ rm -rf cpio.testdir cpio.testdir2 2>/dev
 # testing "test name" "command" "expected result" "file input" "stdin"
 
 testing "cpio extracts zero-sized hardlinks" \
-"$ECHO -ne '$hexdump' | bzcat | cpio -i; echo \$?;
+"$ECHO -ne '$hexdump' | bzcat | cpio -i 2>&1; echo \$?;
 ls -ln cpio.testdir | $FILTER_LS" \
 "\
 1 blocks
@@ -45,7 +45,7 @@ ls -ln cpio.testdir | $FILTER_LS" \
 
 test x"$SKIP_KNOWN_BUGS" = x"" && {
 # Currently fails. Numerous buglets: "1 blocks" versus "1 block",
-# "1 block" must go to stderr, does not list cpio.testdir/x and cpio.testdir/y
+# does not list cpio.testdir/x and cpio.testdir/y
 testing "cpio lists hardlinks" \
 "$ECHO -ne '$hexdump' | bzcat | cpio -t 2>&1; echo \$?" \
 "\
@@ -70,7 +70,7 @@ ln cpio.testdir/nonempty cpio.testdir/no
 mkdir cpio.testdir2
 
 testing "cpio extracts zero-sized hardlinks 2" \
-"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i); echo \$?;
+"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i 2>&1); echo \$?;
 ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
 "\
 2 blocks
@@ -87,7 +87,7 @@ ls -ln cpio.testdir2/cpio.testdir | $FIL
 # Was trying to create "/usr/bin", correct is "usr/bin".
 rm -rf cpio.testdir
 testing "cpio -p with absolute paths" \
-"echo /usr/bin | cpio -dp cpio.testdir; echo \$?;
+"echo /usr/bin | cpio -dp cpio.testdir 2>&1; echo \$?;
 ls cpio.testdir" \
 "\
 1 blocks
+0 −12
Original line number Diff line number Diff line
diff -urpN busybox-1.16.1/networking/udhcp/leases.c busybox-1.16.1-dhcpd/networking/udhcp/leases.c
--- busybox-1.16.1/networking/udhcp/leases.c	2010-03-28 19:43:36.000000000 +0200
+++ busybox-1.16.1-dhcpd/networking/udhcp/leases.c	2010-05-15 20:47:08.000000000 +0200
@@ -64,6 +64,8 @@ struct dyn_lease* FAST_FUNC add_lease(
 		oldest->hostname[0] = '\0';
 		if (hostname) {
 			char *p;
+
+			hostname_len++; /* include NUL */
 			if (hostname_len > sizeof(oldest->hostname))
 				hostname_len = sizeof(oldest->hostname);
 			p = safe_strncpy(oldest->hostname, hostname, hostname_len);
Loading