sudo: update to 1.8.6p7

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7521 ec354946-7b23-47d6-9f5a-488ba84defc7

s/sudo/sudo-sudoers-vine

@@ -62,6 +62,8 @@ Defaults    env_keep += "LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES
 Defaults    env_keep += "LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE"
 Defaults    env_keep += "LC_TIME LC_ALL LANGUAGE LINGUAS _XKB_CHARSET XAUTHORITY"
 
+Defaults    secure_path = /sbin:/bin:/usr/sbin:/usr/bin
+
 ## Next comes the main part: which users can run what software on 
 ## which machines (the sudoers file can be shared between multiple
 ## systems).
@@ -92,3 +94,5 @@ root	ALL=(ALL) 	ALL
 ## Allows members of the users group to shutdown this system
 # %users  localhost=/sbin/shutdown -h now
 
+## Read drop-in files from /etc/sudoers.d (the # here does not mean a comment)
+#includedir /etc/sudoers.d

s/sudo/sudo-vl.spec

@@ -1,27 +1,17 @@
 Summary: Allows command execution as root for specified users
 Summary(ja): スーパーユーザ権限でのコマンドの実行
 Name: sudo
-Version: 1.7.2p7
-Release: 5%{?_dist_release}
+Version: 1.8.6p7
+Release: 1%{?_dist_release}
 License: ISC-style
 Group: Applications/System
-URL: http://www.sudo.ws/
+URL: http://www.sudo.ws/sudo/
 
 Source0: http://www.sudo.ws/sudo/dist/sudo-%{version}.tar.gz
 Source1: sudo-sudoers-vine
 
 Patch1: sudo-1.6.7p5-strip.patch
-Patch2: sudo-1.7.2-login.patch
-Patch3: sudo-1.7.2p4-getgrouplist.patch
-Patch4: sudo-1.7.1-envdebug.patch
-Patch5: sudo-1.7.1-libtool.patch
-# reset HOME when using the -i' option (#635250)
-Patch6: sudo-1.7.4p4-sudoi.patch
-# security
-Patch100: sudo-1.7.2p7_CVE-2010-2956.patch
-Patch110: sudo-1.7.2p7_CVE-2011-0010.patch
-Patch111: sudo-1.7.2p7_user_in_group.patch
-Patch120: sudo-1.7.2p7_CVE-2012-2337.patch
+Patch4: sudo-1.7.2p1-envdebug.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pam-devel
@@ -48,17 +38,9 @@ sudo は、特定のユーザや特定のグループに所属するユーザが
 %prep
 %setup -q
 %patch1 -p1 -b .strip
-%patch2 -p1 -b .login
-%patch3 -p1 -b .getgrouplist
 %patch4 -p1 -b .envdebug
-%patch5 -p1 -b .libtool
 
-%patch100 -p1 -b .CVE-2010-2956
-%patch110 -p1 -b .CVE-2011-0010
-%patch111 -p1 -b .user_in_group
-%patch120 -p1 -b .CVE-2012-2337
-
-libtoolize --force && rm acsite.m4 && mv aclocal.m4 acinclude.m4 && autoreconf
+autoreconf -I m4 -fv --install
 
 %build
 %configure \
@@ -66,6 +48,7 @@ libtoolize --force && rm acsite.m4 && mv aclocal.m4 acinclude.m4 && autoreconf
   --sbindir=%{_sbindir} \
   --libdir=%{_libdir} \
   --sysconfdir=%{_sysconfdir} \
+  --docdir=%{_datadir}/doc/%{name}-%{version} \
   --with-pam \
   --with-pam-login \
   --with-logging=syslog \
@@ -77,7 +60,8 @@ libtoolize --force && rm acsite.m4 && mv aclocal.m4 acinclude.m4 && autoreconf
   --with-ldap \
   --with-passprompt="[sudo] password for %p: " \
   --with-secure-path="/sbin:/bin:/usr/sbin:/usr/bin" \
-  --without-interfaces
+  --without-interfaces \
+  --without-selinux
 make %{?_smp_mflags}
 
 %install
@@ -86,8 +70,20 @@ mkdir $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" install_uid=`id -u` install_gid=`id -g` sudoers_uid=`id -u` sudoers_gid=`id -g`
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_sbindir}/* 
 install -p -d -m 700 $RPM_BUILD_ROOT/var/run/sudo
+install -p -d -m 750 $RPM_BUILD_ROOT/etc/sudoers.d
 install -p -c -m 0440 %{SOURCE1} $RPM_BUILD_ROOT/etc/sudoers
 
+chmod +x $RPM_BUILD_ROOT%{_libexecdir}/*.so # for stripping, reset in %%files
+
+# Remove execute permission on this script so we don't pull in perl deps
+chmod -x $RPM_BUILD_ROOT%{_docdir}/sudo-*/sudoers2ldif
+
+%find_lang sudo
+%find_lang sudoers
+
+cat sudo.lang sudoers.lang > sudo_all.lang
+rm sudo.lang sudoers.lang
+
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 cat > $RPM_BUILD_ROOT/etc/pam.d/sudo << EOF
 #%PAM-1.0
@@ -111,28 +107,40 @@ EOF
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f sudo_all.lang
 %defattr(-,root,root)
-%doc HISTORY LICENSE README* TROUBLESHOOTING UPGRADE
-%doc ChangeLog
-%doc *.pod schema.* sudoers2ldif sample.*
+%doc plugins/sample/sample_plugin.c
 %attr(0440,root,root) %config(noreplace) /etc/sudoers
+%attr(0750,root,root) %dir /etc/sudoers.d/
 %config(noreplace) /etc/pam.d/sudo
 %config(noreplace) /etc/pam.d/sudo-i
 %dir /var/run/sudo
 %attr(4111,root,root) %{_bindir}/sudo
 %attr(4111,root,root) %{_bindir}/sudoedit
+%attr(4111,root,root) %{_bindir}/sudoreplay
 %attr(0755,root,root) %{_sbindir}/visudo
-%{_libexecdir}/sudo_noexec.*
+%attr(0644,root,root) %{_libexecdir}/sudo_noexec.so
+%attr(0644,root,root) %{_libexecdir}/sudoers.so*
 %{_mandir}/man5/sudoers*.5*
 %{_mandir}/man8/sudo.8*
 %{_mandir}/man8/sudoedit.8*
+%{_mandir}/man8/sudoreplay.8*
 %{_mandir}/man8/visudo.8*
+%dir %{_docdir}/sudo-%{version}
+%{_docdir}/sudo-%{version}/*
+# should be splitted to -devel?
+%{_includedir}/sudo_plugin.h
+%{_mandir}/man8/sudo_plugin.8*
+
 
 %post
 /bin/chmod 0440 /etc/sudoers || :
 
 %changelog
+* Mon Mar 04 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.8.6p7-1
+- update to 1.8.6p7
+- drop unneeded patches.
+
 * Sat May 19 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.7.2p7-5
 - add patch120 for fix CVE-2012-2337 (netmask match)
 
@@ -256,7 +264,7 @@ rm -rf $RPM_BUILD_ROOT
 - 1.6.3p7-0vl1
 - use better macros
 
-* Tue Mar 1 2001 Kunio Murasawa <murasawa@marineroad.com>
+* Thu Mar 1 2001 Kunio Murasawa <murasawa@marineroad.com>
 - 1.6.3p6-0vl1
 - changed sudo.rpmnonroot.diff for 1.6.3p6