Re: git: 77f72c463b90 - 2024Q1 - x11-servers/xwayland-devel: backport recent secfixes

From: Jan Beich <>
Date: Thu, 04 Apr 2024 11:54:52 UTC
Emmanuel Vadot <> writes:

> On Thu, 4 Apr 2024 09:55:13 GMT
> Jan Beich <> wrote:
>> The branch 2024Q1 has been updated by jbeich:
>> URL:
>> 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:
>>     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.