diff mbox series

[2/5] shadow: upgrade from 4.17.1 to 4.17.2

Message ID 20250213060000.1092285-2-Qi.Chen@windriver.com
State Accepted, archived
Commit 6170d60175237dd4a0471d6f88cee2db4a37b7c4
Headers show
Series [1/5] sysstat: upgrade from 12.7.6 to 12.7.7 | expand

Commit Message

ChenQi Feb. 13, 2025, 5:59 a.m. UTC 
From: Chen Qi <Qi.Chen@windriver.com>

Upgrade shadow from 4.17.1 to 4.17.2.

0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch is dropped
because it has been merged.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 ...-use-C23-attributes-only-with-gcc-10.patch | 29 -------------------
 .../{shadow_4.17.1.bb => shadow_4.17.2.bb}    |  3 +-
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch
 rename meta/recipes-extended/shadow/{shadow_4.17.1.bb => shadow_4.17.2.bb} (98%)
diff mbox series

Patch

diff --git a/meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch b/meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch
deleted file mode 100644
index 4e2d3a89c3..0000000000
--- a/meta/recipes-extended/shadow/files/0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
-From f2d8d96e8586772becd68593a5bd9e14632841af Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Tue, 7 Jan 2025 17:03:32 +0100
-Subject: [PATCH] lib/attr.h: use C23 attributes only with gcc >= 10
-
-These are not available on earlier versions and builds break there.
-
-Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/1172]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- lib/attr.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/attr.h b/lib/attr.h
-index 02c7e252..290514d8 100644
---- a/lib/attr.h
-+++ b/lib/attr.h
-@@ -5,7 +5,7 @@
- #include "config.h"
- 
- 
--#if defined(__GNUC__)
-+#if defined(__GNUC__) && (__GNUC__ >= 10)
- # define MAYBE_UNUSED                [[gnu::unused]]
- # define NORETURN                    [[gnu::__noreturn__]]
- # define format_attr(type, fmt, va)  [[gnu::format(type, fmt, va)]]
--- 
-2.45.2
-
diff --git a/meta/recipes-extended/shadow/shadow_4.17.1.bb b/meta/recipes-extended/shadow/shadow_4.17.2.bb
similarity index 98%
rename from meta/recipes-extended/shadow/shadow_4.17.1.bb
rename to meta/recipes-extended/shadow/shadow_4.17.2.bb
index 7c89062646..5459d4e57f 100644
--- a/meta/recipes-extended/shadow/shadow_4.17.1.bb
+++ b/meta/recipes-extended/shadow/shadow_4.17.2.bb
@@ -14,7 +14,6 @@  GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases"
 SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \
            ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
            file://useradd \
-           file://0001-lib-attr.h-use-C23-attributes-only-with-gcc-10.patch \
            "
 
 SRC_URI:append:class-target = " \
@@ -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] = "51a946bbce141c5de14b6d47cab167206cd685d2307e917611dbc1be46c84a18"
+SRC_URI[sha256sum] = "064a7c048e613ef5b5f3613e137d79d35d062ab434e89020f743e90844ec5c4f"
 UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$"
 
 # Additional Policy files for PAM