AUX busybox-1.18.3-buildsys.patch 320 RMD160 5591dc086f5c2d060b0c6e8496df8515ec1dccc8 SHA1 12bd93ead0022a8e80a7d3c40f1f6b166cc3942f SHA256 cb438f0a5c46125387187b4a2389d56f7aa8db5a308aed314f5866cf9a09b72b

AUX busybox-1.18.3-modutils24.patch 949 RMD160 5c7aef4dd8195a6432a8c7e6e865eff1bc73bdd4 SHA1 445c5e662c2bea616b327744d4e9b6b2fd7a645a SHA256 134ed86867784348f484810464df5bc97589e7aa41079c90e35b8d12b9284df8

AUX busybox-1.18.3-wget.patch 3805 RMD160 e3846336786aa825da96ff9b2cf08829c81482a9 SHA1 cb9227a3d9783e4222fbe2f42cb769c7ff1e14e3 SHA256 22538ebee96f66916104b8143cfd16e21568da4c5a89128b9daa60d83a59120b

DIST busybox-1.18.3.tar.bz2 2119251 RMD160 b38e5bc8ca9d586dd1528080b6a866ad8719a31a SHA1 4debdbdf8abb7ae54e0c0e2650cb03d957400533 SHA256 83f112ee88b7eb85bea1cac0b1af33f61387a1036f1898c5ecd79813191a619b

EBUILD busybox-1.18.3.ebuild 7923 RMD160 70a7319bcda540bbccb5264cdd218384540aa4c5 SHA1 1ce5019a08595955bd446341af6bb985ae9d347b SHA256 b98879df777c471d1afdac749fdfb139df04b2fa995d0f0795c456be9b3cf53d

iQIcBAEBCAAGBQJNeFGCAAoJEHQ6UuhrqBBQgd8P/iXBkSSbLxKTXjuPZCIMG9b0

kcDWv47ZdgxByPgjeQub3PlxRz8Ab++x4cu6NYi8mR7H9p3BiG1DMSu/s9pZvhEK

e9/P9C/ZfVQcbDIof+RkaOfY1SCEuAwRTB8qABFRlPldTRjO8XGP94VAblXFbvMr

x9L4o5q1Q+ESYrxR6ddSyM7KJ0jc1dDH0USuCNwpWxFto6jX+vrcrG0kjSCTZJ5U

bL88zQMLwSRKgfUlpahVOojaTV4RLPZvTNL1X3y/1lla4edRrBAvmAJ8laWGRi+F

tcKJIlTaWe0fy3I5YSjsiSzF1QYt2isBw+1Y1w3aoBctTUFfgkPmI+UUURmjMT3P

p5J1dr6QbcelYEIbieAaSK9VAIhXaNT5RInBLD3BsQEsvBKuNMGb4jHBafQ8ewrF

PMi+pum9kJmdbwIVm8+UJkpzpl5j3CsxEpIzJ+9FHareleLnLRvnXZzYlB9FxSvy

XT9whBOuP//HNhmdNxNR1KbksaMJCvbN33Ldtd/WjcrPWXTqPwXXQkI+6pe/oSHH

LuGNUjYeflA5FrINlsX5Hhx9xu8mprgTd8xnkvz1EcOy9Zcqs2qTCEWn3tNR9/jZ

5kq1EFG3SIdI2ta1iMZtY7qne6+/1LVrSdNcrYw7+IqAIpAktKhnE8vCIwA1ZDbv

kehnD4AZtn0ipkCMOGdv

=aW4J

	epatch "${FILESDIR}"/busybox-1.18.1-ldflags.patch

--- busybox-1.18.3/Config.in

+++ busybox-1.18.3-buildsys/Config.in

@@ -126,7 +126,6 @@ config FEATURE_INSTALLER

 config INSTALL_NO_USR

 	bool "Don't use /usr"

 	default n

-	depends on FEATURE_INSTALLER

 	help

 	  Disable use of /usr. busybox --install and "make install"

 	  will install applets only to /bin and /sbin,

--- busybox-1.18.3/modutils/modutils-24.c

+++ busybox-1.18.3-modutils24/modutils/modutils-24.c

@@ -2474,6 +2474,7 @@ new_process_module_arguments(struct obj_

 		n = 0;

 		p = val;

 		while (*p != 0) {

+			char sv_ch;

 			char *endp;

 			if (++n > max)

@@ -2482,14 +2483,17 @@ new_process_module_arguments(struct obj_

 			switch (*pinfo) {

 			case 's':

 				len = strcspn(p, ",");

+				sv_ch = p[len];

 				p[len] = 0;

 				obj_string_patch(f, sym->secidx,

 						 loc - contents, p);

 				loc += tgt_sizeof_char_p;

 				p += len;

+				*p = sv_ch;

 				break;

 			case 'c':

 				len = strcspn(p, ",");

+				sv_ch = p[len];

 				p[len] = 0;

 				if (len >= charssize)

 					bb_error_msg_and_die("string too long for %s (max %ld)", param,

@@ -2497,6 +2501,7 @@ new_process_module_arguments(struct obj_

 				strcpy((char *) loc, p);

 				loc += charssize;

 				p += len;

+				*p = sv_ch;

 				break;

 			case 'b':

 				*loc++ = strtoul(p, &endp, 0);

--- busybox-1.18.3/networking/wget.c

+++ busybox-1.18.3-wget/networking/wget.c

@@ -446,7 +446,7 @@ static FILE* prepare_ftp_session(FILE **

 static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)

 {

-	char buf[512];

+	char buf[4*1024]; /* made bigger to speed up local xfers */

 #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT

 # if ENABLE_FEATURE_WGET_TIMEOUT

 	unsigned second_cnt;

@@ -455,7 +455,6 @@ static void NOINLINE retrieve_file_data(

 	polldata.fd = fileno(dfp);

 	polldata.events = POLLIN | POLLPRI;

-	ndelay_on(polldata.fd);

 #endif

 	progress_meter(PROGRESS_START);

@@ -464,6 +463,10 @@ static void NOINLINE retrieve_file_data(

 	/* Loops only if chunked */

 	while (1) {

+

+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT

+		ndelay_on(polldata.fd);

+#endif

 		while (1) {

 			int n;

 			unsigned rdsz;

@@ -493,22 +496,46 @@ static void NOINLINE retrieve_file_data(

 				progress_meter(PROGRESS_BUMP);

 			}

 #endif

+			/* fread internally uses read loop, which in our case

+			 * is usually exited when we get EAGAIN.

+			 * In this case, libc sets error marker on the stream.

+			 * Need to clear it before next fread to avoid possible

+			 * rare false positive ferror below. Rare because usually

+			 * fread gets more than zero bytes, and we don't fall

+			 * into if (n <= 0) ...

+			 */

+			clearerr(dfp);

+			errno = 0;

 			n = safe_fread(buf, rdsz, dfp);

+			/* man fread:

+			 * If error occurs, or EOF is reached, the return value

+			 * is a short item count (or zero).

+			 * fread does not distinguish between EOF and error.

+			 */

 			if (n <= 0) {

-				if (ferror(dfp)) {

-					/* perror will not work: ferror doesn't set errno */

-					bb_error_msg_and_die(bb_msg_read_error);

-				}

-				break;

+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT

+				if (errno == EAGAIN) /* poll lied, there is no data? */

+					continue; /* yes */

+#endif

+				if (ferror(dfp))

+					bb_perror_msg_and_die(bb_msg_read_error);

+				break; /* EOF, not error */

 			}

+

 			xwrite(output_fd, buf, n);

 #if ENABLE_FEATURE_WGET_STATUSBAR

 			G.transferred += n;

 			progress_meter(PROGRESS_BUMP);

 #endif

-			if (G.got_clen)

+			if (G.got_clen) {

 				G.content_len -= n;

+				if (G.content_len == 0)

+					break;

+			}

 		}

+#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT

+		ndelay_off(polldata.fd);

+#endif

 		if (!G.chunked)

 			break;

@@ -706,6 +733,11 @@ int wget_main(int argc UNUSED_PARAM, cha

 		fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n",

 			target.host, user_agent);

+		/* Ask server to close the connection as soon as we are done

+		 * (IOW: we do not intend to send more requests)

+		 */

+		fprintf(sfp, "Connection: close\r\n");

+

 #if ENABLE_FEATURE_WGET_AUTHENTICATION

 		if (target.user) {

 			fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6,

@@ -719,22 +751,25 @@ int wget_main(int argc UNUSED_PARAM, cha

 		if (G.beg_range)

 			fprintf(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);

+

 #if ENABLE_FEATURE_WGET_LONG_OPTIONS

 		if (extra_headers)

 			fputs(extra_headers, sfp);

 		if (opt & WGET_OPT_POST_DATA) {

 			char *estr = URL_escape(post_data);

-			fprintf(sfp, "Content-Type: application/x-www-form-urlencoded\r\n");

-			fprintf(sfp, "Content-Length: %u\r\n" "\r\n" "%s",

-					(int) strlen(estr), estr);

-			/*fprintf(sfp, "Connection: Keep-Alive\r\n\r\n");*/

-			/*fprintf(sfp, "%s\r\n", estr);*/

+			fprintf(sfp,

+				"Content-Type: application/x-www-form-urlencoded\r\n"

+				"Content-Length: %u\r\n"

+				"\r\n"

+				"%s",

+				(int) strlen(estr), estr

+			);

 			free(estr);

 		} else

 #endif

-		{ /* If "Connection:" is needed, document why */

-			fprintf(sfp, /* "Connection: close\r\n" */ "\r\n");

+		{

+			fprintf(sfp, "\r\n");

 		}

 		fflush(sfp);