diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2024-05-20 16:10:38 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-22 10:20:08 +0100 |
| commit | 921b010e6e4b3a61779d8c10eb38966560f665f5 (patch) | |
| tree | f10c7e4ebc4fb9e83065c601ba2d807ac68a0717 | |
| parent | 88ab0efeda625892f393576fbcc87e9b517103f5 (diff) | |
| download | openembedded-core-contrib-921b010e6e4b3a61779d8c10eb38966560f665f5.tar.gz | |
shadow: upgrade from 4.15.0 to 4.15.1
0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch is dropped
as it has been merged and is in this new release.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/shadow/shadow_4.15.1.bb (renamed from meta/recipes-extended/shadow/shadow_4.15.0.bb) | 0 |
3 files changed, 1 insertions, 39 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch b/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch deleted file mode 100644 index 2e5503bfd4..0000000000 --- a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch +++ /dev/null @@ -1,37 +0,0 @@ -From af4b8cb780587aa736692a3baa76b60474f19c5d Mon Sep 17 00:00:00 2001 -From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> -Date: Mon, 18 Mar 2024 12:14:21 +0100 -Subject: [PATCH] lib/copydir:copy_entry(): use temporary stat buffer - -There are no guarantees that fstatat() does not clobber the stat -buffer on errors. - -Use a temporary buffer so that the following code sees correct -attributes of the source entry. - -Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/974] - -Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> ---- - lib/copydir.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/lib/copydir.c -+++ b/lib/copydir.c -@@ -400,6 +400,7 @@ static int copy_entry (const struct path - { - int err = 0; - struct stat sb; -+ struct stat tmp_sb; - struct link_name *lp; - struct timespec mt[2]; - -@@ -423,7 +424,7 @@ static int copy_entry (const struct path - * If the destination already exists do nothing. - * This is after the copy_dir above to still iterate into subdirectories. - */ -- if (fstatat(dst->dirfd, dst->name, &sb, AT_SYMLINK_NOFOLLOW) != -1) { -+ if (fstatat(dst->dirfd, dst->name, &tmp_sb, AT_SYMLINK_NOFOLLOW) != -1) { - return err; - } - diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 25930b64c1..3991006b43 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -12,7 +12,6 @@ DEPENDS = "virtual/crypt" GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ - file://0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://useradd \ " @@ -25,7 +24,7 @@ SRC_URI:append:class-target = " \ SRC_URI:append:class-native = " \ file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ " -SRC_URI[sha256sum] = "377fe0d7c1a0aa5e3514c08fdf5ddc70c9dcbb391678c2134445ed97326bcc26" +SRC_URI[sha256sum] = "b34686b89b279887ffbf1f33128902ccc0fa1a998a3add44213bb12d7385b218" # Additional Policy files for PAM PAM_SRC_URI = "file://pam.d/chfn \ diff --git a/meta/recipes-extended/shadow/shadow_4.15.0.bb b/meta/recipes-extended/shadow/shadow_4.15.1.bb index e57676c1da..e57676c1da 100644 --- a/meta/recipes-extended/shadow/shadow_4.15.0.bb +++ b/meta/recipes-extended/shadow/shadow_4.15.1.bb |