From owner-svn-ports-head@freebsd.org  Wed Nov  6 21:17:25 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 62FA3178B19;
 Wed,  6 Nov 2019 21:17:25 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 477fW91yMKz4fPp;
 Wed,  6 Nov 2019 21:17:25 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2381131B3;
 Wed,  6 Nov 2019 21:17:25 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA6LHOh9011883;
 Wed, 6 Nov 2019 21:17:24 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA6LHOfM011882;
 Wed, 6 Nov 2019 21:17:24 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201911062117.xA6LHOfM011882@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Wed, 6 Nov 2019 21:17:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r516926 - head/sysutils/screen
X-SVN-Group: ports-head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: head/sysutils/screen
X-SVN-Commit-Revision: 516926
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Nov 2019 21:17:25 -0000

Author: cy
Date: Wed Nov  6 21:17:24 2019
New Revision: 516926
URL: https://svnweb.freebsd.org/changeset/ports/516926

Log:
  Circumvent a hang on FreeBSD 11 i386 caused by an unreported (only visible
  through truss) stack assertion.
  
  This is a temporary fix which will require further investigation to
  determine the cause.
  
  PR:		241750
  Reported by:	Victor Sudakov <vas@sibptus.ru> (in the PR)
  		Paul Beard <paulbeard@gmail.com> (via direct email)

Modified:
  head/sysutils/screen/Makefile

Modified: head/sysutils/screen/Makefile
==============================================================================
--- head/sysutils/screen/Makefile	Wed Nov  6 20:49:25 2019	(r516925)
+++ head/sysutils/screen/Makefile	Wed Nov  6 21:17:24 2019	(r516926)
@@ -3,7 +3,7 @@
 
 PORTNAME=	screen
 PORTVERSION=	4.7.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU \
 		ftp://ftp.gnu.org/gnu/screen/ \
@@ -50,6 +50,9 @@ CPE_VENDOR=	gnu
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7
+SSP_CFLAGS?=	-fno-stack-protector
+.endif
+.if ${ARCH} == i386 && ${OSVERSION} < 1200000
 SSP_CFLAGS?=	-fno-stack-protector
 .endif