From owner-svn-ports-all@freebsd.org  Wed Oct  9 01:03:05 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 309B113C770;
 Wed,  9 Oct 2019 01:03:05 +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 46nwtx0C3Rz3GNL;
 Wed,  9 Oct 2019 01:03:05 +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 DF0DC8CEA;
 Wed,  9 Oct 2019 01:03:04 +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 x99134e6012145;
 Wed, 9 Oct 2019 01:03:04 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x991341V012144;
 Wed, 9 Oct 2019 01:03:04 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201910090103.x991341V012144@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, 9 Oct 2019 01:03:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r514110 - in head/sysutils/screen: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: in head/sysutils/screen: . files
X-SVN-Commit-Revision: 514110
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Oct 2019 01:03:05 -0000

Author: cy
Date: Wed Oct  9 01:03:04 2019
New Revision: 514110
URL: https://svnweb.freebsd.org/changeset/ports/514110

Log:
  Resolve a segfault in utmp.c:519 at some installations.

Modified:
  head/sysutils/screen/Makefile
  head/sysutils/screen/files/patch-utmp.c

Modified: head/sysutils/screen/Makefile
==============================================================================
--- head/sysutils/screen/Makefile	Wed Oct  9 01:01:35 2019	(r514109)
+++ head/sysutils/screen/Makefile	Wed Oct  9 01:03:04 2019	(r514110)
@@ -3,6 +3,7 @@
 
 PORTNAME=	screen
 PORTVERSION=	4.7.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU \
 		ftp://ftp.gnu.org/gnu/screen/ \

Modified: head/sysutils/screen/files/patch-utmp.c
==============================================================================
--- head/sysutils/screen/files/patch-utmp.c	Wed Oct  9 01:01:35 2019	(r514109)
+++ head/sysutils/screen/files/patch-utmp.c	Wed Oct  9 01:03:04 2019	(r514110)
@@ -1,6 +1,6 @@
 --- utmp.c.orig	2019-10-01 15:08:00.000000000 -0700
-+++ utmp.c	2019-10-08 12:08:46.535155000 -0700
-@@ -26,6 +26,7 @@
++++ utmp.c	2019-10-08 17:56:32.853627000 -0700
+@@ -26,9 +26,13 @@
   ****************************************************************
   */
  
@@ -8,16 +8,12 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
-@@ -88,6 +89,9 @@
- static void makedead __P((struct utmp *));
- static int  pututslot __P((slot_t, struct utmp *, char *, struct win *));
- static struct utmp *getutslot __P((slot_t));
 +#ifdef __FreeBSD_version
 +#define GETUTENT
 +#endif
- #ifndef GETUTENT
- static struct utmp *getutent __P((void));
- static void endutent __P((void));
+ 
+ #include "config.h"
+ #include "screen.h"
 @@ -102,7 +106,7 @@
  
  static int utmpok;