From 777954ed1247d72d7a28a69a2c29c147bfd6ff1e Mon Sep 17 00:00:00 2001
From: christos <christos@pkgsrc.org>
Date: Mon, 3 Jan 2022 21:21:12 +0000
Subject: Fix HUP-on-master close issue

---
 misc/screen/Makefile             |  4 ++--
 misc/screen/distinfo             |  4 ++--
 misc/screen/patches/patch-tty.sh | 27 ++++++++++++++++++++++-----
 3 files changed, 26 insertions(+), 9 deletions(-)

(limited to 'misc')

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 7439e5515ea..74b1708bd03 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.120 2021/09/28 12:51:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.121 2022/01/03 21:21:12 christos Exp $
 
 DISTNAME=	screen-4.8.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	misc shells
 MASTER_SITES=	${MASTER_SITE_GNU:=screen/}
 
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index a0213493239..b522aac448f 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2021/10/26 10:59:32 nia Exp $
+$NetBSD: distinfo,v 1.62 2022/01/03 21:21:12 christos Exp $
 
 BLAKE2s (screen-4.8.0.tar.gz) = 51169142215c9f8b64da633a6d77db24894d7f2f95636532344efc79985898d3
 SHA512 (screen-4.8.0.tar.gz) = 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
@@ -19,5 +19,5 @@ SHA1 (patch-display.h) = 922ebe152d8c09fc016b983d8fe9c1c64ef74578
 SHA1 (patch-encoding.c) = f426f0118a76106f8063c8d0c0f36b4e4ad7ae0b
 SHA1 (patch-screen.c) = de5d8468100ab88cbdb842e21b04b00221e798b8
 SHA1 (patch-socket.c) = ef7d3cb14f0199383c0e750af48f19537eb0b36d
-SHA1 (patch-tty.sh) = 711e10879250de4b0e04bc2ec00472edeaf6aada
+SHA1 (patch-tty.sh) = 6a818b7a4d70e55878ee69605e53300eabcb525f
 SHA1 (patch-window.h) = 84dc5a2c24ff77147b416c05f897536c0cfddf31
diff --git a/misc/screen/patches/patch-tty.sh b/misc/screen/patches/patch-tty.sh
index ce040f28700..2d9700bdfed 100644
--- a/misc/screen/patches/patch-tty.sh
+++ b/misc/screen/patches/patch-tty.sh
@@ -1,13 +1,30 @@
-$NetBSD: patch-tty.sh,v 1.5 2020/02/07 12:19:00 ryoon Exp $
+$NetBSD: patch-tty.sh,v 1.6 2022/01/03 21:21:12 christos Exp $
 
 Change condition for using TIOCSCTTY.
 
 NetBSD on the netbsd-5 branch insists on a non-NULL second argument
 to the realpath() function.  Make it so.
 
---- tty.sh.orig	2020-02-05 20:09:38.000000000 +0000
-+++ tty.sh
-@@ -784,7 +784,9 @@ int fgtty(int fd)
+On BSD's we don't want to set CLOCAL because it prevents sending SIGHUP
+on master pty close.
+
+--- tty.sh.orig	2020-02-05 15:09:38.000000000 -0500
++++ tty.sh	2022-01-03 16:10:52.529555957 -0500
+@@ -267,7 +267,13 @@
+ 
+ IF{CS8} 	m->tio.c_cflag |= CS8;
+ IF{CREAD}	m->tio.c_cflag |= CREAD;
++#ifndef BSD
++/*
++ * On BSDs definining CLOCAL disables SIGHUP on master close
++ * and we don't want that.
++ */
+ IF{CLOCAL}	m->tio.c_cflag |= CLOCAL;
++#endif
+ 
+ IF{ECHOCTL}	m->tio.c_lflag |= ECHOCTL;
+ IF{ECHOKE}	m->tio.c_lflag |= ECHOKE;
+@@ -784,7 +790,9 @@
    /*
     * Under BSD we have to set the controlling terminal again explicitly.
     */
@@ -18,7 +35,7 @@ to the realpath() function.  Make it so.
    ioctl(fd, TIOCSCTTY, (char *)0);
  # endif
  
-@@ -1485,8 +1487,10 @@ int CheckTtyname (char *tty)
+@@ -1485,8 +1493,10 @@
    char realbuf[PATH_MAX];
    const char *real;
    int rc;
-- 
cgit v1.2.3