From 8165cd422eb9a7e921d540b576cca69b1ff37314 Mon Sep 17 00:00:00 2001
From: kim <kim@pkgsrc.org>
Date: Sun, 2 Aug 2020 10:59:13 +0000
Subject: Simplify the IPv6 address handling patch

Also fix the completely incorrect code that was inteded to look for
the closing bracket (but clearly wouldn't work and wasn't hit in my
previous testing).
---
 misc/screen/Makefile         |  4 ++--
 misc/screen/distinfo         |  4 ++--
 misc/screen/patches/patch-al | 53 ++++++++++++++++++--------------------------
 3 files changed, 25 insertions(+), 36 deletions(-)

(limited to 'misc/screen')

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index e9264edaf27..bcf89e9b6ef 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.115 2020/08/01 14:10:23 kim Exp $
+# $NetBSD: Makefile,v 1.116 2020/08/02 10:59:13 kim Exp $
 
 DISTNAME=	screen-4.8.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc shells
 MASTER_SITES=	${MASTER_SITE_GNU:=screen/}
 
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 0446358e053..82300651615 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2020/08/01 14:10:23 kim Exp $
+$NetBSD: distinfo,v 1.55 2020/08/02 10:59:13 kim Exp $
 
 SHA1 (screen-4.8.0.tar.gz) = 2328927e10e68d357bdfec7bd740726011e834e9
 RMD160 (screen-4.8.0.tar.gz) = 43888fa00f708a8a9aa226e0df39abd7181b15ae
@@ -10,7 +10,7 @@ SHA1 (patch-ae) = c952a7e52df0f33c2853c348e89650009c0d8696
 SHA1 (patch-ai) = edefc44e47066dc89bda22a94d417511f46f0190
 SHA1 (patch-aj) = 446b07f7f418dd0c83fb5bc6246a01cc4417b03b
 SHA1 (patch-ak) = 1aaf82f7fe666d86a9f4ab7d6f7222e895a17bba
-SHA1 (patch-al) = 1b9e74992fba751d90611126d6fa4608ec3415a3
+SHA1 (patch-al) = 74634eadfd53e217032e735adf09295868f11bd8
 SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1
 SHA1 (patch-an) = bda6c65148410a6c9a13afd8ad34f93e33731552
 SHA1 (patch-ao) = a45ae3186cd9bddeb915bad890f1be5abc315dd3
diff --git a/misc/screen/patches/patch-al b/misc/screen/patches/patch-al
index 9f3ebbb7c02..571b2208f58 100644
--- a/misc/screen/patches/patch-al
+++ b/misc/screen/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.7 2020/08/01 14:10:23 kim Exp $
+$NetBSD: patch-al,v 1.8 2020/08/02 10:59:13 kim Exp $
 
 Make extra calls to remove utmp entries when utmpx is used.
 For non-login entries we only update utmpx, as it stores
@@ -52,7 +52,7 @@ unless already wrapped (e.g. from $DISPLAY).
    char host[sizeof(D_loginhost) + 15];
  #else
    char *host = 0;
-@@ -449,12 +461,48 @@ struct win *wi;
+@@ -449,12 +461,37 @@ struct win *wi;
  	   * "faui45.informati"......:s.0
  	   * HPUX uses host:0.0, so chop at "." and ":" (Eric Backus)
  	   */
@@ -61,45 +61,34 @@ unless already wrapped (e.g. from $DISPLAY).
 +	  for (m = p = host; *p; p++)
 +	    if (*p == ':')
  	      break;
--	  if (*p)
 +	  if (*p == ':')
-+	    {
-+	      for (m = p + 1; *m; m++)
++	    for (m = p + 1; *m; m++)
++	      if (*m == ':')
 +		{
-+		  if (*m == ':')
++		  if (host[0] != '[')
 +		    {
-+		      if (host[0] != '[')
-+			{
-+			  strncpy(host + 1, D_loginhost, sizeof(host) - 15 -1);
-+			  host[0] = '[';
-+			  for (p = host; *p; p++)
-+			    ;
-+			  *p++ = ']';
-+			  break;
-+			}
-+		      else
-+			{
-+			  for (p = m + 1; *p; p++)
-+			    ;
-+			}
++		      strncpy(host + 1, D_loginhost, sizeof(host) - 15 - 2);
++		      host[0] = '[';
++		      p = host + strlen(host);
++		      *p++ = ']';
 +		    }
++		  break;
 +		}
-+	    }
 +	  else
++	    for (p = host; *p; p++)
++	      if ((*p < '0' || *p > '9') && (*p != '.'))
++		break;
+ 	  if (*p)
  	    {
- 	      for (p = host; *p; p++)
-+		if ((*p < '0' || *p > '9') && (*p != '.'))
-+		  break;
-+	    }
-+	  if (*p)
-+	    {
+-	      for (p = host; *p; p++)
 +	      p = host;
 +	      if (host[0] == '[')
-+		{
-+		  for (; *p == ']'; p++)
-+		    ;
-+		  p++;
-+		}
++		for (; *p; p++)
++		  if (*p == ']')
++		    {
++		      p++;
++		      break;
++		    }
 +	      for (; *p; p++)
  		if (*p == '.' || (*p == ':' && p != host))
  		  {
-- 
cgit v1.2.3