update busybox and default config

1 files changed, 51 insertions, 15 deletions

diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in
index 35f89670d..174f192a2 100644
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -58,7 +58,7 @@ config BUSYBOX_USE_BB_SHADOW
 	  password servers and whatnot.
 
 config BUSYBOX_USE_BB_CRYPT
-	bool "Use internal DES and MD5 crypt functions"
+	bool "Use internal crypt functions"
 	default y
 	help
 	  Busybox has internal DES and MD5 crypt functions.
@@ -79,12 +79,31 @@ config BUSYBOX_USE_BB_CRYPT
 	  In static build, it makes code _smaller_ by about 1.2k,
 	  and likely many kilobytes less of bss.
 
+config BUSYBOX_USE_BB_CRYPT_SHA
+	bool "Enable SHA256/512 crypt functions"
+	default n
+	depends on BUSYBOX_USE_BB_CRYPT
+	help
+	  Enable this if you have passwords starting with "$5$" or "$6$"
+	  in your /etc/passwd or /etc/shadow files. These passwords
+	  are hashed using SHA256 and SHA512 algorithms. Support for them
+	  was added to glibc in 2008.
+	  With this option off, login will fail password check for any
+	  user which has password encrypted with these algorithms.
+
 config BUSYBOX_ADDGROUP
 	bool "addgroup"
 	default y
 	help
 	  Utility for creating a new group account.
 
+config BUSYBOX_FEATURE_ADDGROUP_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BUSYBOX_ADDGROUP && BUSYBOX_LONG_OPTS
+	help
+	  Support long options for the addgroup applet.
+
 config BUSYBOX_FEATURE_ADDUSER_TO_GROUP
 	bool "Support for adding users to groups"
 	default n
@@ -129,10 +148,26 @@ config BUSYBOX_ADDUSER
 config BUSYBOX_FEATURE_ADDUSER_LONG_OPTIONS
 	bool "Enable long options"
 	default n
-	depends on BUSYBOX_ADDUSER && BUSYBOX_GETOPT_LONG
+	depends on BUSYBOX_ADDUSER && BUSYBOX_LONG_OPTS
 	help
 	  Support long options for the adduser applet.
 
+config BUSYBOX_FIRST_SYSTEM_ID
+	int "First valid system uid or gid for adduser and addgroup"
+	depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP
+	range 0 64900
+	default 100
+	help
+	  First valid system uid or gid for adduser and addgroup
+
+config BUSYBOX_LAST_SYSTEM_ID
+	int "Last valid system uid or gid for adduser and addgroup"
+	depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP
+	range 0 64900
+	default 999
+	help
+	  Last valid system uid or gid for adduser and addgroup
+
 config BUSYBOX_DELUSER
 	bool "deluser"
 	default y
@@ -149,14 +184,14 @@ config BUSYBOX_GETTY
 config BUSYBOX_FEATURE_UTMP
 	bool "Support utmp file"
 	depends on BUSYBOX_GETTY || BUSYBOX_LOGIN || BUSYBOX_SU || BUSYBOX_WHO
-	default y
+	default n
 	help
 	  The file /var/run/utmp is used to track who is currently logged in.
 
 config BUSYBOX_FEATURE_WTMP
 	bool "Support wtmp file"
 	depends on BUSYBOX_GETTY || BUSYBOX_LOGIN || BUSYBOX_SU || BUSYBOX_LAST
-	default y
+	default n
 	select BUSYBOX_FEATURE_UTMP
 	help
 	  The file /var/run/wtmp is used to track when user's have logged into
@@ -173,12 +208,12 @@ config BUSYBOX_LOGIN
 	  Note that Busybox binary must be setuid root for this applet to
 	  work properly.
 
-#config BUSYBOX_PAM
-#	bool "Support for PAM (Pluggable Authentication Modules)"
-#	default n
-#	depends on BUSYBOX_LOGIN
-#	help
-#	  Use PAM in login(1) instead of direct access to password database.
+config BUSYBOX_PAM
+	bool "Support for PAM (Pluggable Authentication Modules)"
+	default n
+	depends on BUSYBOX_LOGIN
+	help
+	  Use PAM in login(1) instead of direct access to password database.
 
 config BUSYBOX_LOGIN_SCRIPTS
 	bool "Support for login scripts"
@@ -221,7 +256,7 @@ config BUSYBOX_PASSWD
 
 config BUSYBOX_FEATURE_PASSWD_WEAK_CHECK
 	bool "Check new passwords for weakness"
-	default y
+	default n
 	depends on BUSYBOX_PASSWD
 	help
 	  With this option passwd will refuse new passwords which are "weak".
@@ -230,15 +265,16 @@ config BUSYBOX_CRYPTPW
 	bool "cryptpw"
 	default n
 	help
-	  Applet for crypting a string.
+	  Encrypts the given password with the crypt(3) libc function
+	  using the given salt. Debian has this utility under mkpasswd
+	  name. Busybox provides mkpasswd as an alias for cryptpw.
 
 config BUSYBOX_CHPASSWD
 	bool "chpasswd"
 	default n
 	help
-	  chpasswd reads a file of user name and password pairs from
-	  standard input and uses this information to update a group of
-	  existing users.
+	  Reads a file of user name and password pairs from standard input
+	  and uses this information to update a group of existing users.
 
 config BUSYBOX_SU
 	bool "su"