X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=sudo.spec;h=4ca8965422cf8144437e2f0e19b04426afb18825;hb=24895e4378cde4cfd859fc834a61bef5d06a0764;hp=4dc9cb5aa4482eb3dfeef6cded12d775fe8fe78c;hpb=1daa532d4b809cd81e195ffaf81e791ef68c2e14;p=packages%2Fsudo.git

diff --git a/sudo.spec b/sudo.spec
index 4dc9cb5..4ca8965 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,28 +1,41 @@
+#
+# Conditional build:
+%bcond_without	selinux		# build without SELinux support
+%bcond_without	skey		# disable skey (onetime passwords) support
+%bcond_without	heimdal		# disable Kerberos support
+%bcond_without	ldap		# disable LDAP support
+#
 Summary:	Allows command execution as root for specified users
 Summary(es):	Permite que usuarios específicos ejecuten comandos como se fueran el root
 Summary(ja):	»ØÄê¥æ¡¼¥¶¤ËÀ©¸ÂÉÕ¤Îroot¸¢¸Â¤òµö²Ä¤¹¤ë
-Summary(pl):	Umo¿liwia wykonywaniew poleceñ jako root dla konkretnych u¿ytkowników
+Summary(pl):	Umo¿liwia wykonywanie poleceñ jako root dla konkretnych u¿ytkowników
 Summary(pt_BR):	Permite que usuários específicos executem comandos como se fossem o root
 Summary(ru):	ðÏÚ×ÏÌÑÅÔ ÏÐÒÅÄÅÌÅÎÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÉÓÐÏÌÎÑÔØ ËÏÍÁÎÄÙ ÏÔ ÉÍÅÎÉ root
 Summary(uk):	äÏÚ×ÏÌѤ ×ËÁÚÁÎÉÍ ËÏÒÉÓÔÕ×ÁÞÁÍ ×ÉËÏÎÕ×ÁÔÉ ËÏÍÁÎÄÉ ×¦Ä ¦ÍÅΦ root
 Name:		sudo
-Version:	1.6.7p5
-Release:	4
+Version:	1.6.8p12
+Release:	2
 Epoch:		1
 License:	BSD
 Group:		Applications/System
-Source0:	ftp://ftp.courtesan.com/pub/sudo/%{name}-%{version}.tar.gz
-# Source0-md5:	55d503e5c35bf1ea83d38244e0242aaf
+Source0:	ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
+# Source0-md5:	b29893c06192df6230dd5f340f3badf5
 Source1:	%{name}.pamd
 Source2:	%{name}.logrotate
 Patch0:		%{name}-selinux.patch
-URL:		http://www.courtesan.com/sudo/
-BuildRequires:	autoconf
+Patch1:		%{name}-ac.patch
+URL:		http://www.sudo.ws/sudo/
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
+%{?with_heimdal:BuildRequires:	heimdal-devel >= 0.7}
+%{?with_selinux:BuildRequires:	libselinux-devel}
+BuildRequires:	libtool
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 BuildRequires:	pam-devel
+%{?with_skey:BuildRequires:	skey-devel >= 2.2-11}
 Requires:	pam >= 0.77.3
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	cu-sudo
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Sudo (superuser do) allows a permitted user to execute a command as
@@ -95,30 +108,43 @@ Sudo (superuser do) 
 
 %prep
 %setup -q
-%patch0 -p1
+%{?with_selinux:%patch0 -p1}
+
+# only local macros
+mv -f aclocal.m4 acinclude.m4
+# kill libtool.m4 copy
+rm -f acsite.m4
+
+%patch1 -p1
 
 %build
-cp /usr/share/automake/config.sub .
-%configure2_13 \
+cp -f /usr/share/automake/config.sub .
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+# sparc64 2.4.x kernels have buggy sys32_utimes(somefile, NULL) syscall
+# it's fixed in >= 2.4.31-0.3, but keep workaround not to require very
+# fresh kernel
+%ifarch sparc sparcv9
+export ac_cv_func_utimes=no
+%endif
+%configure \
+	NROFFPROG=nroff \
+	--with-incpath=/usr/include/security \
 	--with-timedir=/var/run/sudo \
-	--with-C2 \
 	--with-pam \
 	--with-logging=both \
 	--with-logfac=auth \
 	--with-logpath=/var/log/sudo \
-	--with-message=full \
 	--with-ignore-dot \
 	--with-env-editor \
-	--with-insults \
-	--with-all-insults \
-	--with-classic-insults \
-	--with-csops-insults \
-	--with-hal-insults \
-	--with-goons-insults \
-	--with-secure-path="/bin:/sbin:%{_bindir}:%{_sbindir}" \
+	--with-secure-path="/bin:/sbin:/usr/bin:/usr/sbin" \
 	--with-loglen=320 \
 	--disable-saved-ids \
-	NROFFPROG=nroff
+	--with%{!?with_heimdal:out}-kerb5 \
+	--with%{!?with_ldap:out}-ldap \
+	--with%{!?with_skey:out}-skey \
+	--with-long-otp-prompt
 
 %{__make}
 
@@ -139,17 +165,22 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/sudo
 
 chmod -R +r $RPM_BUILD_ROOT%{_prefix}
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/sudo_noexec.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc BUGS CHANGES HISTORY README TODO TROUBLESHOOTING sample.sudoers
-%attr(0440,root,root) %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/sudoers
-%attr(0600,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/sudo
-%attr(4555,root,root) %{_bindir}/sudo
-%attr(0555,root,root) %{_sbindir}/visudo
+%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(4755,root,root) %{_bindir}/sudo
+%attr(4755,root,root) %{_bindir}/sudoedit
+%{?with_selinux:%attr(755,root,root) %{_sbindir}/sesh}
+%attr(755,root,root) %{_sbindir}/visudo
+%attr(755,root,root) %{_libdir}/sudo_noexec.so
 %{_mandir}/man*/*
-%attr(0600,root,root) %ghost /var/log/sudo
-%attr(0640,root,root) /etc/logrotate.d/*
-%attr(0700,root,root) %dir /var/run/sudo
+%attr(600,root,root) %ghost /var/log/sudo
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
+%attr(700,root,root) %dir /var/run/sudo