aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2024-04-04 00:38:43 +0000
committerJan Beich <jbeich@FreeBSD.org>2024-04-04 00:59:23 +0000
commit0f0eaee14e697cff0101838139091e2c5d5a73bb (patch)
treea16f968a467a15123d0d2ea3549312cd6fd8e7fb
parentb047995ba10897d61205d5cfeec3f2b39f3aa873 (diff)
downloadports-0f0eaee14e697cff0101838139091e2c5d5a73bb.tar.gz
ports-0f0eaee14e697cff0101838139091e2c5d5a73bb.zip
x11-servers/xwayland-devel: backport recent secfixes
Changes: https://gitlab.freedesktop.org/xorg/xserver/-/compare/272e2915f...bdca6c3d1 Security: CVE-2024-31080 CVE-2024-31081 CVE-2024-31082 CVE-2024-31083
-rw-r--r--x11-servers/xwayland-devel/Makefile5
-rw-r--r--x11-servers/xwayland-devel/distinfo8
2 files changed, 13 insertions, 0 deletions
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 5179fa6d078a..01ec3c241ec1 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -2,6 +2,7 @@ PORTNAME= xwayland
DISTVERSIONPREFIX= xorg-server-
DISTVERSION= 21.0.99.1-841
DISTVERSIONSUFFIX= -g052909ab9
+PORTREVISION= 1
CATEGORIES= x11-servers
PKGNAMESUFFIX= -devel
@@ -10,6 +11,10 @@ PATCHFILES+= cd6c9c1246af.patch:-p1:github # https://gitlab.freedesktop.org/xorg
PATCHFILES+= 91b97b031290.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
PATCHFILES+= 3b0d1a3a2296.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
+PATCHFILES+= 96798fc19674.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463
+PATCHFILES+= 3e77295f888c.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463
+PATCHFILES+= 6c684d035c06.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463
+PATCHFILES+= bdca6c3d1f50.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463
MAINTAINER= jbeich@FreeBSD.org
COMMENT= X11 server as Wayland client (development snapshot)
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index 503ebaf12b8d..b09bfbb6aed1 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -7,3 +7,11 @@ SHA256 (91b97b031290.patch) = 8e44f24c34d598cc152173d2d59cc6eb7d3ac3427819c732f0
SIZE (91b97b031290.patch) = 18382
SHA256 (3b0d1a3a2296.patch) = 4e2c4165e9e287ed42cbb9a30eedf1a10f0fcbae0db6a222feb1783f9bb2ed29
SIZE (3b0d1a3a2296.patch) = 2513
+SHA256 (96798fc19674.patch) = 8b59b74f09476bb44d7b425dc2453b54766db4b7d30e20e1b1f1bef4ad0db7c1
+SIZE (96798fc19674.patch) = 1467
+SHA256 (3e77295f888c.patch) = 33686bbf6ecec42d064b4066b13f79f9e32f86d4ceef819ebdb7567f326fbd7d
+SIZE (3e77295f888c.patch) = 1358
+SHA256 (6c684d035c06.patch) = 01ad0be2af7c0a00fd3efd218eee64fb5bd8acbf0978186947f0b6b4b1b9febd
+SIZE (6c684d035c06.patch) = 1569
+SHA256 (bdca6c3d1f50.patch) = fcec0b3e508ee12824e7b2e48ede67766104105605ff996ad0df9cb1d9ad389d
+SIZE (bdca6c3d1f50.patch) = 3830