From 1e4373bf06b67f4b88cd354b9462e74945970f51 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 17 Jan 2021 17:26:39 +0100 Subject: [PATCH] - merged uidmap subpackage and files fixes from PLD --- shadow.spec | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/shadow.spec b/shadow.spec index 3702c5e..6bb0e5a 100644 --- a/shadow.spec +++ b/shadow.spec @@ -11,7 +11,7 @@ Summary(pt_BR.UTF-8): Utilitários para o arquivo de senhas Shadow Summary(tr.UTF-8): Gölge parola dosyası araçları Name: shadow Version: 4.8.1 -Release: 1 +Release: 2 Epoch: 1 License: BSD Group: Applications/System @@ -118,6 +118,15 @@ arquivos-padrão UNIX de senha para o formato shadow. Várias páginas de manual estão também incluídas sobre estes utilitários e senhas shadow em geral. +%package -n uidmap +Summary: Programs to help use subuids +Group: Applications/System +Requires: setup >= 2.10.0 + +%description -n uidmap +These programs help unprivileged users to create uid and gid mappings +in user namespaces. + %prep %setup -q %patch0 -p1 @@ -129,8 +138,8 @@ utilitários e senhas shadow em geral. # - cracklib option refers to non-PAM passwd code # - skey referes to non-PAM pw_auth/passwd_check (login, su, chfn, chsh) code %configure \ - --bindir=/bin \ - --sbindir=/sbin \ + --bindir=%{_bindir} \ + --sbindir=%{_sbindir} \ --enable-shadowgrp \ %{?with_shared:--enable-shared --disable-static} \ --disable-silent-rules \ @@ -177,7 +186,7 @@ cp -p %{SOURCE23} $RPM_BUILD_ROOT/etc/pam.d/usermod > $RPM_BUILD_ROOT/etc/security/chfn.allow > $RPM_BUILD_ROOT/etc/security/chsh.allow -%{__rm} $RPM_BUILD_ROOT/{etc/pam.d,bin}/{login,su} +%{__rm} $RPM_BUILD_ROOT/{etc/pam.d,%{_bindir}}/{login,su} %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/{login,su}.1* %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man3/*.3* @@ -185,10 +194,10 @@ cp -p %{SOURCE23} $RPM_BUILD_ROOT/etc/pam.d/usermod %{__rm} $RPM_BUILD_ROOT%{_bindir}/lastlog %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man8/lastlog.8* # packaged in coreutils -%{__rm} $RPM_BUILD_ROOT/bin/groups +%{__rm} $RPM_BUILD_ROOT%{_bindir}/groups %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/groups.1* # packaged in util-linux -%{__rm} $RPM_BUILD_ROOT/sbin/nologin +%{__rm} $RPM_BUILD_ROOT%{_sbindir}/nologin %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/nologin.8* %find_lang %{name} @@ -207,7 +216,6 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) %doc ChangeLog NEWS TODO doc/{HOWTO,WISHLIST} -%attr(750,root,root) %dir %{_sysconfdir}/default %attr(640,root,root) %config %verify(not md5 mtime size) %{_sysconfdir}/default/useradd %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/chage %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/chfn @@ -228,7 +236,6 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/chsh.allow %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/login.defs %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %ghost %{_sysconfdir}/shadow -%dir /etc/skel %dir /etc/skel/tmp %{?with_shared:%attr(755,root,root) %{_libdir}/lib*.so.*.*} %attr(4755,root,root) %{_bindir}/chfn @@ -236,11 +243,9 @@ fi %attr(4755,root,root) %{_bindir}/expiry %attr(4755,root,root) %{_bindir}/gpasswd %attr(4755,root,root) %{_bindir}/passwd -%attr(755,root,root) %{_bindir}/chage +%attr(4755,root,root) %{_bindir}/chage %attr(755,root,root) %{_bindir}/faillog -%attr(755,root,root) %{_bindir}/newgidmap -%attr(755,root,root) %{_bindir}/newgrp -%attr(755,root,root) %{_bindir}/newuidmap +%attr(4755,root,root) %{_bindir}/newgrp %attr(755,root,root) %{_bindir}/sg %attr(755,root,root) %{_sbindir}/chgpasswd %attr(755,root,root) %{_sbindir}/chpasswd @@ -266,9 +271,7 @@ fi %{_mandir}/man1/chsh.1* %{_mandir}/man1/expiry.1* %{_mandir}/man1/gpasswd.1* -%{_mandir}/man1/newgidmap.1* %{_mandir}/man1/newgrp.1* -%{_mandir}/man1/newuidmap.1* %{_mandir}/man1/passwd.1* %{_mandir}/man1/sg.1* %{_mandir}/man5/faillog.5* @@ -277,8 +280,6 @@ fi %{_mandir}/man5/passwd.5* %{_mandir}/man5/shadow.5* %{_mandir}/man5/suauth.5* -%{_mandir}/man5/subgid.5* -%{_mandir}/man5/subuid.5* %{_mandir}/man8/chgpasswd.8* %{_mandir}/man8/chpasswd.8* %{_mandir}/man8/faillog.8* @@ -365,9 +366,7 @@ fi %lang(fr) %{_mandir}/fr/man1/chsh.1* %lang(fr) %{_mandir}/fr/man1/expiry.1* %lang(fr) %{_mandir}/fr/man1/gpasswd.1* -%lang(fr) %{_mandir}/fr/man1/newgidmap.1* %lang(fr) %{_mandir}/fr/man1/newgrp.1* -%lang(fr) %{_mandir}/fr/man1/newuidmap.1* %lang(fr) %{_mandir}/fr/man1/passwd.1* %lang(fr) %{_mandir}/fr/man1/sg.1* %lang(fr) %{_mandir}/fr/man5/faillog.5* @@ -376,8 +375,6 @@ fi %lang(fr) %{_mandir}/fr/man5/passwd.5* %lang(fr) %{_mandir}/fr/man5/shadow.5* %lang(fr) %{_mandir}/fr/man5/suauth.5* -%lang(fr) %{_mandir}/fr/man5/subgid.5* -%lang(fr) %{_mandir}/fr/man5/subuid.5* %lang(fr) %{_mandir}/fr/man8/chgpasswd.8* %lang(fr) %{_mandir}/fr/man8/chpasswd.8* %lang(fr) %{_mandir}/fr/man8/faillog.8* @@ -622,3 +619,16 @@ fi %lang(zh_TW) %{_mandir}/zh_TW/man8/useradd.8* %lang(zh_TW) %{_mandir}/zh_TW/man8/userdel.8* %lang(zh_TW) %{_mandir}/zh_TW/man8/usermod.8* + +%files -n uidmap +%defattr(644,root,root,755) +%attr(4755,root,root) %{_bindir}/newgidmap +%attr(4755,root,root) %{_bindir}/newuidmap +%{_mandir}/man1/newgidmap.1* +%{_mandir}/man1/newuidmap.1* +%{_mandir}/man5/subgid.5* +%{_mandir}/man5/subuid.5* +%lang(fr) %{_mandir}/fr/man1/newgidmap.1* +%lang(fr) %{_mandir}/fr/man1/newuidmap.1* +%lang(fr) %{_mandir}/fr/man5/subgid.5* +%lang(fr) %{_mandir}/fr/man5/subuid.5* -- 2.44.0