pool/shadow
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 993912 from home:kukuk:branches:Base:System

Browse Source 
- Remove duplicate pam.d/useradd entry
- Provide /etc/login.defs.d on SLE15 since we support and use it
- Use %_pam_vendordir macro

OBS-URL: https://build.opensuse.org/request/show/993912
OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=121
This commit is contained in:
Michael Vetter 2022-08-09 09:45:37 +00:00 committed by Git OBS Bridge
parent a4f7b923a4
commit 0ca771d496
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shadow.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Aug 9 06:29:07 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
- Remove duplicate pam.d/useradd entry
- Provide /etc/login.defs.d on SLE15 since we support and use it
-------------------------------------------------------------------
Mon Aug 8 13:00:46 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
- Use %_pam_vendordir macro
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 12 16:52:39 UTC 2022 - Stanislav Brabec <sbrabec@suse.com> Wed Jan 12 16:52:39 UTC 2022 - Stanislav Brabec <sbrabec@suse.com>

33
shadow.spec
View File

@ -231,9 +231,11 @@ rm %{buildroot}/%{_libdir}/libsubid.{la,a}
# Move /etc to /usr/etc # Move /etc to /usr/etc
if [ ! -d %{buildroot}%{_distconfdir} ]; then if [ ! -d %{buildroot}%{_distconfdir} ]; then
mkdir -p %{buildroot}%{_distconfdir} mkdir -p %{buildroot}%{_distconfdir}
mv %{buildroot}%{_sysconfdir}/{login.defs,pam.d} %{buildroot}%{_distconfdir} mkdir -p %{buildroot}%{_pam_vendordir}
mkdir -p %{buildroot}%{_sysconfdir}/login.defs.d mv %{buildroot}%{_sysconfdir}/login.defs %{buildroot}%{_distconfdir}
mv %{buildroot}%{_sysconfdir}/pam.d/* %{buildroot}%{_pam_vendordir}/
fi fi
mkdir -p %{buildroot}%{_sysconfdir}/login.defs.d
%find_lang shadow %find_lang shadow
@ -299,19 +301,18 @@ test -f %{_sysconfdir}/login.defs.rpmsave && mv -v %{_sysconfdir}/login.defs.rpm
%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/subuid %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/subuid
%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/subgid %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/subgid
%if %{defined no_config} %if %{defined no_config}
%{_distconfdir}/pam.d/chage %{_pam_vendordir}/chage
%{_distconfdir}/pam.d/chfn %{_pam_vendordir}/chfn
%{_distconfdir}/pam.d/chsh %{_pam_vendordir}/chsh
%{_distconfdir}/pam.d/passwd %{_pam_vendordir}/passwd
%{_distconfdir}/pam.d/useradd %{_pam_vendordir}/chpasswd
%{_distconfdir}/pam.d/chpasswd %{_pam_vendordir}/groupadd
%{_distconfdir}/pam.d/groupadd %{_pam_vendordir}/groupdel
%{_distconfdir}/pam.d/groupdel %{_pam_vendordir}/groupmod
%{_distconfdir}/pam.d/groupmod %{_pam_vendordir}/newusers
%{_distconfdir}/pam.d/newusers %{_pam_vendordir}/useradd
%{_distconfdir}/pam.d/useradd %{_pam_vendordir}/userdel
%{_distconfdir}/pam.d/userdel %{_pam_vendordir}/usermod
%{_distconfdir}/pam.d/usermod
%else %else
%config %{_sysconfdir}/pam.d/chage %config %{_sysconfdir}/pam.d/chage
%config %{_sysconfdir}/pam.d/chfn %config %{_sysconfdir}/pam.d/chfn
@ -389,8 +390,8 @@ test -f %{_sysconfdir}/login.defs.rpmsave && mv -v %{_sysconfdir}/login.defs.rpm
%{_unitdir}/* %{_unitdir}/*
%files -n login_defs %files -n login_defs
%if %{defined no_config}
%dir %{_sysconfdir}/login.defs.d %dir %{_sysconfdir}/login.defs.d
%if %{defined no_config}
%attr(0644,root,root) %{_distconfdir}/login.defs %attr(0644,root,root) %{_distconfdir}/login.defs
%else %else
%attr(0644,root,root) %config %{_sysconfdir}/login.defs %attr(0644,root,root) %config %{_sysconfdir}/login.defs