From nobody Thu Apr 4 09:55:13 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9H6V1vzSz5GhF6; Thu, 4 Apr 2024 09:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9H6V1Nxfz4xLP; Thu, 4 Apr 2024 09:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712224514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+NZ+FUuSS8WFnu6rqyoVFyKU8qO8W1HKLXhLOkQ6UIo=; b=Furuw12KBrPFbQp4W9f04cJo0FLDSKDJIveUbzFDscNNpgtCyj+tjG1qj7UcLVaO0E9D4V /lmJZvr+P1pJ6Yl1u8gj5L8pc0xTcMUZ4bsx5DqC24sF6vhsMNlfER0iiwK4c+oTBla5GV BqwvO/EtgY3TIjDCHOvvIgPxSpyWeZt5afPQ1wZZGRzfNCFgreNp4TUpkMBWbn1WqtfBBs zlSnfa/WlcIT0GXtVJktyX975uackBsqRlpqhs/WMXGWX4BRAw8wTw5vIXqVIR5mH6u+EX 0OTrFnDynYHjm4MJJeHoXb9VoJmuw7fN/KWUydPMOQAqzSAqrZwjPHAh5zxIuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712224514; a=rsa-sha256; cv=none; b=LYqACbsIlhgcT/HRXDNWTLL57nruA7j57n+ccMk6bA7g3tTyrBhSePXKOepQJOZ8bi434W 2P+2u/Pl+5PAYVvRxuR3TB2HK+16KkNqJQPrYvEyNTyE6tSI9e52gH4RImahYJPbcSfqxl H3FtxZVSiu3V5WSxEfnaJ0BpqI6MtCBV2Kbl0IoFhBnsMvzTZ+hqaEMj+i4lyXexOqMDAR C5DOAwyruTyzCfLcNKsjf4iDPOi9rL0tpG9iGnKadDJiXF/z9REUbpCqOH9javiFI7JFvP C0EGpMmF+2lvEev+mWi+urTPgkidkiwwIzIbu2YBHzOv7Bpic8gwc1FXd9Fi1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712224514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+NZ+FUuSS8WFnu6rqyoVFyKU8qO8W1HKLXhLOkQ6UIo=; b=LN6kObT8HIUww4OrOebHMW0HMgZTBu6fzDWUkzdJw+XP2ZZV+h8AYrn6jfCytLJ+eaG/de Nb25YZn6ddipM/qXoaz4j2nNVcx1rDwKFp+3deOVFc686rDbObIQO2+tkuoafNMx7BJst+ FrcZdBQ9A1nE/26BLY8MPvkBOW7X7agMF60Xhmh4vkMUzftapvnmXPi0hLaXZFCOxekovl BxkwiDrZ0AWahkm/qCKxTqMkmCW8O3hIST1rIYq5e3HmxkIYoZz+s51DVO1fgah7ONn/su xqvRb/n6iE+a5KM8CF4+LxcvnelBkJcDKHGuVgspnlIx/P+c6MacwWMWAEbo4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9H6V0hJtz1BhV; Thu, 4 Apr 2024 09:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4349tDqC089065; Thu, 4 Apr 2024 09:55:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4349tDrM089062; Thu, 4 Apr 2024 09:55:13 GMT (envelope-from git) Date: Thu, 4 Apr 2024 09:55:13 GMT Message-Id: <202404040955.4349tDrM089062@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 77f72c463b90 - 2024Q1 - x11-servers/xwayland-devel: backport recent secfixes List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 77f72c463b90237feeba97e05b597101cc407ebd Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=77f72c463b90237feeba97e05b597101cc407ebd commit 77f72c463b90237feeba97e05b597101cc407ebd Author: Jan Beich AuthorDate: 2024-04-04 00:38:43 +0000 Commit: Jan Beich CommitDate: 2024-04-04 09:40:32 +0000 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 (cherry picked from commit 0f0eaee14e697cff0101838139091e2c5d5a73bb) --- x11-servers/xwayland-devel/Makefile | 5 +++++ x11-servers/xwayland-devel/distinfo | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 010672cbfeac..2edd4156938c 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-671 DISTVERSIONSUFFIX= -gf0a187f55 +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+= 01941a831811.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 356dcaddd63d..5ab6dd254465 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 (01941a831811.patch) = b44dca9b0d15ce8b9a0e1d7bdeb45bad9014aa16a4e63ed979a166d6b755c2f1 +SIZE (01941a831811.patch) = 3654