diff options
Diffstat (limited to 'poky/meta/recipes-extended/shadow')
4 files changed, 7 insertions, 53 deletions
diff --git a/poky/meta/recipes-extended/shadow/files/0001-useradd-copy-extended-attributes-of-home.patch b/poky/meta/recipes-extended/shadow/files/0001-useradd-copy-extended-attributes-of-home.patch deleted file mode 100644 index 474b3a257..000000000 --- a/poky/meta/recipes-extended/shadow/files/0001-useradd-copy-extended-attributes-of-home.patch +++ /dev/null @@ -1,41 +0,0 @@ -Subject: [PATCH] useradd: copy extended attributes of home - -The Home directory wasn't getting the extended attributes -of /etc/skel. This patch fixes that issue and adds the copy -of the extended attributes of the root of the home directory. - -Upstream-Status: Pending - -Signed-off-by: José Bollo <jose.bollo@iot.bzh> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - src/useradd.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/useradd.c b/src/useradd.c -index e721e52..c74e491 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -54,6 +54,9 @@ - #include <sys/wait.h> - #include <time.h> - #include <unistd.h> -+#ifdef WITH_ATTR -+#include <attr/libattr.h> -+#endif - #include "chkname.h" - #include "defines.h" - #include "faillog.h" -@@ -2042,6 +2045,9 @@ static void create_home (void) - (void) chown (prefix_user_home, user_id, user_gid); - chmod (prefix_user_home, - 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); -+#ifdef WITH_ATTR -+ attr_copy_file (def_template, user_home, NULL, NULL); -+#endif - home_added = true; - #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_USER, Prog, --- -2.11.0 - diff --git a/poky/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch b/poky/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch index 702413659..faa6f68eb 100644 --- a/poky/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch +++ b/poky/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch @@ -4,11 +4,11 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- - src/useradd.c | 82 +++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 54 insertions(+), 28 deletions(-) + src/useradd.c | 80 +++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 53 insertions(+), 27 deletions(-) diff --git a/src/useradd.c b/src/useradd.c -index 7214e72..3aaf45c 100644 +index 00a3c30..9ecbb58 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -2021,6 +2021,35 @@ static void usr_update (void) @@ -47,7 +47,7 @@ index 7214e72..3aaf45c 100644 * create_home - create the user's home directory * * create_home() creates the user's home directory if it does not -@@ -2038,42 +2067,39 @@ static void create_home (void) +@@ -2038,39 +2067,36 @@ static void create_home (void) fail_exit (E_HOMEDIR); } #endif @@ -74,16 +74,12 @@ index 7214e72..3aaf45c 100644 - (void) chown (prefix_user_home, user_id, user_gid); - chmod (prefix_user_home, - 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); +- home_added = true; + fail_exit (E_HOMEDIR); + } + (void) chown (prefix_user_home, user_id, user_gid); + chmod (prefix_user_home, + 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); - #ifdef WITH_ATTR -- attr_copy_file (def_template, user_home, NULL, NULL); -+ attr_copy_file (def_template, user_home, NULL, NULL); - #endif -- home_added = true; + home_added = true; #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_USER, Prog, diff --git a/poky/meta/recipes-extended/shadow/shadow.inc b/poky/meta/recipes-extended/shadow/shadow.inc index 09c37ef8a..4de21acb7 100644 --- a/poky/meta/recipes-extended/shadow/shadow.inc +++ b/poky/meta/recipes-extended/shadow/shadow.inc @@ -11,7 +11,6 @@ DEPENDS = "virtual/crypt" UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases" SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}.tar.gz \ file://shadow-4.1.3-dots-in-usernames.patch \ - file://0001-useradd-copy-extended-attributes-of-home.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ " @@ -57,7 +56,7 @@ EXTRA_OECONF += "--without-audit \ NSCDOPT = "" NSCDOPT_class-native = "--without-nscd" NSCDOPT_class-nativesdk = "--without-nscd" -NSCDOPT_libc-glibc = "${@bb.utils.contains('DISTRO_FEATURES', 'libc-spawn', '--with-nscd', '--without-nscd', d)}" +NSCDOPT_libc-glibc = "--with-nscd" PAM_PLUGINS = "libpam-runtime \ pam-plugin-faildelay \ diff --git a/poky/meta/recipes-extended/shadow/shadow_4.6.bb b/poky/meta/recipes-extended/shadow/shadow_4.6.bb index 5675cb8cc..c975395ff 100644 --- a/poky/meta/recipes-extended/shadow/shadow_4.6.bb +++ b/poky/meta/recipes-extended/shadow/shadow_4.6.bb @@ -2,7 +2,7 @@ require shadow.inc # Build falsely assumes that if --enable-libpam is set, we don't need to link against # libcrypt. This breaks chsh. -BUILD_LDFLAGS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', bb.utils.contains('DISTRO_FEATURES', 'libc-crypt', '-lcrypt', '', d), '', d)}" +BUILD_LDFLAGS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-lcrypt', '', d)}" BBCLASSEXTEND = "native nativesdk" |
