Rel 2; updated user/group names patch from fc

[packages/shadow.git] / shadow.spec

diff --git a/shadow.spec b/shadow.spec
index 2540c46d59b46270402b35e63d753b4a80bb2022..d1cb51c02c7a08eef05e6107993f55e85249d2c8 100644 (file)
--- a/shadow.spec
+++ b/shadow.spec
@@ -1,26 +1,5 @@
 # TODO
-# - /etc/login.defs contains options valid only when PAM is disabled:
-# gpasswd -M chef_server chef_server
-#configuration error - unknown item 'FAILLOG_ENAB' (notify administrator)
-#configuration error - unknown item 'LASTLOG_ENAB' (notify administrator)
-#configuration error - unknown item 'MAIL_CHECK_ENAB' (notify administrator)
-#configuration error - unknown item 'OBSCURE_CHECKS_ENAB' (notify administrator)
-#configuration error - unknown item 'PORTTIME_CHECKS_ENAB' (notify administrator)
-#configuration error - unknown item 'QUOTAS_ENAB' (notify administrator)
-#configuration error - unknown item 'MOTD_FILE' (notify administrator)
-#configuration error - unknown item 'FTMP_FILE' (notify administrator)
-#configuration error - unknown item 'NOLOGINS_FILE' (notify administrator)
-#configuration error - unknown item 'ENV_HZ' (notify administrator)
-#configuration error - unknown item 'PASS_MIN_LEN' (notify administrator)
-#configuration error - unknown item 'SU_WHEEL_ONLY' (notify administrator)
-#configuration error - unknown item 'CRACKLIB_DICTPATH' (notify administrator)
-#configuration error - unknown item 'PASS_CHANGE_TRIES' (notify administrator)
-#configuration error - unknown item 'PASS_ALWAYS_WARN' (notify administrator)
-#configuration error - unknown item 'CHFN_AUTH' (notify administrator)
-#configuration error - unknown item 'ENVIRON_FILE' (notify administrator)
-# - sync pam files from pwdutils
 # - tcb support?
-# - ensure Conflicts with various packages (util-linux,sysvinit,coreutils) is up to date
 
 # Conditional build:
 %bcond_without selinux         # build without SE-Linux support
@@ -34,15 +13,13 @@ Summary(pl.UTF-8):  Narzędzia do obsługi mechanizmu ukrytych haseł
 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.6
-#BuildRequires:        useradd -g is broken, use pwdutils, or fix it:
-# http://zie.pg.gda.pl/mailman/pipermail/shadow/2006-September/000395.html
-Release:       0.1
+Version:       4.8.1
+Release:       2
 Epoch:         1
 License:       BSD
 Group:         Applications/System
 Source0:       https://github.com/shadow-maint/shadow/releases/download/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: b491fecbf1232632c32ff8f1437fd60e
+# Source0-md5: 4b05eff8a427cf50e615bda324b5bc45
 Source2:       %{name}-login.defs
 Source3:       %{name}.useradd
 Source10:      chage.pamd
@@ -79,9 +56,9 @@ Requires:     pam >= 0.99.7.1
 Provides:      passwd
 Provides:      shadow-utils
 Obsoletes:     passwd
-Obsoletes:     pwdutils
-Obsoletes:     shadow-extras
-Obsoletes:     shadow-utils
+Obsoletes:     pwdutils < 3.3
+Obsoletes:     shadow-extras < 1:4.2
+Obsoletes:     shadow-utils < 1:4
 Conflicts:     util-linux < 2.12-10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -145,15 +122,22 @@ utilitários e senhas shadow em geral.
 
 %package -n uidmap
 Summary:       Programs to help use subuids
+Summary(pl.UTF-8):     Programy pomagające w stosowaniu poduidów
 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.
 
+%description -n uidmap -l pl.UTF-8
+Programy z tego pakietu pomagają nieuprzywilejowanym użytkownikom
+tworzyć mapowania uidów i gidów w przestrzeniach użytkowników.
+
 %prep
 %setup -q
 %patch0 -p1
+# allows dots in user/group names
 %patch1 -p1
 
 %build
@@ -161,8 +145,6 @@ in user namespaces.
 # - 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 \
        --enable-shadowgrp \
        %{?with_shared:--enable-shared --disable-static} \
        --disable-silent-rules \
@@ -209,7 +191,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*
 
@@ -217,10 +199,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}
@@ -239,7 +221,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
@@ -260,7 +241,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