Browse Source

busybox/hush: update to 1.35.0

Waldemar Brodkorb 2 years ago
parent
commit
a4fe6056f3

+ 2 - 2
package/busybox/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.33.0
+PKG_VERSION:=		1.35.0
 PKG_RELEASE:=		1
-PKG_HASH:=		d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd
+PKG_HASH:=		faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694
 PKG_DESCR:=		core utilities for embedded systems
 PKG_SECTION:=		base/apps
 PKG_URL:=		http://www.busybox.net/

+ 14 - 0
package/busybox/config/archival/Config.in

@@ -204,6 +204,20 @@ config BUSYBOX_FEATURE_CPIO_P
 	depends on BUSYBOX_FEATURE_CPIO_O
 	help
 	Passthrough mode. Rarely used.
+
+config BUSYBOX_FEATURE_CPIO_IGNORE_DEVNO
+	bool "Support --ignore-devno like GNU cpio"
+	default y
+	depends on BUSYBOX_FEATURE_CPIO_O && BUSYBOX_LONG_OPTS
+	help
+	Optionally ignore device numbers when creating archives.
+
+config BUSYBOX_FEATURE_CPIO_RENUMBER_INODES
+	bool "Support --renumber-inodes like GNU cpio"
+	default y
+	depends on BUSYBOX_FEATURE_CPIO_O && BUSYBOX_LONG_OPTS
+	help
+	Optionally renumber inodes when creating archives.
 config BUSYBOX_DPKG
 	bool "dpkg (43 kb)"
 	default y

+ 73 - 41
package/busybox/config/coreutils/Config.in

@@ -6,6 +6,47 @@
 
 menu "Coreutils"
 
+config BUSYBOX_FEATURE_VERBOSE
+	bool "Support verbose options (usually -v) for various applets"
+	default y
+	help
+	Enable cp -v, rm -v and similar messages.
+	Also enables long option (--verbose) if it exists.
+	Without this option, -v is accepted but ignored.
+
+comment "Common options for date and touch"
+
+config BUSYBOX_FEATURE_TIMEZONE
+	bool "Allow timezone in dates"
+	default y
+	depends on BUSYBOX_DESKTOP
+	help
+	Permit the use of timezones when parsing user-provided data
+	strings, e.g. '1996-04-09 12:45:00 -0500'.
+
+	This requires support for the '%z' extension to strptime() which
+	may not be available in all implementations.
+
+comment "Common options for cp and mv"
+	depends on BUSYBOX_CP || BUSYBOX_MV
+
+config BUSYBOX_FEATURE_PRESERVE_HARDLINKS
+	bool "Preserve hard links"
+	default y
+	depends on BUSYBOX_CP || BUSYBOX_MV
+	help
+	Allow cp and mv to preserve hard links.
+
+comment "Common options for df, du, ls"
+	depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
+
+config BUSYBOX_FEATURE_HUMAN_READABLE
+	bool "Support human readable output (example 13k, 23M, 235G)"
+	default y
+	depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
+	help
+	Allow df, du, and ls to have human readable output.
+
 config BUSYBOX_BASENAME
 	bool "basename (438 bytes)"
 	default y
@@ -63,8 +104,10 @@ config BUSYBOX_CHROOT
 config BUSYBOX_CKSUM
 	bool "cksum (4.1 kb)"
 	default y
-	help
-	cksum is used to calculate the CRC32 checksum of a file.
+
+config BUSYBOX_CRC32
+	bool "crc32 (4.1 kb)"
+	default y
 config BUSYBOX_COMM
 	bool "comm (4.2 kb)"
 	default y
@@ -95,6 +138,13 @@ config BUSYBOX_CUT
 	help
 	cut is used to print selected parts of lines from
 	each file to stdout.
+
+config BUSYBOX_FEATURE_CUT_REGEX
+	bool "cut -F"
+	default y
+	depends on BUSYBOX_CUT
+	help
+	Allow regex based delimiters.
 config BUSYBOX_DATE
 	bool "date (7 kb)"
 	default y
@@ -191,6 +241,26 @@ config BUSYBOX_FEATURE_DF_FANCY
 	-a Show all filesystems
 	-i Inodes
 	-B <SIZE> Blocksize
+
+config BUSYBOX_FEATURE_SKIP_ROOTFS
+	bool "Skip rootfs in mount table"
+	default y
+	depends on BUSYBOX_DF
+	help
+	Ignore rootfs entry in mount table.
+
+	In Linux, kernel has a special filesystem, rootfs, which is initially
+	mounted on /. It contains initramfs data, if kernel is configured
+	to have one. Usually, another file system is mounted over / early
+	in boot process, and therefore most tools which manipulate
+	mount table, such as df, will skip rootfs entry.
+
+	However, some systems do not mount anything on /.
+	If you need to configure busybox for one of these systems,
+	you may find it useful to turn this option off to make df show
+	initramfs statistics.
+
+	Otherwise, choose Y.
 config BUSYBOX_DIRNAME
 	bool "dirname (329 bytes)"
 	default y
@@ -739,16 +809,8 @@ config BUSYBOX_TOUCH
 	touch is used to create or change the access and/or
 	modification timestamp of specified files.
 
-config BUSYBOX_FEATURE_TOUCH_NODEREF
-	bool "Add support for -h"
-	default y
-	depends on BUSYBOX_TOUCH
-	help
-	Enable touch to have the -h option.
-	This requires libc support for lutimes() function.
-
 config BUSYBOX_FEATURE_TOUCH_SUSV3
-	bool "Add support for SUSV3 features (-d -t -r)"
+	bool "Add support for SUSV3 features (-a -d -m -t -r)"
 	default y
 	depends on BUSYBOX_TOUCH
 	help
@@ -895,34 +957,4 @@ config BUSYBOX_YES
 	yes is used to repeatedly output a specific string, or
 	the default string 'y'.
 
-comment "Common options"
-
-config BUSYBOX_FEATURE_VERBOSE
-	bool "Support verbose options (usually -v) for various applets"
-	default y
-	help
-	Enable cp -v, rm -v and similar messages.
-	Also enables long option (--verbose) if it exists.
-	Without this option, -v is accepted but ignored.
-
-comment "Common options for cp and mv"
-	depends on BUSYBOX_CP || BUSYBOX_MV
-
-config BUSYBOX_FEATURE_PRESERVE_HARDLINKS
-	bool "Preserve hard links"
-	default y
-	depends on BUSYBOX_CP || BUSYBOX_MV
-	help
-	Allow cp and mv to preserve hard links.
-
-comment "Common options for df, du, ls"
-	depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
-
-config BUSYBOX_FEATURE_HUMAN_READABLE
-	bool "Support human readable output (example 13k, 23M, 235G)"
-	default y
-	depends on BUSYBOX_DF || BUSYBOX_DU || BUSYBOX_LS
-	help
-	Allow df, du, and ls to have human readable output.
-
 endmenu

+ 16 - 0
package/busybox/config/editors/Config.in

@@ -110,6 +110,14 @@ config BUSYBOX_FEATURE_VI_COLON
 	Enable a limited set of colon commands. This does not
 	provide an "ex" mode.
 
+config BUSYBOX_FEATURE_VI_COLON_EXPAND
+	bool "Expand \"%\" and \"#\" in colon commands"
+	default y
+	depends on BUSYBOX_FEATURE_VI_COLON
+	help
+	Expand the special characters \"%\" (current filename)
+	and \"#\" (alternate filename) in colon commands.
+
 config BUSYBOX_FEATURE_VI_YANKMARK
 	bool "Enable yank/put commands and mark cmds"
 	default y
@@ -217,6 +225,14 @@ config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX
 	Unless you want more (or less) frequent "undo points" while typing,
 	you should probably leave this unchanged.
 
+config BUSYBOX_FEATURE_VI_VERBOSE_STATUS
+	bool "Enable verbose status reporting"
+	default y
+	depends on BUSYBOX_VI
+	help
+	Enable more verbose reporting of the results of yank, change,
+	delete, undo and substitution commands.
+
 config BUSYBOX_FEATURE_ALLOW_EXEC
 	bool "Allow vi and awk to execute shell commands"
 	default y

+ 41 - 2
package/busybox/config/findutils/Config.in

@@ -23,21 +23,53 @@ config BUSYBOX_FEATURE_FIND_PRINT0
 	interpreted by other programs.
 
 config BUSYBOX_FEATURE_FIND_MTIME
-	bool "Enable -mtime: modified time matching"
+	bool "Enable -mtime: modification time matching"
 	default y
 	depends on BUSYBOX_FIND
 	help
 	Allow searching based on the modification time of
 	files, in days.
 
+config BUSYBOX_FEATURE_FIND_ATIME
+	bool "Enable -atime: access time matching"
+	default y
+	depends on BUSYBOX_FEATURE_FIND_MTIME
+	help
+	Allow searching based on the access time of
+	files, in days.
+
+config BUSYBOX_FEATURE_FIND_CTIME
+	bool "Enable -ctime: status change timestamp matching"
+	default y
+	depends on BUSYBOX_FEATURE_FIND_MTIME
+	help
+	Allow searching based on the status change timestamp of
+	files, in days.
+
 config BUSYBOX_FEATURE_FIND_MMIN
-	bool "Enable -mmin: modified time matching by minutes"
+	bool "Enable -mmin: modification time matching by minutes"
 	default y
 	depends on BUSYBOX_FIND
 	help
 	Allow searching based on the modification time of
 	files, in minutes.
 
+config BUSYBOX_FEATURE_FIND_AMIN
+	bool "Enable -amin: access time matching by minutes"
+	default y
+	depends on BUSYBOX_FEATURE_FIND_MMIN
+	help
+	Allow searching based on the access time of
+	files, in minutes.
+
+config BUSYBOX_FEATURE_FIND_CMIN
+	bool "Enable -cmin: status change timestamp matching by minutes"
+	default y
+	depends on BUSYBOX_FEATURE_FIND_MMIN
+	help
+	Allow searching based on the status change timestamp of
+	files, in minutes.
+
 config BUSYBOX_FEATURE_FIND_PERM
 	bool "Enable -perm: permissions matching"
 	default y
@@ -79,6 +111,13 @@ config BUSYBOX_FEATURE_FIND_INUM
 	default y
 	depends on BUSYBOX_FIND
 
+config BUSYBOX_FEATURE_FIND_SAMEFILE
+	bool "Enable -samefile: reference file matching"
+	default y
+	depends on BUSYBOX_FIND
+	help
+	Support the 'find -samefile' option for searching by a reference file.
+
 config BUSYBOX_FEATURE_FIND_EXEC
 	bool "Enable -exec: execute commands"
 	default y

+ 1 - 1
package/busybox/config/klibc-utils/Config.in

@@ -13,7 +13,7 @@ config BUSYBOX_MINIPS
 	Alias to "ps".
 config BUSYBOX_NUKE
 	bool "nuke (2.9 kb)"
-	default y
+	default n  # off by default: too "accidentally destructive"
 	help
 	Alias to "rm -rf".
 config BUSYBOX_RESUME

+ 61 - 113
package/busybox/config/libbb/Config.in

@@ -117,32 +117,73 @@ config BUSYBOX_SHA3_SMALL
 	64-bit x86: +270 bytes of code, 45% faster
 	32-bit x86: +450 bytes of code, 75% faster
 
-config BUSYBOX_FEATURE_FAST_TOP
-	bool "Faster /proc scanning code (+100 bytes)"
-	default n  # all "fast or small" options default to small
+config BUSYBOX_FEATURE_NON_POSIX_CP
+	bool "Non-POSIX, but safer, copying to special nodes"
+	default y
 	help
-	This option makes top and ps ~20% faster (or 20% less CPU hungry),
-	but code size is slightly bigger.
+	With this option, "cp file symlink" will delete symlink
+	and create a regular file. This does not conform to POSIX,
+	but prevents a symlink attack.
+	Similarly, "cp file device" will not send file's data
+	to the device. (To do that, use "cat file >device")
 
-config BUSYBOX_FEATURE_ETC_NETWORKS
-	bool "Support /etc/networks"
+config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE
+	bool "Give more precise messages when copy fails (cp, mv etc)"
 	default n
 	help
-	Enable support for network names in /etc/networks. This is
-	a rarely used feature which allows you to use names
-	instead of IP/mask pairs in route command.
+	Error messages with this feature enabled:
 
-config BUSYBOX_FEATURE_ETC_SERVICES
-	bool "Consult /etc/services even for well-known ports"
-	default n
+	$ cp file /does_not_exist/file
+	cp: cannot create '/does_not_exist/file': Path does not exist
+	$ cp file /vmlinuz/file
+	cp: cannot stat '/vmlinuz/file': Path has non-directory component
+
+	If this feature is not enabled, they will be, respectively:
+
+	cp: cannot create '/does_not_exist/file': No such file or directory
+	cp: cannot stat '/vmlinuz/file': Not a directory
+
+	This will cost you ~60 bytes.
+
+config BUSYBOX_FEATURE_USE_SENDFILE
+	bool "Use sendfile system call"
+	default y
+	help
+	When enabled, busybox will use the kernel sendfile() function
+	instead of read/write loops to copy data between file descriptors
+	(for example, cp command does this a lot).
+	If sendfile() doesn't work, copying code falls back to read/write
+	loop. sendfile() was originally implemented for faster I/O
+	from files to sockets, but since Linux 2.6.33 it was extended
+	to work for many more file types.
+
+config BUSYBOX_FEATURE_COPYBUF_KB
+	int "Copy buffer size, in kilobytes"
+	range 1 1024
+	default 4
 	help
-	Look up e.g. "telnet" and "http" in /etc/services file
-	instead of assuming ports 23 and 80.
-	This is almost never necessary (everybody uses standard ports),
-	and it makes sense to avoid reading this file.
-	If you disable this option, in the cases where port is explicitly
-	specified as a service name (e.g. "telnet HOST PORTNAME"),
-	it will still be looked up in /etc/services.
+	Size of buffer used by cp, mv, install, wget etc.
+	Buffers which are 4 kb or less will be allocated on stack.
+	Bigger buffers will be allocated with mmap, with fallback to 4 kb
+	stack buffer if mmap fails.
+
+config BUSYBOX_MONOTONIC_SYSCALL
+	bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
+	default y
+	help
+	Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
+	time intervals (time, ping, traceroute etc need this).
+	Probably requires Linux 2.6+. If not selected, gettimeofday
+	will be used instead (which gives wrong results if date/time
+	is reset).
+
+config BUSYBOX_IOCTL_HEX2STR_ERROR
+	bool "Use ioctl names rather than hex values in error messages"
+	default y
+	help
+	Use ioctl names rather than hex values in error messages
+	(e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
+	saves about 1400 bytes.
 
 config BUSYBOX_FEATURE_EDITING
 	bool "Command line editing"
@@ -358,96 +399,3 @@ config BUSYBOX_UNICODE_PRESERVE_BROKEN
 	For example, this means that entering 'l', 's', ' ', 0xff, [Enter]
 	at shell prompt will list file named 0xff (single char name
 	with char value 255), not file named '?'.
-
-config BUSYBOX_FEATURE_NON_POSIX_CP
-	bool "Non-POSIX, but safer, copying to special nodes"
-	default y
-	help
-	With this option, "cp file symlink" will delete symlink
-	and create a regular file. This does not conform to POSIX,
-	but prevents a symlink attack.
-	Similarly, "cp file device" will not send file's data
-	to the device. (To do that, use "cat file >device")
-
-config BUSYBOX_FEATURE_VERBOSE_CP_MESSAGE
-	bool "Give more precise messages when copy fails (cp, mv etc)"
-	default n
-	help
-	Error messages with this feature enabled:
-
-	$ cp file /does_not_exist/file
-	cp: cannot create '/does_not_exist/file': Path does not exist
-	$ cp file /vmlinuz/file
-	cp: cannot stat '/vmlinuz/file': Path has non-directory component
-
-	If this feature is not enabled, they will be, respectively:
-
-	cp: cannot create '/does_not_exist/file': No such file or directory
-	cp: cannot stat '/vmlinuz/file': Not a directory
-
-	This will cost you ~60 bytes.
-
-config BUSYBOX_FEATURE_USE_SENDFILE
-	bool "Use sendfile system call"
-	default y
-	help
-	When enabled, busybox will use the kernel sendfile() function
-	instead of read/write loops to copy data between file descriptors
-	(for example, cp command does this a lot).
-	If sendfile() doesn't work, copying code falls back to read/write
-	loop. sendfile() was originally implemented for faster I/O
-	from files to sockets, but since Linux 2.6.33 it was extended
-	to work for many more file types.
-
-config BUSYBOX_FEATURE_COPYBUF_KB
-	int "Copy buffer size, in kilobytes"
-	range 1 1024
-	default 4
-	help
-	Size of buffer used by cp, mv, install, wget etc.
-	Buffers which are 4 kb or less will be allocated on stack.
-	Bigger buffers will be allocated with mmap, with fallback to 4 kb
-	stack buffer if mmap fails.
-
-config BUSYBOX_FEATURE_SKIP_ROOTFS
-	bool "Skip rootfs in mount table"
-	default y
-	help
-	Ignore rootfs entry in mount table.
-
-	In Linux, kernel has a special filesystem, rootfs, which is initially
-	mounted on /. It contains initramfs data, if kernel is configured
-	to have one. Usually, another file system is mounted over / early
-	in boot process, and therefore most tools which manipulate
-	mount table, such as df, will skip rootfs entry.
-
-	However, some systems do not mount anything on /.
-	If you need to configure busybox for one of these systems,
-	you may find it useful to turn this option off to make df show
-	initramfs statistics.
-
-	Otherwise, choose Y.
-
-config BUSYBOX_MONOTONIC_SYSCALL
-	bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
-	default y
-	help
-	Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
-	time intervals (time, ping, traceroute etc need this).
-	Probably requires Linux 2.6+. If not selected, gettimeofday
-	will be used instead (which gives wrong results if date/time
-	is reset).
-
-config BUSYBOX_IOCTL_HEX2STR_ERROR
-	bool "Use ioctl names rather than hex values in error messages"
-	default y
-	help
-	Use ioctl names rather than hex values in error messages
-	(e.g. VT_DISALLOCATE rather than 0x5608). If disabled this
-	saves about 1400 bytes.
-
-config BUSYBOX_FEATURE_HWIB
-	bool "Support infiniband HW"
-	default y
-	help
-	Support for printing infiniband addresses in network applets.

+ 7 - 7
package/busybox/config/mailutils/Config.in

@@ -1,6 +1,13 @@
 # DO NOT EDIT. This file is generated from Config.src
 menu "Mail Utilities"
 
+config BUSYBOX_FEATURE_MIME_CHARSET
+	string "Default charset"
+	default "us-ascii"
+	depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL
+	help
+	Default charset of the message.
+
 config BUSYBOX_MAKEMIME
 	bool "makemime (5.4 kb)"
 	default y
@@ -41,11 +48,4 @@ config BUSYBOX_SENDMAIL
 	help
 	Barebones sendmail.
 
-config BUSYBOX_FEATURE_MIME_CHARSET
-	string "Default charset"
-	default "us-ascii"
-	depends on BUSYBOX_MAKEMIME || BUSYBOX_REFORMIME || BUSYBOX_SENDMAIL
-	help
-	Default charset of the message.
-
 endmenu

+ 21 - 0
package/busybox/config/miscutils/Config.in

@@ -12,6 +12,12 @@ config BUSYBOX_ADJTIMEX
 	help
 	Adjtimex reads and optionally sets adjustment parameters for
 	the Linux clock adjustment algorithm.
+config BUSYBOX_ASCII
+	bool "ascii"
+	default y
+	help
+	Print ascii table.
+
 config BUSYBOX_BBCONFIG
 	bool "bbconfig (9.7 kb)"
 	default n
@@ -783,4 +789,19 @@ config BUSYBOX_WATCHDOG
 	certain amount of time, the watchdog device assumes the system has
 	hung, and will cause the hardware to reboot.
 
+config BUSYBOX_FEATURE_WATCHDOG_OPEN_TWICE
+	bool "Open watchdog device twice, closing it gracefully in between"
+	depends on BUSYBOX_WATCHDOG
+	default n   # this behavior was essentially a hack for a broken driver
+	help
+	When enabled, the watchdog device is opened and then immediately
+	magic-closed, before being opened a second time. This may be necessary
+	for some watchdog devices, but can cause spurious warnings in the
+	kernel log if the nowayout feature is enabled. If this workaround
+	is really needed for you machine to work properly, consider whether
+	it should be fixed in the kernel driver instead. Even when disabled,
+	the behaviour is easily emulated with a "printf 'V' > /dev/watchdog"
+	immediately before starting the busybox watchdog daemon. Say n unless
+	you know that you absolutely need this.
+
 endmenu

+ 46 - 0
package/busybox/config/networking/Config.in

@@ -47,6 +47,32 @@ config BUSYBOX_VERBOSE_RESOLUTION_ERRORS
 	"can't resolve 'hostname.com'" and want to know more.
 	This may increase size of your executable a bit.
 
+config BUSYBOX_FEATURE_ETC_NETWORKS
+	bool "Support /etc/networks"
+	default n
+	help
+	Enable support for network names in /etc/networks. This is
+	a rarely used feature which allows you to use names
+	instead of IP/mask pairs in route command.
+
+config BUSYBOX_FEATURE_ETC_SERVICES
+	bool "Consult /etc/services even for well-known ports"
+	default n
+	help
+	Look up e.g. "telnet" and "http" in /etc/services file
+	instead of assuming ports 23 and 80.
+	This is almost never necessary (everybody uses standard ports),
+	and it makes sense to avoid reading this file.
+	If you disable this option, in the cases where port is explicitly
+	specified as a service name (e.g. "telnet HOST PORTNAME"),
+	it will still be looked up in /etc/services.
+
+config BUSYBOX_FEATURE_HWIB
+	bool "Support infiniband HW"
+	default y
+	help
+	Support for printing infiniband addresses in network applets.
+
 config BUSYBOX_FEATURE_TLS_SHA1
 	bool "In TLS code, support ciphers which use deprecated SHA1"
 	depends on BUSYBOX_TLS
@@ -173,6 +199,12 @@ config BUSYBOX_HTTPD
 	help
 	HTTP server.
 
+config BUSYBOX_FEATURE_HTTPD_PORT_DEFAULT
+	int "Default port"
+	default 80
+	range 1 65535
+	depends on BUSYBOX_HTTPD
+
 config BUSYBOX_FEATURE_HTTPD_RANGES
 	bool "Support 'Ranges:' header"
 	default y
@@ -939,6 +971,12 @@ config BUSYBOX_FEATURE_TELNETD_STANDALONE
 	help
 	Selecting this will make telnetd able to run standalone.
 
+config BUSYBOX_FEATURE_TELNETD_PORT_DEFAULT
+	int "Default port"
+	default 23
+	range 1 65535
+	depends on BUSYBOX_FEATURE_TELNETD_STANDALONE
+
 config BUSYBOX_FEATURE_TELNETD_INETD_WAIT
 	bool "Support -w SEC option (inetd wait mode)"
 	default y
@@ -1086,6 +1124,13 @@ config BUSYBOX_FEATURE_WGET_STATUSBAR
 	default y
 	depends on BUSYBOX_WGET
 
+config BUSYBOX_FEATURE_WGET_FTP
+	bool "Enable FTP protocol (+1k)"
+	default y
+	depends on BUSYBOX_WGET
+	help
+	To support FTPS, enable FEATURE_WGET_HTTPS as well.
+
 config BUSYBOX_FEATURE_WGET_AUTHENTICATION
 	bool "Enable HTTP authentication"
 	default y
@@ -1114,6 +1159,7 @@ config BUSYBOX_FEATURE_WGET_HTTPS
 	select BUSYBOX_TLS
 	help
 	wget will use internal TLS code to connect to https:// URLs.
+	It also enables FTPS support, but it's not well tested yet.
 	Note:
 	On NOMMU machines, ssl_helper applet should be available
 	in the $PATH for this to work. Make sure to select that applet.

+ 8 - 0
package/busybox/config/networking/udhcp/Config.in

@@ -142,6 +142,14 @@ config BUSYBOX_FEATURE_UDHCPC6_RFC5970
 comment "Common options for DHCP applets"
         depends on BUSYBOX_UDHCPD || BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6 || BUSYBOX_DHCPRELAY
 
+config BUSYBOX_UDHCPC_DEFAULT_INTERFACE
+	string "Default interface name"
+	default "eth0"
+	depends on BUSYBOX_UDHCPC || BUSYBOX_UDHCPC6
+	help
+	The interface that will be used if no other interface is
+	specified on the commandline.
+
 config BUSYBOX_FEATURE_UDHCP_PORT
 	bool "Enable '-P port' option for udhcpd and udhcpc"
 	default n

+ 15 - 8
package/busybox/config/procps/Config.in

@@ -6,6 +6,21 @@
 
 menu "Process Utilities"
 
+config BUSYBOX_FEATURE_FAST_TOP
+	bool "Faster /proc scanning code (+100 bytes)"
+	default n  # all "fast or small" options default to small
+	help
+	This option makes top and ps ~20% faster (or 20% less CPU hungry),
+	but code size is slightly bigger.
+
+config BUSYBOX_FEATURE_SHOW_THREADS
+	bool "Support thread display in ps/pstree/top"
+	default y
+	depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE
+	help
+	Enables the ps -T option, showing of threads in pstree,
+	and 'h' command in top.
+
 config BUSYBOX_FREE
 	bool "free (3.1 kb)"
 	default y
@@ -259,12 +274,4 @@ config BUSYBOX_WATCH
 	watch is used to execute a program periodically, showing
 	output to the screen.
 
-config BUSYBOX_FEATURE_SHOW_THREADS
-	bool "Support thread display in ps/pstree/top"
-	default y
-	depends on BUSYBOX_PS || BUSYBOX_TOP || BUSYBOX_PSTREE
-	help
-	Enables the ps -T option, showing of threads in pstree,
-	and 'h' command in top.
-
 endmenu

+ 6 - 6
package/busybox/config/shell/Config.in

@@ -88,7 +88,7 @@ config BUSYBOX_SHELL_ASH
 
 config BUSYBOX_ASH
 	bool "ash (78 kb)"
-	default n
+	default y
 	depends on !BUSYBOX_NOMMU
 	select BUSYBOX_SHELL_ASH
 	help
@@ -299,11 +299,6 @@ config BUSYBOX_HUSH_BRACE_EXPANSION
 	help
 	Enable {abc,def} extension.
 
-config BUSYBOX_HUSH_LINENO_VAR
-	bool "$LINENO variable"
-	default y
-	depends on BUSYBOX_HUSH_BASH_COMPAT
-
 config BUSYBOX_HUSH_BASH_SOURCE_CURDIR
 	bool "'source' and '.' builtins search current directory after $PATH"
 	default n   # do not encourage non-standard behavior
@@ -311,6 +306,11 @@ config BUSYBOX_HUSH_BASH_SOURCE_CURDIR
 	help
 	This is not compliant with standards. Avoid if possible.
 
+config BUSYBOX_HUSH_LINENO_VAR
+	bool "$LINENO variable (bashism)"
+	default y
+	depends on BUSYBOX_SHELL_HUSH
+
 config BUSYBOX_HUSH_INTERACTIVE
 	bool "Interactive mode"
 	default y

+ 3 - 3
package/busybox/config/util-linux/Config.in

@@ -517,7 +517,7 @@ config BUSYBOX_MKFS_VFAT
 	Alias to "mkdosfs".
 config BUSYBOX_MKSWAP
 	bool "mkswap (6.3 kb)"
-	default n
+	default y
 	help
 	The mkswap utility is used to configure a file or disk partition as
 	Linux swap space. This allows Linux to use the entire file or
@@ -781,7 +781,7 @@ config BUSYBOX_SETSID
 	setsid runs a program in a new session
 config BUSYBOX_SWAPON
 	bool "swapon (15 kb)"
-	default n
+	default y
 	help
 	Once you have created some swap space using 'mkswap', you also need
 	to enable your swap space with the 'swapon' utility. The 'swapoff'
@@ -807,7 +807,7 @@ config BUSYBOX_FEATURE_SWAPON_PRI
 
 config BUSYBOX_SWAPOFF
 	bool "swapoff (14 kb)"
-	default n
+	default y
 
 config BUSYBOX_FEATURE_SWAPONOFF_LABEL
 	bool "Support specifying devices by label or UUID"

+ 2 - 2
package/hush/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		hush
-PKG_VERSION:=		1.33.0
+PKG_VERSION:=		1.35.0
 PKG_RELEASE:=		1
-PKG_HASH:=		d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd
+PKG_HASH:=		faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694
 PKG_DESCR:=		hush standalone shell
 PKG_SECTION:=		base/shells
 PKG_URL:=		http://www.busybox.net/

+ 41 - 24
package/hush/files/config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.33.0
-# Fri Apr  9 22:37:09 2021
+# Busybox version: 1.35.0
+# Sat Jan  8 19:16:27 2022
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -94,9 +94,12 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
 CONFIG_SHA3_SMALL=1
-# CONFIG_FEATURE_FAST_TOP is not set
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_ETC_SERVICES is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
+CONFIG_FEATURE_USE_SENDFILE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
@@ -120,14 +123,6 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_USE_SENDFILE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
 
 #
 # Applets
@@ -162,6 +157,8 @@ CONFIG_BZIP2_SMALL=0
 # CONFIG_CPIO is not set
 # CONFIG_FEATURE_CPIO_O is not set
 # CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_FEATURE_CPIO_IGNORE_DEVNO is not set
+# CONFIG_FEATURE_CPIO_RENUMBER_INODES is not set
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_GZIP is not set
@@ -197,6 +194,14 @@ CONFIG_GZIP_FAST=0
 #
 # Coreutils
 #
+# CONFIG_FEATURE_VERBOSE is not set
+
+#
+# Common options for date and touch
+#
+# CONFIG_FEATURE_TIMEZONE is not set
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+# CONFIG_FEATURE_HUMAN_READABLE is not set
 # CONFIG_BASENAME is not set
 # CONFIG_CAT is not set
 # CONFIG_FEATURE_CATN is not set
@@ -207,11 +212,13 @@ CONFIG_GZIP_FAST=0
 # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
 # CONFIG_CHROOT is not set
 # CONFIG_CKSUM is not set
+# CONFIG_CRC32 is not set
 # CONFIG_COMM is not set
 # CONFIG_CP is not set
 # CONFIG_FEATURE_CP_LONG_OPTIONS is not set
 # CONFIG_FEATURE_CP_REFLINK is not set
 # CONFIG_CUT is not set
+# CONFIG_FEATURE_CUT_REGEX is not set
 # CONFIG_DATE is not set
 # CONFIG_FEATURE_DATE_ISOFMT is not set
 # CONFIG_FEATURE_DATE_NANO is not set
@@ -223,6 +230,7 @@ CONFIG_GZIP_FAST=0
 # CONFIG_FEATURE_DD_STATUS is not set
 # CONFIG_DF is not set
 # CONFIG_FEATURE_DF_FANCY is not set
+# CONFIG_FEATURE_SKIP_ROOTFS is not set
 # CONFIG_DIRNAME is not set
 # CONFIG_DOS2UNIX is not set
 # CONFIG_UNIX2DOS is not set
@@ -312,7 +320,6 @@ CONFIG_GZIP_FAST=0
 # CONFIG_FEATURE_TEST_64 is not set
 # CONFIG_TIMEOUT is not set
 # CONFIG_TOUCH is not set
-# CONFIG_FEATURE_TOUCH_NODEREF is not set
 # CONFIG_FEATURE_TOUCH_SUSV3 is not set
 # CONFIG_TR is not set
 # CONFIG_FEATURE_TR_CLASSES is not set
@@ -338,13 +345,6 @@ CONFIG_UNAME_OSNAME=""
 # CONFIG_WHOAMI is not set
 # CONFIG_YES is not set
 
-#
-# Common options
-#
-# CONFIG_FEATURE_VERBOSE is not set
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-# CONFIG_FEATURE_HUMAN_READABLE is not set
-
 #
 # Console Utilities
 #
@@ -408,6 +408,7 @@ CONFIG_DEFAULT_SETFONT_DIR=""
 CONFIG_FEATURE_VI_MAX_LEN=0
 # CONFIG_FEATURE_VI_8BIT is not set
 # CONFIG_FEATURE_VI_COLON is not set
+# CONFIG_FEATURE_VI_COLON_EXPAND is not set
 # CONFIG_FEATURE_VI_YANKMARK is not set
 # CONFIG_FEATURE_VI_SEARCH is not set
 # CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -421,6 +422,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0
 # CONFIG_FEATURE_VI_UNDO is not set
 # CONFIG_FEATURE_VI_UNDO_QUEUE is not set
 CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
+# CONFIG_FEATURE_VI_VERBOSE_STATUS is not set
 # CONFIG_FEATURE_ALLOW_EXEC is not set
 
 #
@@ -429,7 +431,11 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
 # CONFIG_FIND is not set
 # CONFIG_FEATURE_FIND_PRINT0 is not set
 # CONFIG_FEATURE_FIND_MTIME is not set
+# CONFIG_FEATURE_FIND_ATIME is not set
+# CONFIG_FEATURE_FIND_CTIME is not set
 # CONFIG_FEATURE_FIND_MMIN is not set
+# CONFIG_FEATURE_FIND_AMIN is not set
+# CONFIG_FEATURE_FIND_CMIN is not set
 # CONFIG_FEATURE_FIND_PERM is not set
 # CONFIG_FEATURE_FIND_TYPE is not set
 # CONFIG_FEATURE_FIND_EXECUTABLE is not set
@@ -437,6 +443,7 @@ CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0
 # CONFIG_FEATURE_FIND_MAXDEPTH is not set
 # CONFIG_FEATURE_FIND_NEWER is not set
 # CONFIG_FEATURE_FIND_INUM is not set
+# CONFIG_FEATURE_FIND_SAMEFILE is not set
 # CONFIG_FEATURE_FIND_EXEC is not set
 # CONFIG_FEATURE_FIND_EXEC_PLUS is not set
 # CONFIG_FEATURE_FIND_USER is not set
@@ -719,6 +726,7 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 # Miscellaneous Utilities
 #
 # CONFIG_ADJTIMEX is not set
+# CONFIG_ASCII is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 # CONFIG_BC is not set
@@ -814,6 +822,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_UBIRENAME is not set
 # CONFIG_VOLNAME is not set
 # CONFIG_WATCHDOG is not set
+# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
 
 #
 # Networking Utilities
@@ -822,6 +831,9 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
 # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_ETC_SERVICES is not set
+# CONFIG_FEATURE_HWIB is not set
 # CONFIG_FEATURE_TLS_SHA1 is not set
 # CONFIG_ARP is not set
 # CONFIG_ARPING is not set
@@ -840,6 +852,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 # CONFIG_HOSTNAME is not set
 # CONFIG_DNSDOMAINNAME is not set
 # CONFIG_HTTPD is not set
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0
 # CONFIG_FEATURE_HTTPD_RANGES is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
@@ -932,6 +945,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR=""
 # CONFIG_FEATURE_TELNET_WIDTH is not set
 # CONFIG_TELNETD is not set
 # CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0
 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 # CONFIG_TFTP is not set
 # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
@@ -952,6 +966,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR=""
 # CONFIG_WGET is not set
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
 # CONFIG_FEATURE_WGET_STATUSBAR is not set
+# CONFIG_FEATURE_WGET_FTP is not set
 # CONFIG_FEATURE_WGET_AUTHENTICATION is not set
 # CONFIG_FEATURE_WGET_TIMEOUT is not set
 # CONFIG_FEATURE_WGET_HTTPS is not set
@@ -973,6 +988,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
+CONFIG_UDHCPC_DEFAULT_INTERFACE=""
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
@@ -990,17 +1006,19 @@ CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 #
 # Mail Utilities
 #
+CONFIG_FEATURE_MIME_CHARSET=""
 # CONFIG_MAKEMIME is not set
 # CONFIG_POPMAILDIR is not set
 # CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
 # CONFIG_REFORMIME is not set
 # CONFIG_FEATURE_REFORMIME_COMPAT is not set
 # CONFIG_SENDMAIL is not set
-CONFIG_FEATURE_MIME_CHARSET=""
 
 #
 # Process Utilities
 #
+# CONFIG_FEATURE_FAST_TOP is not set
+# CONFIG_FEATURE_SHOW_THREADS is not set
 # CONFIG_FREE is not set
 # CONFIG_FUSER is not set
 # CONFIG_IOSTAT is not set
@@ -1039,7 +1057,6 @@ CONFIG_FEATURE_MIME_CHARSET=""
 # CONFIG_UPTIME is not set
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 # CONFIG_WATCH is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
 
 #
 # Runit Utilities
@@ -1104,8 +1121,8 @@ CONFIG_HUSH=y
 CONFIG_SHELL_HUSH=y
 CONFIG_HUSH_BASH_COMPAT=y
 CONFIG_HUSH_BRACE_EXPANSION=y
-CONFIG_HUSH_LINENO_VAR=y
 CONFIG_HUSH_BASH_SOURCE_CURDIR=y
+CONFIG_HUSH_LINENO_VAR=y
 CONFIG_HUSH_INTERACTIVE=y
 CONFIG_HUSH_SAVEHISTORY=y
 CONFIG_HUSH_JOB=y