remove su man conflicting with util-linux [release 4.17.2-2mamba;Sat Feb 01 2025]

This commit is contained in:
Silvan Calarco 2025-02-03 10:47:05 +01:00
parent 2d6ed1fbce
commit 4cdd25dd0b

View File

@ -2,9 +2,9 @@
%define mailgroupid 72 %define mailgroupid 72
Summary: Utilities for managing shadow password files and user/group accounts Summary: Utilities for managing shadow password files and user/group accounts
Name: shadow Name: shadow
Version: 4.14.2 Version: 4.17.2
Group: Applications/Security Group: Applications/Security
Release: 1mamba Release: 2mamba
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
@ -28,13 +28,9 @@ BuildRequires: glibc-devel
BuildRequires: libacl-devel BuildRequires: libacl-devel
BuildRequires: libattr-devel BuildRequires: libattr-devel
BuildRequires: libaudit-devel BuildRequires: libaudit-devel
BuildRequires: libbsd-devel
BuildRequires: libcrack-devel
BuildRequires: libmd-devel
BuildRequires: libpam-devel BuildRequires: libpam-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: libsemanage-devel BuildRequires: libsemanage-devel
BuildRequires: libsystemd-devel
BuildRequires: libxcrypt-devel BuildRequires: libxcrypt-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: libsemanage-devel >= 3.3 BuildRequires: libsemanage-devel >= 3.3
@ -45,7 +41,15 @@ Obsoletes: pwdutils < 4.9
Provides: shadow-common Provides: shadow-common
Obsoletes: shadow-common <= 4.9-1mamba Obsoletes: shadow-common <= 4.9-1mamba
Provides: /bin/groups Provides: /bin/groups
Provides: /usr/sbin/adduser
Provides: /usr/sbin/useradd
Provides: /usr/sbin/userdel
Provides: /usr/sbin/usermod
Provides: /usr/sbin/groupadd
Provides: /usr/sbin/groupdel
Provides: /usr/sbin/groupmod
Provides: group(mail)
Provides: group(shadow)
%description %description
The shadow package includes the necessary programs for converting UNIX password files to the shadow password format, plus programs for managing user and group accounts. The shadow package includes the necessary programs for converting UNIX password files to the shadow password format, plus programs for managing user and group accounts.
@ -79,8 +83,6 @@ Requires: libsubid = %{?epoch:%epoch:}%{version}-%{release}
Sub-id library provided with shadow package. Sub-id library provided with shadow package.
This is the development package. This is the development package.
%debug_package
%prep %prep
%setup -q %setup -q
%patch 5 -p1 %patch 5 -p1
@ -88,11 +90,25 @@ This is the development package.
%build %build
%configure \ %configure \
--with-libpam \ --sbindir=%{_bindir} \
--disable-account-tools-setuid \
--enable-lastlog \
--enable-logind=no \
--enable-man \
--enable-shadowgrp \
--enable-shared \ --enable-shared \
--with-libcrack \ --with-audit \
--with-skey \ --with-bcrypt \
--enable-man --with-group-name-max-length=32 \
--with-libpam \
--with-selinux \
--with-sha-crypt \
--with-yescrypt \
--without-libbsd \
--without-libcrack \
--without-nscd \
--without-sssd \
--without-su
%make %make
@ -141,31 +157,15 @@ cp %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/groupmod
cp %{SOURCE5} %{buildroot}%{_sysconfdir}/pam.d/passwd cp %{SOURCE5} %{buildroot}%{_sysconfdir}/pam.d/passwd
cp %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/login cp %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/login
#touch %{buildroot}%{_sysconfdir}/shadow # The installation script doesn't actually use the configured paths
mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
# remove conflicting su man still installed
rm -f %{buildroot}%{_mandir}/man1/su.1*
rm -f %{buildroot}%{_mandir}/*/man1/su.1*
%find_lang shadow --all-name --with-man %find_lang shadow --all-name --with-man
#for l in cs da de fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW; do
# for m in man1/groups.1 man5/faillog.5 man8/lastlog.8 man8/newusers.8; do
# [ -e %{buildroot}%{_mandir}/$l/$m ] && \
# echo "%lang(%l) %{_mandir}/$l/$m*" >> shadow.lang
# done
# for m in `ls %{buildroot}%{_mandir}/$l/*/*`; do
# m1=`echo $m | sed "s|%{buildroot}||"`
# grep $m1 shadow.lang || \
# echo "%lang(%l) /${m1}*" >> shadow-main.man
# done
#done
#for m in man1/groups.1 man5/faillog.5 man8/lastlog.8 man8/newusers.8; do
# [ -e %{buildroot}%{_mandir}/$m ] && \
# echo "%{_mandir}/$m*" >> shadow.lang
#done
#for m in `ls %{buildroot}%{_mandir}/*/*\.[1-9]`; do
# m1=`echo $m | sed "s|%{buildroot}||"`
# grep $m1 shadow.lang || \
# echo "/${m1}*" >> shadow-main.man
#done
%clean %clean
[ "%{buildroot}" != / ] && rm -rf %{buildroot} [ "%{buildroot}" != / ] && rm -rf %{buildroot}
@ -183,7 +183,6 @@ groupadd mail -g %{mailgroupid} 2>/dev/null || :
%files -f shadow.lang %files -f shadow.lang
%defattr(-,root,root) %defattr(-,root,root)
#%attr(640,root,shadow) %config(noreplace) %{_sysconfdir}/shadow
%dir %{_sysconfdir}/default %dir %{_sysconfdir}/default
%config(noreplace) %{_sysconfdir}/default/useradd %config(noreplace) %{_sysconfdir}/default/useradd
%config(noreplace) %{_sysconfdir}/limits %config(noreplace) %{_sysconfdir}/limits
@ -200,32 +199,47 @@ groupadd mail -g %{mailgroupid} 2>/dev/null || :
%attr(644,root,root) %config /etc/pam.d/userdel %attr(644,root,root) %config /etc/pam.d/userdel
%attr(644,root,root) %config /etc/pam.d/usermod %attr(644,root,root) %config /etc/pam.d/usermod
%{_bindir}/chage %{_bindir}/chage
%{_bindir}/chgpasswd
%{_bindir}/chpasswd
%{_bindir}/expiry %{_bindir}/expiry
%{_bindir}/faillog %{_bindir}/faillog
%{_bindir}/getsubids %{_bindir}/getsubids
%{_bindir}/gpasswd %{_bindir}/gpasswd
%{_bindir}/groups %{_bindir}/groupadd
#%{_bindir}/lastlog %{_bindir}/groupdel
%{_bindir}/groupmems
%{_bindir}/groupmod
%{_bindir}/grpck
%{_bindir}/grpconv
%{_bindir}/grpunconv
%{_bindir}/lastlog
%{_bindir}/logoutd
%{_bindir}/newgidmap %{_bindir}/newgidmap
%{_bindir}/newuidmap %{_bindir}/newuidmap
%{_bindir}/newgrp %{_bindir}/newgrp
%{_bindir}/newusers
%{_bindir}/passwd %{_bindir}/passwd
%{_bindir}/pwck
%{_bindir}/pwconv
%{_bindir}/pwunconv
%{_bindir}/sg %{_bindir}/sg
%{_sbindir}/* %{_bindir}/useradd
%{_bindir}/userdel
%{_bindir}/usermod
%{_bindir}/vigr
%{_bindir}/vipw
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
%{_mandir}/man3/*.3* %{_mandir}/man3/*.3*
%{_mandir}/man5/*.5* %{_mandir}/man5/*.5*
%{_mandir}/man8/*.8* %{_mandir}/man8/*.8*
%exclude %{_sbindir}/nologin %exclude %{_bindir}/nologin
%exclude %{_mandir}/man1/chfn.1* %exclude %{_mandir}/man1/chfn.1*
%exclude %{_mandir}/man1/chsh.1* %exclude %{_mandir}/man1/chsh.1*
%exclude %{_mandir}/man1/login.1* %exclude %{_mandir}/man1/login.1*
%exclude %{_mandir}/man1/su.1*
%exclude %{_mandir}/man8/nologin.8* %exclude %{_mandir}/man8/nologin.8*
%exclude %{_mandir}/*/man1/chfn.1* %exclude %{_mandir}/*/man1/chfn.1*
%exclude %{_mandir}/*/man1/chsh.1* %exclude %{_mandir}/*/man1/chsh.1*
%exclude %{_mandir}/*/man1/login.1* %exclude %{_mandir}/*/man1/login.1*
%exclude %{_mandir}/*/man1/su.1*
%exclude %{_mandir}/*/man8/nologin.8* %exclude %{_mandir}/*/man8/nologin.8*
%files extra %files extra
@ -235,21 +249,17 @@ groupadd mail -g %{mailgroupid} 2>/dev/null || :
%attr(644,root,root) %config /etc/pam.d/login %attr(644,root,root) %config /etc/pam.d/login
%attr(644,root,root) %config /etc/pam.d/chfn %attr(644,root,root) %config /etc/pam.d/chfn
%attr(644,root,root) %config /etc/pam.d/chsh %attr(644,root,root) %config /etc/pam.d/chsh
%attr(644,root,root) %config /etc/pam.d/su
%{_bindir}/login %{_bindir}/login
%{_bindir}/su
%{_bindir}/chfn %{_bindir}/chfn
%{_bindir}/chsh %{_bindir}/chsh
%{_sbindir}/nologin %{_bindir}/nologin
%{_mandir}/man1/chfn.1* %{_mandir}/man1/chfn.1*
%{_mandir}/man1/chsh.1* %{_mandir}/man1/chsh.1*
%{_mandir}/man1/login.1* %{_mandir}/man1/login.1*
%{_mandir}/man1/su.1*
%{_mandir}/man8/nologin.8* %{_mandir}/man8/nologin.8*
%{_mandir}/*/man1/chfn.1* %{_mandir}/*/man1/chfn.1*
%{_mandir}/*/man1/chsh.1* %{_mandir}/*/man1/chsh.1*
%{_mandir}/*/man1/login.1* %{_mandir}/*/man1/login.1*
%{_mandir}/*/man1/su.1*
%{_mandir}/*/man8/nologin.8* %{_mandir}/*/man8/nologin.8*
%files -n libsubid %files -n libsubid
@ -263,6 +273,14 @@ groupadd mail -g %{mailgroupid} 2>/dev/null || :
%{_libdir}/libsubid.so %{_libdir}/libsubid.so
%changelog %changelog
* Sat Feb 01 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 4.17.2-2mamba
- remove su man conflicting with util-linux
* Fri Jan 31 2025 Automatic Build System <autodist@openmamba.org> 4.17.2-1mamba
- automatic version update by autodist
- provide groups shadow and mail
- updated configure options
* Mon Oct 30 2023 Automatic Build System <autodist@mambasoft.it> 4.14.2-1mamba * Mon Oct 30 2023 Automatic Build System <autodist@mambasoft.it> 4.14.2-1mamba
- automatic version update by autodist - automatic version update by autodist