diff options
Diffstat (limited to 'poky/meta/recipes-extended/shadow/files')
| -rw-r--r-- | poky/meta/recipes-extended/shadow/files/0001-Drop-nsswitch.conf-message-when-not-in-place-eg.-musl.patch | 27 | ||||
| -rw-r--r-- | poky/meta/recipes-extended/shadow/files/0001-shadow-use-relaxed-usernames.patch (renamed from poky/meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch) | 47 | ||||
| -rw-r--r-- | poky/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch | 27 | ||||
| -rw-r--r-- | poky/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch | 4 |
4 files changed, 50 insertions, 55 deletions
diff --git a/poky/meta/recipes-extended/shadow/files/0001-Drop-nsswitch.conf-message-when-not-in-place-eg.-musl.patch b/poky/meta/recipes-extended/shadow/files/0001-Drop-nsswitch.conf-message-when-not-in-place-eg.-musl.patch new file mode 100644 index 0000000000..21c9a1415c --- /dev/null +++ b/poky/meta/recipes-extended/shadow/files/0001-Drop-nsswitch.conf-message-when-not-in-place-eg.-musl.patch @@ -0,0 +1,27 @@ +From 11290e897a49adddee215833944a518443d9b0d6 Mon Sep 17 00:00:00 2001 +From: Andrei Gherzan <andrei.gherzan@huawei.com> +Date: Wed, 24 Aug 2022 00:54:47 +0200 +Subject: [PATCH] Drop nsswitch.conf message when not in place - eg. musl + +Upstream-Status: Inappropriate [issue reported at https://github.com/shadow-maint/shadow/issues/557] +Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> +--- + lib/nss.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/nss.c b/lib/nss.c +index 06fa48e..44245da 100644 +--- a/lib/nss.c ++++ b/lib/nss.c +@@ -59,7 +59,7 @@ void nss_init(const char *nsswitch_path) { + // subid: files + nssfp = fopen(nsswitch_path, "r"); + if (!nssfp) { +- fprintf(shadow_logfd, "Failed opening %s: %m\n", nsswitch_path); ++ //fprintf(shadow_logfd, "Failed opening %s: %m\n", nsswitch_path); + atomic_store(&nss_init_completed, true); + return; + } +-- +2.25.1 + diff --git a/poky/meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch b/poky/meta/recipes-extended/shadow/files/0001-shadow-use-relaxed-usernames.patch index cc833362e9..6c7abcef1d 100644 --- a/poky/meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch +++ b/poky/meta/recipes-extended/shadow/files/0001-shadow-use-relaxed-usernames.patch @@ -1,6 +1,6 @@ -From ca472d6866e545aaa70a70020e3226f236a8aafc Mon Sep 17 00:00:00 2001 -From: Shan Hai <shan.hai@windriver.com> -Date: Tue, 13 Sep 2016 13:45:46 +0800 +From b182c52d63bea0f08e1befcec5c3797dd97cdef5 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Tue, 16 Aug 2022 13:46:22 +0200 Subject: [PATCH] shadow: use relaxed usernames The groupadd from shadow does not allow upper case group names, the @@ -11,21 +11,21 @@ restrictions to allow the upper case group names, and the relaxation is POSIX compliant because POSIX indicate that usernames are composed of characters from the portable filename character set [A-Za-z0-9._-]. -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/551] Signed-off-by: Shan Hai <shan.hai@windriver.com> - +Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- - libmisc/chkname.c | 30 ++++++++++++++++++------------ + libmisc/chkname.c | 29 ++++++++++++++++++----------- man/groupadd.8.xml | 6 ------ - man/useradd.8.xml | 8 +------- - 3 files changed, 19 insertions(+), 25 deletions(-) + man/useradd.8.xml | 6 ------ + 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/libmisc/chkname.c b/libmisc/chkname.c -index 90f185c..65762b4 100644 +index cb002a14..c0306c5a 100644 --- a/libmisc/chkname.c +++ b/libmisc/chkname.c -@@ -55,22 +55,28 @@ static bool is_valid_name (const char *name) +@@ -32,21 +32,28 @@ static bool is_valid_name (const char *name) } /* @@ -54,7 +54,6 @@ index 90f185c..65762b4 100644 - ( ('0' <= *name) && ('9' >= *name) ) || - ('_' == *name) || - ('-' == *name) || -- ('.' == *name) || - ( ('$' == *name) && ('\0' == *(name + 1)) ) - )) { + if (!( (*name >= 'a' && *name <= 'z') || @@ -67,13 +66,13 @@ index 90f185c..65762b4 100644 } } diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml -index 1e58f09..d804b61 100644 +index 26671f92..3eacaa09 100644 --- a/man/groupadd.8.xml +++ b/man/groupadd.8.xml -@@ -272,12 +272,6 @@ - - <refsect1 id='caveats'> - <title>CAVEATS</title> +@@ -63,12 +63,6 @@ + values from the system. The new group will be entered into the system + files as needed. + </para> - <para> - Groupnames must start with a lower case letter or an underscore, - followed by lower case letters, digits, underscores, or dashes. @@ -84,19 +83,10 @@ index 1e58f09..d804b61 100644 Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long. </para> diff --git a/man/useradd.8.xml b/man/useradd.8.xml -index a16d730..c0bd777 100644 +index c7f95b47..e056d141 100644 --- a/man/useradd.8.xml +++ b/man/useradd.8.xml -@@ -366,7 +366,7 @@ - </term> - <listitem> - <para> -- Do no create the user's home directory, even if the system -+ Do not create the user's home directory, even if the system - wide setting from <filename>/etc/login.defs</filename> - (<option>CREATE_HOME</option>) is set to - <replaceable>yes</replaceable>. -@@ -660,12 +660,6 @@ +@@ -691,12 +691,6 @@ the user account creation request. </para> @@ -109,3 +99,6 @@ index a16d730..c0bd777 100644 <para> Usernames may only be up to 32 characters long. </para> +-- +2.30.2 + diff --git a/poky/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch b/poky/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch deleted file mode 100644 index a7bb0a9290..0000000000 --- a/poky/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch +++ /dev/null @@ -1,27 +0,0 @@ -# commit message copied from openembedded: -# commit 246c80637b135f3a113d319b163422f98174ee6c -# Author: Khem Raj <raj.khem@gmail.com> -# Date: Wed Jun 9 13:37:03 2010 -0700 -# -# shadow-4.1.4.2: Add patches to support dots in login id. -# -# Signed-off-by: Khem Raj <raj.khem@gmail.com> -# -# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-08-11 - -Upstream-Status: Pending - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -Index: shadow-4.1.4.2/libmisc/chkname.c -=================================================================== ---- shadow-4.1.4.2.orig/libmisc/chkname.c 2009-04-28 12:14:04.000000000 -0700 -+++ shadow-4.1.4.2/libmisc/chkname.c 2010-06-03 17:43:20.638973857 -0700 -@@ -61,6 +61,7 @@ static bool is_valid_name (const char *n - ( ('0' <= *name) && ('9' >= *name) ) || - ('_' == *name) || - ('-' == *name) || -+ ('.' == *name) || - ( ('$' == *name) && ('\0' == *(name + 1)) ) - )) { - return false; diff --git a/poky/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch b/poky/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch index 15f8044fa2..3b61b75e5b 100644 --- a/poky/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch +++ b/poky/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch @@ -4,7 +4,9 @@ In yocto it obey the way with Debian/Ubuntu, and the names are common-auth, comm common-password and common-session. So update them with oe way. -Upstream-Status: Pending +See meta/recipes-extended/pam/libpam/pam.d/common-password + +Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Kang Kai <kai.kang@windriver.com> |