Index: branches/2017Q3/security/sudo/Makefile
===================================================================
--- branches/2017Q3/security/sudo/Makefile	(revision 447784)
+++ branches/2017Q3/security/sudo/Makefile	(revision 447785)
@@ -1,98 +1,98 @@
 # Created by: erich@rrnet.com
 # $FreeBSD$
 
 PORTNAME=	sudo
 PORTVERSION=	1.8.20p2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	SUDO
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Allow others to run commands as root
 
 LICENSE=	sudo
 LICENSE_NAME=	Sudo license
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cpe libtool
 CPE_VENDOR=	todd_miller
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lgcc
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-ignore-dot \
 		--with-tty-tickets \
 		--with-env-editor \
 		--with-logincap \
 		--with-long-otp-prompt
 
 OPTIONS_DEFINE=	LDAP INSULTS DISABLE_ROOT_SUDO DISABLE_AUTH NOARGS_SHELL \
 		AUDIT OPIE NLS SSSD DOCS
 OPTIONS_DEFAULT=	AUDIT
 OPTIONS_SUB=	yes
 
 INSULTS_DESC=	Enable insults on failures
 DISABLE_ROOT_SUDO_DESC=	Do not allow root to run sudo
 DISABLE_AUTH_DESC=	Do not require authentication by default
 NOARGS_SHELL_DESC=	Run a shell if no arguments are given
 AUDIT_DESC=	Enable BSM audit support
 OPIE_DESC=	Enable one-time passwords (no PAM support)
 SSSD_DESC=	Enable SSSD backend support.
 
 LOGFAC?=	authpriv
 CONFIGURE_ARGS+=	--with-logfac=${LOGFAC}
 
 # This is intentionally not an option.
 # SUDO_SECURE_PATH is a PATH string that will override the user's PATH.
 # ex: make SUDO_SECURE_PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 .if defined(SUDO_SECURE_PATH)
 CONFIGURE_ARGS+=	--with-secure-path="${SUDO_SECURE_PATH}"
 .endif
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_LDFLAGS=	-L${LOCALBASE}/lib -lintl
 NLS_CFLAGS=	-I${LOCALBASE}/include
 
 INSULTS_CONFIGURE_ON=	--with-insults
 INSULTS_CONFIGURE_ON+=	--with-all-insults
 
 LDAP_USE=	OPENLDAP=yes
 LDAP_CONFIGURE_ON=	--with-ldap=${PREFIX}
 SUDO_LDAP_CONF?=	ldap.conf
 LDAP_CONFIGURE_ON+=	--with-ldap-conf-file=${PREFIX}/etc/${SUDO_LDAP_CONF}
 
 DISABLE_ROOT_SUDO_CONFIGURE_ON=	--disable-root-sudo
 DISABLE_AUTH_CONFIGURE_ON=	--disable-authentication
 NOARGS_SHELL_CONFIGURE_ENABLE=	noargs-shell
 AUDIT_CONFIGURE_WITH=	bsm-audit
 OPIE_CONFIGURE_ON=	--with-opie
 OPIE_CONFIGURE_OFF=	--with-pam
 SSSD_CONFIGURE_ON=	--with-sssd
 SSSD_RUN_DEPENDS=	sssd:security/sssd
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "arm"
 CONFIGURE_ARGS+=	--disable-pie
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E '/install-(binaries|noexec):/,/^$$/ \
 		s/\$$\(INSTALL\)/& ${STRIP}/;s/-b\~/-b ~/' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's,$$(srcdir)/sudoers2ldif $$(DESTDIR)$$(docdir),$$(srcdir)/sudoers2ldif $$(DESTDIR)$$(bindir),' \
 		${WRKSRC}/plugins/sudoers/Makefile.in
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/sudo.default
 	${RM} ${STAGEDIR}${PREFIX}/etc/sudoers
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sudoreplay
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/visudo
 .for f in group_file.so libsudo_util.so sudoers.so system_group.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/sudo/${f}
 .endfor
 
 .include <bsd.port.mk>
Index: branches/2017Q3/security/sudo/files/patch-src_exec__nopty.c
===================================================================
--- branches/2017Q3/security/sudo/files/patch-src_exec__nopty.c	(nonexistent)
+++ branches/2017Q3/security/sudo/files/patch-src_exec__nopty.c	(revision 447785)
@@ -0,0 +1,26 @@
+--- src/exec_nopty.c.orig	2017-08-09 17:20:41 UTC
++++ src/exec_nopty.c
+@@ -201,7 +201,7 @@ exec_nopty(struct command_details *details, struct com
+ 	sudo_warn(U_("unable to set handler for signal %d"), SIGCHLD);
+     if (sudo_sigaction(SIGCONT, &sa, NULL) != 0)
+ 	sudo_warn(U_("unable to set handler for signal %d"), SIGCONT);
+-#ifdef SIGINFO
++#if defined(SIGINFO) && !defined(__FreeBSD__)
+     if (sudo_sigaction(SIGINFO, &sa, NULL) != 0)
+ 	sudo_warn(U_("unable to set handler for signal %d"), SIGINFO);
+ #endif
+@@ -222,6 +222,14 @@ exec_nopty(struct command_details *details, struct com
+ 	sudo_warn(U_("unable to set handler for signal %d"), SIGQUIT);
+     if (sudo_sigaction(SIGTSTP, &sa, NULL) != 0)
+ 	sudo_warn(U_("unable to set handler for signal %d"), SIGTSTP);
++#if defined(SIGINFO) && defined(__FreeBSD__)
++    /*
++     * FreeBSD's ^T will generate a SIGINFO to the controlling terminal's
++     * process group.
++     */
++    if (sudo_sigaction(SIGINFO, &sa, NULL) != 0)
++	sudo_warn(U_("unable to set handler for signal %d"), SIGINFO);
++#endif
+ 
+     /*
+      * The policy plugin's session init must be run before we fork

Property changes on: branches/2017Q3/security/sudo/files/patch-src_exec__nopty.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q3
===================================================================
--- branches/2017Q3	(revision 447784)
+++ branches/2017Q3	(revision 447785)

Property changes on: branches/2017Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r447784