X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=sudo.spec;h=6932047ef938a8891386b420f2ea91cce90c7dbc;hb=9a8adb9d40cb146e82ca6d58806c5376ff04a77f;hp=e67ea8e2e50b6e048a5ce1e1ede47743b553326c;hpb=1e0a7c2509ff6306af841f00eafd6c64fd03189f;p=packages%2Fsudo.git

diff --git a/sudo.spec b/sudo.spec
index e67ea8e..6932047 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -20,13 +20,13 @@ 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.6
+Version:	1.7.10p6
 Release:	1
 Epoch:		1
 License:	BSD
 Group:		Applications/System
 Source0:	ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
-# Source0-md5:	4d97dd8b46f09924ba07e6aeb407578f
+# Source0-md5:	75e5c9de05fb63f928c3185a86e93cd7
 Source1:	%{name}.pamd
 Source2:	%{name}-i.pamd
 Source3:	%{name}.logrotate
@@ -152,12 +152,11 @@ 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 \
 	--with-incpath=/usr/include/security \
-	--with-timedir=/var/run/sudo \
 	--with-pam \
 	--with-pam-login \
 	--with-logging=both \
@@ -165,6 +164,7 @@ cp -f /usr/share/automake/config.sub .
 	--with-logpath=/var/log/sudo \
 	--with-ignore-dot \
 	--with-env-editor \
+	--with-passprompt="[sudo] password for %%p: " \
 	--with-secure-path="/bin:/sbin:/usr/bin:/usr/sbin" \
 	--with-loglen=320 \
 	--enable-zlib=system \
@@ -176,12 +176,9 @@ cp -f /usr/share/automake/config.sub .
 
 %{__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}
+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 \
@@ -193,6 +190,7 @@ 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
+
 touch $RPM_BUILD_ROOT/var/log/sudo
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -223,6 +221,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.*
@@ -246,8 +248,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
+%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