rel 1: let's give this a try; at least uidmap package is usable standalone

[packages/shadow.git] / shadow.spec

diff --git a/shadow.spec b/shadow.spec
index 401cf7ff90140edb9f69f0a87d268ddb49fdacc0..00097ab89d73b33ca39349d5a34a272b23ee0045 100644 (file)
--- a/shadow.spec
+++ b/shadow.spec
@@ -19,6 +19,7 @@
 #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:
@@ -33,15 +34,15 @@ 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.4
+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
+Release:       1
 Epoch:         1
 License:       BSD
 Group:         Applications/System
-Source0:       https://github.com/shadow-maint/shadow/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 014062a24c2ba450f85d7bd1147a8528
+Source0:       https://github.com/shadow-maint/shadow/releases/download/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: b491fecbf1232632c32ff8f1437fd60e
 Source2:       %{name}-login.defs
 Source3:       %{name}.useradd
 Source10:      chage.pamd
@@ -65,10 +66,11 @@ URL:                https://github.com/shadow-maint/shadow
 BuildRequires: acl-devel
 BuildRequires: attr-devel
 BuildRequires: audit-libs-devel
-BuildRequires: autoconf
-BuildRequires: automake >= 1.0
+BuildRequires: autoconf >= 2.64
+BuildRequires: automake >= 1:1.11
 BuildRequires: gettext-tools >= 0.12.1
 %{?with_selinux:BuildRequires: libselinux-devel}
+%{?with_selinux:BuildRequires: libsemanage-devel}
 BuildRequires: libtool
 BuildRequires: pam-devel
 BuildRequires: tar >= 1:1.22
@@ -141,29 +143,40 @@ 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
+
+%description -n uidmap
+These programs help unprivileged users to create uid and gid mappings
+in user namespaces.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 
 %build
+# NOTE:
+# - 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} \
-       --without-libcrack \
-       --without-tcb \
-       --with-sha-crypt \
-       --with-nscd \
-       --with-audit \
+       --disable-silent-rules \
+       --enable-subordinate-ids \
        --with-acl \
        --with-attr \
+       --with-audit \
+       --with-group-name-max-length=32 \
        --with-libpam \
-       --enable-nls \
-       --enable-shadowgrp \
+       --with-nscd \
+       --without-libcrack \
        %{?with_selinux:--with-selinux} \
-       --enable-subordinate-ids \
-       --with-group-name-max-length=32
+       --with-sha-crypt \
+       --without-tcb
 
 %{__make}
 
@@ -255,11 +268,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
@@ -285,9 +296,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*
@@ -296,8 +305,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*
@@ -384,9 +391,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*
@@ -395,8 +400,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*
@@ -641,3 +644,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*