mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

shadow: update 4.11.1 -> 4.12.1

Browse Source 
Combine two username relaxing patches into one, rebase, and submit upstream.

(From OE-Core rev: 6f0042be60582669d317b9ff2e1b8034ab2a01d3)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-08-19 09:26:50 +02:00
committed by Richard Purdie
parent c148576562
commit 222cf77268
4 changed files with 23 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch → meta/recipes-extended/shadow/files/0001-shadow-use-relaxed-usernames.patch
+20 -27
View File
@@ -1,6 +1,6 @@
From ca472d6866e545aaa70a70020e3226f236a8aafc Mon Sep 17 00:00:00 2001 From b182c52d63bea0f08e1befcec5c3797dd97cdef5 Mon Sep 17 00:00:00 2001
From: Shan Hai <shan.hai@windriver.com> From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 13 Sep 2016 13:45:46 +0800 Date: Tue, 16 Aug 2022 13:46:22 +0200
Subject: [PATCH] shadow: use relaxed usernames Subject: [PATCH] shadow: use relaxed usernames
The groupadd from shadow does not allow upper case group names, the 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 POSIX compliant because POSIX indicate that usernames are composed of
characters from the portable filename character set [A-Za-z0-9._-]. 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: 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/groupadd.8.xml | 6 ------
man/useradd.8.xml | 8 +------- man/useradd.8.xml | 6 ------
3 files changed, 19 insertions(+), 25 deletions(-) 3 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/libmisc/chkname.c b/libmisc/chkname.c diff --git a/libmisc/chkname.c b/libmisc/chkname.c
index 90f185c..65762b4 100644 index cb002a14..c0306c5a 100644
--- a/libmisc/chkname.c --- a/libmisc/chkname.c
+++ b/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) ) || - ( ('0' <= *name) && ('9' >= *name) ) ||
- ('_' == *name) || - ('_' == *name) ||
- ('-' == *name) || - ('-' == *name) ||
- ('.' == *name) ||
- ( ('$' == *name) && ('\0' == *(name + 1)) ) - ( ('$' == *name) && ('\0' == *(name + 1)) )
- )) { - )) {
+ if (!( (*name >= 'a' && *name <= 'z') || + 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 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 --- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml +++ b/man/groupadd.8.xml
@@ -272,12 +272,6 @@ @@ -63,12 +63,6 @@
values from the system. The new group will be entered into the system
<refsect1 id='caveats'> files as needed.
<title>CAVEATS</title> </para>
- <para> - <para>
- Groupnames must start with a lower case letter or an underscore, - Groupnames must start with a lower case letter or an underscore,
- followed by lower case letters, digits, underscores, or dashes. - 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. Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long.
</para> </para>
diff --git a/man/useradd.8.xml b/man/useradd.8.xml 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 --- a/man/useradd.8.xml
+++ b/man/useradd.8.xml +++ b/man/useradd.8.xml
@@ -366,7 +366,7 @@ @@ -691,12 +691,6 @@
</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 @@
the user account creation request. the user account creation request.
</para> </para>
@@ -109,3 +99,6 @@ index a16d730..c0bd777 100644
<para> <para>
Usernames may only be up to 32 characters long. Usernames may only be up to 32 characters long.
</para> </para>
--
2.30.2
meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch
-27
View File
@@ -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;
meta/recipes-extended/shadow/shadow.inc
+3 -5
View File
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c9a450b7be84eac23e6353efecb60b5b \
DEPENDS = "virtual/crypt" DEPENDS = "virtual/crypt"
UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases" UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases"
SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/v${PV}/${BP}.tar.gz \ 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-shadow-use-relaxed-usernames.patch \
${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
file://shadow-relaxed-usernames.patch \
file://useradd \ file://useradd \
" "
@@ -30,8 +29,7 @@ SRC_URI:append:class-native = " \
SRC_URI:append:class-nativesdk = " \ SRC_URI:append:class-nativesdk = " \
file://0001-Disable-use-of-syslog-for-sysroot.patch \ file://0001-Disable-use-of-syslog-for-sysroot.patch \
" "
SRC_URI[sha256sum] = "9fdb73b5d2b44e8ba9fcee1b4493ac75dd5040bda35b9ac8b06570cd192e7ee3"
SRC_URI[sha256sum] = "f262089be6a1011d50ec7849e14571b7b2e788334368f3dccb718513f17935ed"
# Additional Policy files for PAM # Additional Policy files for PAM
PAM_SRC_URI = "file://pam.d/chfn \ PAM_SRC_URI = "file://pam.d/chfn \
meta/recipes-extended/shadow/shadow_4.11.1.bb → meta/recipes-extended/shadow/shadow_4.12.1.bb
View File