- updated to 1.8.11

[packages/sudo.git] / sudo.spec

diff --git a/sudo.spec b/sudo.spec
index 1d66444f458a514635c9571176cac842bb3bc889..32ee303f4fd5beb8ea96072e837c79f03d570a9a 100644 (file)
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,6 +1,10 @@
 #
 # Conditional build:
+%if "%{pld_release}" == "ac"
+%bcond_with    audit           # Linux audit support
+%else
 %bcond_without audit           # Linux audit support
+%endif
 %bcond_with    kerberos5       # Kerberos V support (conflicts with PAM)
 %bcond_without ldap            # LDAP support
 %bcond_without pam             # PAM support
@@ -23,20 +27,19 @@ 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.8.10p3
+Version:       1.8.11
 Release:       1
 Epoch:         1
 License:       BSD
 Group:         Applications/System
 Source0:       ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
-# Source0-md5: fcd8d0d9f9f0397d076ee901e242ed39
+# Source0-md5: 9a642cf6aca5375f8569a2961f44d0f3
 Source1:       %{name}.pamd
 Source2:       %{name}-i.pamd
 Source3:       %{name}.logrotate
 Source4:       %{name}.tmpfiles
-Patch0:                %{name}-libtool.patch
-Patch1:                %{name}-env.patch
-Patch2:                config.patch
+Patch0:                %{name}-env.patch
+Patch1:                config.patch
 URL:           http://www.sudo.ws/sudo/
 %{?with_audit:BuildRequires:   audit-libs-devel}
 BuildRequires: autoconf >= 2.53
@@ -60,6 +63,9 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                schemadir       /usr/share/openldap/schema
 
+# uses sudo_warn_*_v1 symbols from binaries
+%define                skip_post_check_so      libsudo_util.so.*
+
 %description
 Sudo (superuser do) allows a permitted user to execute a command as
 the superuser (real and effective uid and gid are set to 0 and root's
@@ -167,7 +173,6 @@ cp -p acinclude.m4 acinclude.m4.orig
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__mv} install-sh install-custom-sh
@@ -222,6 +227,7 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 touch $RPM_BUILD_ROOT/var/log/sudo
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/sudo/*.la
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %if %{with ldap}
@@ -253,11 +259,12 @@ if [ "$1" = "0" ]; then
        %service -q ldap restart
 fi
 
-%triggerpostun -- %{name} < 1:1.7.8p2-5
+%triggerpostun -- %{name} < 1:1.8.7-2
+# 1:1.7.8p2-5
 mv -f /var/run/sudo/* /var/db/sudo 2>/dev/null
 rmdir /var/run/sudo 2>/dev/null || :
 
-%triggerpostun -- %{name} < 1:1.8.7-2
+# 1:1.8.7-2
 # add include statement to sudoers
 if ! grep -q '#includedir %{_sysconfdir}/sudoers.d' /etc/sudoers; then
        echo 'Adding includedir %{_sysconfdir}/sudoers.d to /etc/sudoers'
@@ -281,12 +288,15 @@ fi
 %attr(755,root,root) %{_bindir}/sudoreplay
 %attr(755,root,root) %{_sbindir}/visudo
 %dir %{_libdir}/sudo
-%dir /var/run/sudo
+%attr(755,root,root) %{_libdir}/sudo/libsudo_util.so.*.*.*
+%attr(755,root,root) %{_libdir}/sudo/libsudo_util.so.0
+%attr(755,root,root) %{_libdir}/sudo/libsudo_util.so
 %{?with_selinux:%attr(755,root,root) %{_libdir}/sudo/sesh}
 %attr(755,root,root) %{_libdir}/sudo/group_file.so
 %attr(755,root,root) %{_libdir}/sudo/sudo_noexec.so
 %attr(755,root,root) %{_libdir}/sudo/sudoers.so
 %attr(755,root,root) %{_libdir}/sudo/system_group.so
+%dir /var/run/sudo
 %{_mandir}/man5/sudoers.5*
 %{_mandir}/man5/sudo.conf.5*
 %{?with_ldap:%{_mandir}/man5/sudoers.ldap.5*}