From nobody Thu Apr 4 11:54:52 2024 X-Original-To: dev-commits-ports-all@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 4V9Kmc5q4nz5Gssn; Thu, 4 Apr 2024 11:54:56 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9Kmc517Nz40YL; Thu, 4 Apr 2024 11:54:56 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712231696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=i9OfZj3sm3/AAa1cOCDh2HVUq6WaPBD6agnwy9F3Txw=; b=HGIudz+kr8UedT3IQ+pfV7Es35j0wTmhIVt7StEGqbgqLKeO/YQfEtx2CJHfTk651bvXoY bZOmYaF3TApzAwKLUJxLh2OaGtlUHux4RNbVs8pwFgt75V7b6jTLo9hmJr+ktFwmiAotRd 2GESkcMj2o4QVluQ/2D03GyYv7YuBH3dBnbJI2wPVBt3j77epMpyRMhcGcJDm0Y6ShFwJb t+cERCjf8qL46oMOFnjDZq7HXr2g6CRgerxrvXge2Sb3Q5JhUj05D7dfmjLTz/LbdIOU+9 mTPkM5z+DrBocKVKDAgnM9rPm8K3bnUhW3pvjUKujdZhK0wpI5pMMzhZVLtNYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712231696; a=rsa-sha256; cv=none; b=xKHONtlmR7E43NLrXrmhCs3vsUpWPaReg/KZ1volc1wRp8VQcCdNJANCOBZ2Yd/x307S2P px++y8/3NjR7y9HRuWkg+SjrGcMjEJJodPA6/d1dfR1y253VifVgyqdewXOA6XoBsu3jQO +qHWmthH/lTCkNEKKiOyamChdsgv3vwFKN/ev6C+TSQHdYxQIUAp8egDjqin+ZfULVUtII KdUd0k/+FNXU2CvbMhBnmL9MzcY1pL5Q79oQE77MgDOcdQkZM3sSuqnRMj9SNKjnd91iC0 bRlkD3bfFO8J3W6dEvK0Htm/dhQauodtNUnG0CuhivbHtH3Kw4ASt41B08fhgQ== 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=1712231696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=i9OfZj3sm3/AAa1cOCDh2HVUq6WaPBD6agnwy9F3Txw=; b=d9zNiYMSK95ntzgjUa/NyNNCQwcTbQD0Yv+ZH1hfbbP0usEbFybCOuBjbqHRaObNr/w6tu Nud4yLuUWpFlLUeRKi7ENT5O4tdJxVYSfQANjbrZcejh/6uPowOt8j500Fcg/owYt72OeS /wH5avyPHP2iDAMWjmIBC8vpwoUuUIw84GVw/Wk/SLs7XF5hwsqXTqCLaK7h5y4f6vm14n FuN/m61zUw1IGAMMmuzPiahYgP9WJQ1s3hTYR7yuzgOr52fLdfquwbf2yPbiYOKdGqA7Hq XC+iqgnEiu2MpETWJmMx6j4oEWgXAmcYHbbYN8TN7TG1yUE6+Qz4WGID0y0Aqw== Received: by freefall.freebsd.org (Postfix, from userid 1354) id 84CE21A399; Thu, 4 Apr 2024 11:54:56 +0000 (UTC) From: Jan Beich To: Emmanuel Vadot 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 In-Reply-To: <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> (Emmanuel Vadot's message of "Thu, 4 Apr 2024 12:57:43 +0200") References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> Date: Thu, 04 Apr 2024 13:54:52 +0200 Message-ID: <8r1t-ny0j-wny@FreeBSD.org> List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Emmanuel Vadot writes: > On Thu, 4 Apr 2024 09:55:13 GMT > Jan Beich wrote: > >> The branch 2024Q1 has been updated by jbeich: >> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=77f72c463b90237feeba97e05b597101cc407ebd >> >> 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: 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.