CVS commit: pkgsrc/misc/screen

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Wed Sep  6 16:00:15 UTC 2023

Modified Files:
        pkgsrc/misc/screen: Makefile distinfo options.mk
        pkgsrc/misc/screen/patches: patch-aa patch-aj patch-al patch-socket.c
Added Files:
        pkgsrc/misc/screen/patches: patch-doc_screen.texinfo

Log Message:
misc/screen: update to 4.9.1.

# Changes
Version 4.9.1 (20/08/2023):
  * Support stop/parity bits on serial port (#23952)
  * Add needed system headers in checks and return values
    for implicit function declarations
  * Fixes:
        - Avoid zombies after shell exit (#25089)
        - Missed signal sending permission check on failed
          query messages (CVE-2023-24626)
        - manpage fixes
        - source code fixes during cleanup
        - UTF-8 encoding can emit invalid UTF-8 sequences
          for out of range unicode values (#62097)


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 pkgsrc/misc/screen/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/misc/screen/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/screen/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/misc/screen/patches/patch-aa
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/screen/patches/patch-aj
cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/screen/patches/patch-al
cvs rdiff -u -r0 -r1.3 pkgsrc/misc/screen/patches/patch-doc_screen.texinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/screen/patches/patch-socket.c

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.122 pkgsrc/misc/screen/Makefile:1.123
--- pkgsrc/misc/screen/Makefile:1.122   Sun Mar  6 13:04:20 2022
+++ pkgsrc/misc/screen/Makefile Wed Sep  6 16:00:15 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.122 2022/03/06 13:04:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.123 2023/09/06 16:00:15 vins Exp $
 
-DISTNAME=      screen-4.9.0
+DISTNAME=      screen-4.9.1
 CATEGORIES=    misc shells
 MASTER_SITES=  ${MASTER_SITE_GNU:=screen/}
 
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=      --enable-colors256
 
 PKG_SHELL=             bin/screen
 
-USE_TOOLS+=            automake makeinfo
+USE_TOOLS+=            automake autoconf autoreconf makeinfo
 INFO_FILES=            YES
 
 .include "../../mk/bsd.prefs.mk"
@@ -45,7 +45,7 @@ PLIST_VARS+=          terminfo
 .include "../../mk/compiler.mk"
 
 .if ${OPSYS} == "SunOS"
-.  if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*) || !empty(CC_VERSION:Mgcc-1[0-9].*)
+.  if !empty(PKGSRC_COMPILER:Mclang) || ${CC_VERSION:Mgcc-[6-9]*} || ${CC_VERSION:Mgcc-1[0-9].*}
 CPPFLAGS+=     -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
 .  else
 CPPFLAGS+=     -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
@@ -59,7 +59,7 @@ post-install: screen-terminfo
 
 INSTALLATION_DIRS+=    share/examples/screen
 
-.if empty(UNPRIVILEGED:M[Yy][Ee][Ss])
+.if ${UNPRIVILEGED:U:tl} != yes
 SPECIAL_PERMS+=                bin/${DISTNAME} ${SETUID_ROOT_PERMS}
 .endif
 
@@ -71,7 +71,7 @@ post-install:
                ${DESTDIR}${PREFIX}/share/examples/screen/etcscreenrc
        ${INSTALL_DATA} ${WRKSRC}/etc/screenrc                          \
                ${DESTDIR}${PREFIX}/share/examples/screen/screenrc
-.if !empty(UNPRIVILEGED:M[Yy][Ee][Ss])
+.if ${UNPRIVILEGED:U:tl} == yes
        chmod -s ${DESTDIR}${PREFIX}/bin/${DISTNAME}
 .endif
 

Index: pkgsrc/misc/screen/distinfo
diff -u pkgsrc/misc/screen/distinfo:1.63 pkgsrc/misc/screen/distinfo:1.64
--- pkgsrc/misc/screen/distinfo:1.63    Sun Mar  6 13:04:20 2022
+++ pkgsrc/misc/screen/distinfo Wed Sep  6 16:00:15 2023
@@ -1,19 +1,20 @@
-$NetBSD: distinfo,v 1.63 2022/03/06 13:04:20 ryoon Exp $
+$NetBSD: distinfo,v 1.64 2023/09/06 16:00:15 vins Exp $
 
-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
+BLAKE2s (screen-4.9.1.tar.gz) = 5632587a76908410b4b1af70c729e01521970c72693fa78ec9b62d907fefbc8c
+SHA512 (screen-4.9.1.tar.gz) = 1f278313528815f4246bb162ced611c5d77321d11055e8d853168dc804c75d5f78568056a23e46db0640e1605e5cad4a5ce05e95e50cf02bb322cb6f57e5a126
+Size (screen-4.9.1.tar.gz) = 1040785 bytes
+SHA1 (patch-aa) = ea0c43e54d8764e4896f45677eb0a6070bd7b54b
 SHA1 (patch-ab) = 36474dfd780c0d0188eda998fb2d936fa4893b9c
 SHA1 (patch-ae) = c952a7e52df0f33c2853c348e89650009c0d8696
 SHA1 (patch-ai) = edefc44e47066dc89bda22a94d417511f46f0190
-SHA1 (patch-aj) = 446b07f7f418dd0c83fb5bc6246a01cc4417b03b
-SHA1 (patch-al) = 74634eadfd53e217032e735adf09295868f11bd8
+SHA1 (patch-aj) = 1260f55afb98536d0da081fbd95fafa9b5b513f7
+SHA1 (patch-al) = ef32a642ddb12f0bf13149c406f4dde7926ae678
 SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1
 SHA1 (patch-an) = bda6c65148410a6c9a13afd8ad34f93e33731552
 SHA1 (patch-ao) = a45ae3186cd9bddeb915bad890f1be5abc315dd3
 SHA1 (patch-ap) = 4aab542045a0abe55e82d91851b94c3cb569139f
+SHA1 (patch-doc_screen.texinfo) = 18d959580fd03731c7e7dbc683970f80b4245840
 SHA1 (patch-screen.c) = de5d8468100ab88cbdb842e21b04b00221e798b8
-SHA1 (patch-socket.c) = ef7d3cb14f0199383c0e750af48f19537eb0b36d
+SHA1 (patch-socket.c) = 290a6a1113a9100bea0748406374ec3d835f5ba7
 SHA1 (patch-tty.sh) = 6a818b7a4d70e55878ee69605e53300eabcb525f
 SHA1 (patch-window.h) = 84dc5a2c24ff77147b416c05f897536c0cfddf31

Index: pkgsrc/misc/screen/options.mk
diff -u pkgsrc/misc/screen/options.mk:1.3 pkgsrc/misc/screen/options.mk:1.4
--- pkgsrc/misc/screen/options.mk:1.3   Sun Nov  3 17:04:27 2019
+++ pkgsrc/misc/screen/options.mk       Wed Sep  6 16:00:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/11/03 17:04:27 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2023/09/06 16:00:15 vins Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.screen
 
@@ -10,7 +10,7 @@ PKG_SUPPORTED_OPTIONS=                # undef
 .include "../../mk/bsd.options.mk"
 
 ###
-### Override the default curses implemenation
+### Override the default curses implementation
 ###
 .if !empty(PKG_OPTIONS:Mcurses)
 CURSES_DEFAULT=        curses

Index: pkgsrc/misc/screen/patches/patch-aa
diff -u pkgsrc/misc/screen/patches/patch-aa:1.13 pkgsrc/misc/screen/patches/patch-aa:1.14
--- pkgsrc/misc/screen/patches/patch-aa:1.13    Fri Feb 13 04:44:40 2015
+++ pkgsrc/misc/screen/patches/patch-aa Wed Sep  6 16:00:15 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.13 2015/02/13 04:44:40 rodent Exp $
+$NetBSD: patch-aa,v 1.14 2023/09/06 16:00:15 vins Exp $
+
+Portability fixes for NetBSD pty(4).
 
 --- pty.c.orig 2014-04-26 10:58:35.000000000 +0000
 +++ pty.c

Index: pkgsrc/misc/screen/patches/patch-aj
diff -u pkgsrc/misc/screen/patches/patch-aj:1.10 pkgsrc/misc/screen/patches/patch-aj:1.11
--- pkgsrc/misc/screen/patches/patch-aj:1.10    Tue Jul 18 23:02:18 2017
+++ pkgsrc/misc/screen/patches/patch-aj Wed Sep  6 16:00:15 2023
@@ -1,36 +1,27 @@
-$NetBSD: patch-aj,v 1.10 2017/07/18 23:02:18 kim Exp $
+$NetBSD: patch-aj,v 1.11 2023/09/06 16:00:15 vins 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  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([
-+#include <curses.h>
-+
- main()
- {
-  exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
-@@ -812,9 +814,16 @@
+--- configure.ac.orig  2023-08-16 00:29:26.000000000 +0000
++++ configure.ac
+@@ -904,9 +904,16 @@ AC_CHECKING(getutent)
  AC_TRY_LINK([
- #include <time.h> /* to get time_t on SCO */
- #include <sys/types.h>
+     #include <time.h> /* to get time_t on SCO */
+     #include <sys/types.h>
 -#if defined(SVR4) && !defined(DGUX)
-+#include <sys/param.h>
++    #include <sys/param.h>
 +#if (defined(SVR4) && !defined(DGUX)) \
-+ || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106050000)) \
-+ || (defined(__DragonFly__) && (__DragonFly_version >= 200902))
- #include <utmpx.h>
++    || (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>
+     #include <utmp.h>
  #endif

Index: pkgsrc/misc/screen/patches/patch-al
diff -u pkgsrc/misc/screen/patches/patch-al:1.8 pkgsrc/misc/screen/patches/patch-al:1.9
--- pkgsrc/misc/screen/patches/patch-al:1.8     Sun Aug  2 10:59:13 2020
+++ pkgsrc/misc/screen/patches/patch-al Wed Sep  6 16:00:15 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.8 2020/08/02 10:59:13 kim Exp $
+$NetBSD: patch-al,v 1.9 2023/09/06 16:00:15 vins Exp $
 
 Make extra calls to remove utmp entries when utmpx is used.
 For non-login entries we only update utmpx, as it stores
@@ -8,7 +8,7 @@ Do not truncate hostnames that have two 
 are likely IPv6 addresses. Wrap them in brackets ([])
 unless already wrapped (e.g. from $DISPLAY).
 
---- utmp.c.orig        2016-06-19 19:41:03.000000000 +0000
+--- utmp.c.orig        2023-08-16 00:29:26.000000000 +0000
 +++ utmp.c
 @@ -48,6 +48,12 @@ extern char *LoginName;
  extern int real_uid, eff_uid;
@@ -42,7 +42,7 @@ unless already wrapped (e.g. from $DISPL
 +#endif
    if (utmpok && D_loginslot != (slot_t)0 && D_loginslot != (slot_t)-1)
      {
-       debug1(" logging you in again (slot %#x)\n", (int)D_loginslot);
+       debug1(" logging you in again (slot %#lx)\n", (long)D_loginslot);
 @@ -410,7 +422,7 @@ struct win *wi;
    struct utmp u;
    int saved_ut;

Index: pkgsrc/misc/screen/patches/patch-socket.c
diff -u pkgsrc/misc/screen/patches/patch-socket.c:1.3 pkgsrc/misc/screen/patches/patch-socket.c:1.4
--- pkgsrc/misc/screen/patches/patch-socket.c:1.3       Tue Jul 18 23:02:18 2017
+++ pkgsrc/misc/screen/patches/patch-socket.c   Wed Sep  6 16:00:15 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-socket.c,v 1.3 2017/07/18 23:02:18 kim Exp $
+$NetBSD: patch-socket.c,v 1.4 2023/09/06 16:00:15 vins Exp $
+
+Include <uio.h> for iovec. 
 
 --- socket.c.orig      2017-07-10 19:26:25.000000000 +0000
 +++ socket.c   2017-07-18 22:35:40.000000000 +0000

Added files:

Index: pkgsrc/misc/screen/patches/patch-doc_screen.texinfo
diff -u /dev/null pkgsrc/misc/screen/patches/patch-doc_screen.texinfo:1.3
--- /dev/null   Wed Sep  6 16:00:16 2023
+++ pkgsrc/misc/screen/patches/patch-doc_screen.texinfo Wed Sep  6 16:00:15 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-doc_screen.texinfo,v 1.3 2023/09/06 16:00:15 vins Exp $
+
+Fix: Node `Window Settings' lacks menu item for `Mousetrack'
+
+--- doc/screen.texinfo.orig    2023-08-16 00:29:26.000000000 +0000
++++ doc/screen.texinfo
+@@ -2414,6 +2414,7 @@ terminal emulation itself.
+ * Login::                       Control @file{/etc/utmp} logging
+ * Mode::                        Control the file mode of the pty
+ * Monitor::                     Watch for activity or inactivity in a window
++* Mousetrack::                        Set whether screen should track mouse events
+ * Windows::                   List the active windows
+ * Hardstatus::                        Set a window's hardstatus line
+ @end menu