Author: matkor Date: Mon Feb 9 12:50:29 2009 GMT Module: SPECS Tag: AC-branch ---- Log message: - Version 1.7.0-1. Stolen from HEAD. Works for me but pam stuff needs review.
---- Files affected: SPECS: sudo.spec (1.118.2.3 -> 1.118.2.4) ---- Diffs: ================================================================ Index: SPECS/sudo.spec diff -u SPECS/sudo.spec:1.118.2.3 SPECS/sudo.spec:1.118.2.4 --- SPECS/sudo.spec:1.118.2.3 Mon Apr 7 11:03:21 2008 +++ SPECS/sudo.spec Mon Feb 9 13:50:24 2009 @@ -1,4 +1,5 @@ # $Revision$, $Date$ +# TODO: Review pam stuff. # # Conditional build: %bcond_with kerberos5 # enable Kerberos V support (conflicts with PAM) @@ -15,29 +16,29 @@ Summary(ru.UTF-8): Позволяет определенным пользователям исполнять команды от имени root Summary(uk.UTF-8): Дозволяє вказаним користувачам виконувати команди від імені root Name: sudo -Version: 1.6.9p6 -Release: 3 +Version: 1.7.0 +Release: 1 Epoch: 1 License: BSD Group: Applications/System Source0: ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz -# Source0-md5: 1f262526f321af388b37e05ee57bb2c7 +# Source0-md5: 5fd96bba35fe29b464f7aa6ad255f0a6 Source1: %{name}.pamd -Source2: %{name}.logrotate -Patch0: %{name}-selinux.patch +Source2: %{name}-i.pamd +Source3: %{name}.logrotate +Patch0: %{name}-pam-login.patch Patch1: %{name}-libtool.patch Patch2: %{name}-env.patch URL: http://www.sudo.ws/sudo/ BuildRequires: autoconf >= 2.53 BuildRequires: automake -%{?with_kerberos5:BuildRequires: heimdal-devel >= 0.7} +%{?with_kerberos5:BuildRequires: krb5-devel} %{?with_selinux:BuildRequires: libselinux-devel} BuildRequires: libtool -%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0} -BuildRequires: pam-devel +%{?with_ldap:BuildRequires: openldap-devel } +%{?with_pam:BuildRequires: pam-devel} %{?with_skey:BuildRequires: skey-devel >= 2.2-11} -Requires: logrotate -Requires: pam >= 0.77.3 +Requires: pam >= 0.80.1 Obsoletes: cu-sudo BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -112,32 +113,28 @@ %prep %setup -q -%{?with_selinux:%patch0 -p1} - # only local macros mv -f aclocal.m4 acinclude.m4 # kill libtool.m4 copy rm -f acsite.m4 +%patch0 -p1 %patch1 -p1 %patch2 -p1 %build -cp -f /usr/share/automake/config.sub . +%{__mv} install-sh install-custom-sh %{__libtoolize} +%{__mv} install-custom-sh install-sh +cp -f /usr/share/automake/config.sub . %{__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-pam \ + --with-pam-login \ --with-logging=both \ --with-logfac=auth \ --with-logpath=/var/log/sudo \ @@ -146,19 +143,19 @@ --with-secure-path="/bin:/sbin:/usr/bin:/usr/sbin" \ --with-loglen=320 \ --disable-saved-ids \ - --with%{!?with_heimdal5:out}-kerb5 \ + --with%{!?with_kerberos5:out}-kerb5 \ --with%{!?with_ldap:out}-ldap \ --with%{!?with_skey:out}-skey \ - --with-long-otp-prompt \ - --with-sendmail=/usr/sbin/sendmail + --with%{!?with_selinux:out}-selinux \ + --with-long-otp-prompt %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{pam.d,logrotate.d},/var/{log,run/sudo}} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{pam.d,logrotate.d},/var/{log,run/sudo},%{_mandir}/man8} -%{__make} install \ +%{__make} -j1 install \ DESTDIR=$RPM_BUILD_ROOT \ install_uid=`id -u` \ install_gid=`id -g` \ @@ -166,29 +163,39 @@ sudoers_gid=`id -g` install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/sudo +install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sudo-i touch $RPM_BUILD_ROOT/var/log/sudo -install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/sudo +install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/sudo chmod -R +r $RPM_BUILD_ROOT%{_prefix} rm -f $RPM_BUILD_ROOT%{_libdir}/sudo_noexec.la +# replace hardlinks with symlinks +ln -sf %{_bindir}/sudo $RPM_BUILD_ROOT%{_bindir}/sudoedit +rm -f $RPM_BUILD_ROOT%{_mandir}/man8/sudoedit.8 +echo '.so sudo.8' > $RPM_BUILD_ROOT%{_mandir}/man8/sudoedit.8 + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc BUGS CHANGES HISTORY README TROUBLESHOOTING sample.sudoers +%doc HISTORY README TROUBLESHOOTING sample.sudoers %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(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sudo-i %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 +%{?with_selinux:%attr(755,root,root) %{_libdir}/sesh} %attr(755,root,root) %{_libdir}/sudo_noexec.so -%{_mandir}/man*/* +%{_mandir}/man5/sudoers.5* +%{_mandir}/man8/sudo.8* +%{_mandir}/man8/sudoedit.8* +%{_mandir}/man8/visudo.8* %attr(600,root,root) %ghost /var/log/sudo -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/* +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/sudo %attr(700,root,root) %dir /var/run/sudo %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -197,14 +204,78 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.118.2.3 2008/04/07 09:03:21 glen -- R: logrotate due dirdeps; rel 3 +Revision 1.118.2.4 2009/02/09 12:50:24 matkor +- Version 1.7.0-1. Stolen from HEAD. Works for me but pam stuff needs review. + +Revision 1.139 2008/12/31 17:24:10 arekm +- up to 1.7.0 + +Revision 1.138 2008/12/04 07:46:54 arekm +- up to 1.6.9p19 + +Revision 1.137 2008/11/15 08:58:04 paszczus +- updated to 1.6.9p18 + +Revision 1.136 2008/10/15 16:22:10 qboosh +- reordered + +Revision 1.135 2008/10/15 13:55:21 glen +- replace symlink with man links + +Revision 1.134 2008/10/15 12:52:50 sls +- replace sudoedit* hardlinks with symlinks + +Revision 1.133 2008/10/15 12:45:18 sls +- keep custom install-sh +- use pretty __make install + +Revision 1.132 2008/10/15 11:21:07 sls +- parallel build works + +Revision 1.131 2008/10/15 11:16:44 sls +- switched from '__make install' to shell installation, because: + __libtoolize overwrites install-sh scripts so $INSTALL from Makefile + no longer recognizes '-O' and '-G' options (useless anyway) and fails + (installation is strongly based on Makefile installation and may seem + silly - for example: sudoedit and sudoedit.8 hardlinks) + +Revision 1.130 2008/10/15 10:32:37 sls +- verbose files + +Revision 1.129 2008/06/27 20:51:50 arekm +- up to 1.6.9p17 + +Revision 1.128 2008-05-30 22:38:23 qboosh +- updated to 1.6.9p16 +- fixed build with libtool 2.2 + +Revision 1.127 2008-03-30 21:45:41 arekm +- up to 1.6.9p15 + +Revision 1.126 2008-03-09 16:15:23 arekm +- up to 1.6.9p14 (selinux already merged in) + +Revision 1.125 2008-01-04 19:34:11 twittner +- rel. 2 - rebuild with new openldap + +Revision 1.124 2007-12-16 14:48:24 qboosh +- updated to 1.6.9p9 +- updated selinux patch + +Revision 1.123 2007-11-03 12:11:30 baggins +- rel 2 + +Revision 1.122 2007/11/03 02:10:04 baggins +- updated openldap BR/R to 2.4.6 + +Revision 1.121 2007/11/01 21:01:33 qboosh +- updated to 1.6.9p7 -Revision 1.118.2.2 2007/11/01 20:40:21 glen -- preserve $SSH_AUTH_SOCK env; rel 2 +Revision 1.120 2007/11/01 20:41:13 glen +- preserve $SSH_AUTH_SOCK env; rel 3 -Revision 1.118.2.1 2007/10/19 19:30:17 glen -- AC-branched +Revision 1.119 2007/10/19 19:31:55 glen +- rel 2 Revision 1.118 2007/10/19 19:24:45 glen - adapter, changelog cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/sudo.spec?r1=1.118.2.3&r2=1.118.2.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
