- added /etc/sudoers.d directory.

[packages/sudo.git] / sudo.spec

diff --git a/sudo.spec b/sudo.spec
index 51460d9f7f741cf60b7cc0e28b7f7f120cb713d9..8dab4dcb4224c6bea6aa421e6d754f6514b7a6bd 100644 (file)
--- a/sudo.spec
+++ b/sudo.spec
@@ -20,25 +20,24 @@ Summary(pt_BR.UTF-8):       Permite que usuários específicos executem comandos como
 Summary(ru.UTF-8):     Позволяет определенным пользователям исполнять команды от имени root
 Summary(uk.UTF-8):     Дозволяє вказаним користувачам виконувати команди від імені root
 Name:          sudo
-Version:       1.7.2p7
-Release:       3
+Version:       1.7.4p3
+Release:       2
 Epoch:         1
 License:       BSD
 Group:         Applications/System
 Source0:       ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
-# Source0-md5: 3ac78668427a53e12d7639fdfab2f1af
+# Source0-md5: 950994a454a3eb7a74df5f4bc863bd2b
 Source1:       %{name}.pamd
 Source2:       %{name}-i.pamd
 Source3:       %{name}.logrotate
-Patch0:                %{name}-pam-login.patch
-Patch1:                %{name}-libtool.patch
-Patch2:                %{name}-env.patch
+Patch0:                %{name}-libtool.patch
+Patch1:                %{name}-env.patch
 URL:           http://www.sudo.ws/sudo/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 %{?with_selinux:BuildRequires: libselinux-devel}
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.2.6
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 %{?with_pam:BuildRequires:     pam-devel}
 BuildRequires: rpm >= 4.4.9-56
@@ -121,6 +120,7 @@ Sudo (superuser do) дозволяє системному адміністрат
 
 %package -n openldap-schema-sudo
 Summary:       Sudo LDAP schema
+Summary(pl.UTF-8):     Schemat bazy sudo dla LDAP
 Group:         Networking/Daemons
 Requires(post,postun): sed >= 4.0
 Requires:      openldap-servers
@@ -138,10 +138,11 @@ Ten pakiet zawiera sudo.schema dla pakietu openldap.
 mv -f aclocal.m4 acinclude.m4
 # kill libtool.m4 copy
 rm -f acsite.m4
+# do not load libtool macros from acinclude
+%{__sed} -i -e '/Pull in libtool macros/,$d' acinclude.m4
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__mv} install-sh install-custom-sh
@@ -173,7 +174,10 @@ cp -f /usr/share/automake/config.sub .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{pam.d,logrotate.d},/var/{log,run/sudo},%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d},/var/{log,run/sudo},%{_mandir}/man8}
+
+# makefile broken?
+touch .libs/sudo_noexec.so
 
 %{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -190,6 +194,7 @@ cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/sudo
 chmod -R +r $RPM_BUILD_ROOT%{_prefix}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/sudo_noexec.la
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %if %{with ldap}
 install -d $RPM_BUILD_ROOT%{schemadir}
@@ -203,9 +208,9 @@ rm -rf $RPM_BUILD_ROOT
 %openldap_schema_register %{schemadir}/sudo.schema -d core
 %service -q ldap restart
 
-%banner -e openldap-schema-sudo <<'EOF'
 # banner on first install
-if [ "$1" = "1" ]; the
+if [ "$1" = "1" ]; then
+%banner -e openldap-schema-sudo <<'EOF'
 NOTE:
 In order for sudoRole LDAP queries to be efficient, the server must index
 the attribute 'sudoUser', e.g.
@@ -223,13 +228,15 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc HISTORY README TROUBLESHOOTING sample.sudoers
+%doc ChangeLog HISTORY NEWS README TROUBLESHOOTING UPGRADE sample.*
 %{?with_ldap:%doc README.LDAP sudoers2ldif}
+%attr(550,root,root) %dir %{_sysconfdir}/sudoers.d
 %attr(440,root,root) %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/sudoers
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sudo
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sudo-i
 %attr(4755,root,root) %{_bindir}/sudo
 %attr(4755,root,root) %{_bindir}/sudoedit
+%attr(755,root,root) %{_bindir}/sudoreplay
 %attr(755,root,root) %{_sbindir}/visudo
 %{?with_selinux:%attr(755,root,root) %{_libdir}/sesh}
 %attr(755,root,root) %{_libdir}/sudo_noexec.so
@@ -237,6 +244,7 @@ fi
 %{?with_ldap:%{_mandir}/man5/sudoers.ldap.5*}
 %{_mandir}/man8/sudo.8*
 %{_mandir}/man8/sudoedit.8*
+%{_mandir}/man8/sudoreplay.8*
 %{_mandir}/man8/visudo.8*
 %attr(600,root,root) %ghost /var/log/sudo
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/sudo
@@ -244,4 +252,4 @@ fi
 
 %files -n openldap-schema-sudo
 %defattr(644,root,root,755)
-%{schemadir}/*.schema
+%{schemadir}/sudo.schema