This patch will upgrade Sudo version 1.8.5 to Sudo version 1.8.5 patchlevel 1. To apply: $ cd sudo-1.8.5 $ patch -p1 < sudo-1.8.5p1.patch diff -urNa sudo-1.8.5/ChangeLog sudo-1.8.5p1/ChangeLog --- sudo-1.8.5/ChangeLog Tue May 15 12:41:25 2012 +++ sudo-1.8.5p1/ChangeLog Thu May 17 15:54:58 2012 @@ -1,3 +1,21 @@ +2012-05-17 Todd C. Miller + + * NEWS, configure, configure.in: + Update for 1.8.5p1 + [c33c49bf5b4b] + + * plugins/sudoers/toke.c, plugins/sudoers/toke.l: + Fix #includedir; from Mike Frysinger + [d4833d4e39a0] + + * plugins/sudoers/check.c: + Don't prompt for a password if the user is in the exempt group, is + root, or is running the command as themselves even if the -k option + was specified. This makes "sudo -k command" consistent with the + behavior one would get if the user ran "sudo -k" immediately before + running the command. + [632b3961df00] + 2012-05-15 Todd C. Miller * INSTALL: diff -urNa sudo-1.8.5/NEWS sudo-1.8.5p1/NEWS --- sudo-1.8.5/NEWS Tue May 15 10:10:45 2012 +++ sudo-1.8.5p1/NEWS Thu May 17 15:53:53 2012 @@ -1,3 +1,8 @@ +What's new in Sudo 1.8.5p1? + + * Fixed a bug that prevented files in an include directory from + being evaluated. + What's new in Sudo 1.8.5? * When "noexec" is enabled, sudo_noexec.so will now be prepended diff -urNa sudo-1.8.5/configure sudo-1.8.5p1/configure --- sudo-1.8.5/configure Tue May 15 10:10:12 2012 +++ sudo-1.8.5p1/configure Thu May 17 15:53:53 2012 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for sudo 1.8.5. +# Generated by GNU Autoconf 2.68 for sudo 1.8.5p1. # # Report bugs to . # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='sudo' PACKAGE_TARNAME='sudo' -PACKAGE_VERSION='1.8.5' -PACKAGE_STRING='sudo 1.8.5' +PACKAGE_VERSION='1.8.5p1' +PACKAGE_STRING='sudo 1.8.5p1' PACKAGE_BUGREPORT='http://www.sudo.ws/bugs/' PACKAGE_URL='' @@ -1447,7 +1447,7 @@ # 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.5 to adapt to many kinds of systems. +\`configure' configures sudo 1.8.5p1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1512,7 +1512,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sudo 1.8.5:";; + short | recursive ) echo "Configuration of sudo 1.8.5p1:";; esac cat <<\_ACEOF @@ -1730,7 +1730,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sudo configure 1.8.5 +sudo configure 1.8.5p1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2434,7 +2434,7 @@ 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.5, which was +It was created by sudo $as_me 1.8.5p1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -20682,7 +20682,7 @@ # 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.5, which was +This file was extended by sudo $as_me 1.8.5p1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20748,7 +20748,7 @@ 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.5 +sudo config.status 1.8.5p1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urNa sudo-1.8.5/configure.in sudo-1.8.5p1/configure.in --- sudo-1.8.5/configure.in Tue May 15 10:10:12 2012 +++ sudo-1.8.5p1/configure.in Thu May 17 15:53:54 2012 @@ -3,7 +3,7 @@ dnl dnl Copyright (c) 1994-1996,1998-2012 Todd C. Miller dnl -AC_INIT([sudo], [1.8.5], [http://www.sudo.ws/bugs/], [sudo]) +AC_INIT([sudo], [1.8.5p1], [http://www.sudo.ws/bugs/], [sudo]) AC_CONFIG_HEADER([config.h pathnames.h]) dnl dnl Note: this must come after AC_INIT diff -urNa sudo-1.8.5/plugins/sudoers/toke.c sudo-1.8.5p1/plugins/sudoers/toke.c --- sudo-1.8.5/plugins/sudoers/toke.c Tue May 15 12:22:03 2012 +++ sudo-1.8.5p1/plugins/sudoers/toke.c Thu May 17 15:47:28 2012 @@ -3525,6 +3525,8 @@ if (isdir) { struct stat sb; switch (sudo_secure_dir(path, sudoers_uid, sudoers_gid, &sb)) { + case SUDO_PATH_SECURE: + break; case SUDO_PATH_MISSING: debug_return_bool(false); case SUDO_PATH_BAD_TYPE: diff -urNa sudo-1.8.5/plugins/sudoers/toke.l sudo-1.8.5p1/plugins/sudoers/toke.l --- sudo-1.8.5/plugins/sudoers/toke.l Tue May 15 12:22:03 2012 +++ sudo-1.8.5p1/plugins/sudoers/toke.l Thu May 17 15:47:28 2012 @@ -816,6 +816,8 @@ if (isdir) { struct stat sb; switch (sudo_secure_dir(path, sudoers_uid, sudoers_gid, &sb)) { + case SUDO_PATH_SECURE: + break; case SUDO_PATH_MISSING: debug_return_bool(false); case SUDO_PATH_BAD_TYPE: