From f9690b192bbca0b1a9917773d2f17da1498ad57e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 29 Feb 2004 08:50:23 +0000 Subject: [PATCH] - updated to 4.0.4.1, updated patches - newgrp+sg is back, Conflicts: util-linus < 2.12-10 Changed files: shadow.spec -> 1.92 --- shadow.spec | 97 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 34 deletions(-) diff --git a/shadow.spec b/shadow.spec index 4c93199..43118a2 100644 --- a/shadow.spec +++ b/shadow.spec @@ -11,8 +11,8 @@ Summary(pl): Narz Summary(tr): Gölge parola dosyasý araçlarý Summary(pt_BR): Utilitários para o arquivo de senhas Shadow Name: shadow -Version: 4.0.3 -Release: 7 +Version: 4.0.4.1 +Release: 0.1 Epoch: 1 License: BSD Group: Applications/System @@ -29,13 +29,14 @@ Source8: useradd.pamd Patch0: %{name}-utmpx.patch Patch1: %{name}-man_and_po.patch Patch2: %{name}-pl.po-update.patch -Patch3: %{name}-undoc-groupadd-f.patch -Patch4: %{name}-pld.patch -Patch5: %{name}-chage_expdays.patch -Patch6: %{name}-selinux.patch +Patch3: %{name}-userdel-exit-bug.patch +Patch4: %{name}-useradd-p.patch +Patch5: %{name}-pld.patch +Patch6: %{name}-chage_expdays.patch +Patch7: %{name}-selinux.patch BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gettext-devel +BuildRequires: automake >= 1.0 +BuildRequires: gettext-devel >= 0.12.1 BuildRequires: pam-devel BuildRequires: libtool %{?with_selinux:BuildRequires: libselinux-devel} @@ -114,6 +115,7 @@ Summary: shadow - not often used programs Summary(pl): shadow - programy nieczêsto u¿ywane Group: Applications/System Requires: %{name} = %{epoch}:%{version}-%{release} +Conflicts: util-linux < 2.12-10 # to force proper util-linux version, so "newgrp" command exists Requires: /usr/bin/newgrp @@ -132,7 +134,8 @@ Programy niecz %patch3 -p1 %patch4 -p1 %patch5 -p1 -%{?with_selinux:%patch6 -p1} +%patch6 -p1 +%{?with_selinux:%patch7 -p1} %build %{__gettextize} @@ -172,15 +175,13 @@ install %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/useradd > $RPM_BUILD_ROOT/etc/security/chfn.allow > $RPM_BUILD_ROOT/etc/security/chsh.allow -> $RPM_BUILD_ROOT%{_sysconfdir}/d_passwd -> $RPM_BUILD_ROOT%{_sysconfdir}/dialups -install man/dpasswd.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install man/ja/dpasswd.8 $RPM_BUILD_ROOT%{_mandir}/ja/man8 -install man/pl/dpasswd.8 $RPM_BUILD_ROOT%{_mandir}/pl/man8 -install man/pl/dialups.5 $RPM_BUILD_ROOT%{_mandir}/pl/man5 - +# vigr symlink is created by make install, but in wrong dir ln -sf vipw $RPM_BUILD_ROOT%{_sbindir}/vigr +echo '.so newgrp.1' > $RPM_BUILD_ROOT%{_mandir}/fr/man1/sg.1 +echo '.so newgrp.1' > $RPM_BUILD_ROOT%{_mandir}/it/man1/sg.1 +echo '.so newgrp.1' > $RPM_BUILD_ROOT%{_mandir}/ko/man1/sg.1 + %find_lang %{name} %clean @@ -196,7 +197,7 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) -%doc doc/ANNOUNCE NEWS doc/README doc/README.linux doc/HOWTO +%doc ChangeLog NEWS TODO doc/{HOWTO,README,README.linux,README.pam,WISHLIST} %attr(750,root,root) %dir %{_sysconfdir}/default %attr(640,root,root) %config %verify(not md5 size mtime) %{_sysconfdir}/default/* %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/chage @@ -255,6 +256,8 @@ fi %lang(de) %{_mandir}/de/man1/passwd.1* +%lang(es) %{_mandir}/es/man1/passwd.1* + %lang(fr) %{_mandir}/fr/man1/passwd.1* %lang(fr) %{_mandir}/fr/man5/faillog.5* %lang(fr) %{_mandir}/fr/man5/passwd.5* @@ -342,19 +345,35 @@ fi %lang(pt_BR) %{_mandir}/pt_BR/man8/groupdel.8* %lang(pt_BR) %{_mandir}/pt_BR/man8/groupmod.8* +%lang(ru) %{_mandir}/ru/man5/passwd.5* + +%lang(zh_CN) %{_mandir}/zh_CN/man8/chpasswd.8* +%lang(zh_CN) %{_mandir}/zh_CN/man8/groupadd.8* +%lang(zh_CN) %{_mandir}/zh_CN/man8/groupdel.8* +%lang(zh_CN) %{_mandir}/zh_CN/man8/groupmod.8* +%lang(zh_CN) %{_mandir}/zh_CN/man8/useradd.8* +%lang(zh_CN) %{_mandir}/zh_CN/man8/userdel.8* +%lang(zh_CN) %{_mandir}/zh_CN/man8/usermod.8* + +%lang(zh_TW) %{_mandir}/zh_TW/man8/groupadd.8* +%lang(zh_TW) %{_mandir}/zh_TW/man8/groupdel.8* +%lang(zh_TW) %{_mandir}/zh_TW/man8/groupmod.8* +%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 extras %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/chfn %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/chsh %attr(640,root,root) %config %verify(not md5 size mtime) /etc/security/* -%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/d_passwd -%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/dialups %attr(755,root,root) %{_bindir}/chage %attr(4755,root,root) %{_bindir}/chfn %attr(4755,root,root) %{_bindir}/chsh %attr(4755,root,root) %{_bindir}/expiry %attr(4755,root,root) %{_bindir}/gpasswd -%attr(755,root,root) %{_sbindir}/dpasswd +%attr(755,root,root) %{_bindir}/newgrp +%attr(755,root,root) %{_bindir}/sg %attr(755,root,root) %{_sbindir}/mkpasswd %attr(755,root,root) %{_sbindir}/newusers @@ -363,51 +382,68 @@ fi %{_mandir}/man1/chsh.1* %{_mandir}/man1/expiry.1* %{_mandir}/man1/gpasswd.1* -%{_mandir}/man8/dpasswd.8* +%{_mandir}/man1/newgrp.1* +%{_mandir}/man1/sg.1* %{_mandir}/man8/mkpasswd.8* %{_mandir}/man8/newusers.8* +%lang(de) %{_mandir}/de/man1/chfn.1* %lang(de) %{_mandir}/de/man1/chsh.1* %lang(fr) %{_mandir}/fr/man1/chage.1* %lang(fr) %{_mandir}/fr/man1/chsh.1* %lang(fr) %{_mandir}/fr/man1/gpasswd.1* +%lang(fr) %{_mandir}/fr/man1/newgrp.1* +%lang(fr) %{_mandir}/fr/man1/sg.1* %lang(hu) %{_mandir}/hu/man1/chsh.1* %lang(hu) %{_mandir}/hu/man1/gpasswd.1* +%lang(hu) %{_mandir}/hu/man1/newgrp.1* +%lang(hu) %{_mandir}/hu/man1/sg.1* %lang(id) %{_mandir}/id/man1/chsh.1* %lang(it) %{_mandir}/it/man1/chfn.1* %lang(it) %{_mandir}/it/man1/chsh.1* %lang(it) %{_mandir}/it/man1/gpasswd.1* +%lang(it) %{_mandir}/it/man1/newgrp.1* +%lang(it) %{_mandir}/it/man1/sg.1* %lang(ja) %{_mandir}/ja/man1/chage.1* %lang(ja) %{_mandir}/ja/man1/chfn.1* %lang(ja) %{_mandir}/ja/man1/chsh.1* +%lang(ja) %{_mandir}/ja/man1/expiry.1* %lang(ja) %{_mandir}/ja/man1/gpasswd.1* +%lang(ja) %{_mandir}/ja/man1/newgrp.1* +%lang(ja) %{_mandir}/ja/man1/sg.1* %lang(ja) %{_mandir}/ja/man8/chpasswd.8* -%lang(ja) %{_mandir}/ja/man8/dpasswd.8* %lang(ja) %{_mandir}/ja/man8/mkpasswd.8* %lang(ja) %{_mandir}/ja/man8/newusers.8* %lang(ko) %{_mandir}/ko/man1/chfn.1* %lang(ko) %{_mandir}/ko/man1/chsh.1* +%lang(ko) %{_mandir}/ko/man1/newgrp.1* +%lang(ko) %{_mandir}/ko/man1/sg.1* %lang(pl) %{_mandir}/pl/man1/chage.1* %lang(pl) %{_mandir}/pl/man1/chfn.1* %lang(pl) %{_mandir}/pl/man1/chsh.1* %lang(pl) %{_mandir}/pl/man1/expiry.1* %lang(pl) %{_mandir}/pl/man1/gpasswd.1* -%lang(pl) %{_mandir}/pl/man5/d_passwd.5* -%lang(pl) %{_mandir}/pl/man5/dialups.5* +%lang(pl) %{_mandir}/pl/man1/newgrp.1* +%lang(pl) %{_mandir}/pl/man1/sg.1* %lang(pl) %{_mandir}/pl/man8/chpasswd.8* -%lang(pl) %{_mandir}/pl/man8/dpasswd.8* %lang(pl) %{_mandir}/pl/man8/mkpasswd.8* %lang(pl) %{_mandir}/pl/man8/newusers.8* %lang(pt_BR) %{_mandir}/pt_BR/man1/gpasswd.1* +%lang(zh_CN) %{_mandir}/zh_CN/man1/chfn.1* +%lang(zh_CN) %{_mandir}/zh_CN/man1/chsh.1* + +%lang(zh_TW) %{_mandir}/zh_TW/man1/chfn.1* +%lang(zh_TW) %{_mandir}/zh_TW/man1/chsh.1* + # unpackaged: # - /bin/login already in login (from util-linux.spec) #%attr(755,root,root) %{_bindir}/login @@ -421,20 +457,13 @@ fi #%lang(ko) %{_mandir}/ko/man1/login.1* #%lang(pl) %{_mandir}/pl/man1/login.1* #%lang(pl) %{_mandir}/pl/man5/porttime.5* + # - /bin/su already in coreutils #%attr(4755,root,root) %{_bindir}/su #%{_mandir}/man1/su.1* #%lang(ja) %{_mandir}/ja/man1/su.1* #%lang(pl) %{_mandir}/pl/man1/su.1* -# - newgrp/sg commands in util-linux -#%attr(755,root,root) %{_bindir}/sg -#%{_mandir}/man1/sg.1* -#%lang(fr) %{_mandir}/fr/man1/sg.1* -#%lang(hu) %{_mandir}/hu/man1/sg.1* -#%lang(it) %{_mandir}/it/man1/sg.1* -#%lang(ja) %{_mandir}/ja/man1/sg.1* -#%lang(ko) %{_mandir}/ko/man1/sg.1* -#%lang(pl) %{_mandir}/pl/man1/sg.1* + # - unknown reason (removed w/o comment in rev 1.27) #%attr(755,root,root) %{_sbindir}/logoutd #%{_mandir}/man8/logoutd.8* -- 2.44.0