git: 19f40054803c - main - x11-servers/xwayland: Update to 23.2.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Fri, 27 Oct 2023 09:16:33 UTC
The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=19f40054803cbe761265a9b4f3e7e7dccc2d2dd5

commit 19f40054803cbe761265a9b4f3e7e7dccc2d2dd5
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-10-26 08:20:27 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-10-27 09:16:19 +0000

    x11-servers/xwayland: Update to 23.2.2
    
    CVE:    CVE-2023-5367 CVE-2023-5380 CVE-2023-5574
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
---
 x11-servers/xwayland/Makefile |  9 ++++-----
 x11-servers/xwayland/distinfo | 18 +++++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile
index b4cd01a6293d..607ca5a2204d 100644
--- a/x11-servers/xwayland/Makefile
+++ b/x11-servers/xwayland/Makefile
@@ -1,14 +1,13 @@
 PORTNAME=	xwayland
-PORTVERSION=	22.1.8
-PORTREVISION=	1
+PORTVERSION=	23.2.2
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	42e34498f87a.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	0d56c27582a2.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	1f7b28547011.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	cd6c9c1246af.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	3930d00746b0.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	3b0d1a3a2296.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X11 server as Wayland Client
diff --git a/x11-servers/xwayland/distinfo b/x11-servers/xwayland/distinfo
index 79b0d6d33ab5..0d7db41e1dec 100644
--- a/x11-servers/xwayland/distinfo
+++ b/x11-servers/xwayland/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1679734051
-SHA256 (xwayland-22.1.8.tar.xz) = d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73
-SIZE (xwayland-22.1.8.tar.xz) = 1273668
-SHA256 (42e34498f87a.patch) = 64cd5eed076cdc575f1189e8491fb752054970032697445e6c192b4e63cac2a4
-SIZE (42e34498f87a.patch) = 10310
-SHA256 (0d56c27582a2.patch) = b7a53f6f52c197ac42ae521881c2d5e986f9983f5eb3640ecf1adb51356db40f
-SIZE (0d56c27582a2.patch) = 17463
-SHA256 (1f7b28547011.patch) = 483d5e636f011570953579a53814c45789958af94d003cda19cedd394df93ed8
-SIZE (1f7b28547011.patch) = 2472
+TIMESTAMP = 1698308401
+SHA256 (xwayland-23.2.2.tar.xz) = 9f7c0938d2a41e941ffa04f99c35e5db2bcd3eec034afe8d35d5c810a22eb0a8
+SIZE (xwayland-23.2.2.tar.xz) = 1298400
+SHA256 (cd6c9c1246af.patch) = a50fd4511793a53cacefbca2c8436cf43d36ce21d245aadb5d17e16653580d75
+SIZE (cd6c9c1246af.patch) = 3730
+SHA256 (3930d00746b0.patch) = acae16d3636d12e631a14e2584a4ae5d527dfb9897b897631f7c8c8e3d5f49c7
+SIZE (3930d00746b0.patch) = 18587
+SHA256 (3b0d1a3a2296.patch) = 4e2c4165e9e287ed42cbb9a30eedf1a10f0fcbae0db6a222feb1783f9bb2ed29
+SIZE (3b0d1a3a2296.patch) = 2513