busybox: update to version 1.25.0

[openwrt/staging/rmilecki.git] / package / utils / busybox / config / loginutils / Config.in

diff --git a/package/utils/busybox/config/loginutils/Config.in b/package/utils/busybox/config/loginutils/Config.in
index f5ecf6f23b5e4cc51618fa937bf5898e9b5602f7..956115c7f42db40b4fdc72b36c71b6974be0e6ba 100644 (file)
--- a/package/utils/busybox/config/loginutils/Config.in
+++ b/package/utils/busybox/config/loginutils/Config.in
@@ -6,18 +6,6 @@
 
 menu "Login/Password Management Utilities"
 
 
 menu "Login/Password Management Utilities"
 

-config BUSYBOX_CONFIG_ADD_SHELL
-       bool "add-shell"
-       default BUSYBOX_DEFAULT_ADD_SHELL if BUSYBOX_CONFIG_DESKTOP
-       help
-         Add shells to /etc/shells.
-
-config BUSYBOX_CONFIG_REMOVE_SHELL
-       bool "remove-shell"
-       default BUSYBOX_DEFAULT_REMOVE_SHELL if BUSYBOX_CONFIG_DESKTOP
-       help
-         Remove shells from /etc/shells.
-

 config BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS
        bool "Support for shadow passwords"
        default BUSYBOX_DEFAULT_FEATURE_SHADOWPASSWDS
 config BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS
        bool "Support for shadow passwords"
        default BUSYBOX_DEFAULT_FEATURE_SHADOWPASSWDS


@@ -104,6 +92,38 @@ config BUSYBOX_CONFIG_USE_BB_CRYPT_SHA
          With this option off, login will fail password check for any
          user which has password encrypted with these algorithms.
 
          With this option off, login will fail password check for any
          user which has password encrypted with these algorithms.
 

+config BUSYBOX_CONFIG_ADD_SHELL
+       bool "add-shell"
+       default BUSYBOX_DEFAULT_ADD_SHELL if BUSYBOX_CONFIG_DESKTOP
+       help
+         Add shells to /etc/shells.
+
+config BUSYBOX_CONFIG_REMOVE_SHELL
+       bool "remove-shell"
+       default BUSYBOX_DEFAULT_REMOVE_SHELL if BUSYBOX_CONFIG_DESKTOP
+       help
+         Remove shells from /etc/shells.
+config BUSYBOX_CONFIG_ADDGROUP
+       bool "addgroup"
+       default BUSYBOX_DEFAULT_ADDGROUP
+       help
+         Utility for creating a new group account.
+
+config BUSYBOX_CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS
+       bool "Enable long options"
+       default BUSYBOX_DEFAULT_FEATURE_ADDGROUP_LONG_OPTIONS
+       depends on BUSYBOX_CONFIG_ADDGROUP && BUSYBOX_CONFIG_LONG_OPTS
+       help
+         Support long options for the addgroup applet.
+
+config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP
+       bool "Support for adding users to groups"
+       default BUSYBOX_DEFAULT_FEATURE_ADDUSER_TO_GROUP
+       depends on BUSYBOX_CONFIG_ADDGROUP
+       help
+         If  called  with two non-option arguments,
+         addgroup will add an existing user to an
+         existing group.

 config BUSYBOX_CONFIG_ADDUSER
        bool "adduser"
        default BUSYBOX_DEFAULT_ADDUSER
 config BUSYBOX_CONFIG_ADDUSER
        bool "adduser"
        default BUSYBOX_DEFAULT_ADDUSER


@@ -151,29 +171,33 @@ config BUSYBOX_CONFIG_LAST_SYSTEM_ID
        default BUSYBOX_DEFAULT_LAST_SYSTEM_ID
        help
          Last valid system uid or gid for adduser and addgroup
        default BUSYBOX_DEFAULT_LAST_SYSTEM_ID
        help
          Last valid system uid or gid for adduser and addgroup

-
-config BUSYBOX_CONFIG_ADDGROUP
-       bool "addgroup"
-       default BUSYBOX_DEFAULT_ADDGROUP
+config BUSYBOX_CONFIG_CHPASSWD
+       bool "chpasswd"
+       default BUSYBOX_DEFAULT_CHPASSWD

        help
        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_CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS
-       bool "Enable long options"
-       default BUSYBOX_DEFAULT_FEATURE_ADDGROUP_LONG_OPTIONS
-       depends on BUSYBOX_CONFIG_ADDGROUP && BUSYBOX_CONFIG_LONG_OPTS
+config BUSYBOX_CONFIG_FEATURE_DEFAULT_PASSWD_ALGO
+       string "Default password encryption method (passwd -a, cryptpw -m parameter)"
+       default BUSYBOX_DEFAULT_FEATURE_DEFAULT_PASSWD_ALGO
+       depends on BUSYBOX_CONFIG_PASSWD || BUSYBOX_CONFIG_CRYPTPW

        help
        help

-         Support long options for the addgroup applet.
-
-config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP
-       bool "Support for adding users to groups"
-       default BUSYBOX_DEFAULT_FEATURE_ADDUSER_TO_GROUP
-       depends on BUSYBOX_CONFIG_ADDGROUP
+         Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
+config BUSYBOX_CONFIG_CRYPTPW
+       bool "cryptpw"
+       default BUSYBOX_DEFAULT_CRYPTPW

        help
        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_CONFIG_MKPASSWD
+       bool "mkpasswd"
+       default BUSYBOX_DEFAULT_MKPASSWD
+       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_CONFIG_DELUSER
        bool "deluser"
        default BUSYBOX_DEFAULT_DELUSER
 config BUSYBOX_CONFIG_DELUSER
        bool "deluser"
        default BUSYBOX_DEFAULT_DELUSER


@@ -193,7 +217,6 @@ config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP
        help
          If called with two non-option arguments, deluser
          or delgroup will remove an user from a specified group.
        help
          If called with two non-option arguments, deluser
          or delgroup will remove an user from a specified group.

-

 config BUSYBOX_CONFIG_GETTY
        bool "getty"
        default BUSYBOX_DEFAULT_GETTY
 config BUSYBOX_CONFIG_GETTY
        bool "getty"
        default BUSYBOX_DEFAULT_GETTY


@@ -212,7 +235,6 @@ config BUSYBOX_CONFIG_GETTY
          printf "%s login: " "`hostname`"
          read -r login
          exec /bin/login "$login"
          printf "%s login: " "`hostname`"
          read -r login
          exec /bin/login "$login"

-

 config BUSYBOX_CONFIG_LOGIN
        bool "login"
        default BUSYBOX_DEFAULT_LOGIN
 config BUSYBOX_CONFIG_LOGIN
        bool "login"
        default BUSYBOX_DEFAULT_LOGIN


@@ -258,7 +280,6 @@ config BUSYBOX_CONFIG_FEATURE_SECURETTY
          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_CONFIG_PASSWD
        bool "passwd"
        default BUSYBOX_DEFAULT_PASSWD
 config BUSYBOX_CONFIG_PASSWD
        bool "passwd"
        default BUSYBOX_DEFAULT_PASSWD


@@ -278,29 +299,6 @@ config BUSYBOX_CONFIG_FEATURE_PASSWD_WEAK_CHECK
        depends on BUSYBOX_CONFIG_PASSWD
        help
          With this option passwd will refuse new passwords which are "weak".
        depends on BUSYBOX_CONFIG_PASSWD
        help
          With this option passwd will refuse new passwords which are "weak".

-
-config BUSYBOX_CONFIG_CRYPTPW
-       bool "cryptpw"
-       default BUSYBOX_DEFAULT_CRYPTPW
-       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_CONFIG_CHPASSWD
-       bool "chpasswd"
-       default BUSYBOX_DEFAULT_CHPASSWD
-       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_CONFIG_FEATURE_DEFAULT_PASSWD_ALGO
-       string "Default password encryption method (passwd -a, cryptpw -m parameter)"
-       default BUSYBOX_DEFAULT_FEATURE_DEFAULT_PASSWD_ALGO
-       depends on BUSYBOX_CONFIG_PASSWD || BUSYBOX_CONFIG_CRYPTPW
-       help
-         Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
-

 config BUSYBOX_CONFIG_SU
        bool "su"
        default BUSYBOX_DEFAULT_SU
 config BUSYBOX_CONFIG_SU
        bool "su"
        default BUSYBOX_DEFAULT_SU


@@ -321,7 +319,6 @@ config BUSYBOX_CONFIG_FEATURE_SU_CHECKS_SHELLS
        bool "Enable su to check user's shell to be listed in /etc/shells"
        depends on BUSYBOX_CONFIG_SU
        default BUSYBOX_DEFAULT_FEATURE_SU_CHECKS_SHELLS
        bool "Enable su to check user's shell to be listed in /etc/shells"
        depends on BUSYBOX_CONFIG_SU
        default BUSYBOX_DEFAULT_FEATURE_SU_CHECKS_SHELLS

-

 config BUSYBOX_CONFIG_SULOGIN
        bool "sulogin"
        default BUSYBOX_DEFAULT_SULOGIN
 config BUSYBOX_CONFIG_SULOGIN
        bool "sulogin"
        default BUSYBOX_DEFAULT_SULOGIN


@@ -329,7 +326,6 @@ config BUSYBOX_CONFIG_SULOGIN
        help
          sulogin is invoked when the system goes into single user
          mode (this is done through an entry in inittab).
        help
          sulogin is invoked when the system goes into single user
          mode (this is done through an entry in inittab).

-

 config BUSYBOX_CONFIG_VLOCK
        bool "vlock"
        default BUSYBOX_DEFAULT_VLOCK
 config BUSYBOX_CONFIG_VLOCK
        bool "vlock"
        default BUSYBOX_DEFAULT_VLOCK