From a50e72b81b804ac120dfb0b8c4797594bdef4d9e Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Tue, 7 Oct 2014 14:14:43 -0600
Subject: [PATCH] Update for sudo 1.8.11p1

---
 NEWS         | 17 ++++++++++++++++-
 configure    | 18 +++++++++---------
 configure.ac |  2 +-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index a91cbb7ad..5af8cbe30 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-What's new in Sudo 1.8.12
+What's new in Sudo 1.8.11p1
 
  * Fixed a compilation problem on some systems when the
    --disable-shared-libutil configure option was specified.
@@ -14,6 +14,21 @@ What's new in Sudo 1.8.12
  * Fixed a compilation problem on Linux systems that do not use PAM.
    Bug #667
 
+ * "make install" will now work with the stock GNU autotools
+   install-sh script.  Bug #669
+
+ * Fixed a crash with "sudo -i" when the current working directory
+   does not exist.  Bug #670
+
+ * Fixed a potential crash in the debug subsystem when logging a message
+   larger that 1024 bytes.
+
+ * Fixed a "make check" failure for ttyname when stdin is closed and
+   stdout and stderr are redirected to a different tty.  Bug #643
+
+ * Added BASH_FUNC_* to environment blacklist to match newer-style
+   bash functions.
+
 What's new in Sudo 1.8.11
 
  * The sudoers plugin no longer uses setjmp/longjmp to recover
diff --git a/configure b/configure
index dd054a55b..cf143064c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sudo 1.8.11.
+# Generated by GNU Autoconf 2.69 for sudo 1.8.11p1.
 #
 # Report bugs to <http://www.sudo.ws/bugs/>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sudo'
 PACKAGE_TARNAME='sudo'
-PACKAGE_VERSION='1.8.11'
-PACKAGE_STRING='sudo 1.8.11'
+PACKAGE_VERSION='1.8.11p1'
+PACKAGE_STRING='sudo 1.8.11p1'
 PACKAGE_BUGREPORT='http://www.sudo.ws/bugs/'
 PACKAGE_URL=''
 
@@ -1507,7 +1507,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sudo 1.8.11 to adapt to many kinds of systems.
+\`configure' configures sudo 1.8.11p1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1572,7 +1572,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sudo 1.8.11:";;
+     short | recursive ) echo "Configuration of sudo 1.8.11p1:";;
    esac
   cat <<\_ACEOF
 
@@ -1807,7 +1807,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sudo configure 1.8.11
+sudo configure 1.8.11p1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2516,7 +2516,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sudo $as_me 1.8.11, which was
+It was created by sudo $as_me 1.8.11p1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -23698,7 +23698,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sudo $as_me 1.8.11, which was
+This file was extended by sudo $as_me 1.8.11p1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23764,7 +23764,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sudo config.status 1.8.11
+sudo config.status 1.8.11p1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 120000cdb..75714a2d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl
 dnl Copyright (c) 1994-1996,1998-2014 Todd C. Miller <Todd.Miller@courtesan.com>
 dnl
 AC_PREREQ([2.59])
-AC_INIT([sudo], [1.8.11], [http://www.sudo.ws/bugs/], [sudo])
+AC_INIT([sudo], [1.8.11p1], [http://www.sudo.ws/bugs/], [sudo])
 AC_CONFIG_HEADER([config.h pathnames.h])
 AC_CONFIG_SRCDIR([src/sudo.c])
 dnl
-- 
2.40.0