Import busybox-1.18.x kconfig symbolsbusybox-1.18.4

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

1 files changed, 59 insertions, 51 deletions

diff --git a/busybox-loginutils.kconfig b/busybox-loginutils.kconfig
index d0afc38..018dcd2 100644
--- a/busybox-loginutils.kconfig
+++ b/busybox-loginutils.kconfig
@@ -7,7 +7,19 @@ comment "-------------------------------------------------"
 comment "Login/Password Management Utilities"
 comment "-------------------------------------------------"
 
-
+config KEMBTK_BUSYB_ADD_SHELL
+       bool "add-shell"
+       depends on EMBTK_BB_VERSION_1_18_X
+       default y if KEMBTK_BUSYB_DESKTOP
+       help
+         Add shells to /etc/shells.
+
+config KEMBTK_BUSYB_REMOVE_SHELL
+       bool "remove-shell"
+       depends on EMBTK_BB_VERSION_1_18_X
+       default y if KEMBTK_BUSYB_DESKTOP
+       help
+         Remove shells from /etc/shells.
 
 config KEMBTK_BUSYB_FEATURE_SHADOWPASSWDS
 	bool "Support for shadow passwords"
@@ -87,7 +99,7 @@ config KEMBTK_BUSYB_USE_BB_CRYPT_SHA
 	bool "Enable SHA256/512 crypt functions"
 	default y
 	depends on KEMBTK_BUSYB_USE_BB_CRYPT
-	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X
 	help
 	  Enable this if you have passwords starting with "$5$" or "$6$"
 	  in your /etc/passwd or /etc/shadow files. These passwords
@@ -96,42 +108,18 @@ config KEMBTK_BUSYB_USE_BB_CRYPT_SHA
 	  With this option off, login will fail password check for any
 	  user which has password encrypted with these algorithms.
 
-config KEMBTK_BUSYB_ADDGROUP
-	bool "addgroup"
+config KEMBTK_BUSYB_ADDUSER
+	bool "adduser"
 	default y
 	help
-	  Utility for creating a new group account.
+	  Utility for creating a new user account.
 
-config KEMBTK_BUSYB_FEATURE_ADDGROUP_LONG_OPTIONS
+config KEMBTK_BUSYB_FEATURE_ADDUSER_LONG_OPTIONS
 	bool "Enable long options"
 	default y
-	depends on KEMBTK_BUSYB_ADDGROUP && KEMBTK_BUSYB_LONG_OPTS
-	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X
-	help
-	  Support long options for the addgroup applet.
-
-config KEMBTK_BUSYB_FEATURE_ADDUSER_TO_GROUP
-	bool "Support for adding users to groups"
-	default y
-	depends on KEMBTK_BUSYB_ADDGROUP
-	help
-	  If  called  with two non-option arguments,
-	  addgroup will add an existing user to an
-	  existing group.
-
-config KEMBTK_BUSYB_DELGROUP
-	bool "delgroup"
-	default y
-	help
-	  Utility for deleting a group account.
-
-config KEMBTK_BUSYB_FEATURE_DEL_USER_FROM_GROUP
-	bool "Support for removing users from groups"
-	default y
-	depends on KEMBTK_BUSYB_DELGROUP
+	depends on KEMBTK_BUSYB_ADDUSER && KEMBTK_BUSYB_LONG_OPTS
 	help
-	  If called with two non-option arguments, deluser
-	  or delgroup will remove an user from a specified group.
+	  Support long options for the adduser applet.
 
 config KEMBTK_BUSYB_FEATURE_CHECK_NAMES
 	bool "Enable sanity check on user/group names in adduser and addgroup"
@@ -144,23 +132,10 @@ config KEMBTK_BUSYB_FEATURE_CHECK_NAMES
 	  For compatibility with Samba machine accounts "$" is also supported
 	  at the end of the user or group name.
 
-config KEMBTK_BUSYB_ADDUSER
-	bool "adduser"
-	default y
-	help
-	  Utility for creating a new user account.
-
-config KEMBTK_BUSYB_FEATURE_ADDUSER_LONG_OPTIONS
-	bool "Enable long options"
-	default y
-	depends on KEMBTK_BUSYB_ADDUSER && KEMBTK_BUSYB_LONG_OPTS
-	help
-	  Support long options for the adduser applet.
-
 config KEMBTK_BUSYB_FIRST_SYSTEM_ID
 	int "First valid system uid or gid for adduser and addgroup"
 	depends on KEMBTK_BUSYB_ADDUSER || KEMBTK_BUSYB_ADDGROUP
-	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X
 	range 0 64900
 	default 100
 	help
@@ -169,18 +144,55 @@ config KEMBTK_BUSYB_FIRST_SYSTEM_ID
 config KEMBTK_BUSYB_LAST_SYSTEM_ID
 	int "Last valid system uid or gid for adduser and addgroup"
 	depends on KEMBTK_BUSYB_ADDUSER || KEMBTK_BUSYB_ADDGROUP
-	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X
 	range 0 64900
 	default 999
 	help
 	  Last valid system uid or gid for adduser and addgroup
 
+config KEMBTK_BUSYB_ADDGROUP
+	bool "addgroup"
+	default y
+	help
+	  Utility for creating a new group account.
+
+config KEMBTK_BUSYB_FEATURE_ADDGROUP_LONG_OPTIONS
+	bool "Enable long options"
+	default y
+	depends on KEMBTK_BUSYB_ADDGROUP && KEMBTK_BUSYB_LONG_OPTS
+	depends on EMBTK_BB_VERSION_1_15_X || EMBTK_BB_VERSION_1_16_X || EMBTK_BB_VERSION_1_17_X || EMBTK_BB_VERSION_1_18_X
+	help
+	  Support long options for the addgroup applet.
+
+config KEMBTK_BUSYB_FEATURE_ADDUSER_TO_GROUP
+	bool "Support for adding users to groups"
+	default y
+	depends on KEMBTK_BUSYB_ADDGROUP
+	help
+	  If  called  with two non-option arguments,
+	  addgroup will add an existing user to an
+	  existing group.
+
 config KEMBTK_BUSYB_DELUSER
 	bool "deluser"
 	default y
 	help
 	  Utility for deleting a user account.
 
+config KEMBTK_BUSYB_DELGROUP
+	bool "delgroup"
+	default y
+	help
+	  Utility for deleting a group account.
+
+config KEMBTK_BUSYB_FEATURE_DEL_USER_FROM_GROUP
+	bool "Support for removing users from groups"
+	default y
+	depends on KEMBTK_BUSYB_DELGROUP
+	help
+	  If called with two non-option arguments, deluser
+	  or delgroup will remove an user from a specified group.
+
 config KEMBTK_BUSYB_GETTY
 	bool "getty"
 	default y
@@ -191,7 +203,6 @@ config KEMBTK_BUSYB_GETTY
 config KEMBTK_BUSYB_LOGIN
 	bool "login"
 	default y
-	select KEMBTK_BUSYB_FEATURE_SUID
 	select KEMBTK_BUSYB_FEATURE_SYSLOG
 	help
 	  login is used when signing onto a system.
@@ -233,7 +244,6 @@ config KEMBTK_BUSYB_FEATURE_SECURETTY
 config KEMBTK_BUSYB_PASSWD
 	bool "passwd"
 	default y
-	select KEMBTK_BUSYB_FEATURE_SUID
 	select KEMBTK_BUSYB_FEATURE_SYSLOG
 	help
 	  passwd changes passwords for user and group accounts. A normal user
@@ -269,7 +279,6 @@ config KEMBTK_BUSYB_CHPASSWD
 config KEMBTK_BUSYB_SU
 	bool "su"
 	default y
-	select KEMBTK_BUSYB_FEATURE_SUID
 	select KEMBTK_BUSYB_FEATURE_SYSLOG
 	help
 	  su is used to become another user during a login session.
@@ -299,7 +308,6 @@ config KEMBTK_BUSYB_SULOGIN
 config KEMBTK_BUSYB_VLOCK
 	bool "vlock"
 	default y
-	select KEMBTK_BUSYB_FEATURE_SUID
 	help
 	  Build the "vlock" applet which allows you to lock (virtual) terminals.