Received: by mail.netbsd.org (Postfix, from userid 605) id 7089684D4D; Tue, 18 Jul 2017 23:02:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0345884CDE for ; Tue, 18 Jul 2017 23:02:20 +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 hfPs2pzyvpXq for ; Tue, 18 Jul 2017 23:02:19 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D572584C6C for ; Tue, 18 Jul 2017 23:02:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D01F3FACD; Tue, 18 Jul 2017 23:02:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1500418938274630" MIME-Version: 1.0 Date: Tue, 18 Jul 2017 23:02:18 +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: <20170718230218.D01F3FACD@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. --_----------=_1500418938274630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kim Date: Tue Jul 18 23:02:18 UTC 2017 Modified Files: pkgsrc/misc/screen: Makefile distinfo pkgsrc/misc/screen/patches: patch-ae patch-ai patch-aj patch-ak patch-ap patch-screen.c patch-socket.c patch-tty.sh Removed Files: pkgsrc/misc/screen/patches: patch-doc_screen.texinfo Log Message: Upgrade misc/screen to version 4.6.1 Version 4.6.1 (10/07/2017): * Fixes: - problems with starting session in some cases - parallel make install - segfault when querying info on nonUTF locale Version 4.6.0 (28/06/2017): * Update Unicode wide tables to 9.0 * Support more serial speeds * Improved namespaces support * Migrate from fifos to sockets * Start viewing scrollback at first line of output To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 pkgsrc/misc/screen/Makefile cvs rdiff -u -r1.46 -r1.47 pkgsrc/misc/screen/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/screen/patches/patch-ae cvs rdiff -u -r1.7 -r1.8 pkgsrc/misc/screen/patches/patch-ai \ pkgsrc/misc/screen/patches/patch-ap cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/screen/patches/patch-aj cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/screen/patches/patch-ak cvs rdiff -u -r1.1 -r0 pkgsrc/misc/screen/patches/patch-doc_screen.texinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/screen/patches/patch-screen.c cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/screen/patches/patch-socket.c cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/screen/patches/patch-tty.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1500418938274630 Content-Disposition: inline Content-Length: 11838 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.102 pkgsrc/misc/screen/Makefile:1.103 --- pkgsrc/misc/screen/Makefile:1.102 Tue Jul 18 10:35:28 2017 +++ pkgsrc/misc/screen/Makefile Tue Jul 18 23:02:18 2017 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.102 2017/07/18 10:35:28 kim Exp $ +# $NetBSD: Makefile,v 1.103 2017/07/18 23:02:18 kim Exp $ -DISTNAME= screen-4.5.1 +DISTNAME= screen-4.6.1 #PKGREVISION= 1 CATEGORIES= misc shells MASTER_SITES= ${MASTER_SITE_GNU:=screen/} Index: pkgsrc/misc/screen/distinfo diff -u pkgsrc/misc/screen/distinfo:1.46 pkgsrc/misc/screen/distinfo:1.47 --- pkgsrc/misc/screen/distinfo:1.46 Sat Apr 15 22:31:49 2017 +++ pkgsrc/misc/screen/distinfo Tue Jul 18 23:02:18 2017 @@ -1,21 +1,20 @@ -$NetBSD: distinfo,v 1.46 2017/04/15 22:31:49 kim Exp $ +$NetBSD: distinfo,v 1.47 2017/07/18 23:02:18 kim Exp $ -SHA1 (screen-4.5.1.tar.gz) = d096ea40c7a349ec46f3bd4fcc02fd6a873318e6 -RMD160 (screen-4.5.1.tar.gz) = 2e8aa5ec158fc7d240df176dff0b9ddfcbfc9056 -SHA512 (screen-4.5.1.tar.gz) = ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804 -Size (screen-4.5.1.tar.gz) = 963153 bytes +SHA1 (screen-4.6.1.tar.gz) = 444dae1c6d2ff0b7dfd774b4e53e49c69de811ee +RMD160 (screen-4.6.1.tar.gz) = a1177ec2938c06d9d660cc7c05d002c9a702b014 +SHA512 (screen-4.6.1.tar.gz) = e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336 +Size (screen-4.6.1.tar.gz) = 848979 bytes SHA1 (patch-aa) = 39c6fa5bda62b2891cecf4a5e9598b179ea8b4dc SHA1 (patch-ab) = 40911979a540645db2a17861328292add22898d3 -SHA1 (patch-ae) = 8792f7877c0a29701d7d0643e93360813ed7db0f -SHA1 (patch-ai) = d93147f4e8a2026a1892c3cbd14a929d81e0e635 -SHA1 (patch-aj) = e9996135629085c44867b9264648b2b507e91f98 -SHA1 (patch-ak) = 31982e692cabf25be31bd1758fe1aeb1a4787629 +SHA1 (patch-ae) = 2a9b19c52cafe238c923977c9952af0ec0b0d9f6 +SHA1 (patch-ai) = edefc44e47066dc89bda22a94d417511f46f0190 +SHA1 (patch-aj) = 446b07f7f418dd0c83fb5bc6246a01cc4417b03b +SHA1 (patch-ak) = 1aaf82f7fe666d86a9f4ab7d6f7222e895a17bba SHA1 (patch-al) = caabc33ee51922d97edac19346ad9d80fabb164b SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1 SHA1 (patch-an) = bda6c65148410a6c9a13afd8ad34f93e33731552 SHA1 (patch-ao) = 91eecb62351aff720447eb48ea85aae70b62f9b6 -SHA1 (patch-ap) = 4176e95502754206d6840ce228c61371df947650 -SHA1 (patch-doc_screen.texinfo) = ddce313668c7f9d27973e62042dcdc11f23307b5 -SHA1 (patch-screen.c) = fa54bfdbefcf74944a677ab4b6636d0072e57267 -SHA1 (patch-socket.c) = 09683cee3685a5c6d625e86aa97f6a09f4280b56 -SHA1 (patch-tty.sh) = 93b1fe856cf16640295cb822d60118dbd3734602 +SHA1 (patch-ap) = 1f11b50826b3e4d61540351911d21214d3ab83cc +SHA1 (patch-screen.c) = de5d8468100ab88cbdb842e21b04b00221e798b8 +SHA1 (patch-socket.c) = ef7d3cb14f0199383c0e750af48f19537eb0b36d +SHA1 (patch-tty.sh) = 6d0d8f60740a3f7167d3d064a8979858a9b01bb0 Index: pkgsrc/misc/screen/patches/patch-ae diff -u pkgsrc/misc/screen/patches/patch-ae:1.6 pkgsrc/misc/screen/patches/patch-ae:1.7 --- pkgsrc/misc/screen/patches/patch-ae:1.6 Fri Feb 13 04:44:40 2015 +++ pkgsrc/misc/screen/patches/patch-ae Tue Jul 18 23:02:18 2017 @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.6 2015/02/13 04:44:40 rodent Exp $ +$NetBSD: patch-ae,v 1.7 2017/07/18 23:02:18 kim Exp $ Don't pollute G1 to allow 8-bit encondings. The original code made the TERMCAP env var longer than 1023 bytes, which causes problems. This is a quick hack but works with our termcap. ---- termcap.c.orig 2014-04-26 10:58:35.000000000 +0000 -+++ termcap.c -@@ -80,7 +80,7 @@ static const char TermcapConst[] = "\\\n +--- termcap.c.orig 2017-07-10 19:26:25.000000000 +0000 ++++ termcap.c 2017-07-18 22:44:38.000000000 +0000 +@@ -79,7 +79,7 @@ \t:DO=\\E[%dB:LE=\\E[%dD:RI=\\E[%dC:UP=\\E[%dA:bs:bt=\\E[Z:\\\n\ \t:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:ct=\\E[3g:\\\n\ \t:do=^J:nd=\\E[C:pt:rc=\\E8:rs=\\Ec:sc=\\E7:st=\\EH:up=\\EM:\\\n\ @@ -16,7 +16,7 @@ which causes problems. This is a quick char * gettermcapstring(s) -@@ -826,7 +826,7 @@ char *s; +@@ -825,7 +825,7 @@ { register int n; Index: pkgsrc/misc/screen/patches/patch-ai diff -u pkgsrc/misc/screen/patches/patch-ai:1.7 pkgsrc/misc/screen/patches/patch-ai:1.8 --- pkgsrc/misc/screen/patches/patch-ai:1.7 Mon Jun 20 16:04:44 2016 +++ pkgsrc/misc/screen/patches/patch-ai Tue Jul 18 23:02:18 2017 @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.7 2016/06/20 16:04:44 ryoon Exp $ +$NetBSD: patch-ai,v 1.8 2017/07/18 23:02:18 kim Exp $ -This glues in the code from patch-am (see also path-al and patch-an). +This glues in the code from patch-am (see also patch-al and patch-an). --- os.h.orig 2016-06-19 19:41:03.000000000 +0000 +++ os.h Index: pkgsrc/misc/screen/patches/patch-ap diff -u pkgsrc/misc/screen/patches/patch-ap:1.7 pkgsrc/misc/screen/patches/patch-ap:1.8 --- pkgsrc/misc/screen/patches/patch-ap:1.7 Mon Jun 20 16:04:44 2016 +++ pkgsrc/misc/screen/patches/patch-ap Tue Jul 18 23:02:18 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.7 2016/06/20 16:04:44 ryoon Exp $ +$NetBSD: patch-ap,v 1.8 2017/07/18 23:02:18 kim Exp $ Replace configurable paths with tags. @@ -9,9 +9,9 @@ YOU MUST RUN DIFF BEFORE SUBSTITUTIONS! RUNNING "make patch" TAKES YOU TOO FAR. ---- doc/screen.1.orig 2016-06-19 19:41:03.000000000 +0000 -+++ doc/screen.1 -@@ -636,7 +636,7 @@ Show a listing of all currently attached +--- doc/screen.1.orig 2017-07-10 19:26:25.000000000 +0000 ++++ doc/screen.1 2017-07-18 22:44:38.000000000 +0000 +@@ -712,7 +712,7 @@ .SH CUSTOMIZATION The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to @@ -20,7 +20,7 @@ RUNNING "make patch" TAKES YOU TOO FAR. .I screen is installed setuid-root, then the administrator should compile -@@ -649,7 +649,7 @@ in the environment variable $SCREENDIR. +@@ -725,7 +725,7 @@ When .I screen is invoked, it executes initialization commands from the files @@ -29,7 +29,7 @@ RUNNING "make patch" TAKES YOU TOO FAR. \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's defaults\*U that can be overridden in the following ways: for the global screenrc file -@@ -679,7 +679,7 @@ variable substitution shall be performed +@@ -755,7 +755,7 @@ protected from variable substitution. .PP Two configuration files are shipped as examples with your screen distribution: @@ -38,7 +38,7 @@ RUNNING "make patch" TAKES YOU TOO FAR. useful examples for various commands. .PP Customization can also be done 'on-line'. To enter the command mode type -@@ -4903,14 +4903,14 @@ Examples in the +@@ -5017,14 +5017,14 @@ .I screen distribution package for private and global initialization files. .IP $SYSSCREENRC Index: pkgsrc/misc/screen/patches/patch-aj diff -u pkgsrc/misc/screen/patches/patch-aj:1.9 pkgsrc/misc/screen/patches/patch-aj:1.10 --- pkgsrc/misc/screen/patches/patch-aj:1.9 Tue Sep 1 13:34:47 2015 +++ pkgsrc/misc/screen/patches/patch-aj Tue Jul 18 23:02:18 2017 @@ -1,13 +1,13 @@ -$NetBSD: patch-aj,v 1.9 2015/09/01 13:34:47 kim Exp $ +$NetBSD: patch-aj,v 1.10 2017/07/18 23:02:18 kim Exp $ Include curses header when testing tgetent in order to prevent crash on 64-bit architectures. Detect getutent correctly on NetBSD with utmpx. ---- configure.ac.orig 2015-06-28 21:22:55.000000000 +0000 -+++ configure.ac 2015-09-01 12:49:26.000000000 +0000 -@@ -687,6 +687,8 @@ +--- configure.ac.orig 2017-07-10 19:26:25.000000000 +0000 ++++ configure.ac 2017-07-18 22:50:46.000000000 +0000 +@@ -661,6 +661,8 @@ AC_MSG_ERROR(!!! no tgetent - no screen))))))))) AC_TRY_RUN([ @@ -16,7 +16,7 @@ Detect getutent correctly on NetBSD with main() { exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); -@@ -838,9 +840,16 @@ +@@ -812,9 +814,16 @@ AC_TRY_LINK([ #include /* to get time_t on SCO */ #include Index: pkgsrc/misc/screen/patches/patch-ak diff -u pkgsrc/misc/screen/patches/patch-ak:1.8 pkgsrc/misc/screen/patches/patch-ak:1.9 --- pkgsrc/misc/screen/patches/patch-ak:1.8 Tue Sep 1 13:34:47 2015 +++ pkgsrc/misc/screen/patches/patch-ak Tue Jul 18 23:02:18 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.8 2015/09/01 13:34:47 kim Exp $ +$NetBSD: patch-ak,v 1.9 2017/07/18 23:02:18 kim Exp $ Patch configure after configure.ac (see patch-aj). @@ -7,9 +7,9 @@ crash on 64-bit architectures. Detect getutent correctly on NetBSD with utmpx. ---- configure.orig 2015-06-28 21:42:40.000000000 +0000 -+++ configure 2015-09-01 13:12:22.000000000 +0000 -@@ -5018,6 +5018,8 @@ +--- configure.orig 2017-07-10 19:26:25.000000000 +0000 ++++ configure 2017-07-18 22:50:46.000000000 +0000 +@@ -4985,6 +4985,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18,7 +18,7 @@ Detect getutent correctly on NetBSD with main() { exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); -@@ -5414,9 +5416,16 @@ +@@ -5381,9 +5383,16 @@ #include /* to get time_t on SCO */ #include Index: pkgsrc/misc/screen/patches/patch-screen.c diff -u pkgsrc/misc/screen/patches/patch-screen.c:1.4 pkgsrc/misc/screen/patches/patch-screen.c:1.5 --- pkgsrc/misc/screen/patches/patch-screen.c:1.4 Sat Apr 15 22:31:49 2017 +++ pkgsrc/misc/screen/patches/patch-screen.c Tue Jul 18 23:02:18 2017 @@ -1,10 +1,10 @@ -$NetBSD: patch-screen.c,v 1.4 2017/04/15 22:31:49 kim Exp $ +$NetBSD: patch-screen.c,v 1.5 2017/07/18 23:02:18 kim Exp $ Use standard headers. ---- screen.c.orig 2017-01-17 19:28:29.000000000 +0000 -+++ screen.c -@@ -88,6 +88,8 @@ +--- screen.c.orig 2017-07-10 19:26:25.000000000 +0000 ++++ screen.c 2017-07-18 22:40:56.000000000 +0000 +@@ -95,6 +95,8 @@ # include #endif Index: pkgsrc/misc/screen/patches/patch-socket.c diff -u pkgsrc/misc/screen/patches/patch-socket.c:1.2 pkgsrc/misc/screen/patches/patch-socket.c:1.3 --- pkgsrc/misc/screen/patches/patch-socket.c:1.2 Tue Sep 1 13:34:47 2015 +++ pkgsrc/misc/screen/patches/patch-socket.c Tue Jul 18 23:02:18 2017 @@ -1,15 +1,15 @@ -$NetBSD: patch-socket.c,v 1.2 2015/09/01 13:34:47 kim Exp $ +$NetBSD: patch-socket.c,v 1.3 2017/07/18 23:02:18 kim Exp $ ---- socket.c.orig 2015-06-28 21:22:56.000000000 +0000 -+++ socket.c 2015-09-01 12:42:34.000000000 +0000 -@@ -32,9 +32,7 @@ +--- socket.c.orig 2017-07-10 19:26:25.000000000 +0000 ++++ socket.c 2017-07-18 22:35:40.000000000 +0000 +@@ -34,9 +34,7 @@ + #include #include - #if !defined(NAMEDPIPE) # include -# ifdef _OpenBSD_ -# include -# endif +# include # include - #endif + #ifndef SIGINT Index: pkgsrc/misc/screen/patches/patch-tty.sh diff -u pkgsrc/misc/screen/patches/patch-tty.sh:1.3 pkgsrc/misc/screen/patches/patch-tty.sh:1.4 --- pkgsrc/misc/screen/patches/patch-tty.sh:1.3 Mon Jun 20 16:04:44 2016 +++ pkgsrc/misc/screen/patches/patch-tty.sh Tue Jul 18 23:02:18 2017 @@ -1,13 +1,13 @@ -$NetBSD: patch-tty.sh,v 1.3 2016/06/20 16:04:44 ryoon Exp $ +$NetBSD: patch-tty.sh,v 1.4 2017/07/18 23:02:18 kim 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 2016-06-19 19:41:03.000000000 +0000 -+++ tty.sh -@@ -813,7 +813,8 @@ int fd; +--- tty.sh.orig 2017-07-10 19:26:25.000000000 +0000 ++++ tty.sh 2017-07-18 22:40:56.000000000 +0000 +@@ -813,7 +813,8 @@ /* * Under BSD we have to set the controlling terminal again explicitly. */ @@ -17,7 +17,7 @@ to the realpath() function. Make it so. ioctl(fd, TIOCSCTTY, (char *)0); # endif -@@ -1510,8 +1511,10 @@ char *tty; +@@ -1521,8 +1522,10 @@ char realbuf[PATH_MAX]; const char *real; int rc; --_----------=_1500418938274630--