git: 4488af54c209 - main - x11-servers/xorg-server: security update: 21.1.23 -> 21.1.24
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 08 Jul 2026 13:37:48 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4488af54c2096d991ec179790ec23b69265156a6
commit 4488af54c2096d991ec179790ec23b69265156a6
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2026-07-08 13:29:01 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2026-07-08 13:37:43 +0000
x11-servers/xorg-server: security update: 21.1.23 -> 21.1.24
Regenerate patches.
Security: CVE-2026-55999
PR: 296589
Approved by: x11 (arrowd, maintainer)
Sponsored by: tipi.work
---
x11-servers/xorg-server/Makefile | 3 +--
x11-servers/xorg-server/distinfo | 6 +++---
x11-servers/xorg-server/files/patch-config_udev.c | 22 +++++++++++-----------
.../files/patch-hw_xfree86_common_xf86AutoConfig.c | 4 ++--
.../files/patch-hw_xfree86_common_xf86str.h | 4 ++--
.../xorg-server/files/patch-hw_xfree86_meson.build | 4 ++--
.../patch-hw_xfree86_os-support_bsd_ppc__video.c | 4 ++--
.../files/patch-hw_xfree86_xorg-wrapper.c | 4 ++--
.../xorg-server/files/patch-include_meson.build | 6 +++---
x11-servers/xorg-server/files/patch-os-utils.c | 6 +++---
10 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index dcb4b4c46399..d9f613af45ad 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -1,6 +1,5 @@
PORTNAME= xorg
-PORTVERSION= 21.1.23
-PORTREVISION= 1
+PORTVERSION= 21.1.24
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= XORG/individual/xserver
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 80de4593bbcc..be4f20f09bca 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1780361051
-SHA256 (xorg-server-21.1.23.tar.xz) = e39832e5617dadaf072fdf9f0e19e5d2e1c2a13607ac280bac1aba9f8fe14634
-SIZE (xorg-server-21.1.23.tar.xz) = 5069780
+TIMESTAMP = 1783480518
+SHA256 (xorg-server-21.1.24.tar.xz) = 1a4eb36ca65cc3b1b936566d677a9786e13c11cd5806e951ac55f3f5ce3984af
+SIZE (xorg-server-21.1.24.tar.xz) = 5072780
diff --git a/x11-servers/xorg-server/files/patch-config_udev.c b/x11-servers/xorg-server/files/patch-config_udev.c
index 38b3e84db5ad..9188f89d4348 100644
--- a/x11-servers/xorg-server/files/patch-config_udev.c
+++ b/x11-servers/xorg-server/files/patch-config_udev.c
@@ -2,7 +2,7 @@
*
* Specify a driver to use for basic devices (keyboard and mouse), otherwise none attaches
*
---- config/udev.c.orig 2017-03-15 18:05:25 UTC
+--- config/udev.c.orig 2026-07-08 01:35:09 UTC
+++ config/udev.c
@@ -29,6 +29,7 @@
@@ -12,7 +12,7 @@
#include <unistd.h>
#include "input.h"
-@@ -188,7 +189,21 @@ device_added(struct udev_device *udev_de
+@@ -198,7 +199,21 @@ device_added(struct udev_device *udev_device)
attrs.product = strdup(name);
input_options = input_option_new(input_options, "name", name);
input_options = input_option_new(input_options, "path", path);
@@ -35,10 +35,13 @@
input_options = input_option_new(input_options, "major", itoa(major(devnum)));
input_options = input_option_new(input_options, "minor", itoa(minor(devnum)));
if (path)
-@@ -272,6 +287,18 @@ device_added(struct udev_device *udev_de
- }
- }
-
+@@ -277,6 +292,18 @@ device_added(struct udev_device *udev_device)
+ m++;
+ }
+ }
++ }
++ }
++
+ if (attrs.flags & (ATTR_KEY | ATTR_KEYBOARD)) {
+ if (!feature_present("evdev_support"))
+ input_options = input_option_new(input_options, "driver", "kbd");
@@ -48,9 +51,6 @@
+ else {
+ if (!feature_present("evdev_support"))
+ input_options = input_option_new(input_options, "driver", "mouse");
-+ }
-+ }
-+
- input_options = input_option_new(input_options, "config_info", config_info);
+ }
+ }
- /* Default setting needed for non-seat0 seats */
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86AutoConfig.c b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86AutoConfig.c
index 6f8bb9321863..22a1398ec78b 100644
--- a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86AutoConfig.c
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86AutoConfig.c
@@ -2,8 +2,8 @@
*
* Use our scfb driver as fallback instead of Linux's fbdev
*
---- hw/xfree86/common/xf86AutoConfig.c.orig 2022-01-02 23:41:56.000000000 +0100
-+++ hw/xfree86/common/xf86AutoConfig.c 2022-06-29 11:57:25.400030000 +0200
+--- hw/xfree86/common/xf86AutoConfig.c.orig 2026-07-08 01:35:09 UTC
++++ hw/xfree86/common/xf86AutoConfig.c
@@ -294,7 +294,7 @@ listPossibleVideoDrivers(XF86MatchedDrivers *md)
xf86PciMatchDriver(md);
#endif
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86str.h b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86str.h
index 4f39ce2e3f2d..bf7b10e15223 100644
--- a/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86str.h
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_common_xf86str.h
@@ -1,5 +1,5 @@
---- hw/xfree86/common/xf86str.h.orig 2022-01-02 23:41:56.000000000 +0100
-+++ hw/xfree86/common/xf86str.h 2022-06-29 11:57:25.502421000 +0200
+--- hw/xfree86/common/xf86str.h.orig 2026-07-08 01:35:09 UTC
++++ hw/xfree86/common/xf86str.h
@@ -249,7 +249,7 @@ typedef struct _DriverRec {
*/
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_meson.build b/x11-servers/xorg-server/files/patch-hw_xfree86_meson.build
index 5b5e9e9bc038..fc3e4a0fa468 100644
--- a/x11-servers/xorg-server/files/patch-hw_xfree86_meson.build
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_meson.build
@@ -1,5 +1,5 @@
---- hw/xfree86/meson.build.orig 2022-06-29 14:37:28.042085000 +0000
-+++ hw/xfree86/meson.build 2022-06-29 14:37:36.259147000 +0000
+--- hw/xfree86/meson.build.orig 2026-07-08 01:35:09 UTC
++++ hw/xfree86/meson.build
@@ -152,7 +152,7 @@ if get_option('suid_wrapper')
c_args: xorg_c_args,
install: true,
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c
index 478d009dfebe..25119affe22e 100644
--- a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_bsd_ppc__video.c
@@ -1,5 +1,5 @@
---- hw/xfree86/os-support/bsd/ppc_video.c.orig 2022-01-02 23:41:56.000000000 +0100
-+++ hw/xfree86/os-support/bsd/ppc_video.c 2022-06-29 11:57:25.691481000 +0200
+--- hw/xfree86/os-support/bsd/ppc_video.c.orig 2026-07-08 01:35:09 UTC
++++ hw/xfree86/os-support/bsd/ppc_video.c
@@ -79,7 +79,11 @@ xf86DisableIO()
{
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_xorg-wrapper.c b/x11-servers/xorg-server/files/patch-hw_xfree86_xorg-wrapper.c
index 9a4327eff91f..02ddfe20d48c 100644
--- a/x11-servers/xorg-server/files/patch-hw_xfree86_xorg-wrapper.c
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_xorg-wrapper.c
@@ -1,8 +1,8 @@
* Skip the detection of root rights requirement, the assumption that presence
* of KMS drivers removes the root requirement is only valid for Linux
*
---- hw/xfree86/xorg-wrapper.c.orig 2022-01-02 23:41:56.000000000 +0100
-+++ hw/xfree86/xorg-wrapper.c 2022-06-29 16:28:24.797008000 +0200
+--- hw/xfree86/xorg-wrapper.c.orig 2026-07-08 01:35:09 UTC
++++ hw/xfree86/xorg-wrapper.c
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
int main(int argc, char *argv[])
diff --git a/x11-servers/xorg-server/files/patch-include_meson.build b/x11-servers/xorg-server/files/patch-include_meson.build
index b716f8efcb94..c4c80bb7b66b 100644
--- a/x11-servers/xorg-server/files/patch-include_meson.build
+++ b/x11-servers/xorg-server/files/patch-include_meson.build
@@ -1,6 +1,6 @@
---- include/meson.build.orig 2022-07-12 13:27:57.000000000 +0000
-+++ include/meson.build 2022-08-09 00:48:12.688887000 +0000
-@@ -377,7 +377,7 @@
+--- include/meson.build.orig 2026-07-08 01:35:09 UTC
++++ include/meson.build
+@@ -382,7 +382,7 @@ if host_machine.system() == 'freebsd' or host_machine.
xorg_data.set('HAVE_SYS_VT_H', cc.has_header('sys/vt.h') ? '1' : false)
if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonfly'
diff --git a/x11-servers/xorg-server/files/patch-os-utils.c b/x11-servers/xorg-server/files/patch-os-utils.c
index 8f9c4f1f137d..654569a1e40b 100644
--- a/x11-servers/xorg-server/files/patch-os-utils.c
+++ b/x11-servers/xorg-server/files/patch-os-utils.c
@@ -1,7 +1,7 @@
---- os/utils.c.orig 2014-04-15 01:01:57 UTC
+--- os/utils.c.orig 2026-07-08 01:35:09 UTC
+++ os/utils.c
-@@ -443,11 +443,11 @@ GetTimeInMillis(void)
- static clockid_t clockid;
+@@ -471,11 +471,11 @@ GetTimeInMillis(void)
+ struct timespec tp;
if (!clockid) {
-#ifdef CLOCK_MONOTONIC_COARSE