From nobody Thu Apr 04 12:12:39 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 4V9L9C3ghNz5Gtqg; Thu, 4 Apr 2024 12:12:47 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4V9L9B5j4pz42kL; Thu, 4 Apr 2024 12:12:46 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1712232760; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=988A95id6UZ7girgpTQUi7hr39Myjm5YYQDyh81GDKI=; b=CY4kqRcAOJUTNP+prDQ3DA4UhmsqUwqsyZi171sHN7bOFHl8fsg2E2dXmkHEwCRXXuwOa8 7PPXcYubz4xW7Ubhtl8+K0OgKmv0DgEOUoGb6vVbvb3gWZWtS3rzuoY7D9BDjNzE/GlUHc MZkIKAs0hxHWQEgWGcxkPdhEN4rz2zM= Received: from skull.home.blih.net (lfbn-lyo-1-2174-135.w90-66.abo.wanadoo.fr [90.66.97.135]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 2fab006e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 4 Apr 2024 12:12:40 +0000 (UTC) Date: Thu, 4 Apr 2024 14:12:39 +0200 From: Emmanuel Vadot To: Jan Beich 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: <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> In-Reply-To: <8r1t-ny0j-wny@FreeBSD.org> References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd15.0) 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=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR] X-Rspamd-Queue-Id: 4V9L9B5j4pz42kL On Thu, 04 Apr 2024 13:54:52 +0200 Jan Beich wrote: > 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. This is not what happened here. > 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. Yes, this is what should have been amended in the commit message, I had to look at the repo to find this commit hash because it wasn't in the merge request in comment in the Makefile. I shouldn't have to do that. > 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. This is only because in your own selfishness you think that this is JanBSD and not FreeBSD and thus impose everyone to use xwayland-devel while xwayland is perfectly fine maintained. None of the mentionned ports should depend on a -devel version. > Note, 2024Q1 should have been EOL after 2024-04-01. -- Emmanuel Vadot