Received: by mail.netbsd.org (Postfix, from userid 605) id D8C9284EE9; Sun, 2 Aug 2020 10:59:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5E4FF84E8C for ; Sun, 2 Aug 2020 10:59:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 09TUtuuDKWHu for ; Sun, 2 Aug 2020 10:59:13 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B927E84D69 for ; Sun, 2 Aug 2020 10:59:13 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AC22FFB28; Sun, 2 Aug 2020 10:59:13 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1596365953251280" MIME-Version: 1.0 Date: Sun, 2 Aug 2020 10:59:13 +0000 From: "Kimmo Suominen" Subject: CVS commit: pkgsrc/misc/screen To: pkgsrc-changes@NetBSD.org Reply-To: kim@netbsd.org X-Mailer: log_accum Message-Id: <20200802105913.AC22FFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1596365953251280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kim Date: Sun Aug 2 10:59:13 UTC 2020 Modified Files: pkgsrc/misc/screen: Makefile distinfo pkgsrc/misc/screen/patches: patch-al Log Message: 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). To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 pkgsrc/misc/screen/Makefile cvs rdiff -u -r1.54 -r1.55 pkgsrc/misc/screen/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/misc/screen/patches/patch-al Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1596365953251280 Content-Disposition: inline Content-Length: 3735 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/screen/Makefile diff -u pkgsrc/misc/screen/Makefile:1.115 pkgsrc/misc/screen/Makefile:1.116 --- pkgsrc/misc/screen/Makefile:1.115 Sat Aug 1 14:10:23 2020 +++ pkgsrc/misc/screen/Makefile Sun Aug 2 10:59:13 2020 @@ -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/} Index: pkgsrc/misc/screen/distinfo diff -u pkgsrc/misc/screen/distinfo:1.54 pkgsrc/misc/screen/distinfo:1.55 --- pkgsrc/misc/screen/distinfo:1.54 Sat Aug 1 14:10:23 2020 +++ pkgsrc/misc/screen/distinfo Sun Aug 2 10:59:13 2020 @@ -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) = c952a7e52df0f33c2853c3 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 Index: pkgsrc/misc/screen/patches/patch-al diff -u pkgsrc/misc/screen/patches/patch-al:1.7 pkgsrc/misc/screen/patches/patch-al:1.8 --- pkgsrc/misc/screen/patches/patch-al:1.7 Sat Aug 1 14:10:23 2020 +++ pkgsrc/misc/screen/patches/patch-al Sun Aug 2 10:59:13 2020 @@ -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 $DISPL 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 $DISPL + 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)) { --_----------=_1596365953251280--