busybox: update to 1.31.1

packages/busybox/build.sh

@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://busybox.net/
 TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=1.30.1
-TERMUX_PKG_REVISION=11
+TERMUX_PKG_VERSION=1.31.1
 TERMUX_PKG_SRCURL=https://busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_SHA256=3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc
+TERMUX_PKG_SHA256=d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998
 TERMUX_PKG_BUILD_IN_SRC=true
 # We replace env in the old coreutils package:
 TERMUX_PKG_CONFLICTS="coreutils (<< 8.25-4)"

packages/busybox/busybox.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.30.1
-# Mon Nov 11 16:54:10 2019
+# Busybox version: 1.31.1
+# Mon Nov 11 21:25:37 2019
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -34,6 +34,7 @@ CONFIG_INSTALL_NO_USR=y
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_SELINUX is not set
 # CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_SYSLOG_INFO is not set
 CONFIG_FEATURE_SYSLOG=y
 CONFIG_PLATFORM_LINUX=y
 
@@ -236,7 +237,6 @@ CONFIG_EXPR_MATH_SUPPORT_64=y
 CONFIG_FACTOR=y
 CONFIG_FALSE=y
 CONFIG_FOLD=y
-CONFIG_FSYNC=y
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 # CONFIG_HOSTID is not set
@@ -303,6 +303,7 @@ CONFIG_STTY=y
 CONFIG_SUM=y
 CONFIG_SYNC=y
 # CONFIG_FEATURE_SYNC_FANCY is not set
+CONFIG_FSYNC=y
 CONFIG_TAC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -635,6 +636,7 @@ CONFIG_LSUSB=y
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 # CONFIG_FEATURE_MDEV_EXEC is not set
 # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+# CONFIG_FEATURE_MDEV_DAEMON is not set
 # CONFIG_MESG is not set
 # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
 CONFIG_MKE2FS=y
@@ -782,6 +784,7 @@ CONFIG_HEXEDIT=y
 # CONFIG_I2CSET is not set
 # CONFIG_I2CDUMP is not set
 # CONFIG_I2CDETECT is not set
+# CONFIG_I2CTRANSFER is not set
 CONFIG_INOTIFYD=y
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
@@ -815,6 +818,7 @@ CONFIG_RX=y
 # CONFIG_SETSERIAL is not set
 CONFIG_STRINGS=y
 CONFIG_TIME=y
+# CONFIG_TS is not set
 CONFIG_TTYSIZE=y
 # CONFIG_UBIRENAME is not set
 # CONFIG_UBIATTACH is not set
@@ -942,6 +946,7 @@ CONFIG_FEATURE_TELNETD_STANDALONE=y
 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 CONFIG_TFTP=y
 CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
 CONFIG_TFTPD=y
 CONFIG_FEATURE_TFTP_GET=y
 CONFIG_FEATURE_TFTP_PUT=y
@@ -1147,6 +1152,7 @@ CONFIG_ASH_CMDCMD=y
 #
 CONFIG_FEATURE_SH_MATH=y
 CONFIG_FEATURE_SH_MATH_64=y
+# CONFIG_FEATURE_SH_MATH_BASE is not set
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set

packages/busybox/networking-httpd.c.patch

@@ -1,7 +1,7 @@
-diff -u -r ../busybox-1.27.1/networking/httpd.c ./networking/httpd.c
---- ../busybox-1.27.1/networking/httpd.c	2017-07-06 15:14:57.000000000 +0000
-+++ ./networking/httpd.c	2017-07-24 23:41:41.454424822 +0000
-@@ -234,7 +234,7 @@
+diff -uNr busybox-1.31.1/networking/httpd.c busybox-1.31.1.mod/networking/httpd.c
+--- busybox-1.31.1/networking/httpd.c	2019-06-10 13:50:53.000000000 +0300
++++ busybox-1.31.1.mod/networking/httpd.c	2019-11-11 21:27:40.912339505 +0200
+@@ -232,7 +232,7 @@
  //usage:     "\n	-i		Inetd mode"
  //usage:     "\n	-f		Don't daemonize"
  //usage:     "\n	-v[v]		Verbose"
@@ -10,7 +10,7 @@ diff -u -r ../busybox-1.27.1/networking/httpd.c ./networking/httpd.c
  //usage:	IF_FEATURE_HTTPD_SETUID(
  //usage:     "\n	-u USER[:GRP]	Set uid/gid after binding to port")
  //usage:	IF_FEATURE_HTTPD_BASIC_AUTH(
-@@ -491,7 +491,7 @@
+@@ -487,7 +487,7 @@
  	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
  	IF_FEATURE_HTTPD_BASIC_AUTH(g_realm = "Web Server Authentication";) \
  	IF_FEATURE_HTTPD_RANGES(range_start = -1;) \
@@ -19,7 +19,7 @@ diff -u -r ../busybox-1.27.1/networking/httpd.c ./networking/httpd.c
  	index_page = index_html; \
  	file_size = -1; \
  } while (0)
-@@ -1007,7 +1007,7 @@
+@@ -1003,7 +1003,7 @@
  	if (!errno && n && n <= 0xffff)
  		n = create_and_bind_stream_or_die(NULL, n);
  	else
@@ -28,12 +28,12 @@ diff -u -r ../busybox-1.27.1/networking/httpd.c ./networking/httpd.c
  	xlisten(n, 9);
  	return n;
  }
-@@ -2396,7 +2396,7 @@
- 		int proxy_fd;
- 		len_and_sockaddr *lsa;
- 
--		lsa = host2sockaddr(proxy_entry->host_port, 80);
-+		lsa = host2sockaddr(proxy_entry->host_port, 8080);
- 		if (lsa == NULL)
- 			send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);
- 		proxy_fd = socket(lsa->u.sa.sa_family, SOCK_STREAM, 0);
+@@ -2208,7 +2208,7 @@
+ 		if (proxy_entry) {
+ 			if (verbose > 1)
+ 				bb_error_msg("proxy:%s", urlcopy);
+-			lsa = host2sockaddr(proxy_entry->host_port, 80);
++			lsa = host2sockaddr(proxy_entry->host_port, 8080);
+ 			if (!lsa)
+ 				send_headers_and_exit(HTTP_INTERNAL_SERVER_ERROR);
+ 			proxy_fd = socket(lsa->u.sa.sa_family, SOCK_STREAM, 0);