11 files changed, 43 insertions, 88 deletions

diff --git a/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb b/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb
index 9116b5f749..53e09fd868 100644
--- a/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb
+++ b/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb
@@ -7,7 +7,6 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f9a35333adf75edd1eaef84bca65a490"
 DEPENDS = "libxfont"
 
-SRC_URI[md5sum] = "2a455d3c02390597feb9cefb3fe97a45"
 SRC_URI[sha256sum] = "4b4df05fc53f1e98993638d6f7e178d95b31745c4568cee407e167491fd311a2"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-graphics/xorg-app/twm_1.0.12.bb b/meta-oe/recipes-graphics/xorg-app/twm_1.0.13.1.bb
index 91b1abc211..ff0238a430 100644
--- a/meta-oe/recipes-graphics/xorg-app/twm_1.0.12.bb
+++ b/meta-oe/recipes-graphics/xorg-app/twm_1.0.13.1.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586"
 
 SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.gz"
-SRC_URI[sha256sum] = "4150c9ec595520167ab8c4efcb5cf82641a4c4db78ce0a1cb4834e6aeb7c87fb"
+SRC_URI[sha256sum] = "e16bdbc82ac57c096d606a90e63c42c73a4a8a6a8a04d97b7dad199f919c8471"
 
 FILES:${PN} += "${datadir}/X11/twm/system.twmrc"
 ALTERNATIVE_NAME = "x-window-manager"
diff --git a/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.5.bb b/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.6.bb
index afc1fe17d5..92f1b94215 100644
--- a/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.5.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.6.bb
@@ -10,4 +10,4 @@ DEPENDS += "libxkbfile bison-native"
 BBCLASSEXTEND = "native"
 
 SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "38357b702de9d3457c4ff75053390f457b84c4accc7f088101255c37c684926b"
+SRC_URI[sha256sum] = "d9b401f84cf8568342ff63b1ffc6aecd3877579256d89fe6408645e2741b073e"
diff --git a/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.7.bb
index e866bed016..9b8c655acd 100644
--- a/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.7.bb
@@ -9,5 +9,5 @@ DEPENDS += "libxkbfile"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[sha256sum] = "99cc9404f7b90289ae04944c0d98a208cc8b158492ad6481386e31d4d09aa7b0"
+SRC_URI[sha256sum] = "1c4f49c030329e0defd8c7bc3739e60f2aa1d2aabe0e2d7e63740ab629aa59cc"
 SRC_URI_EXT = "xz"
diff --git a/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.5.bb b/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.6.bb
index f078ad60eb..0274608d05 100644
--- a/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.5.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.6.bb
@@ -9,9 +9,9 @@ It includes: \
     xkbvleds - display the state of LEDs on an XKB keyboard in a window \
     xkbwatch - reports changes in the XKB keyboard state \
 "
-LIC_FILES_CHKSUM = "file://COPYING;md5=64322fab5239f5c8d97cf6e0e14f1c62"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6767a97a97e21260134637b657b922ae"
 
 DEPENDS += "libxaw libxkbfile"
 
 SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "f6a4a8e9c54582beb3787b1faa8168caab125c1fee0ca9cfa5b6c9c1df25eea4"
+SRC_URI[sha256sum] = "31a2bbee1e09ccba01de92897b8f540b545de812f318d31de07bd3a5a75ee25e"
diff --git a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.7.bb b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.8.bb
index e5cd0ce6fb..4ddb1b9887 100644
--- a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.7.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.8.bb
@@ -7,4 +7,4 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b"
 
 SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "7b726945a967b44c35cddee5edd74802907a239ce2e2e515730b8a32c8e50465"
+SRC_URI[sha256sum] = "807f909eace684b866fc63b3e962729c120822a6c96e051ff51cf350b3ffb6cd"
diff --git a/meta-oe/recipes-graphics/xorg-app/xmag_1.0.7.bb b/meta-oe/recipes-graphics/xorg-app/xmag_1.0.8.bb
index f3dac53451..1589f9ae6e 100644
--- a/meta-oe/recipes-graphics/xorg-app/xmag_1.0.7.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xmag_1.0.8.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3413fe6832380b44b69b172d2d1b2387"
 DEPENDS += " libxaw libxt"
 
 SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "009936cc5a2706084079127b26cf55c713767650a34cb69e5682d60e33ce7461"
+SRC_URI[sha256sum] = "326d3c583d795bb53ac609d144e7f7fb1499baba7eaec14b8e6cd232ea069532"
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch
deleted file mode 100644
index a6cf16e4e9..0000000000
--- a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From b23d38f1216c4d70738edaa367cf9ecd2dd4b660 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 13 Dec 2019 12:59:26 -0800
-Subject: [PATCH] Add configure time check for setsid
-
-Do not assume glibc == linux
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- configure    | 1 +
- configure.in | 1 +
- main.c       | 4 ++--
- xtermcfg.hin | 1 +
- 4 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 72342c7..c2ec2ac 100755
---- a/configure
-+++ b/configure
-@@ -5803,6 +5803,7 @@ for ac_func in \
-        unsetenv \
-        sched_yield \
-        setpgid \
-+       setsid \
-        strftime \
-        tcgetattr \
-        waitpid \
-diff --git a/configure.in b/configure.in
-index 56dbc25..0608c80 100644
---- a/configure.in
-+++ b/configure.in
-@@ -99,6 +99,7 @@ AC_CHECK_FUNCS( \
-        unsetenv \
-        sched_yield \
-        setpgid \
-+       setsid \
-        strftime \
-        tcgetattr \
-        waitpid \
-diff --git a/main.c b/main.c
-index 24da0eb..332174c 100644
---- a/main.c
-+++ b/main.c
-@@ -2956,7 +2956,7 @@ main(int argc, char *argv[]ENVP_ARG)
-     }
- }
- 
--#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
-+#if defined(__osf__) || (defined(__linux__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
- #define USE_OPENPTY 1
- static int opened_tty = -1;
- #endif
-@@ -4205,7 +4205,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed)
-            /*
-             * now in child process
-             */
--#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
-+#if HAVE_SETSID
-            int pgrp = setsid();        /* variable may not be used... */
- #else
-            int pgrp = getpid();
-diff --git a/xtermcfg.hin b/xtermcfg.hin
-index 19048cd..e54d2cd 100644
---- a/xtermcfg.hin
-+++ b/xtermcfg.hin
-@@ -98,6 +98,7 @@
- #undef HAVE_SCHED_YIELD                /* AC_CHECK_FUNCS(sched_yield) */
- #undef HAVE_SETITIMER          /* CF_SETITIMER */
- #undef HAVE_SETPGID            /* AC_CHECK_FUNCS(setpgid) */
-+#undef HAVE_SETSID             /* AC_CHECK_FUNCS(setsid) */
- #undef HAVE_STDINT_H           /* AC_PROG_CC_STDC */
- #undef HAVE_STDLIB_H           /* AC_CHECK_HEADERS(stdlib.h) */
- #undef HAVE_STDNORETURN_H      /* CF_C11_NORETURN */
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch
new file mode 100644
index 0000000000..0c9d64c82c
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch
@@ -0,0 +1,30 @@
+From e30ab2d73a21bc55511cbedbb9ae603246dbfcd1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 16 May 2024 23:10:00 -0700
+Subject: [PATCH] include missing pty.h header for openpty()
+
+On musl this problem is unearthed
+
+Fix
+./main.c: In function 'get_pty':
+./main.c:3123:14: error: implicit declaration of function 'openpty'; did you mean 'openat'? [-Wimplicit-function-declaration]
+ 3123 |     result = openpty(pty, &opened_tty, ttydev, NULL, NULL);
+      |              ^~~~~~~
+      |              openat
+
+Upstream-Status: Submitted [sent to dickey@invisible-island.net]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/main.c
++++ b/main.c
+@@ -89,6 +89,7 @@
+ 
+ #define RES_OFFSET(field)      XtOffsetOf(XTERM_RESOURCE, field)
+ 
++#include <pty.h>
+ #include <xterm.h>
+ #include <version.h>
+ #include <graphics.h>
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_388.bb b/meta-oe/recipes-graphics/xorg-app/xterm_394.bb
index 8578f0cc97..94953b288e 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_388.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_394.bb
@@ -2,13 +2,12 @@ require recipes-graphics/xorg-app/xorg-app-common.inc
 SUMMARY = "xterm is the standard terminal emulator for the X Window System"
 DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native"
 
-LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=9c96124b492c0c02356850c243aaeca2"
+LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=1a3032aa728f8fda9d686948940ca58d"
 
 SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
-           file://0001-Add-configure-time-check-for-setsid.patch \
+           file://0001-include-missing-pty.h-header-for-openpty.patch \
           "
-
-SRC_URI[sha256sum] = "ac429345e6f937a5945a89d425a265fee6c215fc669dbdc6a0326e21f4c5f674"
+SRC_URI[sha256sum] = "a2a0cb206eb0423dedc34794f5c2d38c83390d2dd1106b66aba0960c3a976c7a"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native"
@@ -48,3 +47,5 @@ ALTERNATIVE:${PN} = "resize x-terminal-emulator"
 ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm"
 # rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm.
 ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9"
+
+CVE_STATUS[CVE-1999-0965] = "cpe-incorrect: Current version (392) not affected. This was fixed in version X11R5-fix-26 (R11R6 from 1994)"
diff --git a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.7.bb
index 1be0b5cd77..27138f23f8 100644
--- a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.7.bb
@@ -9,4 +9,4 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=31e8892c80b7a0c1c5f37c8e8ae6d794"
 
 SRC_URI_EXT = "xz"
-SRC_URI[sha256sum] = "64048cd15eba3cd9a3d2e3280650391259ebf6b529f2101d1a20f441038c1afe"
+SRC_URI[sha256sum] = "e55cbedab36d7a5f671abf8e594888afc48caa116d51d429ea53ea317ec0c61e"