[pkgsrc/trunk]: pkgsrc/x11/xterm x11/xterm: update to 372

[pin <pin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f6d870747e42
branches:  trunk
changeset: 375449:f6d870747e42
user:      pin <pin%pkgsrc.org@localhost>
date:      Mon Mar 14 13:27:20 2022 +0000

description:
x11/xterm: update to 372

Patch #372 - 2022/03/09
    -amend allocation/freeing of scrollback lines, eliminating an adjustment for
    status-line added in patch #371 (report/testcase by Rajeev V. Pillai).

Patch #371 - 2022/02/24
    -drop double-buffer default from test-packages, since that interferes with
    status-line.
    -add faceSize7 to table in charproc.c, overlooked in patch #360 (patch by
    Vladimir A. Pavlov).
    -use XDrawString rather than XDrawString16 for text when the latter is not
    needed.
    -improve performance for initializing/reusing graphic objects in the SIXEL
    feature.
    -improve error-checking for resize.
    -fix errata in manual page (Debian #988221).
    -extended list of environment variables to purge on startup, i.e., in case a
    user starts xterm from another terminal emulator.
    -add comment in cursor.c to explain why autowrap (DECAWM) does not apply to
    data saved/restored with save/restore cursor-operations (report by Thomas
    Wolff).
    -add special case in generating the combining-character table in wcwidth.c,
    for Hangul Jamo Extended-B (report by Luis Javier Merino).
    -simplify/improve portability of trap commands in shell-scripts.
    -update configure options
     --disable-rectangles,
     --disable-tcap-fkeys and
     --disable-tcap-query
     to account for changed default settings.
    -rather than ignore empty parameter for setting title, use that to reset it
    to “xterm” for scripting.
    -check for out-of-bounds condition while drawing sixels, and quit that
    operation (report by Nick Black).
    -add fallback definition for PROJECTROOT so that a suitable default location
    for luit will be compiled-in on build-servers.
    -implement DEC status-line controls DECSASD/DECSSDT:
        decode controls, set state
        implement DECRQSS responses
        implement indicator-style status-line
        add configure option --enable-status-line
        add resource indicatorFormat
        implement host-writable status-line, able to handle video-attributes and
        simple left/right cursor movement. This disallows all of the DEC/xterm
        private modes such as switching to/from the alternate screen.
        move the status-line if the window is resized.
        Note: the associated screen-resizing does not work for the special case
        of TrueType fonts with double-buffering (see note in patch #349).
    -modify configure-script fixup for -Werror options to exclude fixup for
     -Werror=format, e.g., -Werror=format-security.
    -amend change from patch #370; DEC 070's pseudo-code for DECCOLM incorrectly
    suggests that it enables DECLRMM as a side-effect.
    -fix some memory leaks seen using esctest and asan2 (patch by Luis Javier
    Merino).

diffstat:

 x11/xterm/Makefile                        |   5 +-
 x11/xterm/distinfo                        |   9 +-
 x11/xterm/patches/patch-graphics__sixel.c |  80 -------------------------------
 3 files changed, 6 insertions(+), 88 deletions(-)

diffs (111 lines):

diff -r 5d55fa555206 -r f6d870747e42 x11/xterm/Makefile
--- a/x11/xterm/Makefile        Mon Mar 14 13:19:19 2022 +0000
+++ b/x11/xterm/Makefile        Mon Mar 14 13:27:20 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.136 2022/01/31 10:00:24 wiz Exp $
+# $NetBSD: Makefile,v 1.137 2022/03/14 13:27:20 pin Exp $
 
-DISTNAME=      xterm-370
-PKGREVISION=   1
+DISTNAME=      xterm-372
 CATEGORIES=    x11
 MASTER_SITES=  ftp://ftp.invisible-island.net/xterm/
 EXTRACT_SUFX=  .tgz
diff -r 5d55fa555206 -r f6d870747e42 x11/xterm/distinfo
--- a/x11/xterm/distinfo        Mon Mar 14 13:19:19 2022 +0000
+++ b/x11/xterm/distinfo        Mon Mar 14 13:27:20 2022 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.98 2022/01/31 10:00:24 wiz Exp $
+$NetBSD: distinfo,v 1.99 2022/03/14 13:27:20 pin Exp $
 
-BLAKE2s (xterm-370.tgz) = b0de2145c7c23212c323705804eac28a4398fcd0f77b386358a60b6445db3ffc
-SHA512 (xterm-370.tgz) = 24f1836c4f5aec175c45db77e9bc829b45ee2c93cf12c20252b22bee470392ef0637cfbbb6e90074b1c038ac023f74a4fb713bbd4abf2b5b86d064667caf38dd
-Size (xterm-370.tgz) = 1500208 bytes
-SHA1 (patch-graphics__sixel.c) = 690436769c6472555565e50a61923244ef89e851
+BLAKE2s (xterm-372.tgz) = 6dfecbb048e2a66a265437f03854a57a7f2ff0fd444e3696ca2e58e358ef90af
+SHA512 (xterm-372.tgz) = f65fee6227ca27be85569ec06f3701a6114489e036975d0fe37f3c71d7598d1b06c8689cfbda593a98418eec1417bd60b33e3978752b255989cfa0bb4ce332bf
+Size (xterm-372.tgz) = 1507107 bytes
diff -r 5d55fa555206 -r f6d870747e42 x11/xterm/patches/patch-graphics__sixel.c
--- a/x11/xterm/patches/patch-graphics__sixel.c Mon Mar 14 13:19:19 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-$NetBSD: patch-graphics__sixel.c,v 1.1 2022/01/31 10:00:24 wiz Exp $
-
-Upstream patch to fix CVE-2022-24130.
-
---- graphics_sixel.c.orig      2021-08-10 00:39:26.000000000 +0000
-+++ graphics_sixel.c
-@@ -1,8 +1,8 @@
--/* $XTermId: graphics_sixel.c,v 1.29 2021/08/10 00:39:26 tom Exp $ */
-+/* $XTermId: graphics_sixel.c,v 1.31 2022/01/31 08:53:42 tom Exp $ */
- 
- /*
-- * Copyright 2014-2020,2021 by Ross Combs
-- * Copyright 2014-2020,2021 by Thomas E. Dickey
-+ * Copyright 2014-2021,2022 by Ross Combs
-+ * Copyright 2014-2021,2022 by Thomas E. Dickey
-  *
-  *                         All Rights Reserved
-  *
-@@ -149,7 +149,7 @@ init_sixel_background(Graphic *graphic, 
-     graphic->color_registers_used[context->background] = 1;
- }
- 
--static void
-+static Boolean
- set_sixel(Graphic *graphic, SixelContext const *context, int sixel)
- {
-     const int mh = graphic->max_height;
-@@ -170,7 +170,10 @@ set_sixel(Graphic *graphic, SixelContext
-          ((color != COLOR_HOLE)
-           ? (unsigned) graphic->color_registers[color].b : 0U)));
-     for (pix = 0; pix < 6; pix++) {
--      if (context->col < mw && context->row + pix < mh) {
-+      if (context->col >= 0 &&
-+          context->col < mw &&
-+          context->row + pix >= 0 &&
-+          context->row + pix < mh) {
-           if (sixel & (1 << pix)) {
-               if (context->col + 1 > graphic->actual_width) {
-                   graphic->actual_width = context->col + 1;
-@@ -183,8 +186,10 @@ set_sixel(Graphic *graphic, SixelContext
-           }
-       } else {
-           TRACE(("sixel pixel %d out of bounds\n", pix));
-+          return False;
-       }
-     }
-+    return True;
- }
- 
- static void
-@@ -462,8 +467,12 @@ parse_sixel(XtermWidget xw, ANSI *params
-               init_sixel_background(graphic, &context);
-               graphic->valid = 1;
-           }
--          if (sixel)
--              set_sixel(graphic, &context, sixel);
-+          if (sixel) {
-+              if (!set_sixel(graphic, &context, sixel)) {
-+                  context.col = 0;
-+                  break;
-+              }
-+          }
-           context.col++;
-       } else if (ch == '$') { /* DECGCR */
-           /* ignore DECCRNLM in sixel mode */
-@@ -531,8 +540,12 @@ parse_sixel(XtermWidget xw, ANSI *params
-           if (sixel) {
-               int i;
-               for (i = 0; i < Pcount; i++) {
--                  set_sixel(graphic, &context, sixel);
--                  context.col++;
-+                  if (set_sixel(graphic, &context, sixel)) {
-+                      context.col++;
-+                  } else {
-+                      context.col = 0;
-+                      break;
-+                  }
-               }
-           } else {
-               context.col += Pcount;