X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=sudo.spec;h=8f8c83703d419be22d51d3d5c2b2cc9ecd70aabe;hb=95abd744dd47c90b915dc5282c5a162b10c7fe2d;hp=e661266a2f86ef95609ec4ac80796417bc32a079;hpb=d62bc73e837017648884c758cb734f19e9aff489;p=packages%2Fsudo.git

diff --git a/sudo.spec b/sudo.spec
index e661266..8f8c837 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,5 +1,6 @@
 #
 # Conditional build:
+%bcond_without	audit		# Linux audit support
 %bcond_with	kerberos5	# enable Kerberos V support (conflicts with PAM)
 %bcond_without	ldap		# disable LDAP support
 %bcond_without	pam		# disable PAM support
@@ -20,27 +21,29 @@ 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.8p2
+Version:	1.7.10p7
 Release:	1
 Epoch:		1
 License:	BSD
 Group:		Applications/System
 Source0:	ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
-# Source0-md5:	31f9a5a70e2ea9e45689de5cbf67383c
+# Source0-md5:	9faa5ceaf23cca0468d0f5d211bac6e4
 Source1:	%{name}.pamd
 Source2:	%{name}-i.pamd
 Source3:	%{name}.logrotate
-Source4:	%{name}.tmpfiles
 Patch0:		%{name}-libtool.patch
 Patch1:		%{name}-env.patch
 Patch2:		config.patch
 URL:		http://www.sudo.ws/sudo/
+%{?with_audit:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
+BuildRequires:	bison
+BuildRequires:	flex
 BuildRequires:	gettext-devel
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 %{?with_selinux:BuildRequires:	libselinux-devel}
-BuildRequires:	libtool >= 2:2.2.6
+BuildRequires:	libtool >= 2:2.2.6b
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 %{?with_pam:BuildRequires:	pam-devel}
 BuildRequires:	rpm >= 4.4.9-56
@@ -153,37 +156,34 @@ cp -p acinclude.m4 acinclude.m4.orig
 %{__libtoolize}
 %{__mv} install-custom-sh install-sh
 cp -f /usr/share/automake/config.sub .
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %configure \
 	NROFFPROG=nroff \
+	--enable-zlib=system \
+	--with-env-editor \
+	--with-ignore-dot \
 	--with-incpath=/usr/include/security \
-	--with-timedir=/var/run/sudo \
-	--with-pam \
-	--with-pam-login \
-	--with-logging=both \
+	%{?with_kerberos5:--with-kerb5} \
+	%{?with_ldap:--with-ldap} \
+	%{?with_audit:--with-linux-audit} \
 	--with-logfac=auth \
+	--with-logging=both \
+	--with-loglen=320 \
 	--with-logpath=/var/log/sudo \
-	--with-ignore-dot \
-	--with-env-editor \
+	--with-long-otp-prompt \
+	--with-pam \
+	--with-pam-login \
+	--with-passprompt="[sudo] password for %%p: " \
 	--with-secure-path="/bin:/sbin:/usr/bin:/usr/sbin" \
-	--with-loglen=320 \
-	--enable-zlib=system \
-	--with%{!?with_kerberos5:out}-kerb5 \
-	--with%{!?with_ldap:out}-ldap \
-	--with%{!?with_skey:out}-skey \
-	--with%{!?with_selinux:out}-selinux \
-	--with-long-otp-prompt
+	%{?with_selinux:--with-selinux} \
+	%{?with_skey:--with-skey}
 
 %{__make}
 
-# makefile broken?
-#touch .libs/sudo_noexec.so
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d},/var/{log/sudo-io,run/sudo},%{_mandir}/man8} \
-	$RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d},/var/log/sudo-io,%{_mandir}/man8}
 
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -195,7 +195,6 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d},/var/{lo
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/sudo
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sudo-i
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/sudo
-install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 touch $RPM_BUILD_ROOT/var/log/sudo
 
@@ -227,6 +226,10 @@ if [ "$1" = "0" ]; then
 	%service -q ldap restart
 fi
 
+%triggerpostun -- %{name} < 1:1.7.8p2-5
+mv -f /var/run/sudo/* /var/db/sudo 2>/dev/null
+rmdir /var/run/sudo 2>/dev/null || :
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog HISTORY NEWS README TROUBLESHOOTING UPGRADE sample.*
@@ -250,9 +253,10 @@ fi
 %attr(600,root,root) %ghost /var/log/sudo
 %attr(700,root,root) /var/log/sudo-io
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/sudo
-%attr(700,root,root) %dir /var/run/sudo
-/usr/lib/tmpfiles.d/%{name}.conf
+%attr(700,root,root) %dir /var/db/sudo
 
+%if %{with ldap}
 %files -n openldap-schema-sudo
 %defattr(644,root,root,755)
 %{schemadir}/sudo.schema
+%endif