Branch :
| Author | Commit | Date | CI | Message |
|---|---|---|---|---|
| c3768d1e | 2026-06-02 05:31:48 | Merge fixes from upstream for multiple Xserver issues: * Font Alias Stack-based Buffer Overflow * XSYNC Use-After-Free in miSyncDestroyFence() * XKB Key Types Stack-based Buffer Overflow * XKB SetMap Request Stack-based Buffer Overflow * XSYNC Use-After-Free in FreeCounter() * XSYNC Use-After-Free in SyncChangeCounter() * GLX ChangeDrawableAttributes Out-Of-Bounds Read/Write * CreateSaverWindow Use-After-Free Information Disclosure * DRI2 DRIGetBuffers/DRIGetBuffersWithFormat Out-Of-Bounds Write | ||
| f0e0a48c | 2026-05-08 11:12:08 | Update to xserver 21.1.22. The security fixes were already committed. | ||
| 20bdf2f0 | 2026-02-08 09:45:07 | Update to xserver 21.1.21. ok tb@ | ||
| 17008e3f | 2025-11-06 06:28:13 | constify sparcDriverName(), missed in xserver 21.1.20 merge. | ||
| b48f2471 | 2025-11-03 09:57:22 | Update to xserver 21.1.20. | ||
| dd403c0a | 2025-06-29 05:21:57 | Update to xserver 21.1.18. The security fixes have already been committed. | ||
| e8f2e774 | 2025-06-17 13:10:07 | Merge fixes from upstream for multiple Xserver issues: CVE-2025-49175: Out-of-bounds access in X Rendering extension (Animated cursors) CVE-2025-49176: Integer overflow in Big Requests Extension CVE-2025-49177: Data leak in XFIXES Extension 6 (XFixesSetClientDisconnectMode) CVE-2025-49178: Unprocessed client request via bytes to ignore CVE-2025-49179: Integer overflow in X Record extension CVE-2025-49180: Integer overflow in RandR extension (RRChangeProviderProperty) | ||
| c466e1c7 | 2025-06-14 12:29:51 | Backport the remaining bits of the modesetting driver in X.org master. Work done by tedu@. | ||
| dd8895c0 | 2025-06-14 12:22:29 | Backport TearFree page flips for the modesetting driver from X.Org maaster. Work done by jcs@ and naddy@. This is the TearFree code alone as of 2023-12-17. | ||
| 9cdf3166 | 2025-06-14 12:16:56 | Revert the tearfree commit. It contains a merge error noticed by nadd@ It will be re-done without the merge error. | ||
| b454d6cc | 2025-06-09 18:18:36 | Backport TearFree page flips for the modesetting driver from X.Org maaster. Work done by tedu@ based on previous diffs by jcs@ and stsp@. One bug fix in master by me. tested and ok tb@. commit on behalf of tedu@ | ||
| 3cfba106 | 2025-03-02 09:09:28 | Update to xserver 21.1.16. The security fixes were committed earlier. This is the rest of the 21.1.16 update. | ||
| 443f1bf9 | 2024-12-22 08:26:03 | Update to xserver 21.1.15 | ||
| 8886fdf6 | 2024-11-05 08:13:05 | Update to xserver 21.1.14. tested by tb@ The xkb security fix was committed earlier. This is the rest of the 21.1.14 update. | ||
| 2be848d4 | 2024-10-31 11:54:14 | Don't log DDC modelines (after hotplug events/xrandr) or "Using XX ranges from config file" messages. These were printed after hotplug events which could be frequent in some cases (I have machines where this happens every 10 seconds when the monitor is in a dpms power-saving mode resulting in a full /var/log filesystem). EDID vendor/product ID still logged, giving an indication that events are happening, but reduced from ~3.5KB per event to <100 bytes. based on a diff from / ok matthieu@ | ||
| 84e81534 | 2024-08-16 07:45:15 | Reduce diff with upstream. | ||
| d80f4a53 | 2024-08-16 07:24:52 | Ansify function declarations. These are all simple () -> (void) cases. | ||
| 72350a05 | 2024-04-07 11:42:56 | Update to xserver 21.1.12 The security patches were already commited, sync with the rest of the 21.1.12 relase. | ||
| 669d3297 | 2024-01-19 17:52:03 | WSDISPLAY_TYPE_RKDRM was renamed to WSDISPLAY_TYPE_KMS | ||
| f9c3f64c | 2023-10-29 16:45:32 | Update to xserver 21.1.9. All the security patches have already been committed. Udated autoconf to 2.71 explains the large build infrastructure diff. | ||
| a012b5de | 2023-08-12 16:16:25 | Make sure we don't close(-1); buglet introduced in 1.26. ok matthieu@ | ||
| 8c4424dd | 2023-01-22 09:21:08 | Add back the meson build system to xserver. Not having those file only create noise when merging upstream releases. | ||
| 68328bb5 | 2022-08-31 11:25:18 | Update xserver to version 21.1.4. The security patches were already committed as part of july 24 errata. This brings a few other bug fixes. Tested by Walter Alejandro Iglesias. | ||
| 8a0d473d | 2022-02-20 17:41:34 | Sync with xorg-server 21.1.3. This does *not* include the commit that reverts the new computation of the screen resolution from dimensions returned by the screen since many of you told they prefer the new behaviour from 21.1.1. This is going to be discussed again before 7.1 | ||
| f2d69a35 | 2022-02-03 23:48:52 | remove 0x2972 from the intel gen 2 and 3 list 0x2972 is 946GZ which is gen 4 | ||
| 40f054ff | 2021-12-27 04:58:36 | Recommit: compiler.h: don't define inb/outb and friends on mips From Julien Cristau 0148a15da1616a868d71abe1b56e3f28cc79533c in xserver git without arm_video.c changes. OK matthieu@ | ||
| bf770420 | 2021-12-06 19:41:55 | when xf86CrtcConfigPrivateIndex==-1 XF86_CRTC_CONFIG_PTR() causes an out of bounds read. White-space fix and ok jsg@ | ||
| 7910ce0f | 2021-12-06 19:38:32 | Initialize mode->name for modes generated by libxcvt. ok jsg@ on the upstream merge request. | ||
| a406534d | 2021-11-11 09:10:04 | Update to xserver 21.1.1 | ||
| e086cf5a | 2021-11-11 09:03:02 | Update to xserver 21.1.0 | ||
| 5bd77e16 | 2021-09-03 13:19:11 | Update to xserver 1.20.13. | ||
| cbb2480f | 2021-06-30 08:50:48 | Close the console fd after probing if it's a wscons, even it fails. This avoids keeping an open file descriptor on machines where /dev/console is not a wsdisplay device. | ||
| be6f9bdd | 2021-06-15 13:57:42 | Initial attempt to build xserver for riscv64 ok matthieu@ | ||
| d9345257 | 2021-03-13 13:42:26 | compiler.h: don't define inb/outb and friends on mips From Julien Cristau 0148a15da1616a868d71abe1b56e3f28cc79533c in xserver git without arm_video.c changes. Fixes clang 11 build on mips64. Input and OK jsg@ | ||
| 9d1e1e28 | 2021-02-20 05:47:46 | change from /dev/drm to /dev/dri/ in xenocara ok matthieu@ kettenis@ | ||
| 5b5b8e1a | 2021-01-10 09:14:48 | Add a root window property with the console device. | ||
| 56c8d99a | 2020-12-12 09:30:50 | Update X server to version 1.20.10. Tested by jsg@ and naddy@ | ||
| ad9a065c | 2020-04-20 18:17:25 | Release unused filedescriptors in the privileged X server process. There is no reason to keep /dev/pci* and /dev/ttyC* open in this process. pointed to by deraadt. ok kettenis@ deraadt@ | ||
| 806accb3 | 2020-04-18 09:41:18 | Remove unused files. | ||
| 9064f8ee | 2020-04-13 08:06:58 | Update to xserver 1.20.8. ok jsg@ robert@ | ||
| fb24e5a8 | 2020-03-04 21:07:12 | Use modesetting driver as the default for rkdrm(4). ok patrick@, jsg@ | ||
| 40d42722 | 2020-01-26 13:48:54 | Update to xserver 1.20.7 plus 2 extra fixes from upstream. ok jsg@ | ||
| 9a532c54 | 2019-12-12 06:05:17 | Update to X server 1.20.6. Tested by naddy@ | ||
| 35220e47 | 2019-09-15 12:31:08 | Add modesetting driver as a fall-back when appropriate such that we can use it when running withour root privileges which prevents us from scanning the PCI bus. This makes startx(1)/xinit(1) work again on modern systems with inteldrm(4), radeondrm(4) and amdgpu(4). In some cases this will result in using a different driver than with xenodm(4) which may expose issues (e.g. when we prefer the intel Xorg driver) or loss of acceleration (e.g. older cards supported by radeondrm(4)). ok jsg@, matthieu@ | ||
| 5e779230 | 2019-08-24 01:20:16 | sync i965 pci ids with xserver git master ok matthieu@ | ||
| 38e2fafc | 2019-08-24 01:15:31 | remove duplicate ids added by patch in xserver 1.20.5 update ok matthieu@ | ||
| 1e4dc55a | 2019-08-15 14:48:45 | Don't prune duplicate modes there. This function removes too many modes, causing trouble with the vesa driver at least. Problem reported by semarie@. Thanks. | ||
| 95df71af | 2019-08-03 16:56:01 | Remove files that are no longer part of upstream tarballs. They accumulated over releases for various reasons. No build change. | ||
| a77e9959 | 2019-07-27 07:57:06 | Update to xserver 1.20.5. Tested by jsg@ | ||
| 4fd0ec7f | 2019-04-28 03:12:53 | Backport cf7517675d988c2d1ff967d6d162a17acbdad46 from xserver 1.20 xfree86: Hold input_lock across SPRITE functions in VGA arbiter Fixes stack overflow crash with VGA arbiter used with multi GPU systems. Report and fix identified by 'Joe M' on misc@. ok matthieu@ | ||
| e7e87a2c | 2019-03-19 21:19:54 | Update to xserver 1.19.7. Tested by jca@ and stsp@. | ||
| c4230992 | 2019-02-18 02:41:24 | sync xserver dri2 pci_ids with the latest Mesa the modesetting driver uses these to pick a dri driver name ok phessler@ kettenis@ matthieu@ | ||
| 5a9c7d77 | 2019-01-03 19:31:25 | Call xf86OpenConsole() before probing for drivers. On OpenBSD, we need the console fd to query wsdisplay type, This was only causing problems with -keepPriv, since the privilege separation code already calls xf86OpenConsole() earlier. The function is idempotent, so there's no harm calling it several times. ok kettenis@ | ||
| 2d6e93a5 | 2018-10-25 15:44:27 | MFC: Disable -logfile and -modulepath when running with elevated privileges. This Could cause arbitrary files overwrite. CVE-2018-14665. | ||
| 8869fa7f | 2018-08-20 21:48:55 | Initialize PCI subsystem on arm64. ok matthieu@ | ||
| 13d37ac4 | 2018-04-19 14:52:34 | modesetting: setup colormap Fixes utilities like xcalib Upstream xorg commit ac138f9b31b0fba00742edbc3326afe66e28099a ok matthieu | ||
| 857585fc | 2018-02-18 17:16:37 | Update to xserver 1.19.6. bug fix release | ||
| 6906cf1b | 2018-01-20 12:25:26 | Remove code to pull softfloat libs. It was needed at some point in the past, but doesn't compile and isn't needed with clang. Reported by jsg@. | ||
| b8144c06 | 2018-01-15 15:30:36 | watch for events sent by drm(4) over kevent using EVFILT_DEVICE and NOTE_CHANGE to notify the desktop environment to deal with the change (e.g. after plugging in an HDMI cable) with this change there is no need to manually do any randr commands if your desktop environment supports it (gnome, mate, kde, etc.) ok matthieu@, kettenis@ | ||
| 1a66cad3 | 2017-12-08 15:01:59 | Update to xserver 1.19.5. Tested by bru@, jsg@ and others | ||
| 515a707d | 2017-10-14 09:24:30 | MFC: hw/xfree86: unvalidated lengths This addresses: CVE-2017-12180 in XFree86-VidModeExtension CVE-2017-12181 in XFree86-DGA CVE-2017-12182 in XFree86-DRI | ||
| c6ab4990 | 2017-09-25 15:05:57 | Force Intel Ironlake chipsets to use the xf86-video-intel driver. stsp@ reported that modesetting(4) has been reported unreliable on his laptop, while intel(4) works. XXXX to be removed after 6.2 to figure out and fix the issue. ok kettenis@, also discussed briefly with deraadt@ during EuroBSDCon. | ||
| b8da768e | 2017-08-07 19:17:56 | Disable SSE optimizations on i386/amd64 for SlowBcopy. It is supposed to be slow, and when such instructions are used to copy data from/to mapped video memory, some hypervisors (e.g. KVM, Microsoft Hyper-V) can generate SIGILL or SIGBUS exceptions, causing Xorg to crash. Bug report to OpenBSD by Max Parmer, fix from FreeBSD (Dimitry Andric) via kettenis@ ok kettenis@ | ||
| 38475bb3 | 2017-08-07 12:30:34 | Create on OpenBSD-specific version of listPossibleVideoDrivers() that takes care of autoconfiguration based on the information returned by the WSDISPLAYIO_GTYPE ioctl of the console FD. This should fix selection of wsfb on loongson and sgi when using a non-KMS kernel driver. ok matthieu@, jsg@ | ||
| d74e2cb1 | 2017-07-14 11:38:05 | Use the modesetting driver by default on 4th generation Intel Graphics and later. This matches what several Linux distros do these days as it tends to work better than the intel driver in most cases. There are some performance issues with vncviewer on at least Ivy Bridge and Haswell. But for now that regression outweighs the benefits. ok robert@, tedu@, sthen@ | ||
| 11bfbfff | 2017-07-12 20:08:07 | Add code to update the value of the RandR "Backlight" property based on the KMS connector property of the same name if such a property is present. ok matthieu@ | ||
| 55a8e552 | 2017-05-21 13:18:29 | Make X work with radeondrm(4) hardware on loongson. OK jsg@ | ||
| f372d76f | 2017-03-07 03:40:33 | make xserver build on arm64 ok matthieu@ | ||
| fd18c20e | 2016-10-11 22:14:30 | regen | ||
| 6e1bcfb3 | 2016-08-09 18:59:50 | Update to xserver 1.18.4 tested by krw@ and dcoppa@ ok dcoppa@ | ||
| 185312ce | 2016-08-03 19:31:23 | xserver: fix an off-by-one error that lead to asprintf("%s", NULL) reported by deraadt@, fix reviewed in X.Org by Keith Packard. | ||
| e927c03e | 2016-05-29 12:02:34 | Update to xserver 1.18.3. Tested by shadchin@ and naddy@. Note that indirect GLX is now disbled by default. | ||
| 6b14cdf9 | 2016-04-24 17:21:55 | Fix white space/indentation to match X.Org style. | ||
| a009af0b | 2016-04-24 17:20:04 | Fall back to /dev/ttyC0 when the console device is not a wsdisplay(4) Problem noticed by sthen@. | ||
| 3b5e851d | 2016-04-02 14:25:10 | Implement VT switching (based on the USL compat interface) in the wscons console backend and use it by default. ok kettenis@ | ||
| e44b23d2 | 2016-03-27 18:48:41 | Make alpha_video.c build in recent X server. Completely broken on VGA cards (libpciaccess doesn't know about the alpha specific ways of mapping the PCI space), only XRender is broken on TGA cards. | ||
| ab587bce | 2016-03-06 17:11:46 | Cleanup gcc warnings and function prototypes. | ||
| 926017f7 | 2016-03-06 16:09:27 | Fix typo introduced 5.5 years ago. Note: this changes the #if test result, but the now #ifdef out code has no effect. | ||
| ed4591c1 | 2015-12-21 08:37:11 | On Broadwell, default to using the modesetting driver. Our KMS support on Broadwell is still a bit weak and the modesetting driver seems to work better than the intel driver, while still providing 3D acceleration and video playback support. ok phessler@, matthieu@, jsg@ | ||
| 1e036e40 | 2015-11-15 08:28:24 | Remove the -configure option. This has been broken for a loong time and no one is going to fix it. | ||
| 4c6a4e1e | 2015-11-07 16:48:51 | Update to xserver 1.17.4. tested by naddy@ | ||
| f00e3078 | 2015-10-25 15:24:06 | Reduce white space diff with upstreams. No other change. | ||
| e957e255 | 2015-09-28 07:14:00 | Post xserver 1.17 cleanup | ||
| 5f3337ae | 2015-09-28 06:20:25 | Post-xserver 1.17 cleanup. | ||
| 1867e4b0 | 2015-09-28 06:00:47 | Post xserver 1.17 cleanup. Remove now unused functions. | ||
| 11ed0dd9 | 2015-09-28 05:59:26 | Update for xserver 1.17 | ||
| 7c1233b0 | 2015-09-28 05:53:20 | Patch for xserver 1.17. Missed in upgrade commit. | ||
| 86ea9f12 | 2015-09-16 19:10:19 | Update to xserver 1.17.2. tested by dcoppa@, jsg@, jasper@ & naddy@ | ||
| 0a779e42 | 2015-08-30 13:32:02 | Remove abuse of \/ which is not a slash but an italic correction; ok matthieu@, who will also push these fixes upstream (thanks). | ||
| 031b04ad | 2015-05-27 15:11:12 | Simplify arm_video.c; we will never have PCI graphics on this architecture. This also makes it possible to run wsudl(4) on armv7 machines with echi(4). Tested for non-regression on zaurus by Sigi Rudzio. Thanks. | ||
| 5b19f6d7 | 2015-02-11 20:58:46 | Update to xserver 1.16.4. Contains fix for CVE-2015-0255. ok dcoppa@ | ||
| 797ed933 | 2014-12-09 17:58:52 | Protocol handling issues in X Window System servers One year after Ilja van Sprundel, discovered and reported a large number of issues in the way the X server code base handles requests from X clients, they have been fixed. | ||
| a20b025e | 2014-10-20 06:14:42 | regen | ||
| 25d68f1c | 2014-10-20 06:14:23 | OpenBSD's make now supports -include. So reduce diff with upstreams. ok kettenis@ espie@ | ||
| 4f58590a | 2014-09-27 17:52:59 | Update to xserver 1.16.1. Tested by naddy@, jsg@ & kettenis@ | ||
| 4f333b16 | 2014-07-11 08:13:43 | Update to xorg-server 1.15.2. bug fixes. | ||
| 3bbfe7b1 | 2014-05-02 19:27:46 | Update to xserver 1.15.1. Tested by at least ajacoutot@, dcoppa@ & jasper@ | ||
| 81a3c9ac | 2014-03-18 22:37:28 | Remove {hp300,mvme68k,mvme88k} bits. | ||
| 569a1f62 | 2014-02-26 22:29:17 | Call pci_system_init(), even if opening /dev/xf86 fails. Makes it possible to run X with machdep.allowaperture=0 on hardware supported by radeondrm(4) on macppc too. tested by landry@ ok matthieu@, deraadt@ | ||
| 8742d82e | 2013-12-28 14:40:01 | Update to xserver 1.14.5 |