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

diff --git a/sudo.spec b/sudo.spec
index e60f036..61d2300 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,10 +1,17 @@
 #
 # Conditional build:
-%bcond_with	kerberos5	# enable Kerberos V support (conflicts with PAM)
-%bcond_without	ldap		# disable LDAP support
-%bcond_without	pam		# disable PAM support
-%bcond_without	selinux		# build without SELinux support
-%bcond_with	skey		# enable skey (onetime passwords) support (conflicts with PAM)
+%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
+%bcond_without	selinux		# SELinux support
+%bcond_with	skey		# skey (onetime passwords) support (conflicts with PAM)
+%bcond_without	sssd		# SSSD support plugin
+%bcond_without	tests		# do not perform "make check"
 
 %if "%{pld_release}" == "ac"
 %define		pam_ver	0.80.1
@@ -20,23 +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.7.10p5
+# 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:	68d97fcc0871b07607a5c0248a774d36
+# Source0-md5:	03da8e711caca6fd93e57751bfb74adc
 Source1:	%{name}.pamd
 Source2:	%{name}-i.pamd
-Source3:	%{name}.logrotate
-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
+BuildRequires:	autoconf-archive
 BuildRequires:	automake
+BuildRequires:	bison
+BuildRequires:	flex
 BuildRequires:	gettext-devel
+BuildRequires:	groff
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool >= 2:2.2.6
@@ -52,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
@@ -121,6 +135,17 @@ Sudo (superuser do) дозволяє системному адміністрат
 пам'ятає пароль; використання одного конфігураційного файлу (sudoers)
 на багатьох машинах.
 
+%package devel
+Summary:	Header file for sudo plugins development
+Summary(pl.UTF-8):	Plik nagłówkowy do tworzenia wtyczek dla sudo
+Group:		Development/Libraries
+
+%description devel
+Header file for sudo plugins development.
+
+%description devel -l pl.UTF-8
+Plik nagłówkowy do tworzenia wtyczek dla sudo.
+
 %package -n openldap-schema-sudo
 Summary:	Sudo LDAP schema
 Summary(pl.UTF-8):	Schemat bazy sudo dla LDAP
@@ -128,6 +153,9 @@ Group:		Networking/Daemons
 Requires(post,postun):	sed >= 4.0
 Requires:	openldap-servers
 Requires:	sed >= 4.0
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n openldap-schema-sudo
 This package contains sudo.schema for openldap.
@@ -145,7 +173,9 @@ cp -p acinclude.m4 acinclude.m4.orig
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -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
@@ -156,50 +186,65 @@ cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 %configure \
 	NROFFPROG=nroff \
+	--enable-zlib=system \
+	--with-env-editor \
+	--with-ignore-dot \
 	--with-incpath=/usr/include/security \
+	--with-logfac=authpriv \
+	--with-logging=syslog \
+	--with-loglen=320 \
+	--with-logpath=/var/log/sudo \
+	--with-long-otp-prompt \
 	--with-pam \
 	--with-pam-login \
-	--with-logging=both \
-	--with-logfac=auth \
-	--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 \
-	--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-tty-tickets \
+	--with-exampledir=%{_examplesdir}/%{name}-%{version} \
+	--enable-tmpfiles.d=%{systemdtmpfilesdir} \
+	%{__with kerberos5 kerb5} \
+	%{__with ldap} \
+	%{__with audit linux-audit} \
+	%{__with selinux} \
+	%{__with skey} \
+	%{__with sssd} \
 
 %{__make}
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{sudoers.d,pam.d,logrotate.d},/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 \
 	install_uid=$(id -u) \
 	install_gid=$(id -g) \
 	sudoers_uid=$(id -u) \
-	sudoers_gid=$(id -g)
+	sudoers_gid=$(id -g) \
+	shlib_mode="0755"
 
 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
+%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}
 
 %if %{with ldap}
 install -d $RPM_BUILD_ROOT%{schemadir}
-cp -p schema.OpenLDAP $RPM_BUILD_ROOT%{schemadir}/sudo.schema
+cp -p doc/schema.OpenLDAP $RPM_BUILD_ROOT%{schemadir}/sudo.schema
 %endif
 
+# sudo,sudoers domains
+%find_lang %{name} --all-name
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -221,14 +266,22 @@ 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 || :
+%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'
+	cat <<-EOF >> /etc/sudoers
+		## Read drop-in files from %{_sysconfdir}/sudoers.d
+		## (the '#' here does not indicate a comment)
+		#includedir %{_sysconfdir}/sudoers.d
+	EOF
+fi
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc ChangeLog HISTORY NEWS README TROUBLESHOOTING UPGRADE sample.*
-%{?with_ldap:%doc README.LDAP sudoers2ldif}
+%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
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sudo
@@ -237,18 +290,33 @@ rmdir /var/run/sudo 2>/dev/null || :
 %attr(4755,root,root) %{_bindir}/sudoedit
 %attr(755,root,root) %{_bindir}/sudoreplay
 %attr(755,root,root) %{_sbindir}/visudo
-%{?with_selinux:%attr(755,root,root) %{_libdir}/sesh}
-%attr(755,root,root) %{_libdir}/sudo_noexec.so
+%dir %{_libdir}/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
 %{_mandir}/man5/sudoers.5*
+%{_mandir}/man5/sudo.conf.5*
 %{?with_ldap:%{_mandir}/man5/sudoers.ldap.5*}
 %{_mandir}/man8/sudo.8*
+%{_mandir}/man8/sudo_plugin.8*
 %{_mandir}/man8/sudoedit.8*
 %{_mandir}/man8/sudoreplay.8*
 %{_mandir}/man8/visudo.8*
-%attr(600,root,root) %ghost /var/log/sudo
+%{systemdtmpfilesdir}/%{name}.conf
+%{_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)
+%{_includedir}/sudo_plugin.h
 
 %if %{with ldap}
 %files -n openldap-schema-sudo