CVS commit: pkgsrc/misc/screen

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sun Mar  6 13:04:20 UTC 2022

Modified Files:
        pkgsrc/misc/screen: Makefile distinfo
        pkgsrc/misc/screen/patches: patch-ab
Removed Files:
        pkgsrc/misc/screen/patches: patch-ak patch-ansi.c patch-display.h
            patch-encoding.c

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/misc/screen/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/misc/screen/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/misc/screen/patches/patch-ab
cvs rdiff -u -r1.9 -r0 pkgsrc/misc/screen/patches/patch-ak
cvs rdiff -u -r1.3 -r0 pkgsrc/misc/screen/patches/patch-ansi.c
cvs rdiff -u -r1.2 -r0 pkgsrc/misc/screen/patches/patch-display.h
cvs rdiff -u -r1.1 -r0 pkgsrc/misc/screen/patches/patch-encoding.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.121 pkgsrc/misc/screen/Makefile:1.122
--- pkgsrc/misc/screen/Makefile:1.121   Mon Jan  3 21:21:12 2022
+++ pkgsrc/misc/screen/Makefile Sun Mar  6 13:04:20 2022
@@ -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 @@ CONFIGURE_ARGS+=      --enable-colors256
 
 PKG_SHELL=             bin/screen
 
-USE_TOOLS+=            makeinfo
+USE_TOOLS+=            automake makeinfo
 INFO_FILES=            YES
 
 .include "../../mk/bsd.prefs.mk"
@@ -64,6 +63,9 @@ INSTALLATION_DIRS+=   share/examples/scree
 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

Index: pkgsrc/misc/screen/distinfo
diff -u pkgsrc/misc/screen/distinfo:1.62 pkgsrc/misc/screen/distinfo:1.63
--- pkgsrc/misc/screen/distinfo:1.62    Mon Jan  3 21:21:12 2022
+++ pkgsrc/misc/screen/distinfo Sun Mar  6 13:04:20 2022
@@ -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

Index: pkgsrc/misc/screen/patches/patch-ab
diff -u pkgsrc/misc/screen/patches/patch-ab:1.13 pkgsrc/misc/screen/patches/patch-ab:1.14
--- pkgsrc/misc/screen/patches/patch-ab:1.13    Fri Feb 13 04:44:40 2015
+++ pkgsrc/misc/screen/patches/patch-ab Sun Mar  6 13:04:20 2022
@@ -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