diff mbox series

[v2] shadow: upgrade 4.20.2 -> 4.20.3

Message ID 20261002115736.97429-1-jaipaul.cheernam@est.tech
State New
Headers show
Series [v2] shadow: upgrade 4.20.2 -> 4.20.3 | expand

Commit Message

Jaipaul Cheernam Oct. 2, 2026, 11:57 a.m. UTC
ChangeLog:
https://github.com/shadow-maint/shadow/releases/tag/4.20.3

Compare log: https://github.com/shadow-maint/shadow/compare/4.20.2...4.20.3

- Backport patch for lib/nscd.h: nscd_flush_cache(): Fix type of parameter

Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
---

Changes Since V1:
  - Add backport patch for issue seen in AUH

 ...cd_flush_cache-Fix-type-of-parameter.patch | 30 +++++++++++++++++++
 .../shadow/files/notallylog.patch             |  2 +-
 .../{shadow_4.20.2.bb => shadow_4.20.3.bb}    |  3 +-
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/shadow/files/0001-lib-nscd.h-nscd_flush_cache-Fix-type-of-parameter.patch
 rename meta/recipes-extended/shadow/{shadow_4.20.2.bb => shadow_4.20.3.bb} (97%)
diff mbox series

Patch

diff --git a/meta/recipes-extended/shadow/files/0001-lib-nscd.h-nscd_flush_cache-Fix-type-of-parameter.patch b/meta/recipes-extended/shadow/files/0001-lib-nscd.h-nscd_flush_cache-Fix-type-of-parameter.patch
new file mode 100644
index 0000000000..e873cdaffd
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/0001-lib-nscd.h-nscd_flush_cache-Fix-type-of-parameter.patch
@@ -0,0 +1,30 @@ 
+From b8d3549a49acfe967f45aebaf06d474c82c46d22 Mon Sep 17 00:00:00 2001
+From: Alejandro Colomar <alx@kernel.org>
+Date: Wed, 30 Sep 2026 19:12:01 +0200
+Subject: [PATCH] lib/nscd.h: nscd_flush_cache(): Fix type of parameter
+
+Fixes: deef7d84c3e4 (2026-09-09; "lib/nscd.h: nscd_flush_cache(): Define as static inline function")
+Closes: <https://github.com/shadow-maint/shadow/issues/1763>
+Reported-by: <https://github.com/Bonnietwin>
+Tested-by: <https://github.com/Bonnietwin>
+Signed-off-by: Alejandro Colomar <alx@kernel.org>
+
+Upstream-Status: Backport [https://github.com/shadow-maint/shadow/commit/b8d3549a49acfe967f45aebaf06d474c82c46d22]
+Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
+---
+ lib/nscd.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/nscd.h b/lib/nscd.h
+index fda3b1cb..30b56720 100644
+--- a/lib/nscd.h
++++ b/lib/nscd.h
+@@ -8,7 +8,7 @@
+ extern int nscd_flush_cache (const char *service);
+ #else
+ static inline int
+-nscd_flush_cache(MAYBE_UNUSED int _1)
++nscd_flush_cache(MAYBE_UNUSED const char *_1)
+ {
+ 	return 0;
+ }
diff --git a/meta/recipes-extended/shadow/files/notallylog.patch b/meta/recipes-extended/shadow/files/notallylog.patch
index 6d6957bbf8..b3b30026ce 100644
--- a/meta/recipes-extended/shadow/files/notallylog.patch
+++ b/meta/recipes-extended/shadow/files/notallylog.patch
@@ -1,4 +1,4 @@ 
-From 20dc49519cc177d4c829f4dd5cc277ada24376d7 Mon Sep 17 00:00:00 2001
+From a7d45933186754a1190509b46c51c56d48089004 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Tue, 21 Apr 2026 11:30:52 +0100
 Subject: [PATCH] shadow: Disable tallylog execution
diff --git a/meta/recipes-extended/shadow/shadow_4.20.2.bb b/meta/recipes-extended/shadow/shadow_4.20.3.bb
similarity index 97%
rename from meta/recipes-extended/shadow/shadow_4.20.2.bb
rename to meta/recipes-extended/shadow/shadow_4.20.3.bb
index cf7d253a7f..683a284aad 100644
--- a/meta/recipes-extended/shadow/shadow_4.20.2.bb
+++ b/meta/recipes-extended/shadow/shadow_4.20.3.bb
@@ -14,6 +14,7 @@  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-nscd.h-nscd_flush_cache-Fix-type-of-parameter.patch \
            "
 
 SRC_URI:append:class-target = " \
@@ -23,7 +24,7 @@  SRC_URI:append:class-target = " \
 SRC_URI:append:class-native = " \
            file://notallylog.patch \
            "
-SRC_URI[sha256sum] = "e5016b40541ee6fa02ea3d409547cef6e7eea9b31f0e3482e4874f87c1d0c7c5"
+SRC_URI[sha256sum] = "39006c9daf9228ddda9156605201fc9f59c43f9fdecc83c78bbe0e72d9ffd58c"
 UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$"
 
 # Additional Policy files for PAM