From nobody Thu Apr 04 01:01:15 2024 X-Original-To: dev-commits-ports-branches@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 4V93GN0rvxz5GGsD; Thu, 4 Apr 2024 01:01:16 +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 4V93GM700Lz4sCd; Thu, 4 Apr 2024 01:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712192476; 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=/ZE4VMdj69XTFXI6s30bCbSDo/PDHuTwTrzwPZB2ZYQ=; b=APx+K3zFmyld9GcBpudq2TSyJHUS8ohEPnYWZCJvc5BjFbVoGbyck1jyhaCj9JVFVj38xG dJCIKXHyhjqOuFNmaRUQJWwdzYskTNDvvcakMA0KoljHQkHg4fXah7cQWHwWhqRd84r1zi dvrzqL6D+5irTrYd0Kx0BgVsL0vT7stP1Y+StZJVfPDgsxKJvO6cPdFxME0GzqhY5jfLY8 DpTERbe0P06Vz8jd3fhOCNWWl+ua8hrCgo7brI7RLOTOK+H3swgDHW4437ymBJxnY16/l6 y3QYY0q8kwjIIHR1zSQ9ofOnRTuts4gWRAY+Y7tvnSw+/hRGhYUSiap2eIaYsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712192476; a=rsa-sha256; cv=none; b=SNh307k2jkf918xj7xx0ByTw+0kJq6HtEgoTZVLYDYj/Dm6C1FaeqKoGSJshfxQbFOmWNo 9nGII5/pF2+6MT5Q/knXQY0ez0ETUnZP9GtdaX4I+5AtqSXmAzsX2No8Uiq0JZGF6m/qjs TYLmWMSZdj+9dmJI5poVSfEY1DRvffAHzzEOlrJEFn82/xPXvdDTKnxAhwdpISCWkHYeJD FijMu0Pmz4wTLLnHdA+ttZdtyEepN0X+faLBpb1JBTDCDTRyVbvchhxJHY3MXpDcyyraVp gbTQirnKB47xZ+UHYGRjusO6gNN2qqWfwZEmLTnHDXOkmD2z/2Z8Vm+fHwT6oA== 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=1712192476; 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=/ZE4VMdj69XTFXI6s30bCbSDo/PDHuTwTrzwPZB2ZYQ=; b=oli3GRWk+X0nDK4Gp9Z5hfLr8+BCf7cWFM/YQktW2md5cgsYgPA4XTmqsQc+8wMklPwy2L ddEWfHW8PfaiWZ+0KU/nZXMM1ej9W8TUYoXEMpYpbTAXz2BxoFF6qHGP+Oyiy/QxoWMxKM YlBTjn+mOU4ZeTHWu5uxTrbQjgNLSYOIAP3uFI+j8Uw8VrUPGCKgUmBxlbKZl6WdVXes3a lqzOpzfbD3tQy/DuLV/DI1R8NurJBgedxR/AlVsRsjHflia2eLuovmMF8OgRlHtC1k4Jnj JSJ5TA2lx0RtDYYONjDMdLuMVnUA09gTXJJcgnuIahuq76pBl1YpFpHfD6eGZw== 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 4V93GM6brrzw9F; Thu, 4 Apr 2024 01:01:15 +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 43411Ft2088000; Thu, 4 Apr 2024 01:01:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43411FtO087997; Thu, 4 Apr 2024 01:01:15 GMT (envelope-from git) Date: Thu, 4 Apr 2024 01:01:15 GMT Message-Id: <202404040101.43411FtO087997@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: 655bcbcfb9e0 - 2024Q1 - x11-servers/xwayland-devel: backport recent secfixes List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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: 655bcbcfb9e0caff8e8e2705a78f5a5a3db3d83a Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=655bcbcfb9e0caff8e8e2705a78f5a5a3db3d83a commit 655bcbcfb9e0caff8e8e2705a78f5a5a3db3d83a Author: Jan Beich AuthorDate: 2024-04-04 00:38:43 +0000 Commit: Jan Beich CommitDate: 2024-04-04 01:01:09 +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..ac786c9d01ab 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+= 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 356dcaddd63d..54936c280248 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