Commit 7a7bd4b8 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

busybox: bump 1.19.x stable version



Identical to 1.19.3 + patches.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 40281284
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ config BR2_BUSYBOX_VERSION
	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.5"	if BR2_BUSYBOX_VERSION_1_18_X
	default "1.19.3"	if BR2_BUSYBOX_VERSION_1_19_X
	default "1.19.4"	if BR2_BUSYBOX_VERSION_1_19_X

config BR2_PACKAGE_BUSYBOX_CONFIG
	string "BusyBox configuration file to use?"
+0 −12
Original line number Diff line number Diff line
--- busybox-1.19.3/loginutils/getty.c
+++ busybox-1.19.3-getty/loginutils/getty.c
@@ -271,7 +271,9 @@ static void termios_init(int speed)
 #ifdef CMSPAR
 		| CMSPAR  /* mark or space parity */
 #endif
+#ifdef CBAUD
 		| CBAUD   /* (output) baud rate */
+#endif
 #ifdef CBAUDEX
 		| CBAUDEX /* (output) baud rate */
 #endif
+0 −11
Original line number Diff line number Diff line
--- busybox-1.19.3/util-linux/mdev.c
+++ busybox-1.19.3-mdev/util-linux/mdev.c
@@ -610,7 +610,7 @@ int mdev_main(int argc UNUSED_PARAM, cha
 				int seqlen;
 				char seqbuf[sizeof(int)*3 + 2];
 
-				seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf-1));
+				seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1);
 				if (seqlen < 0) {
 					seq = NULL;
 					break;
+0 −10
Original line number Diff line number Diff line
--- busybox-1.19.3/modutils/modinfo.c
+++ busybox-1.19.3-modinfo/modutils/modinfo.c
@@ -13,6 +13,7 @@
 //config:config MODINFO
 //config:	bool "modinfo"
 //config:	default y
+//config:	select PLATFORM_LINUX
 //config:	help
 //config:	  Show information about a Linux Kernel module
 
+0 −29
Original line number Diff line number Diff line
--- busybox-1.19.3/networking/wget.c
+++ busybox-1.19.3-wget/networking/wget.c
@@ -552,6 +552,7 @@ static void download_one_url(const char 
 	FILE *dfp;                      /* socket to ftp server (data)      */
 	char *proxy = NULL;
 	char *fname_out_alloc;
+	char *redirected_path = NULL;
 	struct host_info server;
 	struct host_info target;
 
@@ -794,8 +795,8 @@ However, in real world it was observed t
 					bb_error_msg_and_die("too many redirections");
 				fclose(sfp);
 				if (str[0] == '/') {
-					free(target.allocated);
-					target.path = target.allocated = xstrdup(str+1);
+					free(redirected_path);
+					target.path = redirected_path = xstrdup(str+1);
 					/* lsa stays the same: it's on the same server */
 				} else {
 					parse_url(str, &target);
@@ -850,6 +851,7 @@ However, in real world it was observed t
 	free(server.allocated);
 	free(target.allocated);
 	free(fname_out_alloc);
+	free(redirected_path);
 }
 
 int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;