Date: Thu, 04 Apr 2024 13:54:52 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Emmanuel Vadot <manu@bidouilliste.com> 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: <8r1t-ny0j-wny@FreeBSD.org> In-Reply-To: <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> (Emmanuel Vadot's message of "Thu, 4 Apr 2024 12:57:43 %2B0200") References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Emmanuel Vadot <manu@bidouilliste.com> writes: > 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. Fixing merge conflicts or build errors as part of rebasing cherry-picks doesn't require annotating in the commit message. Neither upstream nor downstream. Over the years I did lots of non-trivial rebases, mostly limited by QA. Other examples: wlroots -> wlroots-devel (2023Q4), sway -> sway-devel (2024Q1). > 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. Only the last upstream commit was changed compared to the previous attempt. Unfortunately, my revert was 1 minute late, breaking /quarterly build which would make all binary packages that depend on xwayland-devel (e.g., sway, plasma5-kwin or arcan) to temporarily disappear. Note, 2024Q1 should have been EOL after 2024-04-01.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8r1t-ny0j-wny>