From nobody Thu Apr 4 00:59:34 2024 X-Original-To: dev-commits-ports-main@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 4V93DR1rqdz5GH17; Thu, 4 Apr 2024 00:59:35 +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 4V93DR0ZTcz4rtw; Thu, 4 Apr 2024 00:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712192375; 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=GhEnKeNQH3LnurquCzRlggcuXfaIrO4ITBzalg8pXyQ=; b=H5G/eoViFgoHSiOarKx3ixdB9ahgcGZ1/MIwzsjmzvKefC53c3kSb1Ye+GIciTwXVaVORo FgjaLgVWuMtthf35nLkSS3W43eYtORzchi6dQIRuQUeSqXjnZRzBeXLFfeAjXbpXMvFpAM eLHO2/Lxv14SxQeVBLB8pgQLCWBnFGVmwyJhejJ4oxH/Gnu9BcKiUDjBk9T077OWroQ0f0 W2x9m35/x2cIp7KSNtlzWxjNxEkCml0Z6zcxeG7TrfViOMnwdFF3GMGhjzwxH35j/PYJWq UIP7Q66dxH6IvmK4ZIhYDFdwoKcMas9R5FYGAA1wbCrS/1ILuIfqU5gOzUUgnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712192375; a=rsa-sha256; cv=none; b=Xphq/LTUwU3CkTz8oztAadPjUmXIAK5uHYJ+nDJqRt3/wk+kDyT6/ADHD51u/Vz4eSTqwt YbImBNoff3O3Movm4iLSSNPQgHbD9Q7SPL+CdqnNYMIOm0DJU/NuaXGcVEnu4zonZUZ14u RU/cwwOzdYJcJnES/1RP9hN1FxX171c8944vU8kPNfqX6DzvkfiSU+g4uN+I0LyZGfJqfy BqMr8DAWpIaPVphTCoklCsITVeEn5jWzOb78yDpkSB/ySpARmJ20msf2lyb20rBquwZBd9 loOvANMNxM8MA2/8HZb/SlFGY8M6mdozF8gqg67xW/TVjNfv/6h99XrDQWoFxw== 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=1712192375; 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=GhEnKeNQH3LnurquCzRlggcuXfaIrO4ITBzalg8pXyQ=; b=YVKNdWsRTpEXDEkwE1x6tfcWFZ9tVf1AuGUgWH35uySgTjkE53mT5IQZRsbJKDiS54D+Vk OFEH7YW5F9qG56OXRWpUC5CblAOyeHKBBMy7OVhehnTB+wMfNXzARi7XJEWmwLAW6tJsP8 viRPHWr3VOas2nWobvSjxE84PsmW4+fhKSckwpa2/rbN+sKRBg2VS1T5A8w8jA3whNUzZM zR3TuKHjMZzi64mJd/RSqGT+ushCB4oF8Wxyo6GHR3lFjSF+tJ0pk22fAdWk8N5E7p8xkH 1tP+S6cf+e5d0CjHoiAW7LyAzLT3GqIUZnJvbLqHKlUqJsAxuTm+Bl0uJClM/A== 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 4V93DR0BKXzvS6; Thu, 4 Apr 2024 00:59:35 +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 4340xYgx075811; Thu, 4 Apr 2024 00:59:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4340xYvY075808; Thu, 4 Apr 2024 00:59:34 GMT (envelope-from git) Date: Thu, 4 Apr 2024 00:59:34 GMT Message-Id: <202404040059.4340xYvY075808@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 0f0eaee14e69 - main - x11-servers/xwayland-devel: backport recent secfixes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 0f0eaee14e697cff0101838139091e2c5d5a73bb Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f0eaee14e697cff0101838139091e2c5d5a73bb commit 0f0eaee14e697cff0101838139091e2c5d5a73bb Author: Jan Beich AuthorDate: 2024-04-04 00:38:43 +0000 Commit: Jan Beich CommitDate: 2024-04-04 00:59:23 +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 --- 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 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