busybox: update to version 1.25.0

The following patches were removed:
010-networking-fix-uninitialized-memory-when-displaying-.patch
  https://git.busybox.net/busybox/commit/?id=f2c043acfcf9dad9fd3d65821b81f89986bbe54e

030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch
  https://git.busybox.net/busybox/commit/?id=4ab372d49a6e82b0bf097dedb96d26330c5f2d5f

204-udhcpc_src_ip_rebind.patch
  https://git.busybox.net/busybox/commit/?id=abe8f7515aded80889d78c2c1c8947997918cf90

230-ntpd_delayed_resolve.patch
  https://git.busybox.net/busybox/commit/?id=c8641962e4cbde48108ddfc1c105e3320778190d
  https://git.busybox.net/busybox/commit/?id=e4caf1dd9ce8569371a0eeb77ccf02a572dc0f11

260-arping_missing_includes.patch
  Not needed any more, still builds with musl for me.
  Add in 92fd6e6f1a "busybox: fix arping applet building on musl"

The Kconfig files were updated with these commands:
cd config
../convert_menuconfig.pl .../build_dir/target-*/busybox-1.25.0
cd ..
./convert_defaults.pl < .../build_dir/target-*/busybox-1.25.0/.config > Config-defaults.in

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

1 files changed, 30 insertions, 35 deletions

diff --git a/package/utils/busybox/config/runit/Config.in b/package/utils/busybox/config/runit/Config.in
index 8074fb18f7..a322a2cd8a 100644
--- a/package/utils/busybox/config/runit/Config.in
+++ b/package/utils/busybox/config/runit/Config.in
@@ -6,14 +6,43 @@
 
 menu "Runit Utilities"
 
+config BUSYBOX_CONFIG_CHPST
+	bool "chpst"
+	default BUSYBOX_DEFAULT_CHPST
+	help
+	  chpst changes the process state according to the given options, and
+	  execs specified program.
 
+config BUSYBOX_CONFIG_SETUIDGID
+	bool "setuidgid"
+	default BUSYBOX_DEFAULT_SETUIDGID
+	help
+	  Sets soft resource limits as specified by options
+
+config BUSYBOX_CONFIG_ENVUIDGID
+	bool "envuidgid"
+	default BUSYBOX_DEFAULT_ENVUIDGID
+	help
+	  Sets $UID to account's uid and $GID to account's gid
+
+config BUSYBOX_CONFIG_ENVDIR
+	bool "envdir"
+	default BUSYBOX_DEFAULT_ENVDIR
+	help
+	  Sets various environment variables as specified by files
+	  in the given directory
+
+config BUSYBOX_CONFIG_SOFTLIMIT
+	bool "softlimit"
+	default BUSYBOX_DEFAULT_SOFTLIMIT
+	help
+	  Sets soft resource limits as specified by options
 config BUSYBOX_CONFIG_RUNSV
 	bool "runsv"
 	default BUSYBOX_DEFAULT_RUNSV
 	help
 	  runsv starts and monitors a service and optionally an appendant log
 	  service.
-
 config BUSYBOX_CONFIG_RUNSVDIR
 	bool "runsvdir"
 	default BUSYBOX_DEFAULT_RUNSVDIR
@@ -30,7 +59,6 @@ config BUSYBOX_CONFIG_FEATURE_RUNSVDIR_LOG
 	  Enable feature where second parameter of runsvdir holds last error
 	  message (viewable via top/ps). Otherwise (feature is off
 	  or no parameter), error messages go to stderr only.
-
 config BUSYBOX_CONFIG_SV
 	bool "sv"
 	default BUSYBOX_DEFAULT_SV
@@ -45,7 +73,6 @@ config BUSYBOX_CONFIG_SV_DEFAULT_SERVICE_DIR
 	help
 	  Default directory for services.
 	  Defaults to "/var/service"
-
 config BUSYBOX_CONFIG_SVLOGD
 	bool "svlogd"
 	default BUSYBOX_DEFAULT_SVLOGD
@@ -54,36 +81,4 @@ config BUSYBOX_CONFIG_SVLOGD
 	  filters log messages, and writes the data to one or more automatically
 	  rotated logs.
 
-config BUSYBOX_CONFIG_CHPST
-	bool "chpst"
-	default BUSYBOX_DEFAULT_CHPST
-	help
-	  chpst changes the process state according to the given options, and
-	  execs specified program.
-
-config BUSYBOX_CONFIG_SETUIDGID
-	bool "setuidgid"
-	default BUSYBOX_DEFAULT_SETUIDGID
-	help
-	  Sets soft resource limits as specified by options
-
-config BUSYBOX_CONFIG_ENVUIDGID
-	bool "envuidgid"
-	default BUSYBOX_DEFAULT_ENVUIDGID
-	help
-	  Sets $UID to account's uid and $GID to account's gid
-
-config BUSYBOX_CONFIG_ENVDIR
-	bool "envdir"
-	default BUSYBOX_DEFAULT_ENVDIR
-	help
-	  Sets various environment variables as specified by files
-	  in the given directory
-
-config BUSYBOX_CONFIG_SOFTLIMIT
-	bool "softlimit"
-	default BUSYBOX_DEFAULT_SOFTLIMIT
-	help
-	  Sets soft resource limits as specified by options
-
 endmenu