Sudo 1.9.13p2.SUDO_1_9_13p2

3 files changed, 22 insertions, 44 deletions

diff --git a/NEWS b/NEWS
index f5c7eb06c..6a52ebc87 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+What's new in Sudo 1.9.13p2
+
+ * Fixed the --enable-static-sudoers option, broken in sudo 1.9.13.
+   GitHub issue #245.
+
+ * Fixed a potential double-free bug when matching a sudoers rule
+   that contains a per-command chroot directive (CHROOT=dir).  This
+   bug was introduced in sudo 1.9.8.
+
 What's new in Sudo 1.9.13p1
 
  * Fixed a typo in the configure script that resulted in a line
diff --git a/configure b/configure
index 87995fca3..d406eb77a 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.72a for sudo 1.9.13p1.
+# Generated by GNU Autoconf 2.72a for sudo 1.9.13p2.
 #
 # Report bugs to <https://bugzilla.sudo.ws/>.
 #
@@ -614,8 +614,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sudo'
 PACKAGE_TARNAME='sudo'
-PACKAGE_VERSION='1.9.13p1'
-PACKAGE_STRING='sudo 1.9.13p1'
+PACKAGE_VERSION='1.9.13p2'
+PACKAGE_STRING='sudo 1.9.13p2'
 PACKAGE_BUGREPORT='https://bugzilla.sudo.ws/'
 PACKAGE_URL=''
 
@@ -1636,7 +1636,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.9.13p1 to adapt to many kinds of systems.
+'configure' configures sudo 1.9.13p2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1702,7 +1702,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sudo 1.9.13p1:";;
+     short | recursive ) echo "Configuration of sudo 1.9.13p2:";;
    esac
   cat <<\_ACEOF
 
@@ -1993,7 +1993,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sudo configure 1.9.13p1
+sudo configure 1.9.13p2
 generated by GNU Autoconf 2.72a
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2671,7 +2671,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.9.13p1, which was
+It was created by sudo $as_me 1.9.13p2, which was
 generated by GNU Autoconf 2.72a.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -24806,40 +24806,9 @@ fi
 
 			;;
 		    *)
-
-if test ${LIBTLS+y}
-then :
-
-  case " $LIBTLS " in #(
-  *" $f "*) :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LIBTLS already contains \$f"; } >&5
-  (: LIBTLS already contains $f) 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } ;; #(
-  *) :
-
-     as_fn_append LIBTLS " $f"
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LIBTLS=\"\$LIBTLS\""; } >&5
-  (: LIBTLS="$LIBTLS") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-     ;;
-esac
-
-else case e in #(
-  e)
-  LIBTLS=$f
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: : LIBTLS=\"\$LIBTLS\""; } >&5
-  (: LIBTLS="$LIBTLS") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-   ;;
-esac
-fi
-
+			# Do not use AX_APPEND_FLAG as it will break static builds by removing
+			# duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto
+		        LIBTLS="$LIBTLS $f"
 			;;
 		esac
 	    done
@@ -36027,7 +35996,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.9.13p1, which was
+This file was extended by sudo $as_me 1.9.13p2, which was
 generated by GNU Autoconf 2.72a.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -36095,7 +36064,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-sudo config.status 1.9.13p1
+sudo config.status 1.9.13p2
 configured by $0, generated by GNU Autoconf 2.72a,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 8d510370c..ac7f93894 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 dnl
 AC_PREREQ([2.69])
-AC_INIT([sudo], [1.9.13p1], [https://bugzilla.sudo.ws/], [sudo])
+AC_INIT([sudo], [1.9.13p2], [https://bugzilla.sudo.ws/], [sudo])
 AC_CONFIG_HEADERS([config.h pathnames.h])
 AC_CONFIG_SRCDIR([src/sudo.c])
 AC_CONFIG_AUX_DIR([scripts])