X-Git-Url: http://git.pld-linux.org/?p=packages%2Fsudo.git;a=blobdiff_plain;f=sudo.spec;h=61d23008980bd31b461fb86ac3e50aa224470dd0;hp=a5a3eb595822232a563fea5808a5b6a1d1df2d75;hb=bfa28630721b99956a462529a244ede69d73f444;hpb=4eff5cde29f77d4031feaae1847bd1f96f59a48e

diff --git a/sudo.spec b/sudo.spec
index a5a3eb5..61d2300 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -27,27 +27,27 @@ 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.11
-Release:	2
+# please see doc/UPGRADE for important changes each time updating sudo
+Version:	1.8.20p2
+Release:	1
 Epoch:		1
 License:	BSD
 Group:		Applications/System
 Source0:	ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
-# Source0-md5:	9a642cf6aca5375f8569a2961f44d0f3
+# Source0-md5:	03da8e711caca6fd93e57751bfb74adc
 Source1:	%{name}.pamd
 Source2:	%{name}-i.pamd
-Source3:	%{name}.logrotate
-Source4:	%{name}.tmpfiles
 Patch0:		%{name}-env.patch
 Patch1:		config.patch
 URL:		http://www.sudo.ws/sudo/
 %{?with_audit:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf >= 2.53
+BuildRequires:	autoconf-archive
 BuildRequires:	automake
 BuildRequires:	bison
-BuildRequires:	groff
 BuildRequires:	flex
-BuildRequires:	gettext-tools
+BuildRequires:	gettext-devel
+BuildRequires:	groff
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool >= 2:2.2.6
@@ -174,6 +174,9 @@ cp -p acinclude.m4 acinclude.m4.orig
 %patch0 -p1
 %patch1 -p1
 
+! [ -f m4/ax_sys_weak_alias.m4 ] # provide own copy only until it is there
+cp %{_aclocaldir}/ax_sys_weak_alias.m4 m4
+
 %build
 %{__mv} install-sh install-custom-sh
 %{__libtoolize}
@@ -187,8 +190,8 @@ cp -f /usr/share/automake/config.sub .
 	--with-env-editor \
 	--with-ignore-dot \
 	--with-incpath=/usr/include/security \
-	--with-logfac=auth \
-	--with-logging=both \
+	--with-logfac=authpriv \
+	--with-logging=syslog \
 	--with-loglen=320 \
 	--with-logpath=/var/log/sudo \
 	--with-long-otp-prompt \
@@ -196,6 +199,9 @@ cp -f /usr/share/automake/config.sub .
 	--with-pam-login \
 	--with-passprompt="[sudo] password for %%p: " \
 	--with-secure-path="/bin:/sbin:/usr/bin:/usr/sbin" \
+	--with-tty-tickets \
+	--with-exampledir=%{_examplesdir}/%{name}-%{version} \
+	--enable-tmpfiles.d=%{systemdtmpfilesdir} \
 	%{__with kerberos5 kerb5} \
 	%{__with ldap} \
 	%{__with audit linux-audit} \
@@ -209,8 +215,8 @@ cp -f /usr/share/automake/config.sub .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d}
-install -d $RPM_BUILD_ROOT{%{systemdtmpfilesdir},/var/log/sudo-io,%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d},%{_mandir}/man8} \
+	$RPM_BUILD_ROOT{%{systemdtmpfilesdir},/var/log/sudo-io,/var/run/sudo/ts}
 
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -222,10 +228,11 @@ install -d $RPM_BUILD_ROOT{%{systemdtmpfilesdir},/var/log/sudo-io,%{_mandir}/man
 
 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
-cp -p %{SOURCE4} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
-touch $RPM_BUILD_ROOT/var/log/sudo
+%if "%{pld_release}" == "ac"
+# not present in ac, no point searching it
+%{__sed} -i -e '/pam_keyinit.so/d' $RPM_BUILD_ROOT/etc/pam.d/sudo*
+%endif
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/sudo/*.la
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -260,10 +267,6 @@ if [ "$1" = "0" ]; then
 fi
 
 %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 || :
-
 # 1:1.8.7-2
 # add include statement to sudoers
 if ! grep -q '#includedir %{_sysconfdir}/sudoers.d' /etc/sudoers; then
@@ -277,7 +280,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS README doc/{CONTRIBUTORS,HISTORY,LICENSE,TROUBLESHOOTING,UPGRADE,sample.*}
+%doc ChangeLog NEWS README doc/{CONTRIBUTORS,HISTORY,LICENSE,TROUBLESHOOTING,UPGRADE}
 %{?with_ldap:%doc README.LDAP plugins/sudoers/sudoers2ldif}
 %attr(550,root,root) %dir %{_sysconfdir}/sudoers.d
 %attr(440,root,root) %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/sudoers
@@ -296,7 +299,6 @@ fi
 %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*}
@@ -306,10 +308,11 @@ fi
 %{_mandir}/man8/sudoreplay.8*
 %{_mandir}/man8/visudo.8*
 %{systemdtmpfilesdir}/%{name}.conf
-%attr(600,root,root) %ghost /var/log/sudo
+%{_examplesdir}/%{name}-%{version}
 %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/db/sudo
+%dir %attr(711,root,root) /var/run/sudo
+%dir %attr(700,root,root) /var/run/sudo/ts
 
 %files devel
 %defattr(644,root,root,755)