pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/screen screen: Update to 4.9.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/860fb3d0a629
branches: trunk
changeset: 375067:860fb3d0a629
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Sun Mar 06 13:04:20 2022 +0000
description:
screen: Update to 4.9.0
Changelog:
Version 4.9.0 (30/01/2022):
* Hardstatus option for used encoding (escape string '%e')
* OpenBSD uses native openpty() from its utils.h
* Fixes:
- fix combining char handling that could lead to a segfault
- CVE-2021-26937: possible denial of service via a crafted UTF-8 character sequence (bug #60030)
- make screen exit code be 0 when checking --help
- session names limit is 80 symbols (bug #61534)
- option -X ignores specified user in multiuser env (bug #37437)
- a lot of reformations/fixes/cleanups (man page and source code)
diffstat:
misc/screen/Makefile | 10 +++--
misc/screen/distinfo | 14 ++----
misc/screen/patches/patch-ab | 6 +-
misc/screen/patches/patch-ak | 38 --------------------
misc/screen/patches/patch-ansi.c | 43 ----------------------
misc/screen/patches/patch-display.h | 35 ------------------
misc/screen/patches/patch-encoding.c | 68 ------------------------------------
7 files changed, 14 insertions(+), 200 deletions(-)
diffs (279 lines):
diff -r 1c46a2ed8e0d -r 860fb3d0a629 misc/screen/Makefile
--- a/misc/screen/Makefile Sun Mar 06 12:39:02 2022 +0000
+++ b/misc/screen/Makefile Sun Mar 06 13:04:20 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.121 2022/01/03 21:21:12 christos Exp $
+# $NetBSD: Makefile,v 1.122 2022/03/06 13:04:20 ryoon Exp $
-DISTNAME= screen-4.8.0
-PKGREVISION= 5
+DISTNAME= screen-4.9.0
CATEGORIES= misc shells
MASTER_SITES= ${MASTER_SITE_GNU:=screen/}
@@ -30,7 +29,7 @@
PKG_SHELL= bin/screen
-USE_TOOLS+= makeinfo
+USE_TOOLS+= automake makeinfo
INFO_FILES= YES
.include "../../mk/bsd.prefs.mk"
@@ -64,6 +63,9 @@
SPECIAL_PERMS+= bin/${DISTNAME} ${SETUID_ROOT_PERMS}
.endif
+pre-configure:
+ cd ${WRKSRC} && autoreconf -i
+
post-install:
${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
${DESTDIR}${PREFIX}/share/examples/screen/etcscreenrc
diff -r 1c46a2ed8e0d -r 860fb3d0a629 misc/screen/distinfo
--- a/misc/screen/distinfo Sun Mar 06 12:39:02 2022 +0000
+++ b/misc/screen/distinfo Sun Mar 06 13:04:20 2022 +0000
@@ -1,22 +1,18 @@
-$NetBSD: distinfo,v 1.62 2022/01/03 21:21:12 christos Exp $
+$NetBSD: distinfo,v 1.63 2022/03/06 13:04:20 ryoon Exp $
-BLAKE2s (screen-4.8.0.tar.gz) = 51169142215c9f8b64da633a6d77db24894d7f2f95636532344efc79985898d3
-SHA512 (screen-4.8.0.tar.gz) = 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
-Size (screen-4.8.0.tar.gz) = 854854 bytes
+BLAKE2s (screen-4.9.0.tar.gz) = 525be4586976dbd221b43bb08957c87ae98786d7730b42fdefd68d6b26f3b6e5
+SHA512 (screen-4.9.0.tar.gz) = 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84
+Size (screen-4.9.0.tar.gz) = 798229 bytes
SHA1 (patch-aa) = 39c6fa5bda62b2891cecf4a5e9598b179ea8b4dc
-SHA1 (patch-ab) = 40911979a540645db2a17861328292add22898d3
+SHA1 (patch-ab) = 36474dfd780c0d0188eda998fb2d936fa4893b9c
SHA1 (patch-ae) = c952a7e52df0f33c2853c348e89650009c0d8696
SHA1 (patch-ai) = edefc44e47066dc89bda22a94d417511f46f0190
SHA1 (patch-aj) = 446b07f7f418dd0c83fb5bc6246a01cc4417b03b
-SHA1 (patch-ak) = 1aaf82f7fe666d86a9f4ab7d6f7222e895a17bba
SHA1 (patch-al) = 74634eadfd53e217032e735adf09295868f11bd8
SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1
SHA1 (patch-an) = bda6c65148410a6c9a13afd8ad34f93e33731552
-SHA1 (patch-ansi.c) = 741b1c789f8e30fb27c81413b317c27a7235a861
SHA1 (patch-ao) = a45ae3186cd9bddeb915bad890f1be5abc315dd3
SHA1 (patch-ap) = 4aab542045a0abe55e82d91851b94c3cb569139f
-SHA1 (patch-display.h) = 922ebe152d8c09fc016b983d8fe9c1c64ef74578
-SHA1 (patch-encoding.c) = f426f0118a76106f8063c8d0c0f36b4e4ad7ae0b
SHA1 (patch-screen.c) = de5d8468100ab88cbdb842e21b04b00221e798b8
SHA1 (patch-socket.c) = ef7d3cb14f0199383c0e750af48f19537eb0b36d
SHA1 (patch-tty.sh) = 6a818b7a4d70e55878ee69605e53300eabcb525f
diff -r 1c46a2ed8e0d -r 860fb3d0a629 misc/screen/patches/patch-ab
--- a/misc/screen/patches/patch-ab Sun Mar 06 12:39:02 2022 +0000
+++ b/misc/screen/patches/patch-ab Sun Mar 06 13:04:20 2022 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.13 2015/02/13 04:44:40 rodent Exp $
+$NetBSD: patch-ab,v 1.14 2022/03/06 13:04:20 ryoon Exp $
Always use varargs on NetBSD
---- config.h.in.orig 2014-04-26 10:58:46.000000000 +0000
-+++ config.h.in
+--- acconfig.h.orig 2014-04-26 10:58:46.000000000 +0000
++++ acconfig.h
@@ -498,6 +498,15 @@
*/
#undef USEVARARGS
diff -r 1c46a2ed8e0d -r 860fb3d0a629 misc/screen/patches/patch-ak
--- a/misc/screen/patches/patch-ak Sun Mar 06 12:39:02 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-ak,v 1.9 2017/07/18 23:02:18 kim Exp $
-
-Patch configure after configure.ac (see patch-aj).
-
-Include curses header when testing tgetent in order to prevent
-crash on 64-bit architectures.
-
-Detect getutent correctly on NetBSD with utmpx.
-
---- 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. */
-
-+#include <curses.h>
-+
- main()
- {
- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
-@@ -5381,9 +5383,16 @@
-
- #include <time.h> /* to get time_t on SCO */
- #include <sys/types.h>
--#if defined(SVR4) && !defined(DGUX)
-+#include <sys/param.h>
-+#if (defined(SVR4) && !defined(DGUX)) \
-+ || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000)) \
-+ || (defined(__DragonFly__) && (__DragonFly_version >= 200902))
- #include <utmpx.h>
- #define utmp utmpx
-+# if defined(__NetBSD__) || defined(__DragonFly__)
-+# define pututline pututxline
-+# define getutent getutxent
-+# endif
- #else
- #include <utmp.h>
- #endif
diff -r 1c46a2ed8e0d -r 860fb3d0a629 misc/screen/patches/patch-ansi.c
--- a/misc/screen/patches/patch-ansi.c Sun Mar 06 12:39:02 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-ansi.c,v 1.3 2021/03/13 07:24:04 kim Exp $
-
-https://salsa.debian.org/debian/screen/-/raw/master/debian/patches/52fix_screen_utf8_nfd.patch
-
-Author: Michael Schröder <mls%suse.de@localhost>
-Reviewed-By: Axel Beckert <abe%debian.org@localhost>
-Description: screen outputs screen "ÿ" after a connected character.
- This is a character without the need.
- This happens in UTF-8 environment.
- Before : screen$ ruby1.9.1 -e 'puts "\u304b\u3099.."'
- がÿ...
- patch applied : screen $ ruby1.9.1 -e 'puts "\u304b\u3099.."'
- が..
-Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00012.html
-Bugs-Debian: https://bugs.debian.org/600246
-Bugs-Debian: https://bugs.debian.org/677512
-
-diff --git a/ansi.c b/ansi.c
-index 2a52edd..83b266d 100644
---- ansi.c.orig
-+++ ansi.c
-@@ -692,10 +692,6 @@ register int len;
- }
- curr->w_rend.font = 0;
- }
--# ifdef DW_CHARS
-- if (curr->w_encoding == UTF8 && utf8_isdouble(c))
-- curr->w_mbcs = 0xff;
--# endif
- if (curr->w_encoding == UTF8 && c >= 0x0300 && utf8_iscomb(c))
- {
- int ox, oy;
-@@ -730,6 +726,10 @@ register int len;
- }
- break;
- }
-+# ifdef DW_CHARS
-+ if (curr->w_encoding == UTF8 && utf8_isdouble(c))
-+ curr->w_mbcs = 0xff;
-+# endif
- font = curr->w_rend.font;
- # endif
- # ifdef DW_CHARS
diff -r 1c46a2ed8e0d -r 860fb3d0a629 misc/screen/patches/patch-display.h
--- a/misc/screen/patches/patch-display.h Sun Mar 06 12:39:02 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-display.h,v 1.2 2020/03/24 07:00:22 rillig Exp $
-
-display.c: In function 'disp_readev_fn':
-display.c:3590:39: error: array subscript has type 'char' [-Werror=char-subscripts]
- D_mouse_parse.params[D_mouse_parse.state] = 0;
- ^
-display.c:3605:43: error: array subscript has type 'char' [-Werror=char-subscripts]
- D_mouse_parse.params[D_mouse_parse.state] *= 10;
- ^
-display.c:3606:43: error: array subscript has type 'char' [-Werror=char-subscripts]
- D_mouse_parse.params[D_mouse_parse.state] += c - '0';
- ^
-display.c:3618:43: error: array subscript has type 'char' [-Werror=char-subscripts]
- D_mouse_parse.params[D_mouse_parse.state] = 0;
- ^
-display.c:3626:39: error: array subscript has type 'char' [-Werror=char-subscripts]
- D_mouse_parse.params[D_mouse_parse.state++] = c;
- ^
-
-The constants for the state are from an anonymous enum at the top of
-display.c. They are all small nonnegative numbers.
-
-https://savannah.gnu.org/bugs/index.php?58034
-
---- display.h.orig 2020-02-05 20:09:38.000000000 +0000
-+++ display.h
-@@ -61,7 +61,7 @@ struct win; /* forward declaration */
- struct mouse_parse
- {
- char sgrmode; /* non-zero if parsing an SGR sequence */
-- char state; /* current state of parsing */
-+ int state; /* current state of parsing */
- int params[3]; /* parsed params: button, x, y */
- };
-
diff -r 1c46a2ed8e0d -r 860fb3d0a629 misc/screen/patches/patch-encoding.c
--- a/misc/screen/patches/patch-encoding.c Sun Mar 06 12:39:02 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-$NetBSD: patch-encoding.c,v 1.1 2021/03/13 07:24:04 kim Exp $
-
-https://salsa.debian.org/debian/screen/-/raw/master/debian/patches/99_CVE-2021-26937.patch
-
-Description: [CVE-2021-26937] Fix out of bounds array access
-Author: Michael Schröder <mls%suse.de@localhost>
-Bug-Debian: https://bugs.debian.org/982435
-Bug: https://savannah.gnu.org/bugs/?60030
-Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html
-Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3
-Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html
-
---- encoding.c.orig
-+++ encoding.c
-@@ -43,7 +43,7 @@
- # ifdef UTF8
- static int recode_char __P((int, int, int));
- static int recode_char_to_encoding __P((int, int));
--static void comb_tofront __P((int, int));
-+static void comb_tofront __P((int));
- # ifdef DW_CHARS
- static int recode_char_dw __P((int, int *, int, int));
- static int recode_char_dw_to_encoding __P((int, int *, int));
-@@ -1263,6 +1263,8 @@
- {0x30000, 0x3FFFD},
- };
-
-+ if (c >= 0xdf00 && c <= 0xdfff)
-+ return 1; /* dw combining sequence */
- return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) ||
- (cjkwidth &&
- bisearch(c, ambiguous,
-@@ -1330,11 +1332,12 @@
- }
-
- static void
--comb_tofront(root, i)
--int root, i;
-+comb_tofront(i)
-+int i;
- {
- for (;;)
- {
-+ int root = i >= 0x700 ? 0x801 : 0x800;
- debug1("bring to front: %x\n", i);
- combchars[combchars[i]->prev]->next = combchars[i]->next;
- combchars[combchars[i]->next]->prev = combchars[i]->prev;
-@@ -1396,9 +1399,9 @@
- {
- /* full, recycle old entry */
- if (c1 >= 0xd800 && c1 < 0xe000)
-- comb_tofront(root, c1 - 0xd800);
-+ comb_tofront(c1 - 0xd800);
- i = combchars[root]->prev;
-- if (c1 == i + 0xd800)
-+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800)
- {
- /* completely full, can't recycle */
- debug("utf8_handle_comp: completely full!\n");
-@@ -1422,7 +1425,7 @@
- mc->font = (i >> 8) + 0xd8;
- mc->fontx = 0;
- debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800);
-- comb_tofront(root, i);
-+ comb_tofront(i);
- }
-
- #else /* !UTF8 */
Home |
Main Index |
Thread Index |
Old Index