SPECS (AC-branch): sudo.spec - AC-branched

[glen]

Author: glen                         Date: Fri Oct 19 19:30:22 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- AC-branched

---- Files affected:
SPECS:
   sudo.spec (1.118 -> 1.118.2.1) 

---- Diffs:

================================================================
Index: SPECS/sudo.spec
diff -u SPECS/sudo.spec:1.118 SPECS/sudo.spec:1.118.2.1
--- SPECS/sudo.spec:1.118	Fri Oct 19 21:24:45 2007
+++ SPECS/sudo.spec	Fri Oct 19 21:30:17 2007
@@ -23,21 +23,19 @@
 Source0:	ftp://ftp.sudo.ws/pub/sudo/%{name}-%{version}.tar.gz
 # Source0-md5:	1f262526f321af388b37e05ee57bb2c7
 Source1:	%{name}.pamd
-Source2:	%{name}-i.pamd
-Source3:	%{name}.logrotate
+Source2:	%{name}.logrotate
 Patch0:		%{name}-selinux.patch
-Patch1:		%{name}-pam-login.patch
-Patch2:		%{name}-libtool.patch
+Patch1:		%{name}-libtool.patch
 URL:		http://www.sudo.ws/sudo/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
-%{?with_kerberos5:BuildRequires:	krb5-devel}
+%{?with_kerberos5:BuildRequires:	heimdal-devel >= 0.7}
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
-%{?with_pam:BuildRequires:	pam-devel}
+BuildRequires:	pam-devel
 %{?with_skey:BuildRequires:	skey-devel >= 2.2-11}
-Requires:	pam >= 0.99.7.1
+Requires:	pam >= 0.77.3
 Obsoletes:	cu-sudo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -120,7 +118,6 @@
 rm -f acsite.m4
 
 %patch1 -p1
-%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -138,7 +135,6 @@
 	--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 \
@@ -147,10 +143,11 @@
 	--with-secure-path="/bin:/sbin:/usr/bin:/usr/sbin" \
 	--with-loglen=320 \
 	--disable-saved-ids \
-	--with%{!?with_kerberos5:out}-kerb5 \
+	--with%{!?with_heimdal5:out}-kerb5 \
 	--with%{!?with_ldap:out}-ldap \
 	--with%{!?with_skey:out}-skey \
-	--with-long-otp-prompt
+	--with-long-otp-prompt \
+	--with-sendmail=/usr/sbin/sendmail
 
 %{__make}
 
@@ -166,9 +163,8 @@
 	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 %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/sudo
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/sudo
 
 chmod -R +r $RPM_BUILD_ROOT%{_prefix}
 
@@ -182,7 +178,6 @@
 %doc BUGS CHANGES 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}
@@ -199,6 +194,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.118.2.1  2007/10/19 19:30:17  glen
+- AC-branched
+
 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&r2=1.118.2.1&f=u