import CS shadow-utils-4.9-16.el9

This commit is contained in:
AlmaLinux RelEng Bot 2026-03-30 11:04:41 -04:00
parent bd4236055b
commit e34b5a3ddf
2 changed files with 47 additions and 12 deletions

View File

@ -0,0 +1,29 @@
From c1678a9e2759f60a2daf5e136c76fa6e47d6f400 Mon Sep 17 00:00:00 2001
From: Alejandro Colomar <alx@kernel.org>
Date: Wed, 30 Jul 2025 00:18:33 +0200
Subject: [PATCH] src/groupmod.c: --help: wfix
Closes: <https://github.com/shadow-maint/shadow/issues/1313>
Reported-by: Arshdeep Singh <arshdeepsinghsahni8@gmail.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
src/groupmod.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/groupmod.c b/src/groupmod.c
index 34b670f6..2cdb2067 100644
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -132,7 +132,8 @@ static void usage (int status)
" PASSWORD\n"), usageout);
(void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout);
(void) fputs (_(" -P, --prefix PREFIX_DIR prefix directory where are located the /etc/* files\n"), usageout);
- (void) fputs (_(" -U, --users USERS list of user members of this group\n"), usageout);
+ (void) fputs (_(" -U, --users USERS comma-separated list of users to add as\n"
+ " members of this group\n"), usageout);
(void) fputs ("\n", usageout);
exit (status);
}
--
2.52.0

View File

@ -1,7 +1,7 @@
Summary: Utilities for managing accounts and shadow password files
Name: shadow-utils
Version: 4.9
Release: 15%{?dist}
Release: 16%{?dist}
Epoch: 2
License: BSD and GPLv2+
URL: https://github.com/shadow-maint/shadow
@ -88,6 +88,8 @@ Patch32: shadow-4.9-salt-remove-rounds.patch
Patch33: shadow-4.9-shadow-logfd.patch
# https://github.com/shadow-maint/shadow/commit/3b12ab7e29b0f3c766b39269da76a5ef3a753b22
Patch34: shadow-4.9.0-vipw-restore-terminal.patch
# https://github.com/shadow-maint/shadow/commit/c1678a9e2759f60a2daf5e136c76fa6e47d6f400
Patch35: shadow-4.9-groupmod-help.patch
### Dependencies ###
Requires: audit-libs >= 1.6.5
@ -183,6 +185,7 @@ Development files for shadow-utils-subid.
%patch32 -p1 -b .salt-remove-rounds
%patch33 -p1 -b .shadow-logfd
%patch34 -p1 -b .vipw-restore-terminal
%patch35 -p1 -b .groupmod-help
iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8
cp -f doc/HOWTO.utf8 doc/HOWTO
@ -240,7 +243,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/su
rm $RPM_BUILD_ROOT%{_bindir}/faillog
rm $RPM_BUILD_ROOT%{_sysconfdir}/login.access
rm $RPM_BUILD_ROOT%{_sysconfdir}/limits
rm $RPM_BUILD_ROOT%{_sbindir}/logoutd
rm $RPM_BUILD_ROOT/usr/sbin/logoutd
rm $RPM_BUILD_ROOT%{_sbindir}/nologin
rm $RPM_BUILD_ROOT%{_mandir}/man1/chfn.*
rm $RPM_BUILD_ROOT%{_mandir}/*/man1/chfn.*
@ -308,16 +311,16 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la
%attr(0755,root,root) %caps(cap_setgid=ep) %{_bindir}/newgidmap
%attr(0755,root,root) %caps(cap_setuid=ep) %{_bindir}/newuidmap
%{_sbindir}/adduser
%attr(0755,root,root) %{_sbindir}/user*
%attr(0755,root,root) %{_sbindir}/group*
%{_sbindir}/grpck
%{_sbindir}/pwck
%{_sbindir}/*conv
%{_sbindir}/chpasswd
%{_sbindir}/chgpasswd
%{_sbindir}/newusers
%{_sbindir}/vipw
%{_sbindir}/vigr
%attr(0755,root,root) /usr/sbin/user*
%attr(0755,root,root) /usr/sbin/group*
/usr/sbin/grpck
/usr/sbin/pwck
/usr/sbin/*conv
/usr/sbin/chpasswd
/usr/sbin/chgpasswd
/usr/sbin/newusers
/usr/sbin/vipw
/usr/sbin/vigr
%{_mandir}/man1/chage.1*
%{_mandir}/man1/gpasswd.1*
%{_mandir}/man1/sg.1*
@ -353,6 +356,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libsubid.la
%{_libdir}/libsubid.so
%changelog
* Tue Dec 9 2025 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.9-16
- groupmod.c: --help wfix. Resolves: RHEL-130879
* Mon May 26 2025 Iker Pedrosa <ipedrosa@redhat.com> - 2:4.9-15
- nss.c: shadow_logfd to stderr. Resolves: RHEL-83431
- vipw: restore the original terminal pgrp after editing. Resolves: RHEL-70844 and RHEL-72940