This patch will upgrade Sudo version 1.7.10 patchlevel 1 to Sudo version 1.7.10 patchlevel 2. To apply: $ cd sudo-1.7.10p1 $ patch -p1 < sudo-1.7.10p2.patch diff -urNa sudo-1.7.10p1/ChangeLog sudo-1.7.10p2/ChangeLog --- sudo-1.7.10p1/ChangeLog Wed Sep 12 15:34:39 2012 +++ sudo-1.7.10p2/ChangeLog Sun Sep 16 21:08:56 2012 @@ -1,8 +1,24 @@ +2012-09-16 Todd C. Miller + + * .hgtags: + Added tag SUDO_1_7_10p2 for changeset 60d2336634f5 + [aff26f9023cc] [tip] <1.7> + + * NEWS, configure, configure.in: + Sudo 1.7.10p2 + [60d2336634f5] [SUDO_1_7_10p2] <1.7> + + * exec.c: + When setting the signal handler for SIGTSTP to the default value in + non-I/O log mode, store the old handler value for when we restore it + after resume. + [01aab006915d] <1.7> + 2012-09-12 Todd C. Miller * .hgtags: Added tag SUDO_1_7_10p1 for changeset a8330024abe7 - [857744bf2454] [tip] <1.7> + [857744bf2454] <1.7> * NEWS: Mention support for SUCCESS=return in /etc/nsswitch.conf diff -urNa sudo-1.7.10p1/NEWS sudo-1.7.10p2/NEWS --- sudo-1.7.10p1/NEWS Wed Sep 12 15:12:29 2012 +++ sudo-1.7.10p2/NEWS Sun Sep 16 21:06:24 2012 @@ -1,3 +1,9 @@ +What's new in Sudo 1.7.10p2? + + * Fixed suspending a command after it has already been resumed + once when I/O logging (or use_pty) is not enabled. + This was a regression introduced in version 1.7.10. + What's new in Sudo 1.7.10p1? * Fixed the setting of LOGNAME, USER and USERNAME variables in the diff -urNa sudo-1.7.10p1/configure sudo-1.7.10p2/configure --- sudo-1.7.10p1/configure Wed Sep 12 14:12:36 2012 +++ sudo-1.7.10p2/configure Sun Sep 16 21:06:45 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.7.10p1. +# Generated by GNU Autoconf 2.68 for sudo 1.7.10p2. # # Report bugs to . # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='sudo' PACKAGE_TARNAME='sudo' -PACKAGE_VERSION='1.7.10p1' -PACKAGE_STRING='sudo 1.7.10p1' +PACKAGE_VERSION='1.7.10p2' +PACKAGE_STRING='sudo 1.7.10p2' PACKAGE_BUGREPORT='http://www.sudo.ws/bugs/' PACKAGE_URL='' @@ -1445,7 +1445,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.7.10p1 to adapt to many kinds of systems. +\`configure' configures sudo 1.7.10p2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1510,7 +1510,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sudo 1.7.10p1:";; + short | recursive ) echo "Configuration of sudo 1.7.10p2:";; esac cat <<\_ACEOF @@ -1735,7 +1735,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sudo configure 1.7.10p1 +sudo configure 1.7.10p2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2439,7 +2439,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.7.10p1, which was +It was created by sudo $as_me 1.7.10p2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -20747,7 +20747,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.7.10p1, which was +This file was extended by sudo $as_me 1.7.10p2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20813,7 +20813,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.7.10p1 +sudo config.status 1.7.10p2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urNa sudo-1.7.10p1/configure.in sudo-1.7.10p2/configure.in --- sudo-1.7.10p1/configure.in Wed Sep 12 14:12:14 2012 +++ sudo-1.7.10p2/configure.in Sun Sep 16 21:06:27 2012 @@ -3,7 +3,7 @@ dnl dnl Copyright (c) 1994-1996,1998-2012 Todd C. Miller dnl -AC_INIT([sudo], [1.7.10p1], [http://www.sudo.ws/bugs/], [sudo]) +AC_INIT([sudo], [1.7.10p2], [http://www.sudo.ws/bugs/], [sudo]) AC_CONFIG_HEADER(config.h pathnames.h zlib/zconf.h) dnl dnl Note: this must come after AC_INIT diff -urNa sudo-1.7.10p1/exec.c sudo-1.7.10p2/exec.c --- sudo-1.7.10p1/exec.c Mon Aug 27 15:35:10 2012 +++ sudo-1.7.10p2/exec.c Sun Sep 16 21:05:42 2012 @@ -607,7 +607,7 @@ zero_bytes(&sa, sizeof(sa)); sigemptyset(&sa.sa_mask); sa.sa_handler = SIG_DFL; - sigaction(SIGTSTP, &sa, NULL); + sigaction(SIGTSTP, &sa, &osa); } if (kill(getpid(), signo) != 0) warning("kill(%d, %d)", getpid(), signo);