Date: Thu, 4 Apr 2024 12:57:43 +0200 From: Emmanuel Vadot <manu@bidouilliste.com> To: Jan Beich <jbeich@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: Re: git: 77f72c463b90 - 2024Q1 - x11-servers/xwayland-devel: backport recent secfixes Message-ID: <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> In-Reply-To: <202404040955.4349tDrM089062@gitrepo.freebsd.org> References: <202404040955.4349tDrM089062@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 4 Apr 2024 09:55:13 GMT Jan Beich <jbeich@FreeBSD.org> wrote: > The branch 2024Q1 has been updated by jbeich: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=77f72c463b90237feeba97e05b597101cc407ebd > > commit 77f72c463b90237feeba97e05b597101cc407ebd > Author: Jan Beich <jbeich@FreeBSD.org> > AuthorDate: 2024-04-04 00:38:43 +0000 > Commit: Jan Beich <jbeich@FreeBSD.org> > 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) This is not a cherry-pick, this is a direct commit to 2024Q1 as the version differs between main and quarterly. You should have noted in this commit that this was a direct commit and that use used the backported patches applied upstream to the 23.2 branch of xwayland. > --- > 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 -- Emmanuel Vadot <manu@bidouilliste.com> <manu@freebsd.org>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20240404125743.1e52876a69053b726cb456e4>