screen 5.0.1 update for review

[Emmanuel Dreyfus <manu%netbsd.org@localhost>]

Anyone wants to review the attached pkgsrc/misc/screen update to 5.0.1? 

As I understand it now includes many fixes we had as patches, so 
it as mostly about removing patches.

-- 
Emmanuel Dreyfus
manu%netbsd.org@localhost

removed: patches/patch-attacher.c
removed: patches/patch-configure
removed: patches/patch-configure.ac
removed: patches/patch-logfile.c
removed: patches/patch-logfile.h
removed: patches/patch-process.c
removed: patches/patch-screen.c
removed: patches/patch-screen.h

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/screen/Makefile,v
retrieving revision 1.129
diff -U4 -r1.129 Makefile
--- Makefile	12 May 2025 16:03:20 -0000	1.129
+++ Makefile	15 May 2025 13:50:58 -0000
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.129 2025/05/12 16:03:20 wiz Exp $
 
-DISTNAME=	screen-5.0.0
-PKGREVISION=	3
+DISTNAME=	screen-5.0.1
+#PKGREVISION=	1
 CATEGORIES=	misc shells
 MASTER_SITES=	${MASTER_SITE_GNU:=screen/}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/misc/screen/distinfo,v
retrieving revision 1.67
diff -U4 -r1.67 distinfo
--- distinfo	12 May 2025 16:03:20 -0000	1.67
+++ distinfo	15 May 2025 13:50:58 -0000
@@ -1,21 +1,13 @@
 $NetBSD: distinfo,v 1.67 2025/05/12 16:03:20 wiz Exp $
 
-BLAKE2s (screen-5.0.0.tar.gz) = b2d41befdfd7b641bddef5d1eb4a919bcb76f971e79a145ea4a2e3ba55db28d1
-SHA512 (screen-5.0.0.tar.gz) = 18a163313025c58950ec65fa83037ba1df0fa8e2346925593217fb0a6596f2f51914a4f0aec7f0e1c280d3d3ef964e7a886521f41f4b96f4ff08935be7f62117
-Size (screen-5.0.0.tar.gz) = 895882 bytes
+BLAKE2s (screen-5.0.1.tar.gz) = 42fd93ec376003d2f9cc6e40f15e6f2c2da708e2e39220bd8455ed36a596394f
+SHA512 (screen-5.0.1.tar.gz) = 37cf5445ff1d313bf1136a572639b755de8fc0fc82d87204e87fa272c9ed3515e965edbe66b8bc33a87bd79af959bcc8fb266ab11d0abc42d1c857870b9282fb
+Size (screen-5.0.1.tar.gz) = 1034512 bytes
 SHA1 (patch-Makefile.in) = 9a536678040bb6a47e5c7fbeedfecc0aa5c870e2
-SHA1 (patch-attacher.c) = 6d9b76c55e16dd02d9633012013b3b0d5978751b
-SHA1 (patch-configure) = 4f3261342dd9620d2d62c18a33cf9cc15b2f0d78
-SHA1 (patch-configure.ac) = 1535033179bf7dc4a2a0137c8344963b6ca22404
 SHA1 (patch-doc_screen.1) = 858df8ed65c8fa8044075f4066832f79ba77b3a2
 SHA1 (patch-doc_screen.texinfo) = e35f936f307fc6162824c3090221745ba38f6aba
 SHA1 (patch-etc_etcscreenrc) = a45ae3186cd9bddeb915bad890f1be5abc315dd3
-SHA1 (patch-logfile.c) = 2ae1f8684b34b260047046eca6023b74ae069eac
-SHA1 (patch-logfile.h) = d0f2d70bd1ae4beaffafecc0ff9cacbfe82b4db3
-SHA1 (patch-process.c) = d661f47c3c44563853447c20bacdf5d0400f478d
-SHA1 (patch-screen.c) = c1a43ce774ff651085602c41e33b704229a92944
-SHA1 (patch-screen.h) = b544433f3a4b500e2650fa59413fa928cc671fa9
-SHA1 (patch-socket.c) = 04abb03864baab4cfcc053cfab4657d003660648
+SHA1 (patch-socket.c) = 96f165b7fb5168d2e456d40e1dd961744212c39f
 SHA1 (patch-termcap.c) = f06432d06405daac0064296d2cfa3246a2621e4f
 SHA1 (patch-utmp-netbsd.c) = a721e311e7dde7938de0e9546a7892bfd104ebd1
 SHA1 (patch-window.h) = b0fe8f7105a906c6d9a8908ade8d34e5f7da0dd1
Index: patches/patch-socket.c
===================================================================
RCS file: /cvsroot/pkgsrc/misc/screen/patches/patch-socket.c,v
retrieving revision 1.7
diff -U4 -r1.7 patch-socket.c
--- patches/patch-socket.c	12 May 2025 16:03:20 -0000	1.7
+++ patches/patch-socket.c	15 May 2025 13:50:58 -0000
@@ -1,10 +1,8 @@
 $NetBSD: patch-socket.c,v 1.7 2025/05/12 16:03:20 wiz Exp $
 
 Include <uio.h> for iovec.
 
-https://security.opensuse.org/2025/05/12/screen-security-issues.html
-
 --- socket.c.orig	2024-08-28 19:55:03.000000000 +0000
 +++ socket.c
 @@ -35,9 +35,7 @@
  #include <sys/stat.h>
@@ -15,97 +13,4 @@
 -#endif
  #include <sys/un.h>
  #include <utime.h>
  #include <stdint.h>
-@@ -91,6 +89,11 @@ static void AskPassword(Message *);
- static bool CheckPassword(const char *password);
- static void PasswordProcessInput(char *, size_t);
- 
-+static void KillUnpriv(pid_t pid, int sig) {
-+	UserContext();
-+	UserReturn(kill(pid, sig));
-+}
-+
- #define SOCKMODE (S_IWRITE | S_IREAD | (displays ? S_IEXEC : 0) | (multi ? 1 : 0))
- 
- /*
-@@ -148,8 +151,13 @@ int FindSocket(int *fdp, int *nfoundp, i
- 	xseteuid(real_uid);
- 	xsetegid(real_gid);
- 
--	if ((dirp = opendir(SocketPath)) == NULL)
--		Panic(errno, "Cannot opendir %s", SocketPath);
-+	if ((dirp = opendir(SocketPath)) == NULL) {
-+		if (eff_uid == real_uid) {
-+			Panic(errno, "Cannot opendir %s", SocketPath);
-+		} else {
-+			Panic(0, "Error accessing %s", SocketPath);
-+		}
-+	}
- 
- 	slist = NULL;
- 	slisttail = &slist;
-@@ -606,7 +614,7 @@ static int CreateTempDisplay(Message *m,
- 				Msg(errno, "Could not perform necessary sanity "
- 					   "checks on pts device.");
- 				close(i);
--				Kill(pid, SIG_BYE);
-+				KillUnpriv(pid, SIG_BYE);
- 				return -1;
- 			}
- 			if (strcmp(ttyname_in_ns, m->m_tty)) {
-@@ -615,7 +623,7 @@ static int CreateTempDisplay(Message *m,
- 				    ttyname_in_ns,
- 				    m->m_tty[0] != '\0' ? m->m_tty : "(null)");
- 				close(i);
--				Kill(pid, SIG_BYE);
-+				KillUnpriv(pid, SIG_BYE);
- 				return -1;
- 			}
- 			/* m->m_tty so far contains the actual name of the pts
-@@ -633,24 +641,24 @@ static int CreateTempDisplay(Message *m,
- 			    "Attach: passed fd does not match tty: %s - %s!",
- 			    m->m_tty, myttyname ? myttyname : "NULL");
- 			close(i);
--			Kill(pid, SIG_BYE);
-+			KillUnpriv(pid, SIG_BYE);
- 			return -1;
- 		}
- 	} else if ((i = secopen(m->m_tty, O_RDWR | O_NONBLOCK, 0)) < 0) {
- 		Msg(errno, "Attach: Could not open %s!", m->m_tty);
--		Kill(pid, SIG_BYE);
-+		KillUnpriv(pid, SIG_BYE);
- 		return -1;
- 	}
- 
- 	if (attach)
--		Kill(pid, SIGCONT);
-+		KillUnpriv(pid, SIGCONT);
- 
- 	if (attach) {
- 		if (display || win) {
- 			int unused_result = write(i, "Attaching from inside of screen?\n", 33);
- 			(void)unused_result; /* unused */
- 			close(i);
--			Kill(pid, SIG_BYE);
-+			KillUnpriv(pid, SIG_BYE);
- 			Msg(0, "Attach msg ignored: coming from inside.");
- 			return -1;
- 		}
-@@ -673,7 +681,7 @@ static int CreateTempDisplay(Message *m,
- 		(void)unused_result; /* unused */
- 		close(i);
- 		Msg(0, "Attach: could not make display for user %s", user);
--		Kill(pid, SIG_BYE);
-+		KillUnpriv(pid, SIG_BYE);
- 		return -1;
- 	}
- 	if (attach) {
-@@ -879,7 +887,7 @@ void ReceiveMsg(void)
- 				Msg(0, "Query attempt with bad pid(%d)!", m.m.command.apid);
- 			}
- 			else {
--				Kill(m.m.command.apid, (queryflag >= 0) ? SIGCONT : SIG_BYE);	/* Send SIG_BYE if an error happened */
-+				KillUnpriv(m.m.command.apid, (queryflag >= 0) ? SIGCONT : SIG_BYE);	/* Send SIG_BYE if an error happened */
- 				queryflag = -1;
- 			}
- 		}