busybox: bump to version 1.18.3

index e56ef00..ecb3d40 100644
@@ -40,7 +40,7 @@ config BR2_BUSYBOX_VERSION
 	default "1.15.3"	if BR2_BUSYBOX_VERSION_1_15_X
 	default "1.16.2"	if BR2_BUSYBOX_VERSION_1_16_X
 	default "1.17.4"	if BR2_BUSYBOX_VERSION_1_17_X
-	default "1.18.2"	if BR2_BUSYBOX_VERSION_1_18_X
+	default "1.18.3"	if BR2_BUSYBOX_VERSION_1_18_X
 
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"

62 lines not on this page · raw message

deleted file mode 100644
index d08e519..0000000
@@ -1,34 +0,0 @@
---- busybox-1.18.2/shell/hush.c
-+++ busybox-1.18.2-hush/shell/hush.c
-@@ -4123,15 +4123,26 @@ static struct pipe *parse_stream(char **
- 				 && dest.length == 0 && !dest.has_quoted_part
- 				) {
- 					/* This newline can be ignored. But...
--					 * without the below check, interactive shell
--					 * will ignore even lines with bare <newline>,
--					 * and show the continuation prompt:
-+					 * Without check #1, interactive shell
-+					 * ignores even bare <newline>,
-+					 * and shows the continuation prompt:
- 					 * ps1_prompt$ <enter>
--					 * ps2> _   <=== wrong prompt, should be ps1
-+					 * ps2> _   <=== wrong, should be ps1
-+					 * Without check #2, "cmd & <newline>"
-+					 * is similarly mistreated.
-+					 * (BTW, this makes "cmd & cmd"
-+					 * and "cmd && cmd" non-orthogonal.
-+					 * Really, ask yourself, why
-+					 * "cmd && <newline>" doesn't start
-+					 * cmd but waits for more input?
-+					 * No reason...)
- 					 */
- 					struct pipe *pi = ctx.list_head;
--					if (pi->num_cmds != 0)
-+					if (pi->num_cmds != 0       /* check #1 */
-+					 && pi->followup != PIPE_BG /* check #2 */
-+					) {
- 						continue;
-+					}
- 				}
- 				/* Treat newline as a command separator. */
- 				done_pipe(&ctx, PIPE_SEQ);

deleted file mode 100644
index aa7e75d..0000000
@@ -1,10 +0,0 @@
---- busybox-1.18.2/libbb/vfork_daemon_rexec.c
-+++ busybox-1.18.2-libbb/libbb/vfork_daemon_rexec.c
-@@ -52,6 +52,7 @@ pid_t FAST_FUNC spawn(char **argv)
- 	 * Interested party can wait on pid and learn exit code.
- 	 * If 111 - then it (most probably) failed to exec */
- 	if (failed) {
-+		safe_waitpid(pid, NULL, 0); /* prevent zombie */
- 		errno = failed;
- 		return -1;
- 	}

deleted file mode 100644
index b0623f2..0000000
@@ -1,19 +0,0 @@
---- busybox-1.18.2/modutils/modprobe-small.c
-+++ busybox-1.18.2-modprobe-small/modutils/modprobe-small.c
-@@ -205,6 +205,7 @@ static void parse_module(module_info *in
- 	/* Read (possibly compressed) module */
- 	len = 64 * 1024 * 1024; /* 64 Mb at most */
- 	module_image = xmalloc_open_zipped_read_close(pathname, &len);
-+	/* module_image == NULL is ok here, find_keyword handles it */
- //TODO: optimize redundant module body reads
- 
- 	/* "alias1 symbol:sym1 alias2 symbol:sym2" */
-@@ -845,6 +846,8 @@ int modprobe_main(int argc UNUSED_PARAM,
- 
- 		len = MAXINT(ssize_t);
- 		map = xmalloc_open_zipped_read_close(*argv, &len);
-+		if (!map)
-+			bb_perror_msg_and_die("can't read '%s'", *argv);
- 		if (init_module(map, len,
- 			IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "")
- 			IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("")

deleted file mode 100644
index cad887e..0000000
@@ -1,20 +0,0 @@
---- busybox-1.18.2/modutils/modutils.c
-+++ busybox-1.18.2-modprobe/modutils/modutils.c
-@@ -71,12 +71,11 @@ char* FAST_FUNC parse_cmdline_module_opt
- 	optlen = 0;
- 	while (*++argv) {
- 		options = xrealloc(options, optlen + 2 + strlen(*argv) + 2);
--		/* Older versions were enclosing space-containing *argv in "",
--		 * but both modprobe and insmod from module-init-tools 3.11.1
--		 * don't do this anymore. (As to extra trailing space,
--		 * insmod adds it but modprobe does not. We do in both cases)
--		 */
--		optlen += sprintf(options + optlen, "%s ", *argv);
-+		/* Spaces handled by "" pairs, but no way of escaping quotes */
-+//TODO: module-init-tools version 3.11.1 quotes only value:
-+//it generates var="val with spaces", not "var=val with spaces"
-+//(and it won't quote var *name* even if it has spaces)
-+		optlen += sprintf(options + optlen, (strchr(*argv, ' ') ? "\"%s\" " : "%s "), *argv);
- 	}
- 	return options;
- }

deleted file mode 100644
index 34262d6..0000000
@@ -1,11 +0,0 @@
---- busybox-1.18.2/networking/ping.c
-+++ busybox-1.18.2-ping/networking/ping.c
-@@ -394,7 +394,7 @@ static void sendping4(int junk UNUSED_PA
- #if ENABLE_PING6
- static void sendping6(int junk UNUSED_PARAM)
- {
--	struct icmp6_hdr *pkt = alloca(datalen + sizeof(struct icmp6_hdr) + 4);
-+	struct icmp6_hdr *pkt = G.snd_packet;
- 
- 	//memset(pkt, 0, datalen + sizeof(struct icmp6_hdr) + 4);
- 	pkt->icmp6_type = ICMP6_ECHO_REQUEST;

deleted file mode 100644
index 5d5f721..0000000
@@ -1,15 +0,0 @@
---- busybox-1.18.2/archival/tar.c
-+++ busybox-1.18.2-tar/archival/tar.c
-@@ -1037,8 +1037,10 @@ int tar_main(int argc UNUSED_PARAM, char
- 			tar_handle->src_fd = tar_fd;
- 			tar_handle->seek = seek_by_read;
- 		} else {
--			if (ENABLE_FEATURE_TAR_AUTODETECT && flags == O_RDONLY) {
--				get_header_ptr = get_header_tar;
-+			if (ENABLE_FEATURE_TAR_AUTODETECT
-+			 && flags == O_RDONLY
-+			 && get_header_ptr == get_header_tar
-+			) {
- 				tar_handle->src_fd = open_zipped(tar_filename);
- 				if (tar_handle->src_fd < 0)
- 					bb_perror_msg_and_die("can't open '%s'", tar_filename);

deleted file mode 100644
index bed4f4d..0000000
@@ -1,11 +0,0 @@
---- busybox-1.18.2/networking/udhcp/common.c
-+++ busybox-1.18.2-udhcp/networking/udhcp/common.c
-@@ -375,7 +375,7 @@ static NOINLINE void attach_option(
- 		new->data = xmalloc(length + OPT_DATA);
- 		new->data[OPT_CODE] = optflag->code;
- 		new->data[OPT_LEN] = length;
--		memcpy(new->data + OPT_DATA, buffer, length);
-+		memcpy(new->data + OPT_DATA, (allocated ? allocated : buffer), length);
- 
- 		curr = opt_list;
- 		while (*curr && (*curr)->data[OPT_CODE] < optflag->code)

41 lines not on this page · raw message