CVS commit: pkgsrc/misc/screen

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Feb  7 12:19:00 UTC 2020

Modified Files:
        pkgsrc/misc/screen: Makefile distinfo
        pkgsrc/misc/screen/patches: patch-ae patch-tty.sh

Log Message:
screen: Update to 4.8.0

Changelog:
Version 4.8.0 (05/02/2020)
  * Improve startup time by only polling for files to close
  Fixes:
        - Fix for segfault if termcap doesn't have Km entry
        - Make screen exit code be 0 when checking --version
        - Fix potential memory corruption when using OSC 49


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/misc/screen/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/misc/screen/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/misc/screen/patches/patch-ae
cvs rdiff -u -r1.4 -r1.5 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.

Modified files:

Index: pkgsrc/misc/screen/Makefile
diff -u pkgsrc/misc/screen/Makefile:1.112 pkgsrc/misc/screen/Makefile:1.113
--- pkgsrc/misc/screen/Makefile:1.112   Sat Jan 18 23:33:09 2020
+++ pkgsrc/misc/screen/Makefile Fri Feb  7 12:18:59 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.112 2020/01/18 23:33:09 rillig Exp $
+# $NetBSD: Makefile,v 1.113 2020/02/07 12:18:59 ryoon Exp $
 
-DISTNAME=      screen-4.7.0
+DISTNAME=      screen-4.8.0
 CATEGORIES=    misc shells
 MASTER_SITES=  ${MASTER_SITE_GNU:=screen/}
 

Index: pkgsrc/misc/screen/distinfo
diff -u pkgsrc/misc/screen/distinfo:1.49 pkgsrc/misc/screen/distinfo:1.50
--- pkgsrc/misc/screen/distinfo:1.49    Wed Oct  2 09:11:29 2019
+++ pkgsrc/misc/screen/distinfo Fri Feb  7 12:18:59 2020
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.49 2019/10/02 09:11:29 rin Exp $
+$NetBSD: distinfo,v 1.50 2020/02/07 12:18:59 ryoon Exp $
 
-SHA1 (screen-4.7.0.tar.gz) = 48227cc267471a24ca2cf467950ea923c42d3d90
-RMD160 (screen-4.7.0.tar.gz) = 58c4c6f3c817cdce98776eed70d7d7503ba939b8
-SHA512 (screen-4.7.0.tar.gz) = 44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745
-Size (screen-4.7.0.tar.gz) = 854192 bytes
+SHA1 (screen-4.8.0.tar.gz) = 2328927e10e68d357bdfec7bd740726011e834e9
+RMD160 (screen-4.8.0.tar.gz) = 43888fa00f708a8a9aa226e0df39abd7181b15ae
+SHA512 (screen-4.8.0.tar.gz) = 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
+Size (screen-4.8.0.tar.gz) = 854854 bytes
 SHA1 (patch-aa) = 39c6fa5bda62b2891cecf4a5e9598b179ea8b4dc
 SHA1 (patch-ab) = 40911979a540645db2a17861328292add22898d3
-SHA1 (patch-ae) = 2a9b19c52cafe238c923977c9952af0ec0b0d9f6
+SHA1 (patch-ae) = c952a7e52df0f33c2853c348e89650009c0d8696
 SHA1 (patch-ai) = edefc44e47066dc89bda22a94d417511f46f0190
 SHA1 (patch-aj) = 446b07f7f418dd0c83fb5bc6246a01cc4417b03b
 SHA1 (patch-ak) = 1aaf82f7fe666d86a9f4ab7d6f7222e895a17bba
@@ -17,4 +17,4 @@ SHA1 (patch-ao) = 91eecb62351aff720447eb
 SHA1 (patch-ap) = 1f11b50826b3e4d61540351911d21214d3ab83cc
 SHA1 (patch-screen.c) = de5d8468100ab88cbdb842e21b04b00221e798b8
 SHA1 (patch-socket.c) = ef7d3cb14f0199383c0e750af48f19537eb0b36d
-SHA1 (patch-tty.sh) = 6d0d8f60740a3f7167d3d064a8979858a9b01bb0
+SHA1 (patch-tty.sh) = 711e10879250de4b0e04bc2ec00472edeaf6aada

Index: pkgsrc/misc/screen/patches/patch-ae
diff -u pkgsrc/misc/screen/patches/patch-ae:1.7 pkgsrc/misc/screen/patches/patch-ae:1.8
--- pkgsrc/misc/screen/patches/patch-ae:1.7     Tue Jul 18 23:02:18 2017
+++ pkgsrc/misc/screen/patches/patch-ae Fri Feb  7 12:19:00 2020
@@ -1,27 +1,18 @@
-$NetBSD: patch-ae,v 1.7 2017/07/18 23:02:18 kim Exp $
+$NetBSD: patch-ae,v 1.8 2020/02/07 12:19:00 ryoon 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     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\
--\t:le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E)0:";
-+\t:le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E(B:";
+--- termcap.c.orig     2020-02-05 20:09:38.000000000 +0000
++++ termcap.c
+@@ -78,7 +78,7 @@ char *extra_incap, *extra_outcap;
+ static const char TermcapConst[] = "DO=\\E[%dB:LE=\\E[%dD:RI=\\E[%dC:\
+ UP=\\E[%dA:bs:bt=\\E[Z:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:\
+ ct=\\E[3g:do=^J:nd=\\E[C:pt:rc=\\E8:rs=\\Ec:sc=\\E7:st=\\EH:up=\\EM:\
+-le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E)0:";
++le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E(B:";
  
  char *
  gettermcapstring(s)
-@@ -825,7 +825,7 @@
- {
-   register int n;
- 
--  if (tcLineLen + (n = strlen(s)) > 55 && Termcaplen < TERMCAP_BUFSIZE - 4 - 1)
-+  if (tcLineLen + (n = strlen(s)) > 69 && Termcaplen < TERMCAP_BUFSIZE - 4 - 1)
-     {
-       strcpy(Termcap + Termcaplen, "\\\n\t:");
-       Termcaplen += 4;

Index: pkgsrc/misc/screen/patches/patch-tty.sh
diff -u pkgsrc/misc/screen/patches/patch-tty.sh:1.4 pkgsrc/misc/screen/patches/patch-tty.sh:1.5
--- pkgsrc/misc/screen/patches/patch-tty.sh:1.4 Tue Jul 18 23:02:18 2017
+++ pkgsrc/misc/screen/patches/patch-tty.sh     Fri Feb  7 12:19:00 2020
@@ -1,23 +1,24 @@
-$NetBSD: patch-tty.sh,v 1.4 2017/07/18 23:02:18 kim Exp $
+$NetBSD: patch-tty.sh,v 1.5 2020/02/07 12:19:00 ryoon 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        2017-07-10 19:26:25.000000000 +0000
-+++ tty.sh     2017-07-18 22:40:56.000000000 +0000
-@@ -813,7 +813,8 @@
+--- tty.sh.orig        2020-02-05 20:09:38.000000000 +0000
++++ tty.sh
+@@ -784,7 +784,9 @@ int fgtty(int fd)
    /*
     * Under BSD we have to set the controlling terminal again explicitly.
     */
--# if (defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__GNU__)) && defined(TIOCSCTTY)
+-# if (defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__GNU__) || defined(__OpenBSD__)) && defined(TIOCSCTTY)
 +# if (defined(__FreeBSD_kernel__) || defined(__DragonFly__) \
-+      || defined(__GNU__) || (BSD >= 199103)) && defined(TIOCSCTTY)
++      || defined(__GNU__) || (BSD >= 199103) || defined(__OpenBSD__)) \
++      && defined(TIOCSCTTY)
    ioctl(fd, TIOCSCTTY, (char *)0);
  # endif
  
-@@ -1521,8 +1522,10 @@
+@@ -1485,8 +1487,10 @@ int CheckTtyname (char *tty)
    char realbuf[PATH_MAX];
    const char *real;
    int rc;