sudo: updated to 1.9.11p3

What's new in Sudo 1.9.11p3

 * Fixed "connection reset" errors on AIX when running shell scripts
   with the "intercept" or "log_subcmds" sudoers options enabled.

 * Fixed very slow execution of shell scripts when the "intercept"
   or "log_subcmds" sudoers options are set on systems that enable
   Nagle's algorithm on the loopback device, such as AIX.

What's new in Sudo 1.9.11p2

 * Fixed a compilation error on Linux/x86_64 with the x32 ABI.

 * Fixed a regression introduced in 1.9.11p1 that caused a warning
   when logging to sudo_logsrvd if the command returned no output.

What's new in Sudo 1.9.11p1

 * Correctly handle EAGAIN in the I/O read/right events.  This fixes
   a hang seen on some systems when piping a large amount of data
   through sudo, such as via rsync.

 * Changes to avoid implementation or unspecified behavior when
   bit shifting signed values in the protobuf library.

 * Fixed a compilation error on Linux/aarch64.

 * Fixed the configure check for seccomp(2) support on Linux.

 * Corrected the EBNF specification for tags in the sudoers manual
   page.

What's new in Sudo 1.9.11

 * Fixed a crash in the Python module with Python 3.9.10 on some
   systems.  Additionally, "make check" now passes for Python 3.9.10.

 * Error messages sent via email now include more details, including
   the file name and the line number and column of the error.
   Multiple errors are sent in a single message.  Previously, only
   the first error was included.

 * Fixed logging of parse errors in JSON format.  Previously,
   the JSON logger would not write entries unless the command and
   runuser were set.  These may not be known at the time a parse
   error is encountered.

 * Fixed a potential crash parsing sudoers lines larger than twice
   the value of LINE_MAX on systems that lack the getdelim() function.

 * The tests run by "make check" now unset the LANGUAGE environment
   variable.  Otherwise, localization strings will not match if
   LANGUAGE is set to a non-English locale.

 * The "starttime" test now passed when run under Debian faketime.

 * The Kerberos authentication module now honors the custom password
   prompt if one has been specified.

 * The embedded copy of zlib has been updated to version 1.2.12.

 * Updated the version of libtool used by sudo to version 2.4.7.

 * Sudo now defines _TIME_BITS to 64 on systems that define __TIMESIZE
   in the header files (currently only GNU libc).  This is required
   to allow the use of 64-bit time values on some 32-bit systems.

 * Sudo's "intercept" and "log_subcmds" options no longer force the
   command to run in its own pseudo-terminal.  It is now also
   possible to intercept the system(3) function.

 * Fixed a bug in sudo_logsrvd when run in store-first relay mode
   where the commit point messages sent by the server were incorrect
   if the command was suspended or received a window size change
   event.

 * Fixed a potential crash in sudo_logsrvd when the "tls_dhparams"
   configuration setting was used.

 * The "intercept" and "log_subcmds" functionality can now use
   ptrace(2) on Linux systems that support seccomp(2) filtering.
   This has the advantage of working for both static and dynamic
   binaries and can work with sudo's SELinux RBAC mode.  The following
   architectures are currently supported: i386, x86_64, aarch64,
   arm, mips (log_subcmds only), powerpc, riscv, and s390x.  The
   default is to use ptrace(2) where possible; the new "intercept_type"
   sudoers setting can be used to explicitly set the type.

 * New Georgian translation from translationproject.org.

 * Fixed creating packages on CentOS Stream.

 * Fixed a bug in the intercept and log_subcmds support where
   the execve(2) wrapper was using the current environment instead
   of the passed environment pointer.

 * Added AppArmor integration for Linux.  A sudoers rule can now
   specify an APPARMOR_PROFILE option to run a command confined by
   the named AppArmor profile.

 * Fixed parsing of the "server_log" setting in sudo_logsrvd.conf.
   Non-paths were being treated as paths and an actual path was
   treated as an error.

2 files changed, 11 insertions, 26 deletions

diff --git a/security/sudo/patches/patch-configure b/security/sudo/patches/patch-configure
index 9fa42d0c0e6..3137199d5c1 100644
--- a/security/sudo/patches/patch-configure
+++ b/security/sudo/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.8 2022/05/14 05:41:00 adam Exp $
+$NetBSD: patch-configure,v 1.9 2022/07/05 11:01:38 adam Exp $
 
 * Add "--with-nbsdops" option, NetBSD standard options.
 * Link with util(3) in the case of DragonFly, too.
@@ -7,9 +7,9 @@ $NetBSD: patch-configure,v 1.8 2022/05/14 05:41:00 adam Exp $
   functions (HAVE_KRB5_*).
 * Remove setting sysconfdir to "/etc".
 
---- configure.orig	2022-03-03 18:29:40.000000000 +0000
+--- configure.orig	2022-06-20 22:58:38.000000000 +0000
 +++ configure
-@@ -937,6 +937,7 @@ with_incpath
+@@ -940,6 +940,7 @@ with_incpath
  with_libpath
  with_libraries
  with_csops
@@ -17,7 +17,7 @@ $NetBSD: patch-configure,v 1.8 2022/05/14 05:41:00 adam Exp $
  with_passwd
  with_skey
  with_opie
-@@ -1673,7 +1674,7 @@ Fine tuning of the installation director
+@@ -1677,7 +1678,7 @@ Fine tuning of the installation director
    --bindir=DIR            user executables [EPREFIX/bin]
    --sbindir=DIR           system admin executables [EPREFIX/sbin]
    --libexecdir=DIR        program executables [EPREFIX/libexec]
@@ -26,7 +26,7 @@ $NetBSD: patch-configure,v 1.8 2022/05/14 05:41:00 adam Exp $
    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
    --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
-@@ -1801,6 +1802,7 @@ Optional Packages:
+@@ -1805,6 +1806,7 @@ Optional Packages:
    --with-libpath          additional places to look for libraries
    --with-libraries        additional libraries to link with
    --with-csops            add CSOps standard options
@@ -34,7 +34,7 @@ $NetBSD: patch-configure,v 1.8 2022/05/14 05:41:00 adam Exp $
    --without-passwd        don't use passwd/shadow file for authentication
    --with-skey[=DIR]       enable S/Key support
    --with-opie[=DIR]       enable OPIE support
-@@ -5222,6 +5224,23 @@ fi
+@@ -5230,6 +5232,23 @@ fi
  
  
  
@@ -58,7 +58,7 @@ $NetBSD: patch-configure,v 1.8 2022/05/14 05:41:00 adam Exp $
  # Check whether --with-passwd was given.
  if test ${with_passwd+y}
  then :
-@@ -17655,7 +17674,7 @@ fi
+@@ -17818,7 +17837,7 @@ fi
  		: ${mansectform='4'}
  		: ${mansectmisc='5'}
  		;;
@@ -66,8 +66,8 @@ $NetBSD: patch-configure,v 1.8 2022/05/14 05:41:00 adam Exp $
 +    *-*-linux*|*-*-k*bsd*-gnu|*-*-gnukfreebsd)
  		shadow_funcs="getspnam"
  		test -z "$with_pam" && AUTH_EXCL_DEF="PAM"
- 		# Check for SECCOMP_SET_MODE_FILTER in linux/seccomp.h
-@@ -19579,7 +19598,7 @@ then :
+ 		# Check for SECCOMP_MODE_FILTER in linux/seccomp.h
+@@ -19760,7 +19779,7 @@ then :
   LOGINCAP_USAGE='[-c class] '; LCMAN=1
  	with_logincap=yes
  	case "$OS" in
@@ -76,7 +76,7 @@ $NetBSD: patch-configure,v 1.8 2022/05/14 05:41:00 adam Exp $
  		SUDO_LIBS="${SUDO_LIBS} -lutil"
  		SUDOERS_LIBS="${SUDOERS_LIBS} -lutil"
  		;;
-@@ -27725,6 +27744,8 @@ fi
+@@ -27964,6 +27983,8 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
  	AUTH_OBJS="$AUTH_OBJS kerb5.lo"
      fi
@@ -85,7 +85,7 @@ $NetBSD: patch-configure,v 1.8 2022/05/14 05:41:00 adam Exp $
      _LIBS="$LIBS"
      LIBS="${LIBS} ${SUDOERS_LIBS}"
      ac_fn_c_check_func "$LINENO" "krb5_verify_user" "ac_cv_func_krb5_verify_user"
-@@ -32277,7 +32298,6 @@ test "$docdir" = '${datarootdir}/doc/${P
+@@ -32536,7 +32557,6 @@ test "$docdir" = '${datarootdir}/doc/${P
  test "$localedir" = '${datarootdir}/locale' && localedir='$(datarootdir)/locale'
  test "$localstatedir" = '${prefix}/var' && localstatedir='$(prefix)/var'
  test "$runstatedir" = '${localstatedir}/run' && runstatedir='$(localstatedir)/run'
diff --git a/security/sudo/patches/patch-logsrvd_Makefile.in b/security/sudo/patches/patch-logsrvd_Makefile.in
deleted file mode 100644
index 354c3bfbb96..00000000000
--- a/security/sudo/patches/patch-logsrvd_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-logsrvd_Makefile.in,v 1.2 2021/03/18 08:57:48 adam Exp $
-
-Fix build error.
-
---- logsrvd/Makefile.in.orig	2021-03-13 15:47:23.000000000 +0000
-+++ logsrvd/Makefile.in
-@@ -45,7 +45,7 @@ INSTALL_BACKUP = @INSTALL_BACKUP@
- # Libraries
- LT_LIBS = $(top_builddir)/lib/iolog/libsudo_iolog.la \
- 	  $(top_builddir)/lib/logsrv/liblogsrv.la
--LIBS = $(LT_LIBS) @LIBTLS@
-+LIBS = $(LT_LIBS) @LIBTLS@ @LIBS@
- 
- # C preprocessor defines
- CPPDEFS = -D_PATH_SUDO_LOGSRVD_CONF=\"$(sysconfdir)/sudo_logsrvd.conf\" \