Greetings,
This patch updates GNU Screen to version 4.9.0.
'portcheck', 'port-lib-depends-check' and 'update-plist' returns 0.
Updated and tested on aarch64 (SoftIron Overdrive 1000).
All tests are OK:
* 'make test'
* manually started a screen(1) and did some basic operation with it.
I removed:
* patches/patch-osdef_h_in because it's in upstream
* patches/patch-acconfig_h upstream includes fix for CVE-2021-26937, so I
"defined" UTF-8 back
I also updated patches/patch-pty_c because of a typo in upstream...
Changelog:
Version 4.9.0 (30/01/2022):
* Hardstatus option for used encoding (escape string '%e')
* OpenBSD uses native openpty() from its util.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)
Cheers,
Alexander Naumov
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/screen/Makefile,v
retrieving revision 1.75
diff -u -p -u -p -r1.75 Makefile
--- Makefile 9 Feb 2021 20:17:22 -0000 1.75
+++ Makefile 2 Feb 2022 21:58:36 -0000
@@ -2,7 +2,7 @@
COMMENT= multi-screen window manager
-DISTNAME= screen-4.8.0
+DISTNAME= screen-4.9.0
REVISION= 0
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU:=screen/}
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/screen/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 6 Feb 2020 16:17:20 -0000 1.13
+++ distinfo 2 Feb 2022 21:58:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (screen-4.8.0.tar.gz) = bhGxPYSJkl/eJd+wk1v27XH560fv8jOhgeB4/eVlWqE=
-SIZE (screen-4.8.0.tar.gz) = 854854
+SHA256 (screen-4.9.0.tar.gz) = +TNSgbtNFTjtB433iiDC8506+aTpHFfQhCceAonHMPQ=
+SIZE (screen-4.9.0.tar.gz) = 798229
Index: patches/patch-acconfig_h
===================================================================
RCS file: patches/patch-acconfig_h
diff -N patches/patch-acconfig_h
--- patches/patch-acconfig_h 9 Feb 2021 20:17:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-acconfig_h,v 1.1 2021/02/09 20:17:22 sthen Exp $
-
-https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html
-
-Index: acconfig.h
---- acconfig.h.orig
-+++ acconfig.h
-@@ -157,7 +157,7 @@
- # define FONT
- # define DW_CHARS
- # define ENCODINGS
--# define UTF8
-+// # define UTF8
- # define COLORS16
- # define ZMODEM
- # define BLANKER_PRG
Index: patches/patch-osdef_h_in
===================================================================
RCS file: patches/patch-osdef_h_in
diff -N patches/patch-osdef_h_in
--- patches/patch-osdef_h_in 5 Sep 2019 17:35:06 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-osdef_h_in,v 1.1 2019/09/05 17:35:06 sthen Exp $
-
-Index: osdef.h.in
---- osdef.h.in.orig
-+++ osdef.h.in
-@@ -111,7 +111,7 @@ extern int setsid __P((void));
- extern int setpgid __P((int, int));
- extern int tcsetpgrp __P((int, int));
- #endif
--extern int ioctl __P((int, int, char *));
-+extern int ioctl __P((int, unsigned long, char *));
-
- extern int kill __P((int, int));
-
Index: patches/patch-pty_c
===================================================================
RCS file: /cvs/ports/misc/screen/patches/patch-pty_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-pty_c
--- patches/patch-pty_c 5 Sep 2019 17:35:06 -0000 1.4
+++ patches/patch-pty_c 2 Feb 2022 21:58:36 -0000
@@ -1,15 +1,14 @@
-$OpenBSD: patch-pty_c,v 1.4 2019/09/05 17:35:06 sthen Exp $
-
-for openpty()
+$OpenBSD: patch-pty_c,v 1.5 2022/02/02 17:36:07 anaumov Exp $
Index: pty.c
--- pty.c.orig
+++ pty.c
-@@ -30,6 +30,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
+@@ -32,7 +32,7 @@
#include <signal.h>
-+#include <util.h>
+
+ #if defined(__OpenBSD__)
+-#include <utils.h> /* for openpty() */
++#include <util.h> /* for openpty() */
+ #endif
#include "config.h"
- #include "screen.h"
