diff --git a/shadow-utils.spec b/shadow-utils.spec index cf4fbf3..483eb21 100644 --- a/shadow-utils.spec +++ b/shadow-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.18.0 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 2 License: BSD-3-Clause AND GPL-2.0-or-later URL: https://github.com/shadow-maint/shadow @@ -26,8 +26,6 @@ Patch0: shadow-4.15.0-manfix.patch Patch1: shadow-4.18.0-account-tools-setuid.patch # https://github.com/shadow-maint/shadow/commit/db0e0b9112332a45131912021317ab5ab4fd6e40 Patch2: shadow-4.18.0-selinux-chroot-prefix.patch -# Test patch -Patch3: test.patch ### Dependencies ### Requires: audit-libs >= 1.6.5 @@ -273,6 +271,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.a %{_libdir}/libsubid.so %changelog +* Tue Nov 25 2025 Adam Williamson - 2:4.18.0-6 +- Revert changes from -5 (they were only meant for testing) + * Tue Nov 25 2025 Iker Pedrosa - 2:4.18.0-5 - Test CI diff --git a/test.patch b/test.patch deleted file mode 100644 index 346d1b1..0000000 --- a/test.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 012684d388881727d6ce457d710a03d6df216409 Mon Sep 17 00:00:00 2001 -From: Iker Pedrosa -Date: Tue, 25 Nov 2025 09:52:03 +0100 -Subject: [PATCH] Test - -Signed-off-by: Iker Pedrosa ---- - src/useradd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/useradd.c b/src/useradd.c -index f7e46d6b..e2e95693 100644 ---- a/src/useradd.c -+++ b/src/useradd.c -@@ -2440,7 +2440,7 @@ int main (int argc, char **argv) - #endif - unsigned long subuid_count = 0; - unsigned long subgid_count = 0; -- struct option_flags flags; -+ struct option_flags flags = {0}; - bool process_selinux; - - log_set_progname(Prog); --- -2.52.0 -