package/busybox: Update stored config files

When updating busybox, these files must be updated - otherwise the
config written to busybox source tree when building may be incomplete,
causing the build to hang.

Fixes: e4800c73e63e5 ("busybox: update to latest")
Signed-off-by: Phil Sutter <phil@nwl.cc>

1 files changed, 193 insertions, 226 deletions

diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in
index 03aba2b07..5f12bbbee 100644
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -1,363 +1,330 @@
 # DO NOT EDIT. This file is generated from Config.src
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Login/Password Management Utilities"
 
-config BUSYBOX_ADD_SHELL
-       bool "add-shell"
-       default y if DESKTOP
-       help
-         Add shells to /etc/shells.
-
-config BUSYBOX_REMOVE_SHELL
-       bool "remove-shell"
-       default y if DESKTOP
-       help
-         Remove shells from /etc/shells.
-
 config BUSYBOX_FEATURE_SHADOWPASSWDS
-	bool "Support for shadow passwords"
+	bool "Support shadow passwords"
 	default y
 	help
-	  Build support for shadow password in /etc/shadow. This file is only
-	  readable by root and thus the encrypted passwords are no longer
-	  publicly readable.
+	Build support for shadow password in /etc/shadow. This file is only
+	readable by root and thus the encrypted passwords are no longer
+	publicly readable.
 
 config BUSYBOX_USE_BB_PWD_GRP
 	bool "Use internal password and group functions rather than system functions"
-	default n
+	default y
 	help
-	  If you leave this disabled, busybox will use the system's password
-	  and group functions. And if you are using the GNU C library
-	  (glibc), you will then need to install the /etc/nsswitch.conf
-	  configuration file and the required /lib/libnss_* libraries in
-	  order for the password and group functions to work. This generally
-	  makes your embedded system quite a bit larger.
+	If you leave this disabled, busybox will use the system's password
+	and group functions. And if you are using the GNU C library
+	(glibc), you will then need to install the /etc/nsswitch.conf
+	configuration file and the required /lib/libnss_* libraries in
+	order for the password and group functions to work. This generally
+	makes your embedded system quite a bit larger.
 
-	  Enabling this option will cause busybox to directly access the
-	  system's /etc/password, /etc/group files (and your system will be
-	  smaller, and I will get fewer emails asking about how glibc NSS
-	  works). When this option is enabled, you will not be able to use
-	  PAM to access remote LDAP password servers and whatnot. And if you
-	  want hostname resolution to work with glibc, you still need the
-	  /lib/libnss_* libraries.
+	Enabling this option will cause busybox to directly access the
+	system's /etc/password, /etc/group files (and your system will be
+	smaller, and I will get fewer emails asking about how glibc NSS
+	works). When this option is enabled, you will not be able to use
+	PAM to access remote LDAP password servers and whatnot. And if you
+	want hostname resolution to work with glibc, you still need the
+	/lib/libnss_* libraries.
 
-	  If you need to use glibc's nsswitch.conf mechanism
-	  (e.g. if user/group database is NOT stored in /etc/passwd etc),
-	  you must NOT use this option.
+	If you need to use glibc's nsswitch.conf mechanism
+	(e.g. if user/group database is NOT stored in /etc/passwd etc),
+	you must NOT use this option.
 
-	  If you enable this option, it will add about 1.5k.
+	If you enable this option, it will add about 1.5k.
 
 config BUSYBOX_USE_BB_SHADOW
 	bool "Use internal shadow password functions"
-	default n
+	default y
 	depends on BUSYBOX_USE_BB_PWD_GRP && BUSYBOX_FEATURE_SHADOWPASSWDS
 	help
-	  If you leave this disabled, busybox will use the system's shadow
-	  password handling functions. And if you are using the GNU C library
-	  (glibc), you will then need to install the /etc/nsswitch.conf
-	  configuration file and the required /lib/libnss_* libraries in
-	  order for the shadow password functions to work. This generally
-	  makes your embedded system quite a bit larger.
+	If you leave this disabled, busybox will use the system's shadow
+	password handling functions. And if you are using the GNU C library
+	(glibc), you will then need to install the /etc/nsswitch.conf
+	configuration file and the required /lib/libnss_* libraries in
+	order for the shadow password functions to work. This generally
+	makes your embedded system quite a bit larger.
 
-	  Enabling this option will cause busybox to directly access the
-	  system's /etc/shadow file when handling shadow passwords. This
-	  makes your system smaller (and I will get fewer emails asking about
-	  how glibc NSS works). When this option is enabled, you will not be
-	  able to use PAM to access shadow passwords from remote LDAP
-	  password servers and whatnot.
+	Enabling this option will cause busybox to directly access the
+	system's /etc/shadow file when handling shadow passwords. This
+	makes your system smaller (and I will get fewer emails asking about
+	how glibc NSS works). When this option is enabled, you will not be
+	able to use PAM to access shadow passwords from remote LDAP
+	password servers and whatnot.
 
 config BUSYBOX_USE_BB_CRYPT
 	bool "Use internal crypt functions"
-	default n
+	default y
 	help
-	  Busybox has internal DES and MD5 crypt functions.
-	  They produce results which are identical to corresponding
-	  standard C library functions.
+	Busybox has internal DES and MD5 crypt functions.
+	They produce results which are identical to corresponding
+	standard C library functions.
 
-	  If you leave this disabled, busybox will use the system's
-	  crypt functions. Most C libraries use large (~70k)
-	  static buffers there, and also combine them with more general
-	  DES encryption/decryption.
+	If you leave this disabled, busybox will use the system's
+	crypt functions. Most C libraries use large (~70k)
+	static buffers there, and also combine them with more general
+	DES encryption/decryption.
 
-	  For busybox, having large static buffers is undesirable,
-	  especially on NOMMU machines. Busybox also doesn't need
-	  DES encryption/decryption and can do with smaller code.
+	For busybox, having large static buffers is undesirable,
+	especially on NOMMU machines. Busybox also doesn't need
+	DES encryption/decryption and can do with smaller code.
 
-	  If you enable this option, it will add about 4.8k of code
-	  if you are building dynamically linked executable.
-	  In static build, it makes code _smaller_ by about 1.2k,
-	  and likely many kilobytes less of bss.
+	If you enable this option, it will add about 4.8k of code
+	if you are building dynamically linked executable.
+	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
+	default y
 	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.
+	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_ADDUSER
-	bool "adduser"
-	default n
+config BUSYBOX_ADD_SHELL
+	bool "add-shell (3.1 kb)"
+	default y if BUSYBOX_DESKTOP
 	help
-	  Utility for creating a new user account.
+	Add shells to /etc/shells.
 
-config BUSYBOX_FEATURE_ADDUSER_LONG_OPTIONS
-	bool "Enable long options"
-	default n
-	depends on BUSYBOX_ADDUSER && BUSYBOX_LONG_OPTS
+config BUSYBOX_REMOVE_SHELL
+	bool "remove-shell (3 kb)"
+	default y if BUSYBOX_DESKTOP
+	help
+	Remove shells from /etc/shells.
+config BUSYBOX_ADDGROUP
+	bool "addgroup (8.6 kb)"
+	default y
+	select BUSYBOX_LONG_OPTS
+	help
+	Utility for creating a new group account.
+
+config BUSYBOX_FEATURE_ADDUSER_TO_GROUP
+	bool "Support adding users to groups"
+	default y
+	depends on BUSYBOX_ADDGROUP
+	help
+	If called with two non-option arguments,
+	addgroup will add an existing user to an
+	existing group.
+config BUSYBOX_ADDUSER
+	bool "adduser (15 kb)"
+	default y
+	select BUSYBOX_LONG_OPTS
 	help
-	  Support long options for the adduser applet.
+	Utility for creating a new user account.
 
 config BUSYBOX_FEATURE_CHECK_NAMES
 	bool "Enable sanity check on user/group names in adduser and addgroup"
 	default n
 	depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP
 	help
-	  Enable sanity check on user and group names in adduser and addgroup.
-	  To avoid problems, the user or group name should consist only of
-	  letters, digits, underscores, periods, at signs and dashes,
-	  and not start with a dash (as defined by IEEE Std 1003.1-2001).
-	  For compatibility with Samba machine accounts "$" is also supported
-	  at the end of the user or group name.
+	Enable sanity check on user and group names in adduser and addgroup.
+	To avoid problems, the user or group name should consist only of
+	letters, digits, underscores, periods, at signs and dashes,
+	and not start with a dash (as defined by IEEE Std 1003.1-2001).
+	For compatibility with Samba machine accounts "$" is also supported
+	at the end of the user or group name.
 
 config BUSYBOX_LAST_ID
 	int "Last valid uid or gid for adduser and addgroup"
 	depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP
 	default 60000
 	help
-	  Last valid uid or gid for adduser and addgroup
+	Last valid uid or gid for adduser and addgroup
 
 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
+	range 0 BUSYBOX_LAST_ID
 	default 100
 	help
-	  First valid system uid or gid for adduser and addgroup
+	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
+	range BUSYBOX_FIRST_SYSTEM_ID BUSYBOX_LAST_ID
 	default 999
 	help
-	  Last valid system uid or gid for adduser and addgroup
-
-config BUSYBOX_ADDGROUP
-	bool "addgroup"
-	default n
+	Last valid system uid or gid for adduser and addgroup
+config BUSYBOX_CHPASSWD
+	bool "chpasswd (18 kb)"
+	default y
 	help
-	  Utility for creating a new group account.
+	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_FEATURE_ADDGROUP_LONG_OPTIONS
-	bool "Enable long options"
-	default n
-	depends on BUSYBOX_ADDGROUP && BUSYBOX_LONG_OPTS
+config BUSYBOX_FEATURE_DEFAULT_PASSWD_ALGO
+	string "Default encryption method (passwd -a, cryptpw -m, chpasswd -c ALG)"
+	default "des"
+	depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW || BUSYBOX_CHPASSWD
 	help
-	  Support long options for the addgroup applet.
-
-config BUSYBOX_FEATURE_ADDUSER_TO_GROUP
-	bool "Support for adding users to groups"
-	default n
-	depends on BUSYBOX_ADDGROUP
+	Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
+config BUSYBOX_CRYPTPW
+	bool "cryptpw (14 kb)"
+	default y
 	help
-	  If  called  with two non-option arguments,
-	  addgroup will add an existing user to an
-	  existing group.
+	Encrypts the given password with the crypt(3) libc function
+	using the given salt.
 
+config BUSYBOX_MKPASSWD
+	bool "mkpasswd (15 kb)"
+	default y
+	help
+	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_DELUSER
-	bool "deluser"
-	default n
+	bool "deluser (9.1 kb)"
+	default y
 	help
-	  Utility for deleting a user account.
+	Utility for deleting a user account.
 
 config BUSYBOX_DELGROUP
-	bool "delgroup"
-	default n
+	bool "delgroup (6.4 kb)"
+	default y
 	help
-	  Utility for deleting a group account.
+	Utility for deleting a group account.
 
 config BUSYBOX_FEATURE_DEL_USER_FROM_GROUP
-	bool "Support for removing users from groups"
-	default n
+	bool "Support removing users from groups"
+	default y
 	depends on BUSYBOX_DELGROUP
 	help
-	  If called with two non-option arguments, deluser
-	  or delgroup will remove an user from a specified group.
-
+	If called with two non-option arguments, deluser
+	or delgroup will remove an user from a specified group.
 config BUSYBOX_GETTY
-	bool "getty"
+	bool "getty (10 kb)"
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  getty lets you log in on a tty. It is normally invoked by init.
-
-	  Note that you can save a few bytes by disabling it and
-	  using login applet directly.
-	  If you need to reset tty attributes before calling login,
-	  this script approximates getty:
+	getty lets you log in on a tty. It is normally invoked by init.
 
-	  exec </dev/$1 >/dev/$1 2>&1 || BUSYBOX_exit 1
-	  reset
-	  stty sane; stty ispeed 38400; stty ospeed 38400
-	  printf "%s login: " "`hostname`"
-	  read -r login
-	  exec /bin/login "$login"
+	Note that you can save a few bytes by disabling it and
+	using login applet directly.
+	If you need to reset tty attributes before calling login,
+	this script approximates getty:
 
+	exec </dev/$1 >/dev/$1 2>&1 || exit 1
+	reset
+	stty sane; stty ispeed 38400; stty ospeed 38400
+	printf "%s login: " "`hostname`"
+	read -r login
+	exec /bin/login "$login"
 config BUSYBOX_LOGIN
-	bool "login"
+	bool "login (24 kb)"
 	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  login is used when signing onto a system.
+	login is used when signing onto a system.
 
-	  Note that Busybox binary must be setuid root for this applet to
-	  work properly.
+	Note that busybox binary must be setuid root for this applet to
+	work properly.
 
 config BUSYBOX_LOGIN_SESSION_AS_CHILD
 	bool "Run logged in session in a child process"
-	default y if PAM
-	depends on BUSYBOX_LOGIN
-	help
-	  Run the logged in session in a child process.  This allows
-	  login to clean up things such as utmp entries or PAM sessions
-	  when the login session is complete.  If you use PAM, you
-	  almost always would want this to be set to Y, else PAM session
-	  will not be cleaned up.
-
-config BUSYBOX_PAM
-	bool "Support for PAM (Pluggable Authentication Modules)"
-	depends on !BUSYBOX_DISABLE_PAM
-	default n
+	default y if BUSYBOX_PAM
 	depends on BUSYBOX_LOGIN
 	help
-	  Use PAM in login(1) instead of direct access to password database.
+	Run the logged in session in a child process.  This allows
+	login to clean up things such as utmp entries or PAM sessions
+	when the login session is complete.  If you use PAM, you
+	almost always would want this to be set to Y, else PAM session
+	will not be cleaned up.
 
 config BUSYBOX_LOGIN_SCRIPTS
-	bool "Support for login scripts"
+	bool "Support login scripts"
 	depends on BUSYBOX_LOGIN
-	default n
+	default y
 	help
-	  Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT
-	  just prior to switching from root to logged-in user.
+	Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT
+	just prior to switching from root to logged-in user.
 
 config BUSYBOX_FEATURE_NOLOGIN
-	bool "Support for /etc/nologin"
-	default n
+	bool "Support /etc/nologin"
+	default y
 	depends on BUSYBOX_LOGIN
 	help
-	  The file /etc/nologin is used by (some versions of) login(1).
-	  If it exists, non-root logins are prohibited.
+	The file /etc/nologin is used by (some versions of) login(1).
+	If it exists, non-root logins are prohibited.
 
 config BUSYBOX_FEATURE_SECURETTY
-	bool "Support for /etc/securetty"
-	default n
+	bool "Support /etc/securetty"
+	default y
 	depends on BUSYBOX_LOGIN
 	help
-	  The file /etc/securetty is used by (some versions of) login(1).
-	  The file contains the device names of tty lines (one per line,
-	  without leading /dev/) on which root is allowed to login.
-
+	The file /etc/securetty is used by (some versions of) login(1).
+	The file contains the device names of tty lines (one per line,
+	without leading /dev/) on which root is allowed to login.
 config BUSYBOX_PASSWD
-	bool "passwd"
-	default n
+	bool "passwd (21 kb)"
+	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  passwd changes passwords for user and group accounts. A normal user
-	  may only change the password for his/her own account, the super user
-	  may change the password for any account. The administrator of a group
-	  may change the password for the group.
+	passwd changes passwords for user and group accounts. A normal user
+	may only change the password for his/her own account, the super user
+	may change the password for any account. The administrator of a group
+	may change the password for the group.
 
-	  Note that Busybox binary must be setuid root for this applet to
-	  work properly.
+	Note that busybox binary must be setuid root for this applet to
+	work properly.
 
 config BUSYBOX_FEATURE_PASSWD_WEAK_CHECK
 	bool "Check new passwords for weakness"
-	default n
+	default y
 	depends on BUSYBOX_PASSWD
 	help
-	  With this option passwd will refuse new passwords which are "weak".
-
-config BUSYBOX_CRYPTPW
-	bool "cryptpw"
-	default n
-	help
-	  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_MKPASSWD
-	bool "mkpasswd"
-	default n
-	help
-	  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
-	  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_FEATURE_DEFAULT_PASSWD_ALGO
-	string "Default password encryption method (passwd -a, cryptpw -m parameter)"
-	default "des"
-	depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW
-	help
-	  Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
-
+	With this option passwd will refuse new passwords which are "weak".
 config BUSYBOX_SU
-	bool "su"
-	default n
+	bool "su (19 kb)"
+	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  su is used to become another user during a login session.
-	  Invoked without a username, su defaults to becoming the super user.
-
-	  Note that Busybox binary must be setuid root for this applet to
-	  work properly.
+	su is used to become another user during a login session.
+	Invoked without a username, su defaults to becoming the super user.
+	Note that busybox binary must be setuid root for this applet to
+	work properly.
 
 config BUSYBOX_FEATURE_SU_SYSLOG
-	bool "Enable su to write to syslog"
+	bool "Log to syslog all attempts to use su"
 	default y
 	depends on BUSYBOX_SU
 
 config BUSYBOX_FEATURE_SU_CHECKS_SHELLS
-	bool "Enable su to check user's shell to be listed in /etc/shells"
-	depends on BUSYBOX_SU
+	bool "If user's shell is not in /etc/shells, disallow -s PROG"
 	default y
+	depends on BUSYBOX_SU
 
 config BUSYBOX_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY
 	bool "Allow blank passwords only on TTYs in /etc/securetty"
 	default n
 	depends on BUSYBOX_SU
-
 config BUSYBOX_SULOGIN
-	bool "sulogin"
-	default n
+	bool "sulogin (17 kb)"
+	default y
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  sulogin is invoked when the system goes into single user
-	  mode (this is done through an entry in inittab).
-
+	sulogin is invoked when the system goes into single user
+	mode (this is done through an entry in inittab).
 config BUSYBOX_VLOCK
-	bool "vlock"
-	default n
+	bool "vlock (17 kb)"
+	default y
 	help
-	  Build the "vlock" applet which allows you to lock (virtual) terminals.
+	Build the "vlock" applet which allows you to lock (virtual) terminals.
 
-	  Note that Busybox binary must be setuid root for this applet to
-	  work properly.
+	Note that busybox binary must be setuid root for this applet to
+	work properly.
 
 endmenu