summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2011-09-07 13:02:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-09 18:42:55 +0100
commitacf62d33d0e3b11b39c242e557cc2d43dbf47adb (patch)
treed2b196e29984b44d09c3ee9fc52aaee0615db943
parent9c740e042500545b09b1079be4978498d7c32a0f (diff)
downloadpoky-acf62d33d0e3b11b39c242e557cc2d43dbf47adb.tar.gz
shadow: add patch for useradd lossage
This fixes (or, at least, papers over) a failure in do_install for recipes which inherit useradd.bbclass. Rewinding optind in this way is not entirely portable but in practice it seems to work on GNU-ish build hosts at least. (From OE-Core rev: 8fce8180c802ad187c4df44c17207bfb026ce6c7) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/shadow/files/useradd.patch17
-rw-r--r--meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb5
2 files changed, 20 insertions, 2 deletions
diff --git a/meta/recipes-extended/shadow/files/useradd.patch b/meta/recipes-extended/shadow/files/useradd.patch
new file mode 100644
index 0000000000..ff5016c0bf
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/useradd.patch
@@ -0,0 +1,17 @@
1Work around a bug introduced with the --root option which was causing
2all other arguments to be ignored.
3
4Upstream-Status: inappropriate
5Signed-off-by: Phil Blundell <philb@gnu.org>
6
7--- a/src/useradd.c~ 2011-09-01 15:36:40.398234861 +0100
8+++ b/src/useradd.c 2011-09-01 17:29:00.782004133 +0100
9@@ -1957,6 +1957,8 @@
10
11 get_defaults ();
12
13+ optind = 1;
14+
15 process_flags (argc, argv);
16
17 #ifdef ACCT_TOOLS_SETUID
diff --git a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
index 485495eb22..c29e4c1b4d 100644
--- a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
@@ -7,13 +7,14 @@ LICENSE = "BSD | Artistic"
7LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
8 file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe" 8 file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe"
9 9
10PR = "r0" 10PR = "r1"
11 11
12SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ 12SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
13 file://shadow.automake-1.11.patch \ 13 file://shadow.automake-1.11.patch \
14 file://shadow-4.1.3-dots-in-usernames.patch \ 14 file://shadow-4.1.3-dots-in-usernames.patch \
15 file://shadow-4.1.4.2-env-reset-keep-locale.patch \ 15 file://shadow-4.1.4.2-env-reset-keep-locale.patch \
16 file://add_root_cmd_options.patch" 16 file://add_root_cmd_options.patch \
17 file://useradd.patch"
17 18
18SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" 19SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"
19SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" 20SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778"