Skip to contentSkip to conversation

shadow: upgrade 4.8 -> 4.8.1

PATCH New Wang Mingyu 1 participant 1 message Feb 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 shadow: upgrade 4.8 -> 4.8.1

0001-Do-not-check-for-validity-of-shell-executable.patch CVE-2019-19882.patch
Removed since they are included in 4.8.1.

---
 ...eck-for-validity-of-shell-executable.patch | 29 ----------
 .../shadow/files/CVE-2019-19882.patch         | 55 -------------------
 meta/recipes-extended/shadow/shadow.inc       |  6 +-
 .../shadow/{shadow_4.8.bb => shadow_4.8.1.bb} |  0
 4 files changed, 2 insertions(+), 88 deletions(-)
 delete mode 100644 meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch
 delete mode 100644 meta/recipes-extended/shadow/files/CVE-2019-19882.patch
 rename meta/recipes-extended/shadow/{shadow_4.8.bb => shadow_4.8.1.bb} (100%)
meta/recipes-extended/shadow/files/0001-Do-not-check-for-validity-of-shell-executable.patch deleted +0 -29
deleted file mode 100644
index 2d15ff0673..0000000000
@@ -1,29 +0,0 @@
-From 0d0aded7307a9f4ee0d299951512acd18b3e029e Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Wed, 4 Dec 2019 19:28:48 +0100
-Subject: [PATCH] Do not check for validity of shell executable.
-
-This kind of check fails when building a rootfs.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- src/useradd.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/useradd.c b/src/useradd.c
-index 4af0f7c..898fe02 100644
---- a/src/useradd.c
-+++ b/src/useradd.c
-@@ -1328,10 +1328,7 @@ static void process_flags (int argc, char **argv)
- 				if (   ( !VALID (optarg) )
- 				    || (   ('\0' != optarg[0])
- 				        && ('/'  != optarg[0])
--				        && ('*'  != optarg[0]) )
--				    || (stat(optarg, &st) != 0)
--				    || (S_ISDIR(st.st_mode))
--				    || (access(optarg, X_OK) != 0)) {
-+				        && ('*'  != optarg[0]) )) {
- 					fprintf (stderr,
- 					         _("%s: invalid shell '%s'\n"),
- 					         Prog, optarg);
meta/recipes-extended/shadow/files/CVE-2019-19882.patch deleted +0 -55

55 lines not on this page · raw message

meta/recipes-extended/shadow/shadow.inc +2 -4
index 3bfa39e6ff..f86e5e03c0 100644
@@ -13,7 +13,6 @@ SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}.
            file://shadow-4.1.3-dots-in-usernames.patch \
            ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
            file://shadow-relaxed-usernames.patch \
-           file://CVE-2019-19882.patch \
            "
 
 SRC_URI_append_class-target = " \
@@ -25,14 +24,13 @@ SRC_URI_append_class-native = " \
            file://0001-Disable-use-of-syslog-for-sysroot.patch \
            file://0002-Allow-for-setting-password-in-clear-text.patch \
            file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \
-           file://0001-Do-not-check-for-validity-of-shell-executable.patch \
            "
 SRC_URI_append_class-nativesdk = " \
            file://0001-Disable-use-of-syslog-for-sysroot.patch \
            "
 
-SRC_URI[md5sum] = "017ac773ba370bc28e157cee30dad71a"
-SRC_URI[sha256sum] = "82016d65317555fc8ce9e669eb187984d8d4b1f8ecda0769f4bc5412aed326e4"
+SRC_URI[md5sum] = "3d97f11e66bfb0b14702b115fa8be480"
+SRC_URI[sha256sum] = "3ee3081fbbcbcfea5c8916419e46bc724807bab271072104f23e7a29e9668f3a"
 
 # Additional Policy files for PAM
 PAM_SRC_URI = "file://pam.d/chfn \
meta/recipes-extended/shadow/shadow_4.8.1.bb renamed from meta/recipes-extended/shadow/shadow_4.8.bb +0 -0
similarity index 100%
rename from meta/recipes-extended/shadow/shadow_4.8.bb
rename to meta/recipes-extended/shadow/shadow_4.8.1.bb
Signature · 1 line
2.17.1