[sudo] Update to 1.8.6

[Daniel Kopeček]

commit 41b07d49de3a09549d90fd1d87dc45d9bcf27d1b
Author: Daniel Kopecek <dkopecek at redhat.com>
Date:   Thu Sep 6 14:41:27 2012 +0200

    Update to 1.8.6
    
     - dropped SSSD patches as they are now part of the upstream source code
     - use the upstream version of -pipelist patch

 .gitignore                                      |    1 +
 sources                                         |    2 +-
 sudo-1.8.5-add-sssd-debug-subsystem.patch       |  290 -----
 sudo-1.8.5-pipelist.patch                       |   29 -
 sudo-1.8.5-remove-source-when-open-failed.patch |   33 -
 sudo-1.8.5-sssd-dlopen-lib.patch                |  905 ---------------
 sudo-1.8.5-sssd-handle-sss_ret-correctly.patch  |   43 -
 sudo-1.8.5-sssd-support.patch                   | 1327 -----------------------
 sudo-1.8.5-sssd-use-sudo_debug_printf.patch     |  600 ----------
 sudo-1.8.6-pipelist.patch                       |   31 +
 sudo.spec                                       |   35 +-
 11 files changed, 41 insertions(+), 3255 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e51036a..fd1f95d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ sudo-1.7.2p2-sudoers
 /sudo-1.8.1p2.tar.gz
 /sudo-1.8.3p1.tar.gz
 /sudo-1.8.5.tar.gz
+/sudo-1.8.6.tar.gz
diff --git a/sources b/sources
index 667632d..0f34a68 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8d5a664bba74b19ca0b40db1d90f2cee  sudo-1.8.5.tar.gz
+3d400e84c3a1e2164171db8d54b11aab  sudo-1.8.6.tar.gz
 56f74aed3a7b32f2b01a34d65ac86f85  sudo-1.7.4p4-sudoers
diff --git a/sudo-1.8.6-pipelist.patch b/sudo-1.8.6-pipelist.patch
new file mode 100644
index 0000000..87c5337
--- /dev/null
+++ b/sudo-1.8.6-pipelist.patch
@@ -0,0 +1,31 @@
+diff -up sudo-1.8.6/plugins/sudoers/sudo_nss.c.pipelist sudo-1.8.6/plugins/sudoers/sudo_nss.c
+--- sudo-1.8.6/plugins/sudoers/sudo_nss.c.pipelist	2012-09-06 14:27:34.467290727 +0200
++++ sudo-1.8.6/plugins/sudoers/sudo_nss.c	2012-09-06 14:27:39.877315395 +0200
+@@ -18,6 +18,8 @@
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
++#include <sys/stat.h>
++
+ #include <stdio.h>
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
+@@ -257,11 +259,15 @@ display_privs(struct sudo_nss_list *snl,
+ {
+     struct sudo_nss *nss;
+     struct lbuf defs, privs;
+-    int count, olen;
++    struct stat sb;
++    int cols, count, olen;
+     debug_decl(display_privs, SUDO_DEBUG_NSS)
+ 
+-    lbuf_init(&defs, output, 4, NULL, sudo_user.cols);
+-    lbuf_init(&privs, output, 4, NULL, sudo_user.cols);
++    cols = sudo_user.cols;
++    if (fstat(STDOUT_FILENO, &sb) == 0 && S_ISFIFO(sb.st_mode))
++	cols = 0;
++    lbuf_init(&defs, output, 4, NULL, cols);
++    lbuf_init(&privs, output, 4, NULL, cols);
+ 
+     /* Display defaults from all sources. */
+     lbuf_append(&defs, _("Matching Defaults entries for %s on this host:\n"),
diff --git a/sudo.spec b/sudo.spec
index 3e5df6b..5a7f3a3 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
-Version: 1.8.5
-Release: 4%{?dist}
+Version: 1.8.6
+Release: 1%{?dist}
 License: ISC
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -25,23 +25,8 @@ BuildRequires: gettext
 Patch1: sudo-1.6.7p5-strip.patch
 # configure.in fix
 Patch2: sudo-1.7.2p1-envdebug.patch
-# add m4/ to paths in aclocal.m4
-Patch3: sudo-1.7.4p3-m4path.patch
 # disable word wrapping if the ouput is piped
-Patch4: sudo-1.8.5-pipelist.patch
-# SSSD support
-Patch5: sudo-1.8.5-sssd-support.patch
-# Add SSSD debug subsystem
-Patch6: sudo-1.8.5-add-sssd-debug-subsystem.patch
-# Use sudo_debug_printf instead of DPRINTF in sssd.c
-Patch7: sudo-1.8.5-sssd-use-sudo_debug_printf.patch
-# Handle sss_ret correctly in sssd.c to avoid segfault
-# when user is not found in sssd
-Patch8: sudo-1.8.5-sssd-handle-sss_ret-correctly.patch
-# dlopen libsss_sudo
-Patch9: sudo-1.8.5-sssd-dlopen-lib.patch
-# remove source when nss->open() fails
-Patch10: sudo-1.8.5-remove-source-when-open-failed.patch
+Patch3: sudo-1.8.6-pipelist.patch
 
 %description
 Sudo (superuser do) allows a system administrator to give certain
@@ -68,17 +53,10 @@ plugins that use %{name}.
 
 %patch1 -p1 -b .strip
 %patch2 -p1 -b .envdebug
-%patch3 -p1 -b .m4path
-%patch4 -p1 -b .pipelist
-%patch5 -p1 -b .sssd-support
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%patch3 -p1 -b .pipelist
 
 %build
-autoreconf -fv --install
+autoreconf -I m4 -fv --install
 
 %ifarch s390 s390x sparc64
 F_PIE=-fPIE
@@ -185,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sudo_plugin.8*
 
 %changelog
+* Thu Sep  6 2012 Daniel Kopecek <dkopecek at redhat.com> - 1.8.6-1
+- update to 1.8.6
+
 * Thu Jul 26 2012 Daniel Kopecek <dkopecek at redhat.com> - 1.8.5-4
 - added patches that fix & improve SSSD support (thanks to pbrezina at redhat.com)
 - re-enabled SSSD support