diff --git a/shadow.changes b/shadow.changes index d56cbe8..05477b5 100644 --- a/shadow.changes +++ b/shadow.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Sep 8 11:41:13 UTC 2017 - mvetter@suse.com + +- run spec-cleaner +- bsc#1023895: + man page contained invalid options because they depend + on compile flags and we shipped pre built ones. + New BuildRequires: docbook-xsl-stylesheets docbook_4 xml2po + xsltproc + ------------------------------------------------------------------- Thu Jun 8 17:00:57 CEST 2017 - kukuk@suse.de diff --git a/shadow.spec b/shadow.spec index 1dec7d3..1fc6bfd 100644 --- a/shadow.spec +++ b/shadow.spec @@ -16,16 +16,14 @@ # -Summary: Utilities to Manage User and Group Accounts -License: BSD-3-Clause and GPL-2.0+ -Group: System/Base Name: shadow Version: 4.5 Release: 0 +Summary: Utilities to Manage User and Group Accounts +License: BSD-3-Clause AND GPL-2.0+ +Group: System/Base Url: https://github.com/shadow-maint/shadow Source: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz -Source42: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz.asc -Source43: %name.keyring Source1: pamd.tar.bz2 Source2: README.changes-pwdutils Source3: useradd.local @@ -33,7 +31,9 @@ Source4: userdel-pre.local Source5: userdel-post.local Source6: shadow.service Source7: shadow.timer -Patch: shadow-login_defs.patch +Source42: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz.asc +Source43: %{name}.keyring +Patch0: shadow-login_defs.patch Patch1: userdel-script.patch Patch2: useradd-script.patch Patch3: chkname-regex.patch @@ -45,17 +45,19 @@ Patch10: encryption_method_nis.patch Patch11: useradd-mkdirs.patch Patch18: shadow-4.1.5.1-pam_group.patch Patch20: disable_new_audit_function.patch - -Requires: group(root) -Requires: user(root) BuildRequires: audit-devel > 2.3 +BuildRequires: docbook-xsl-stylesheets +BuildRequires: docbook_4 BuildRequires: libacl-devel BuildRequires: libattr-devel BuildRequires: libselinux-devel BuildRequires: libsemanage-devel BuildRequires: pam-devel +BuildRequires: xml2po +BuildRequires: xsltproc BuildRequires: xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: group(root) +Requires: user(root) PreReq: permissions Provides: pwdutils = 3.2.20 Obsoletes: pwdutils <= 3.2.19 @@ -67,16 +69,16 @@ group accounts. %prep %setup -q -a 1 -%patch -p0 -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 -%patch4 -p0 -%patch5 -p0 -%patch6 -p0 -%patch7 -p0 -%patch10 -p0 -%patch11 -p0 +%patch0 +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 +%patch7 +%patch10 +%patch11 %patch18 -p1 %if 0%{?suse_version} < 1330 %patch20 -p1 @@ -86,7 +88,7 @@ iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 mv -v doc/HOWTO.utf8 doc/HOWTO %build -export CFLAGS="$RPM_OPT_FLAGS -fpie" +export CFLAGS="%{optflags} -fpie" export LDFLAGS="-pie" %configure \ @@ -101,107 +103,105 @@ export LDFLAGS="-pie" --with-selinux \ --without-libcrack \ --disable-shared \ - --with-group-name-max-length=32 + --with-group-name-max-length=32 \ + --enable-man make %install -cp %SOURCE2 . -make install DESTDIR=$RPM_BUILD_ROOT gnulocaledir=$RPM_BUILD_ROOT/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs +cp %{SOURCE2} . +make install DESTDIR=%{buildroot} gnulocaledir=%{buildroot}/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs # install useradd.local, userdel.local, ... -install -m 0755 %SOURCE3 $RPM_BUILD_ROOT/%{_sbindir}/ -install -m 0755 %SOURCE4 $RPM_BUILD_ROOT/%{_sbindir}/ -install -m 0755 %SOURCE5 $RPM_BUILD_ROOT/%{_sbindir}/ -install -Dm644 %{S:6} %{buildroot}%{_unitdir}/shadow.service -install -Dm644 %{S:7} %{buildroot}%{_unitdir}/shadow.timer +install -m 0755 %{SOURCE3} %{buildroot}/%{_sbindir}/ +install -m 0755 %{SOURCE4} %{buildroot}/%{_sbindir}/ +install -m 0755 %{SOURCE5} %{buildroot}/%{_sbindir}/ +install -Dm644 %{SOURCE6} %{buildroot}%{_unitdir}/shadow.service +install -Dm644 %{SOURCE7} %{buildroot}%{_unitdir}/shadow.timer # Remove binaries we don't use. -rm $RPM_BUILD_ROOT/%{_bindir}/groups -rm $RPM_BUILD_ROOT/%{_mandir}/man1/groups.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/groups.* +rm %{buildroot}/%{_bindir}/groups +rm %{buildroot}/%{_mandir}/man1/groups.* +rm %{buildroot}/%{_mandir}/*/man1/groups.* -rm $RPM_BUILD_ROOT/%{_sbindir}/grpconv -rm $RPM_BUILD_ROOT/%{_mandir}/man8/grpconv.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/grpconv.* -rm $RPM_BUILD_ROOT/%{_sbindir}/grpunconv -rm $RPM_BUILD_ROOT/%{_mandir}/man8/grpunconv.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/grpunconv.* +rm %{buildroot}/%{_sbindir}/grpconv +rm %{buildroot}/%{_mandir}/man8/grpconv.* +rm %{buildroot}/%{_mandir}/*/man8/grpconv.* +rm %{buildroot}/%{_sbindir}/grpunconv +rm %{buildroot}/%{_mandir}/man8/grpunconv.* +rm %{buildroot}/%{_mandir}/*/man8/grpunconv.* -rm $RPM_BUILD_ROOT/%{_sbindir}/groupmems -rm $RPM_BUILD_ROOT/%{_mandir}/man8/groupmems.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/groupmems.* -rm $RPM_BUILD_ROOT/etc/pam.d/groupmems +rm %{buildroot}/%{_sbindir}/groupmems +rm %{buildroot}/%{_mandir}/man8/groupmems.* +rm %{buildroot}/%{_mandir}/*/man8/groupmems.* +rm %{buildroot}%{_sysconfdir}/pam.d/groupmems -rm $RPM_BUILD_ROOT/%{_bindir}/login -rm $RPM_BUILD_ROOT/%{_mandir}/man1/login.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/login.* -rm $RPM_BUILD_ROOT/etc/pam.d/login +rm %{buildroot}/%{_bindir}/login +rm %{buildroot}/%{_mandir}/man1/login.* +rm %{buildroot}/%{_mandir}/*/man1/login.* +rm %{buildroot}%{_sysconfdir}/pam.d/login -rm $RPM_BUILD_ROOT/%{_bindir}/su -rm $RPM_BUILD_ROOT/%{_mandir}/man1/su.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/su.* -rm $RPM_BUILD_ROOT/%{_mandir}/man5/suauth.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/suauth.* -rm $RPM_BUILD_ROOT/etc/pam.d/su +rm %{buildroot}/%{_bindir}/su +rm %{buildroot}/%{_mandir}/man1/su.* +rm %{buildroot}/%{_mandir}/*/man1/su.* +rm %{buildroot}/%{_mandir}/man5/suauth.* +rm %{buildroot}/%{_mandir}/*/man5/suauth.* +rm %{buildroot}%{_sysconfdir}/pam.d/su -rm $RPM_BUILD_ROOT/%{_bindir}/faillog -rm $RPM_BUILD_ROOT/%{_mandir}/man5/faillog.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/faillog.* -rm $RPM_BUILD_ROOT/%{_mandir}/man8/faillog.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/faillog.* +rm %{buildroot}/%{_bindir}/faillog +rm %{buildroot}/%{_mandir}/man5/faillog.* +rm %{buildroot}/%{_mandir}/*/man5/faillog.* +rm %{buildroot}/%{_mandir}/man8/faillog.* +rm %{buildroot}/%{_mandir}/*/man8/faillog.* -rm $RPM_BUILD_ROOT/%{_sbindir}/logoutd -rm $RPM_BUILD_ROOT/%{_mandir}/man8/logoutd.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/logoutd.* -rm $RPM_BUILD_ROOT/%{_sbindir}/nologin -rm $RPM_BUILD_ROOT/%{_mandir}/man8/nologin.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/nologin.* +rm %{buildroot}/%{_sbindir}/logoutd +rm %{buildroot}/%{_mandir}/man8/logoutd.* +rm %{buildroot}/%{_mandir}/*/man8/logoutd.* +rm %{buildroot}/%{_sbindir}/nologin +rm %{buildroot}/%{_mandir}/man8/nologin.* +rm %{buildroot}/%{_mandir}/*/man8/nologin.* -rm $RPM_BUILD_ROOT/%{_sbindir}/chgpasswd -rm $RPM_BUILD_ROOT/%{_mandir}/man8/chgpasswd.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/chgpasswd.* -rm $RPM_BUILD_ROOT/etc/pam.d/chgpasswd +rm %{buildroot}/%{_sbindir}/chgpasswd +rm %{buildroot}/%{_mandir}/man8/chgpasswd.* +rm %{buildroot}/%{_mandir}/*/man8/chgpasswd.* +rm %{buildroot}%{_sysconfdir}/pam.d/chgpasswd -rm $RPM_BUILD_ROOT/%{_mandir}/man3/getspnam.* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man3/getspnam.* -rm $RPM_BUILD_ROOT/%{_mandir}/man5/gshadow.5* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/gshadow.5* -rm $RPM_BUILD_ROOT/%{_mandir}/man5/passwd.5* -rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/passwd.5* +rm %{buildroot}/%{_mandir}/man3/getspnam.* +rm %{buildroot}/%{_mandir}/*/man3/getspnam.* +rm %{buildroot}/%{_mandir}/man5/gshadow.5* +rm %{buildroot}/%{_mandir}/*/man5/gshadow.5* +rm %{buildroot}/%{_mandir}/man5/passwd.5* +rm %{buildroot}/%{_mandir}/*/man5/passwd.5* -rm -rf $RPM_BUILD_ROOT%{_mandir}/{??,??_??} +rm -rf %{buildroot}%{_mandir}/{??,??_??} %find_lang shadow -%clean -rm -rf $RPM_BUILD_ROOT - %pre %service_add_pre shadow.service shadow.timer %post -%set_permissions /usr/bin/chage -%set_permissions /usr/bin/chfn -%set_permissions /usr/bin/chsh -%set_permissions /usr/bin/expiry -%set_permissions /usr/bin/gpasswd -%set_permissions /usr/bin/newgrp -%set_permissions /usr/bin/passwd -%set_permissions /usr/bin/newgidmap -%set_permissions /usr/bin/newuidmap +%set_permissions %{_bindir}/chage +%set_permissions %{_bindir}/chfn +%set_permissions %{_bindir}/chsh +%set_permissions %{_bindir}/expiry +%set_permissions %{_bindir}/gpasswd +%set_permissions %{_bindir}/newgrp +%set_permissions %{_bindir}/passwd +%set_permissions %{_bindir}/newgidmap +%set_permissions %{_bindir}/newuidmap %service_add_post shadow.service shadow.timer %verifyscript -%verify_permissions /usr/bin/chage -%verify_permissions /usr/bin/chfn -%verify_permissions /usr/bin/chsh -%verify_permissions /usr/bin/expiry -%verify_permissions /usr/bin/gpasswd -%verify_permissions /usr/bin/newgrp -%verify_permissions /usr/bin/passwd -%verify_permissions /usr/bin/newgidmap -%verify_permissions /usr/bin/newuidmap +%verify_permissions %{_bindir}/chage +%verify_permissions %{_bindir}/chfn +%verify_permissions %{_bindir}/chsh +%verify_permissions %{_bindir}/expiry +%verify_permissions %{_bindir}/gpasswd +%verify_permissions %{_bindir}/newgrp +%verify_permissions %{_bindir}/passwd +%verify_permissions %{_bindir}/newgidmap +%verify_permissions %{_bindir}/newuidmap %preun %service_del_preun shadow.service shadow.timer @@ -210,23 +210,22 @@ rm -rf $RPM_BUILD_ROOT %service_del_postun shadow.service shadow.timer %files -f shadow.lang -%defattr(-,root,root) %doc NEWS doc/HOWTO README README.changes-pwdutils %attr(0644,root,root) %config %{_sysconfdir}/login.defs %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/default/useradd -%config /etc/pam.d/chage -%config /etc/pam.d/chfn -%config /etc/pam.d/chsh -%config /etc/pam.d/passwd -%config /etc/pam.d/useradd -%config /etc/pam.d/chpasswd -%config /etc/pam.d/groupadd -%config /etc/pam.d/groupdel -%config /etc/pam.d/groupmod -%config /etc/pam.d/newusers -%config /etc/pam.d/useradd -%config /etc/pam.d/userdel -%config /etc/pam.d/usermod +%config %{_sysconfdir}/pam.d/chage +%config %{_sysconfdir}/pam.d/chfn +%config %{_sysconfdir}/pam.d/chsh +%config %{_sysconfdir}/pam.d/passwd +%config %{_sysconfdir}/pam.d/useradd +%config %{_sysconfdir}/pam.d/chpasswd +%config %{_sysconfdir}/pam.d/groupadd +%config %{_sysconfdir}/pam.d/groupdel +%config %{_sysconfdir}/pam.d/groupmod +%config %{_sysconfdir}/pam.d/newusers +%config %{_sysconfdir}/pam.d/useradd +%config %{_sysconfdir}/pam.d/userdel +%config %{_sysconfdir}/pam.d/usermod %verify(not mode) %attr(2755,root,shadow) %{_bindir}/chage %verify(not mode) %attr(4755,root,shadow) %{_bindir}/chfn %verify(not mode) %attr(4755,root,shadow) %{_bindir}/chsh