diff options
Diffstat (limited to 'meta/recipes-extended/shadow')
-rw-r--r-- | meta/recipes-extended/shadow/files/0001-su.c-fix-to-exec-command-correctly.patch | 25 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 5 |
2 files changed, 4 insertions, 26 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-su.c-fix-to-exec-command-correctly.patch b/meta/recipes-extended/shadow/files/0001-su.c-fix-to-exec-command-correctly.patch deleted file mode 100644 index 31337de362..0000000000 --- a/meta/recipes-extended/shadow/files/0001-su.c-fix-to-exec-command-correctly.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Pending - -Subject: su.c: fix to exec command correctly - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - src/su.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/su.c b/src/su.c -index 3704217..bc4f2ac 100644 ---- a/src/su.c -+++ b/src/su.c -@@ -1156,7 +1156,7 @@ int main (int argc, char **argv) - * Use the shell and create an argv - * with the rest of the command line included. - */ -- argv[-1] = cp; -+ argv[-1] = shellstr; - execve_shell (shellstr, &argv[-1], environ); - err = errno; - (void) fprintf (stderr, --- -1.7.9.5 - diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 7c63d88c70..5451718cce 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -14,7 +14,6 @@ SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.xz \ file://shadow-4.1.3-dots-in-usernames.patch \ file://usermod-fix-compilation-failure-with-subids-disabled.patch \ file://fix-installation-failure-with-subids-disabled.patch \ - file://0001-su.c-fix-to-exec-command-correctly.patch \ file://0001-Do-not-read-login.defs-before-doing-chroot.patch \ file://check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ @@ -108,6 +107,10 @@ do_install() { # Disable checking emails. sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs + # Comment out SU_NAME to work correctly with busybox + # See Bug#5359 and Bug#7173 + sed -i 's:^SU_NAME:#SU_NAME:g' ${D}${sysconfdir}/login.defs + # Use proper encryption for passwords sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs |