diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-03 17:51:29 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-03 17:51:29 +0000 |
commit | 198a63fac56201ee520d94bf8345036e4927fce6 (patch) | |
tree | cf8acd5a45d75baa7b3e5828f47787aec287cb65 /meta/packages/busybox/busybox-1.9.1/adduser-longops.patch | |
parent | 6314103003cef434c29d2133769195daf5cc9309 (diff) | |
download | poky-198a63fac56201ee520d94bf8345036e4927fce6.tar.gz |
busybox: update from 1.8.2 to 1.9.1 (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3889 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/busybox/busybox-1.9.1/adduser-longops.patch')
-rw-r--r-- | meta/packages/busybox/busybox-1.9.1/adduser-longops.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch b/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch new file mode 100644 index 0000000000..f221d30895 --- /dev/null +++ b/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | upstream: http://bugs.busybox.net/view.php?id=2134 | ||
2 | status: accepted in rev. 21031 on Feb 15 2008 | ||
3 | comment: fixes OE bug 3781, applied by mickeyl | ||
4 | |||
5 | diff -Nuar busybox-1.9.1.old/loginutils/Config.in busybox-1.9.1/loginutils/Config.in | ||
6 | --- busybox-1.9.1.old/loginutils/Config.in Tue Feb 12 10:03:11 2008 | ||
7 | +++ busybox-1.9.1/loginutils/Config.in Thu Feb 14 11:48:31 2008 | ||
8 | @@ -88,6 +88,13 @@ | ||
9 | help | ||
10 | Utility for creating a new user account. | ||
11 | |||
12 | +config FEATURE_ADDUSER_LONG_OPTIONS | ||
13 | + bool "Enable long options" | ||
14 | + default n | ||
15 | + depends on ADDUSER && GETOPT_LONG | ||
16 | + help | ||
17 | + Support long options for the adduser applet. | ||
18 | + | ||
19 | config DELUSER | ||
20 | bool "deluser" | ||
21 | default n | ||
22 | diff -Nuar busybox-1.9.1.old/loginutils/adduser.c busybox-1.9.1/loginutils/adduser.c | ||
23 | --- busybox-1.9.1.old/loginutils/adduser.c Thu Feb 14 10:25:33 2008 | ||
24 | +++ busybox-1.9.1/loginutils/adduser.c Thu Feb 14 13:32:47 2008 | ||
25 | @@ -66,6 +66,19 @@ | ||
26 | bb_error_msg_and_die("cannot execute %s, you must set password manually", prog); | ||
27 | } | ||
28 | |||
29 | +#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS | ||
30 | +static const char adduser_longopts[] ALIGN1 = | ||
31 | + "home\0" Required_argument "h" | ||
32 | + "gecos\0" Required_argument "g" | ||
33 | + "shell\0" Required_argument "s" | ||
34 | + "ingroup\0" Required_argument "G" | ||
35 | + "disabled-password\0" No_argument "D" | ||
36 | + "empty-password\0" No_argument "D" | ||
37 | + "system\0" No_argument "S" | ||
38 | + "no-create-home\0" No_argument "H" | ||
39 | + ; | ||
40 | +#endif | ||
41 | + | ||
42 | /* | ||
43 | * adduser will take a login_name as its first parameter. | ||
44 | * home, shell, gecos: | ||
45 | @@ -77,6 +90,10 @@ | ||
46 | struct passwd pw; | ||
47 | const char *usegroup = NULL; | ||
48 | FILE *file; | ||
49 | + | ||
50 | +#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS | ||
51 | + applet_long_options = adduser_longopts; | ||
52 | +#endif | ||
53 | |||
54 | /* got root? */ | ||
55 | if (geteuid()) { | ||