![[BACK]](/icons/back.gif){kind=icon}
Up to [cvs.NetBSD.org] / pkgsrc / x11 / modular-xorg-xwayland
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
x11/modular-xorg-xwayland: Fix build on netbsd<10.
Needs _OPENBSD_SOURCE for reallocarray, from the days before it was
(unfortunately) added to POSIX.
Resolves:
===> Building for modular-xorg-xwayland-23.1.1nb1
ninja: Entering directory `output'
[1/433] Compiling C object dix/liblibxserver_dix.a.p/atom.c.o
FAILED: dix/liblibxserver_dix.a.p/atom.c.o
cc -Idix/liblibxserver_dix.a.p -Idix -I../dix -IXext -I../Xext -IXi -I../Xi -Icomposite -I../composite -Idamageext -I../damageext -Ifb -I../fb -Iglamor -I../glamor -Imi -I../mi -Imiext/damage -I../miext/damage -Imiext/sync -I../miext/sync -Idbe -I../dbe -Idri3 -I../dri3 -Iinclude -I../include -Ipresent -I../present -Irandr -I../randr -Irender -I../render -Ixfixes -I../xfixes -I/pkg/2024Q4/include -I/pkg/2024Q4/include/pixman-1 -I/pkg/2024Q4/include/freetype2 -I/pkg/2024Q4/include/libpng16 -I/pkg/2024Q4/include/libdrm -I/usr/include -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu99 -DHAVE_DIX_CONFIG_H -fno-strict-aliasing -fvisibility=hidden -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=array-bounds -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -O2 -fPIC -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -D_DEFAULT_SOURCE -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -MD -MQ dix/liblibxserver_dix.a.p/atom.c.o -MF dix/liblibxserver_dix.a.p/atom.c.o.d -o dix/liblibxserver_dix.a.p/atom.c.o -c ../dix/atom.c
../dix/atom.c: In function 'MakeAtom':
../dix/atom.c:120:21: error: implicit declaration of function 'reallocarray'; did you mean 'reallocarr'? [-Werror=implicit-function-declaration]
table = reallocarray(nodeTable, tableLength, 2 * sizeof(NodePtr));
^~~~~~~~~~~~
reallocarr
*: Drop maintainership.
*: revebump for new brotli option for freetype2 Addresses PR 57693
modular-xorg-xwayland: update to 23.1.1. Un-BROKEN this package by switching to the new, separate distfile and making it compile. The patches are just compile fixes and wrong (for NetBSD), so input handling will most probably not work nor will RPC authentication. However, this might build on Linux again, and so is still better than a BROKEN package.
*: Recursive revbup from graphics/freetype2
modular-xorg-server*: update to 21.1.5
This release fixes 6 recently reported security vulnerabilities in
various extensions. The CVE numbers are:
CVE-2022-46340, CVE-2022-46341, CVE-2022-46342, CVE-2022-46343,
CVE-2022-46344, and CVE-2022-4283
For details on the these issues please see the security advisory here:
https://lists.x.org/archives/xorg-announce/2022-December/003302.html
Jeremy Huddleston Sequoia (3):
xquartz: Remove unused macro (X11LIBDIR)
xquartz: Move default applications list outside of the main executable
meson: Don't build COMPOSITE for XQuartz
Peter Hutterer (8):
Xtest: disallow GenericEvents in XTestSwapFakeInput
Xi: disallow passive grabs with a detail > 255
Xext: free the XvRTVideoNotify when turning off from the same client
Xext: free the screen saver resource when replacing it
Xi: return an error from XI property changes if verification failed
Xi: avoid integer truncation in length check of ProcXIChangeProperty
xkb: reset the radio_groups pointer to NULL after freeing it
xserver 21.1.5
Bump all dependent packages of wayland (belatedly) The package changed with the addition of its libepoll-shim dependency. Otherwise, we can get: ERROR: libepoll-shim>=0.0.20210418 is not installed; can't buildlink files.
modular-xorg-server*: update to 21.1.4
modular-xorg-xwayland: mark as BROKEN for now, it has a separate distfile
in the 21.x series.
This release fixes 2 recently reported security vulnerabilities in xkb, several
regressions since 1.20.x and a number of miscellaneous bugs.
Błażej Szczygieł (1):
present: Check for NULL to prevent crash
Jeremy Huddleston Sequoia (23):
rootless: Dead code removal (ROOTLESS_REDISPLAY_DELAY is already defined)
X11Application: Ensure TIS operations are done on the main thread
os/connection: Improve abstraction for launchd secure sockets
xquartz: Create a separate category for organizing user preferences
xquartz pbproxy: Adopt NSUserDefaults+XQuartzDefaults for preferences
xquartz: Fold spaces related preferences into NSUserDefaults+XQuartzDefaults
XQuartz: Ensure scroll events are delivered to a single window (not both X11 and AppKit)
meson: Bump requirement to meson-0.50.0
xquartz: Update Sparkle configuration to use SUPublicEDKey
xquartz: Update copyright for 2022
meson: Provide options to set CFBundleVersion and CFBundleVersionString in XQuartz
Revert "meson: Bump requirement to meson-0.50.0"
xquartz: Update autotools-based builds of XQuartz to account for recent changes
print_edid: Fix a format string error
xf86-input-inputtest: Fix build on systems without SOCK_NONBLOCK
tests: Fix build failure from missing micmap.c
meson: Support building Xnest and Xorg on darwin
XQuartz: Build the bundle trampoline when using meson
XQuartz: Add TCC reason keys to Info.plist
xquartz: Use correct defines when building to support Sparkle updates
xquartz: Fix a possible crash when editing the Application menu due to mutaing immutable arrays
XQuartz: Improve type safety for X11Controller's application menu editor
xquartz: Add missing files to distribution tarball
Olivier Fourdan (1):
render: Fix build with gcc 12
Peter Hutterer (3):
xkb: switch to array index loops to moving pointers
xkb: swap XkbSetDeviceInfo and XkbSetDeviceInfoCheck
xkb: add request length validation for XkbSetGeometry
Povilas Kanapickas (5):
Revert "os: Try to discover the current seat with the XDG_SEAT var first"
dix: Correctly save replayed event into GrabInfoRec
dix: Don't send touch end to clients that do async grab without touches
xfree86: Fix event data alignment in inputtest driver
xserver 21.1.4
Samuel Thibault (1):
xkb: fix XkbSetMap when changing a keysym without changing a keytype
modular-xorg-*: update to 1.20.14
Mario Kleiner (2):
Fix RandR leasing for more than 1 simultaneously active lease.
modesetting: Allow Present flips with mismatched stride on atomic drivers.
Matt Turner (1):
xserver 1.20.14
Povilas Kanapickas (4):
record: Fix out of bounds access in SwapCreateRegister()
xfixes: Fix out of bounds access in *ProcXFixesCreatePointerBarrier()
Xext: Fix out of bounds access in SProcScreenSaverSuspend()
render: Fix out of bounds access in SProcRenderCompositeGlyphs()
revbump for icu and libffi
modular-xorg-*: reset PKGREVISION after update
Skip building only-useful-with-Wayland packages on unsupported systems
Pullup ticket #6291 - requested by maya
x11/modular-xorg-server: security fix
Revisions pulled up:
- x11/modular-xorg-server/Makefile 1.128
- x11/modular-xorg-server/distinfo 1.102
- x11/modular-xorg-server/patches/patch-dix_pixmap.c 1.1
- x11/modular-xorg-xephyr/Makefile 1.20
- x11/modular-xorg-xwayland/Makefile 1.8
---
Module Name: pkgsrc
Committed By: maya
Date: Fri Jul 31 16:50:57 UTC 2020
Modified Files:
pkgsrc/x11/modular-xorg-server: Makefile distinfo
pkgsrc/x11/modular-xorg-xephyr: Makefile
pkgsrc/x11/modular-xorg-xwayland: Makefile
Added Files:
pkgsrc/x11/modular-xorg-server/patches: patch-dix_pixmap.c
Log Message:
modular-xorg-*: provide patch (making this package equivalent to
xorg-server 1.20.9, couldn't find a tarball).
X.Org security advisory: July 31, 2020
X Server Pixel Data Uninitialized Memory Information Disclosure
===============================================================
CVE-2020-14347
Allocation for pixmap data in AllocatePixmap() does not initialize the
memory in xserver, it leads to leak uninitialize heap memory to
clients. When the X server runs with elevated privileges.
This flaw can lead to ASLR bypass, which when combined with other
flaws (known/unknown) could lead to lead to privilege elevation in the
client.
Patch
=====
A patch for this issue has been commited to the xorg server git
repository. xorg-server 1.20.9 will be released shortly and will
include this patch.
https://gitlab.freedesktop.org/xorg/xserver.git
diff --git a/dix/pixmap.c b/dix/pixmap.c
index 1186d7dbb..5a0146bbb 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
return NullPixmap;
- pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
+ pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
if (!pPixmap)
return NullPixmap;
Thanks
======
This vulnerability was discovered by Jan-Niklas Sohn working with
Trend Micro Zero Day Initiative.
modular-xorg-*: provide patch (making this package equivalent to
xorg-server 1.20.9, couldn't find a tarball).
X.Org security advisory: July 31, 2020
X Server Pixel Data Uninitialized Memory Information Disclosure
===============================================================
CVE-2020-14347
Allocation for pixmap data in AllocatePixmap() does not initialize the
memory in xserver, it leads to leak uninitialize heap memory to
clients. When the X server runs with elevated privileges.
This flaw can lead to ASLR bypass, which when combined with other
flaws (known/unknown) could lead to lead to privilege elevation in the
client.
Patch
=====
A patch for this issue has been commited to the xorg server git
repository. xorg-server 1.20.9 will be released shortly and will
include this patch.
https://gitlab.freedesktop.org/xorg/xserver.git
diff --git a/dix/pixmap.c b/dix/pixmap.c
index 1186d7dbb..5a0146bbb 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
return NullPixmap;
- pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
+ pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
if (!pPixmap)
return NullPixmap;
Thanks
======
This vulnerability was discovered by Jan-Niklas Sohn working with
Trend Micro Zero Day Initiative.
revbump after updating security/nettle
modular-xorg-server: update to 1.20.8
Adam Jackson (1):
Revert "dri2: Don't make reference to noClientException"
Arthur Williams (1):
dix: Check for NULL spriteInfo in GetPairedDevice
Daniel Llewellyn (1):
os: Ignore dying client in ResetCurrentRequest
Dave Airlie (1):
modesetting: remove unnecessary error message, fix zaphod leases
David Seifert (1):
Fix building with `-fno-common`
Dor Askayo (1):
xwayland: clear pixmaps after creation in rootless mode
Eric Anholt (1):
glamor: Fix a compiler warning since the recent OOM fixes.
George Matsumura (1):
Restrict 1x1 pixmap filling optimization to GXcopy
Jon Turney (2):
Add xf86OSInputThreadInit to stub os-support as well
Fix old-style definition warning for xf86OSInputThreadInit()
Jonas Ådahl (1):
xwayland/glamor-gbm: Handle DRM_FORMAT_MOD_INVALID gracefully
Kenneth Graunke (1):
configure: Define GLAMOR_HAS_EGL_QUERY_DRIVER when available
Maarten Lankhorst (1):
modesetting: Disable atomic support by default
Matt Turner (1):
xserver 1.20.8
Michel Dänzer (8):
modesetting: Explicitly #include "mi.h"
xfree86/modes: Bail from xf86RotateRedisplay if pScreen->root is NULL
xwayland: Split up xwl_screen_post_damage into two phases
xwayland: Call glamor_block_handler from xwl_screen_post_damage
xwayland: Add xwl_window_create_frame_callback helper
xwayland: Use single frame callback for Present flips and normal updates
xwayland: Use frame callbacks for Present vblank events
xwayland: Delete all frame_callback_list nodes in xwl_unrealize_window
Paul Kocialkowski (4):
glamor: Propagate FBO allocation failure for picture to texture upload
glamor: Error out on out-of-memory when allocating PBO for FBO access
glamor: Propagate glamor_prepare_access failures in copy helpers
glamor: Fallback to system memory for RW PBO buffer allocation
*: recursive bump for libffi
modular-xorg-server*: update to 1.20.6
1.20.6
A variety of bugfixes across the board, primarily in Xwayland and PRIME.
This release also includes GLX vendor selection support. Thanks to all
who contributed with testing and fixes!
Aaron Plattner (3):
GLX: Set GlxServerExports::{major,minor}Version
xfree86: Call ScreenInit for protocol screens before GPU screens
os: Don't crash in AttendClient if the client is gone
Adam Jackson (7):
xwayland: Expand the RANDR screen size limits
miext/sync: Fix needless ABI change
glx: Fix previous context validation in xorgGlxMakeCurrent
meson: Fix another reference to "gl" 9.2.0
meson: Apparently 1.2 is < 1.2.0
mi: Add a default no-op miSourceValidate
dix: Call SourceValidate before GetImage
Alex Goins (5):
xsync: Add resource inside of SyncCreate, export SyncCreate
randr: Fix RRCrtcDetachScanoutPixmap() segfault during server teardown
modesetting: Fix ms_covering_crtc() segfault with non-modesetting slave primary
modesetting: Fix ms_covering_crtc() segfault with non-xf86Crtc slave
modesetting: Implement ms_covering_randr_crtc() for ms_present_get_crtc()
Alexander Tsoy (1):
configure: Set libdrm flags correctly if only XORG is enabled
Alexander Volkov (1):
shm: Use memfd_create when possible
Andres Rodriguez (1):
xf86: Disable unused crtc functions when a lease is revoked
Carlos Garnacho (4):
xwayland: Reset scheduled frames after hiding tablet cursor
xwayland: Separate DamagePtr into separate window data
xwayland: Refactor surface creation into a separate function
xwayland: Handle the case of windows being realized before redirection
Eric Anholt (2):
shm: reindent shm_tmpfile to follow our standards.
shm: Pick the shm dir at run time, not build time.
Hans de Goede (1):
glamor/xwayland: Define EGL_NO_X11
Kyle Brenneman (3):
GLX: Add a per-client vendor mapping.
GLX: Use the sending client for looking up XID's
GLX: Add a function to change a clients vendor list.
Marco Trevisan (Treviño) (1):
Xi: Use current device active grab to deliver touch events if any
Marvin Schmidt (1):
build: glx: Lower gl version to work with libglvnd
Matt Roper (1):
dri2: Sync i965_pci_ids.h from mesa
Matt Turner (3):
dix: Assert noPanoramiXExtension is false in PanoramiX code
xfree86: Test presence of isastream()
xserver 1.20.6
Michel Dänzer (2):
Revert "present/scmd: Check that the flip and screen pixmap pitches match"
miext/sync: Make struct _SyncObject::initialized fully ABI compatible
Olivier Fourdan (7):
xwayland: Avoid a crash on pointer enter with a grab
xwayland: Check status in GBM pixmap creation
glamor: Make pixmap exportable from `gbm_bo_from_pixmap()`
xwayland: Update screen pixmap on output resize
xwayland: Do not free a NULL GBM bo
compiler.h: Do not include sys/io.h on ARM with glibc
present/wnmd: Relax assertion on CRTC on abort_vblank()
Samuel Thibault (2):
Fix crash on XkbSetMap
Fix crash on XkbSetMap
Sven Joachim (1):
modesetting: Fix broken manpage in autoconf build
1.20.5
Minor bugfix release to fix some input, Xwayland, glamor, and Present
issues. Thanks to all who contributed fixes and testing.
Adam Jackson (1):
xserver 1.20.5
Michel Dänzer (3):
Revert "gitlab-ci: Only run docker-image stage if relevant source files change"
xwayland/present: Destroy sync_callback in xwl_present_cleanup
present/scmd: Check that the flip and screen pixmap pitches match
Olivier Fourdan (2):
xwayland: search for a render node to use
glamor: pixmap FBO may not be allocated
Peter Hutterer (2):
xwayland: fix a realloc OOM error case
dix: leave last.valuators alone on slave switch
Ray Strode (1):
dix: ensure work queues are cleared on reset
modular-xorg-*: remove libxkbui bl3.mk Unused for years (was only used by removed xorgcfg). Bump PKGREVISION.
modular-xorg-server*: Remove libXxf86misc inclusion It is not actually used. Bump PKGREVISION.
Add x11/modular-xorg-xwayland. XWayland is a fully fledged X server implementation that acts as a proxy between X11 clients and a Wayland compositor. It runs as a specialized Wayland client, while optionally using a set of XWayland specific Wayland protocols for implementing certain functionality. The Wayland compositor acts both as the Wayland display server XWayland connects to, as well as the window manager.