From 7175666b72570ca6bfd86758d193336e3cc9cf8b Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Sun, 9 Aug 2026 05:39:14 +0000
Subject: [PATCH] shadow: upgrade 4.20.0 -> 4.20.2

---
 ...001-subid-Add-stdint.h-for-uintmax_t.patch | 43 -------------------
 .../shadow/files/notallylog.patch             | 18 +++++---
 .../{shadow_4.20.0.bb => shadow_4.20.2.bb}    |  4 +-
 3 files changed, 15 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-extended/shadow/files/0001-subid-Add-stdint.h-for-uintmax_t.patch
 rename meta/recipes-extended/shadow/{shadow_4.20.0.bb => shadow_4.20.2.bb} (98%)

diff --git a/meta/recipes-extended/shadow/files/0001-subid-Add-stdint.h-for-uintmax_t.patch b/meta/recipes-extended/shadow/files/0001-subid-Add-stdint.h-for-uintmax_t.patch
deleted file mode 100644
index 5679be0e61..0000000000
--- a/meta/recipes-extended/shadow/files/0001-subid-Add-stdint.h-for-uintmax_t.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ba4419c57b222b0d34a2b933e7ee92914a51b596 Mon Sep 17 00:00:00 2001
-From: ojab <ojab@ojab.ru>
-Date: Wed, 29 Jul 2026 15:07:43 +0000
-Subject: [PATCH] subid: Add `<stdint.h>` for `uintmax_t`
-
-```
-find_new_sub_uids.c:80:27: error: 'uintmax_t' undeclared (first use in this function)
-find_new_sub_gids.c:80:27: error: 'uintmax_t' undeclared (first use in this function)
-```
-
-Fixes: 4d800cf2eb9e (2026-04-09; "subid: Add deterministic subid ranges")
-
-Upstream-Status: Backport [https://github.com/shadow-maint/shadow/commit/ba4419c57b222b0d34a2b933e7ee92914a51b596]
-Signed-off-by: ojab <ojab@ojab.ru>
----
- lib/find_new_sub_gids.c | 1 +
- lib/find_new_sub_uids.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/lib/find_new_sub_gids.c b/lib/find_new_sub_gids.c
-index 3971ce922e..de514d6b09 100644
---- a/lib/find_new_sub_gids.c
-+++ b/lib/find_new_sub_gids.c
-@@ -8,6 +8,7 @@
- 
- #ifdef ENABLE_SUBIDS
- 
-+#include <stdint.h>
- #include <stdio.h>
- #include <errno.h>
- 
-diff --git a/lib/find_new_sub_uids.c b/lib/find_new_sub_uids.c
-index 65f6815467..f0b4328387 100644
---- a/lib/find_new_sub_uids.c
-+++ b/lib/find_new_sub_uids.c
-@@ -8,6 +8,7 @@
- 
- #ifdef ENABLE_SUBIDS
- 
-+#include <stdint.h>
- #include <stdio.h>
- #include <errno.h>
- 
diff --git a/meta/recipes-extended/shadow/files/notallylog.patch b/meta/recipes-extended/shadow/files/notallylog.patch
index 94773ace2b..6d6957bbf8 100644
--- a/meta/recipes-extended/shadow/files/notallylog.patch
+++ b/meta/recipes-extended/shadow/files/notallylog.patch
@@ -1,13 +1,21 @@
+From 20dc49519cc177d4c829f4dd5cc277ada24376d7 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
+
 We don't want to call /sbin/pam_tally2 in the native tools case so
 disable this function.
 
 Upstream-Status: Inappropriate [OE cross configuration specific]
+---
+ src/useradd.c | 3 +++
+ 1 file changed, 3 insertions(+)
 
-Index: shadow-4.19.4/src/useradd.c
-===================================================================
---- shadow-4.19.4.orig/src/useradd.c
-+++ shadow-4.19.4/src/useradd.c
-@@ -2046,6 +2046,9 @@ static void tallylog_reset (const char *
+diff --git a/src/useradd.c b/src/useradd.c
+index 5404b46..78bb70a 100644
+--- a/src/useradd.c
++++ b/src/useradd.c
+@@ -2015,6 +2015,9 @@ static void tallylog_reset (const char *user_name)
  	int failed;
  	int status;
  
diff --git a/meta/recipes-extended/shadow/shadow_4.20.0.bb b/meta/recipes-extended/shadow/shadow_4.20.2.bb
similarity index 98%
rename from meta/recipes-extended/shadow/shadow_4.20.0.bb
rename to meta/recipes-extended/shadow/shadow_4.20.2.bb
index bb247cee9d..c54ed77a41 100644
--- a/meta/recipes-extended/shadow/shadow_4.20.0.bb
+++ b/meta/recipes-extended/shadow/shadow_4.20.2.bb
@@ -14,7 +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-subid-Add-stdint.h-for-uintmax_t.patch \
+           file://login_defs_pam.sed \
            "
 
 SRC_URI:append:class-target = " \
@@ -24,7 +24,7 @@ SRC_URI:append:class-target = " \
 SRC_URI:append:class-native = " \
            file://notallylog.patch \
            "
-SRC_URI[sha256sum] = "5e1eee2709a540ac07e4e5bb0d30f7b97d6ee1e3714ef527047fe2ffb5fdaa5c"
+SRC_URI[sha256sum] = "e5016b40541ee6fa02ea3d409547cef6e7eea9b31f0e3482e4874f87c1d0c7c5"
 UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$"
 
 # Additional Policy files for PAM
-- 
2.47.1

