[package] update busybox to 1.18.4, patch from Peter Wagner

[openwrt/svn-archive/archive.git] / package / busybox / config / loginutils / Config.in

diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in
index d88876cf93f4e399bab4cec5bed4350ef84cc6c5..0298840620b5e5e27b282fefca6e0a35635ce9ec 100644 (file)
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -5,6 +5,18 @@
 
 menu "Login/Password Management Utilities"
 
+config BUSYBOX_CONFIG_ADD_SHELL
+       bool "add-shell"
+       default n if BUSYBOX_CONFIG_DESKTOP
+       help
+         Add shells to /etc/shells.
+
+config BUSYBOX_CONFIG_REMOVE_SHELL
+       bool "remove-shell"
+       default n if BUSYBOX_CONFIG_DESKTOP
+       help
+         Remove shells from /etc/shells.
+
 config BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS
        bool "Support for shadow passwords"
        default n
@@ -91,34 +103,18 @@ 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.
 
-config BUSYBOX_CONFIG_ADDGROUP
-       bool "addgroup"
-       default n
-       help
-         Utility for creating a new group account.
-
-config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP
-       bool "Support for adding users to groups"
-       default n
-       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_DELGROUP
-       bool "delgroup"
+config BUSYBOX_CONFIG_ADDUSER
+       bool "adduser"
        default n
        help
-         Utility for deleting a group account.
+         Utility for creating a new user account.
 
-config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP
-       bool "Support for removing users from groups"
+config BUSYBOX_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS
+       bool "Enable long options"
        default n
-       depends on BUSYBOX_CONFIG_DELGROUP
+       depends on BUSYBOX_CONFIG_ADDUSER && BUSYBOX_CONFIG_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 BUSYBOX_CONFIG_FEATURE_CHECK_NAMES
        bool "Enable sanity check on user/group names in adduser and addgroup"
@@ -132,18 +128,43 @@ config BUSYBOX_CONFIG_FEATURE_CHECK_NAMES
          For compatibility with Samba machine accounts "$" is also supported
          at the end of the user or group name.
 
-config BUSYBOX_CONFIG_ADDUSER
-       bool "adduser"
+config BUSYBOX_CONFIG_FIRST_SYSTEM_ID
+       int "First valid system uid or gid for adduser and addgroup"
+       depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP
+       range 0 64900
+       default 100
+       help
+         First valid system uid or gid for adduser and addgroup
+
+config BUSYBOX_CONFIG_LAST_SYSTEM_ID
+       int "Last valid system uid or gid for adduser and addgroup"
+       depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP
+       range 0 64900
+       default 999
+       help
+         Last valid system uid or gid for adduser and addgroup
+
+config BUSYBOX_CONFIG_ADDGROUP
+       bool "addgroup"
        default n
        help
-         Utility for creating a new user account.
+         Utility for creating a new group account.
 
-config BUSYBOX_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS
+config BUSYBOX_CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS
        bool "Enable long options"
        default n
-       depends on BUSYBOX_CONFIG_ADDUSER && BUSYBOX_CONFIG_GETOPT_LONG
+       depends on BUSYBOX_CONFIG_ADDGROUP && BUSYBOX_CONFIG_LONG_OPTS
        help
-         Support long options for the adduser applet.
+         Support long options for the addgroup applet.
+
+config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP
+       bool "Support for adding users to groups"
+       default n
+       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_DELUSER
        bool "deluser"
@@ -151,33 +172,30 @@ config BUSYBOX_CONFIG_DELUSER
        help
          Utility for deleting a user account.
 
-config BUSYBOX_CONFIG_GETTY
-       bool "getty"
+config BUSYBOX_CONFIG_DELGROUP
+       bool "delgroup"
        default n
-       select BUSYBOX_CONFIG_FEATURE_SYSLOG
        help
-         getty lets you log in on a tty, it is normally invoked by init.
+         Utility for deleting a group account.
 
-config BUSYBOX_CONFIG_FEATURE_UTMP
-       bool "Support utmp file"
-       depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_WHO
+config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP
+       bool "Support for removing users from groups"
        default n
+       depends on BUSYBOX_CONFIG_DELGROUP
        help
-         The file /var/run/utmp is used to track who is currently logged in.
+         If called with two non-option arguments, deluser
+         or delgroup will remove an user from a specified group.
 
-config BUSYBOX_CONFIG_FEATURE_WTMP
-       bool "Support wtmp file"
-       depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_LAST
+config BUSYBOX_CONFIG_GETTY
+       bool "getty"
        default n
-       select BUSYBOX_CONFIG_FEATURE_UTMP
+       select BUSYBOX_CONFIG_FEATURE_SYSLOG
        help
-         The file /var/run/wtmp is used to track when user's have logged into
-         and logged out of the system.
+         getty lets you log in on a tty, it is normally invoked by init.
 
 config BUSYBOX_CONFIG_LOGIN
        bool "login"
        default n
-       select BUSYBOX_CONFIG_FEATURE_SUID
        select BUSYBOX_CONFIG_FEATURE_SYSLOG
        help
          login is used when signing onto a system.
@@ -220,7 +238,6 @@ config BUSYBOX_CONFIG_FEATURE_SECURETTY
 config BUSYBOX_CONFIG_PASSWD
        bool "passwd"
        default y
-       select BUSYBOX_CONFIG_FEATURE_SUID
        select BUSYBOX_CONFIG_FEATURE_SYSLOG
        help
          passwd changes passwords for user and group accounts. A normal user
@@ -256,7 +273,6 @@ config BUSYBOX_CONFIG_CHPASSWD
 config BUSYBOX_CONFIG_SU
        bool "su"
        default n
-       select BUSYBOX_CONFIG_FEATURE_SUID
        select BUSYBOX_CONFIG_FEATURE_SYSLOG
        help
          su is used to become another user during a login session.
@@ -286,7 +302,6 @@ config BUSYBOX_CONFIG_SULOGIN
 config BUSYBOX_CONFIG_VLOCK
        bool "vlock"
        default n
-       select BUSYBOX_CONFIG_FEATURE_SUID
        help
          Build the "vlock" applet which allows you to lock (virtual) terminals.