From nobody Mon Apr 1 17:23:26 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 4V7dC26znBz5GSyN; Mon, 1 Apr 2024 17:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7dC2649hz4g6r; Mon, 1 Apr 2024 17:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711992206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pFlWHRpKhOr3uetsoTSNPqJ8fm0HFa8Uv7FaEgr+sfI=; b=uFjCTQiL3DtmrB9aNEJ37+iDTTqfiEvzrrnRCCl7IorbvD3x4xAKi3oUW4ix5YOav+U4Hd dOINnchEKpgFgTt4N1ZSd2vL60ma3HJ3vPdXdEBUJXFF68A7PrHlxjs/kU4hQbPC8KUF4y txrLf4mcD1dmkOMO/mjNHTo1Nsq208kn/+a6gzzddyayim6E7Vp2LwUgB8ef9INeA300FU QLGqj4WwG8u7x8o00ZWJyWetromSzzZByTkvVxhHPMwXle7caPizjgl6jCZ90X9/qANF+q s4wYqq+Kuv6lB9E7BlSYqKXH1HnI/0vlaKlhQneADkR7czKQg85Mqx9VlcvvIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711992206; a=rsa-sha256; cv=none; b=gsroHZCjmcOdzI+Q2vvAsm56YlGOYaLs4KRxICzUIDizPOGzaXTcyL+vU1zTbkM8qdLkH4 ipXIbyZ2MawmH/6SCoT5giS9A6oO3VogPFbEOGx4ft+UHidT8XQIa07/kbAMxotg2fG084 eezA6qOZzJOlZefXYuSLbcFY+IDY/KwTwX0HJDa+BKCyzTehJjpifVkXXt77W5y8e7xZjy EZyAS2E1US5PDwsiTfHcJTrhMjpBSkP72X8F5cUh7U1iJLyfen7uF5am1JfRjfPWtzOue8 0uA8mwA/ZNtpqKdgwmhq51NVcig/teDP4KrlgDeFK66dKlnFC+xcuwGjih5U4g== 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=1711992206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pFlWHRpKhOr3uetsoTSNPqJ8fm0HFa8Uv7FaEgr+sfI=; b=QZKlKE7GsQB3LQtayPlZS6dQ8MRCwNrwbKyAmNUzbrnaBU7wCAr1/sIOpk4Q346DVDT8kV jQ84kS1lwz7VrM9+4EZ5r9n/92zyXXaYl38eUxPk7qu3pcV9BN/KKYjqfJ0DdhAcYB8Tmt cti7Mg1RzC+TOYs4MQSdISuWGYZEOnHpNrIzmIOcicmM33Tqd9JAdfkVf1tJotQi5jtGZc orrNeeDqU9/lquS/MxR+JEmjalsKySjorHh3Hxk6L5HI+Nyi+7Uqf2xfVBRjKNlCL6Evos AYEFNuiUdSGtgWdz9IkV6uyM1J7gEnDaEtPqxcQyCF0VYbI/mpFGHceecG+n7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7dC25gSjzFcd; Mon, 1 Apr 2024 17:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431HNQbS039942; Mon, 1 Apr 2024 17:23:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431HNQMs039939; Mon, 1 Apr 2024 17:23:26 GMT (envelope-from git) Date: Mon, 1 Apr 2024 17:23:26 GMT Message-Id: <202404011723.431HNQMs039939@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: bcc3af74bea8 - 2024Q1 - graphics/vulkan-caps-viewer: update to 3.40 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: bcc3af74bea85e9cfc58e2a2acafa65806228ef8 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcc3af74bea85e9cfc58e2a2acafa65806228ef8 commit bcc3af74bea85e9cfc58e2a2acafa65806228ef8 Author: Jan Beich AuthorDate: 2024-03-23 12:04:07 +0000 Commit: Jan Beich CommitDate: 2024-04-01 17:23:18 +0000 graphics/vulkan-caps-viewer: update to 3.40 Changes: https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/3.40 Reported by: GitHub (watch releases) (cherry picked from commit a8d81272f06300bfe17cd6dd4ffdb2078c364961) --- graphics/vulkan-caps-viewer/Makefile | 2 +- graphics/vulkan-caps-viewer/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/vulkan-caps-viewer/Makefile b/graphics/vulkan-caps-viewer/Makefile index 2af8ad6f4fbd..312baae2056a 100644 --- a/graphics/vulkan-caps-viewer/Makefile +++ b/graphics/vulkan-caps-viewer/Makefile @@ -1,5 +1,5 @@ PORTNAME= vulkan-caps-viewer -DISTVERSION= 3.34 +DISTVERSION= 3.40 CATEGORIES= graphics PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/graphics/vulkan-caps-viewer/distinfo b/graphics/vulkan-caps-viewer/distinfo index dfb453e3d055..a27c2edd3f6c 100644 --- a/graphics/vulkan-caps-viewer/distinfo +++ b/graphics/vulkan-caps-viewer/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1710350629 -SHA256 (SaschaWillems-VulkanCapsViewer-3.34_GH0.tar.gz) = 3d3599ef89ff3731f2696c1f775d68ec1790f2d676dbe2ff78e6687b09cd932a -SIZE (SaschaWillems-VulkanCapsViewer-3.34_GH0.tar.gz) = 2810388 +TIMESTAMP = 1711195447 +SHA256 (SaschaWillems-VulkanCapsViewer-3.40_GH0.tar.gz) = 755ee67de736d1f34aa5a2ffc76b3ccb979800a9882eab633f26ef0200c05da7 +SIZE (SaschaWillems-VulkanCapsViewer-3.40_GH0.tar.gz) = 2810587 SHA256 (KhronosGroup-Vulkan-Headers-v1.3.280_GH0.tar.gz) = 717b49c52dbd37c78cf2f7f0fc715292c42e74841219e6cca918cd293ad5dce4 SIZE (KhronosGroup-Vulkan-Headers-v1.3.280_GH0.tar.gz) = 2264744 SHA256 (de463e2fce3f.patch) = 67f03cec1e8ac91a1daf09a88aa96cb47c89549f84b4ef8426d180362cd92e02 From nobody Mon Apr 1 19:23:34 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 4V7gsf3hthz5Gghp; Mon, 1 Apr 2024 19:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7gsf2nyVz4tyH; Mon, 1 Apr 2024 19:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711999414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EzBrI0Mv+lQgPbvV2LVm4IlWnFMF2smXfhh2nn8dKZM=; b=XH9evO+6DuTCsmawIG4WNlRrl/5QewpeUxJhf/NXvE0nHY8i1lmI7gf/+6rjChj5SBIBGh 4ilgOwyS/Y6ucb2EBD8Rzd1FLB9hM3+NHojJF9Rja7S4qe1HVNj83CfOX0l1TxBtPAv+QF lgMWT/P4aIximAjHJiBE8O0FLnHw+1mYBh9WEZ/L12ZrgE++I/OPIHm4wwQOfhODwyuRTb jMyE5uk5LA3oYHdJ2Fn6D5TCUqe17eI5rerJTeOIRMckqLNxwqFV7TcBK2YBWgzttnbdQh PVIOn/w7EkM6pQESRWaC9Q3jdiw0WBDWN1gRqrPnNBYW1QFc5W1lUvCI8NTEPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711999414; a=rsa-sha256; cv=none; b=h+Jo5GUk/Bk4ks6zMz5I8t91RlRZYPtzETRdRv4BD84EjnB7yz1hxiauICO48aLe692tMT ssw1hYKHiR8p9KsIufbHgc+bWsB33ds9sYzHr4d6q+SuxXIrrT4ZB2fnKJycrTl774dG93 zvs+tb2zqbMnqK7hTh7Q9IpA44Q/9/NF8UkXAOa5W4wW7URBu2euD+obdplri6ARHotktu 1ktyH0MtYXGtSghNBgzEQ+wGTdN0HkCEXDbdIoMdNB+iFMlaa6L3qzofD1RKFZWagtwJQN 1+nC/Riz9QT3QsHnCCXMV3H9lmM+LTgNCJdGdCdecdZ6CFX3GDRT5k4iJ+03aA== 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=1711999414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EzBrI0Mv+lQgPbvV2LVm4IlWnFMF2smXfhh2nn8dKZM=; b=yb50vRA8lMqSAWn3BV9sKzuVc472P5NuII29Im1Lo6xuI6NYmNYUJ2c5dHjxhoW8KwL3Kb eXMCGr2oVU8Fxi63tAC37zgtxdlegSDevfUt/eVGBegll1BfV8Pc8FZSxmsRb9yTj98F02 VDd5jPZi9zMiRnKj+00fpAuvQjfNG6y09zu5aUzHiXock5Qoh96Et6UFEm0KYDXvWsHp9h A8NJvuCY+NLYUVpmjiELREAVrqbDTEF2GLtImpmzWZnNCZr7Q2g/cB0bU+ikL8q+FL0MT4 R10TFUPnyodU1VOqZ1B6WxIDJ2Ih8Y9nDM7D2FlrP5Q3E6o8uski4WdUfqt+Gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V7gsf2PJKzJJ2; Mon, 1 Apr 2024 19:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431JNYN2043703; Mon, 1 Apr 2024 19:23:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431JNYFR043700; Mon, 1 Apr 2024 19:23:34 GMT (envelope-from git) Date: Mon, 1 Apr 2024 19:23:34 GMT Message-Id: <202404011923.431JNYFR043700@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: dba2cf6c9e05 - 2024Q1 - www/firefox: update to 124.0.2 (rc1) 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: dba2cf6c9e05606a9024f20a06e42f84f9d9fd9b Auto-Submitted: auto-generated The branch 2024Q1 has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=dba2cf6c9e05606a9024f20a06e42f84f9d9fd9b commit dba2cf6c9e05606a9024f20a06e42f84f9d9fd9b Author: Christoph Moench-Tegeder AuthorDate: 2024-04-01 19:20:47 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2024-04-01 19:23:18 +0000 www/firefox: update to 124.0.2 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/124.0.2/releasenotes/ (cherry picked from commit 1886a4440531bd778a6a14c686670f639f06ba4a) --- www/firefox/Makefile | 2 +- www/firefox/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index cb7f8d5610cc..b453e46c730f 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,5 +1,5 @@ PORTNAME= firefox -DISTVERSION= 124.0.1 +DISTVERSION= 124.0.2 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 8033480214ce..02e740f96ccf 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711130561 -SHA256 (firefox-124.0.1.source.tar.xz) = ddac16aea855e057ff6be3c143f7155cc20f452e1f45eb6288ff27e9346ab843 -SIZE (firefox-124.0.1.source.tar.xz) = 545772696 +TIMESTAMP = 1711995792 +SHA256 (firefox-124.0.2.source.tar.xz) = a6526d3540e19c8875cb7364e4490436c189478d375c4cb5216b0414e4b2d91c +SIZE (firefox-124.0.2.source.tar.xz) = 555223648 From nobody Tue Apr 2 08:36:11 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 4V81SD0Yhwz5G2Gs; Tue, 2 Apr 2024 08:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V81SD01q4z4Ssj; Tue, 2 Apr 2024 08:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712046972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPQrxTZdVMF9LNvIx9YWkQWYjctHqWdP4x1baDazVyY=; b=qdB65iC1knEGjtzfJYsjfKX4RRKCgljTZLZWVHi3eobxwhUd8lvHefzLcQPhlsYLo8VjSB Tf5uYzJtZVFtOkXhJ2zuwqwC8QhPm2XbfhNVoVcmwM8ndC9llsai7uPGsOhoV/OAqfiSUL ToMV6H4VXVj1oo3ZjyPzF8a3X/H+JSXcLKY3f243jwWiPnkdNc+ulOHLoayKY6WjJSiKyU GhhZPXXRnZd1iVnIdHwfMPs0gxByx1tMo6OxCXXMPrUMeumHZVWUyscCaJkcB9NPbYACx8 mJ7I4FixnX/ApY1ODUZ4XZK2FV/8PWkIb7ubGnY/NZEhVl+l3RzfeTxFDm2F+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712046972; a=rsa-sha256; cv=none; b=I1FrbYwMuNJajsfYzadZHGX8eatEaddvATwuxaTn0utWx2uRg5fIAY+hpa7GvocJuMudFe GqYbFFMy65BWReZx+NNxQ2OrCYUuCKZ33hmrq37o23ezi/IRrAqjVD4uRS2++l7Cuf934n +S7Adzdh3UgtUXjNlMuOG+YJ25CiK1IAJSKPmOpzzPPqCV5rhfwPs0e55j82/3kYiSCIGa B3CGKO9kLMZnmXRsh4rXaoQg3hxyRTeNZ0PUb7DQxm+/8Zxl/UdVbQ7GXmZQ6oNs0eA1l1 WKoKRzQlUoeyFwWHsiPlbLWrZ1ZGgYQuTCvJIxpzMYrBWLVXcOhmUMeKK1LXvg== 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=1712046972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPQrxTZdVMF9LNvIx9YWkQWYjctHqWdP4x1baDazVyY=; b=FJ3Q0XyJuzY0g4zumlKUfe0Q1XL1xr3tQYO06w+UxLWO1vt3hbN9YPtnnKw1ElLvxjttMX H2kr0N8BQS8lko15Tq3PUk7bwwyh/qYTurk2fA8d1nZICHNPp4iFjZ0g+U9S+/iXD4defc HwKMMvxUPSkFqiz+NCx+2hV8Nb2TZs5v2poPnyDk0zCqCer4e4ikPcJudWFpQXzn1qj5zL xPOmU6Kz3TC/7g2DkAOSxUyDeoFkWiD+4gPtp4ryp4/35ihUIBMbi328iFJHmKDqQc5GTz XEUCaC0B92QHbafor7PjJ1IbgU/yYz9IRZvUR1sSP4qTJmojZ9Y2IMc1eBa+qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V81SC6gSVzjX2; Tue, 2 Apr 2024 08:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4328aBvM079927; Tue, 2 Apr 2024 08:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4328aBGR079924; Tue, 2 Apr 2024 08:36:11 GMT (envelope-from git) Date: Tue, 2 Apr 2024 08:36:11 GMT Message-Id: <202404020836.4328aBGR079924@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rodrigo Osorio Subject: git: d39e65d2bc62 - 2024Q1 - graphics/py-python-poppler-qt5: fix build on FreeBSD 13 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: d39e65d2bc620a75947d947d346211593f02a054 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=d39e65d2bc620a75947d947d346211593f02a054 commit d39e65d2bc620a75947d947d346211593f02a054 Author: Rodrigo Osorio AuthorDate: 2024-04-01 18:26:00 +0000 Commit: Rodrigo Osorio CommitDate: 2024-04-02 08:33:01 +0000 graphics/py-python-poppler-qt5: fix build on FreeBSD 13 Patch picked from upstream repo Fix the build failures on older FreeBSD versions due to the recently updated graphics/poppler port. PR: 276263 Reported by: Martin Neubauer (maintainer) (cherry picked from commit 5d826246f8a360246c1f8c8fdbed1618f9dbbfe9) --- graphics/py-python-poppler-qt5/Makefile | 26 +++++++++++--------------- graphics/py-python-poppler-qt5/pkg-plist | 26 -------------------------- 2 files changed, 11 insertions(+), 41 deletions(-) diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile index 4a4a61268c4a..6de67c1f9bed 100644 --- a/graphics/py-python-poppler-qt5/Makefile +++ b/graphics/py-python-poppler-qt5/Makefile @@ -1,7 +1,7 @@ PORTNAME= python-poppler-qt5 DISTVERSIONPREFIX= v DISTVERSION= 21.3.0 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,26 +15,22 @@ LICENSE_COMB= dual BUILD_DEPENDS= qmake-qt5:devel/qt5-qmake LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 -USES= compiler:c++11-lang gl pkgconfig pyqt:5 python qt:5 +USES= compiler:c++17-lang gl pkgconfig pyqt:5 python qt:5 USE_GITHUB= yes GH_ACCOUNT= frescobaldi USE_GL= gl -USE_PYQT= pyqt5 sip:build -USE_PYTHON= flavors pep517 +USE_PYQT= pyqt5 +USE_PYTHON= autoplist pep517 USE_QT= core gui xml -PLIST_SUB= _PY_SONAME=${_PY_SONAME} - -_PY_SONAME= ${PYTHON_EXT_SUFFIX} - -do-build: - (cd ${WRKSRC} ; sip-build-${PYTHON_VER} --qmake ${QMAKE} --verbose --no-make --build-dir build ; ${MAKE} -C ./build ) - -do-install: - (cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} ) +PEP517_BUILD_CONFIG_SETTING= -C--build-dir=build \ + -C--jobs=${MAKE_JOBS_NUMBER} -C--qmake=${QMAKE} \ + -C--qmake-setting='CONFIG += c++17' \ + -C--qmake-setting='QMAKE_CXXFLAGS += ${CXXFLAGS}' \ + -C--qmake-setting='QMAKE_LFLAGS += ${LDFLAGS}' \ + -C--verbose post-install: - ${RLN} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${_PY_SONAME}.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${_PY_SONAME}.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${PYTHON_EXT_SUFFIX}.so .include diff --git a/graphics/py-python-poppler-qt5/pkg-plist b/graphics/py-python-poppler-qt5/pkg-plist deleted file mode 100644 index bcbefe9bb5bc..000000000000 --- a/graphics/py-python-poppler-qt5/pkg-plist +++ /dev/null @@ -1,26 +0,0 @@ -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-annotation.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-convert.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-document.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-embedded-file.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-font-info.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-font-iterator.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-form.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-link-destination.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-link.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-media.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-movie-object.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-opt-content-model.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-page-transition.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-page.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-qt5.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-sound-object.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-text-box.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/popplerqt5.toml -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/timeline.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/types.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/version.sip -%%PYTHON_SITELIBDIR%%/popplerqt5%%_PY_SONAME%%.so -%%PYTHON_SITELIBDIR%%/popplerqt5.so -%%PYTHON_SITELIBDIR%%/python_poppler_qt5-21.3.0.dist-info/INSTALLER -%%PYTHON_SITELIBDIR%%/python_poppler_qt5-21.3.0.dist-info/METADATA -%%PYTHON_SITELIBDIR%%/python_poppler_qt5-21.3.0.dist-info/RECORD From nobody Tue Apr 2 16:53:19 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 4V8DTr03Hgz5FG3d; Tue, 2 Apr 2024 16:53:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V8DTq6f95z4djh; Tue, 2 Apr 2024 16:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712076799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dcVGc7Xxm7yZvpjnfjAScPGPcK9B6y0g6EPRI2K0WwM=; b=w1Xj5gJJVblHblkm23l9pAjAT5TJtjRkAe05SSeK5JmJ11RHoPNou1fq1JMnKNvPW2JZMn IMclYOGZIEmyKZQ6eDLjWU+edWh0cETGO1xjxwxglUIRe8p+1/FYvAc3wzSEU5cr9KpCwO DqE66k9BOZ6Gu1Xh1OyluHe0fWQBpYMf8mvevBm5D8dgN1Op3WXcZO2F51xD4aj18LAEkN y+xeyUgzHEVgjELA4pReKCiHKZfoVSiXrkqCXVFBQlXvP4T1BHI/2jrcySlWC+fwRhkghu EqjPQ7CltSEnAW55VVnuPMFbHMVSSlvrPfhStyr9tYk3Pd4N2rcrA2ZfXiJLkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712076799; a=rsa-sha256; cv=none; b=oERJeYG3rTW+Yn4hvmMkGJHK8np2Sfp+1KgdqLkbec9OkdQSY0dH/wBqtc5Xa6HDATK1MM UxdXkvpY+TfmiU2TO7KaLRvQBrEEdARD0NMtO+F+EgpQA83XDmYJN5roasecpL4zxf15h3 rkeM7zuf0RRmTYu8d7HKVx2kZ6xVKDH3po/XgmoDSdG3bxjefIh+2gkcRDgp1oUV6Ok+ll G+Le2ZzR2eddR6pxjmVyqII5d6K9ho0XDO8LGsqZFK8f6WU7yZm8hhWPESAbq+9u3NAZsB mivvfvHjdFkvxGbfL5UCgojr75astkSV6QvorDyEVR8LEP/mUj4czaTkv/6YqA== 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=1712076799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dcVGc7Xxm7yZvpjnfjAScPGPcK9B6y0g6EPRI2K0WwM=; b=hP2LQk+dpLgnwbRFvmjoYFTl3m0lFzEUNqxMnFfhSEIhe4e1ERQBmnFRslnC2ok+EcTaZd YfJTlYlJKNMLvkmL3f1lqMu8vIyUQlPzmmHP2EcQqjm1AWA9dFcn/whsGrpGiI8sLk4DWu ZxANA1Z1UnWz+dFaZse3t1rKnHnaPtpkNq5Lni8u4u9Yj0H2drfZYW4M1v61CN3UM8UA8a FB08A0zaCquLU4142V2AjnLb1FBP2BCvhbznTj+0MnHXFS84UPu//vLC26C6/Tmgb8LwET zAhxMRabRp9Z1A4FosCuw/7F36CvMaNfbtfQYza8d9Mn5uVsKlYe66wXRC1Z9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V8DTq6DGJzxNZ; Tue, 2 Apr 2024 16:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 432GrJEs025648; Tue, 2 Apr 2024 16:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 432GrJub025645; Tue, 2 Apr 2024 16:53:19 GMT (envelope-from git) Date: Tue, 2 Apr 2024 16:53:19 GMT Message-Id: <202404021653.432GrJub025645@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: 7309c9d65c06 - 2024Q1 - devel/jenkins-lts: Update to 2.440.2 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 7309c9d65c069225bdafc2a0560db79cea3edf3b Auto-Submitted: auto-generated The branch 2024Q1 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=7309c9d65c069225bdafc2a0560db79cea3edf3b commit 7309c9d65c069225bdafc2a0560db79cea3edf3b Author: Li-Wen Hsu AuthorDate: 2024-04-02 16:51:03 +0000 Commit: Li-Wen Hsu CommitDate: 2024-04-02 16:53:01 +0000 devel/jenkins-lts: Update to 2.440.2 Security: 2e3bea0c-f110-11ee-bc57-00e081b7aa2d Sponsored by: The FreeBSD Foundation (cherry picked from commit 573c04529ffb342ac2a52eead076f1f30585ab42) --- devel/jenkins-lts/Makefile | 2 +- devel/jenkins-lts/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/jenkins-lts/Makefile b/devel/jenkins-lts/Makefile index 82e3f89e8603..12c7297ad301 100644 --- a/devel/jenkins-lts/Makefile +++ b/devel/jenkins-lts/Makefile @@ -1,5 +1,5 @@ PORTNAME= jenkins -PORTVERSION= 2.426.3 +PORTVERSION= 2.440.2 CATEGORIES= devel java MASTER_SITES= https://get.jenkins.io/war-stable/${PORTVERSION}/ PKGNAMESUFFIX= -lts diff --git a/devel/jenkins-lts/distinfo b/devel/jenkins-lts/distinfo index 20ecc60adbd2..274deef3aaf5 100644 --- a/devel/jenkins-lts/distinfo +++ b/devel/jenkins-lts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706119166 -SHA256 (jenkins/2.426.3/jenkins.war) = ab439243a6a07e2e78fe7c3408c59609f7be3bf268947ac214657af96abad106 -SIZE (jenkins/2.426.3/jenkins.war) = 89542726 +TIMESTAMP = 1712076478 +SHA256 (jenkins/2.440.2/jenkins.war) = 8126628e9e2f8ee2f807d489ec0a6e37fc9f5d6ba84fa8f3718e7f3e2a27312e +SIZE (jenkins/2.440.2/jenkins.war) = 86482142 From nobody Thu Apr 4 01:01:14 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 4V93GL6Qm8z5GGyW; Thu, 4 Apr 2024 01:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V93GL60wHz4sP3; Thu, 4 Apr 2024 01:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712192474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wqVt8A9wWQNU6ReMxLj+k8FweZPA78FCAqtwwDhzlYM=; b=akN7IZJQOsTwxIHZQz81Fb3vge61+1NuqO6UCqP7eY/C/wiYhwB+79PqK/tFYJ1EvM51EN 3wPkQKwE0M7yMrENj622eKYsjaA+8hhFjjQPxGPBOV6qVqXmXt1aVaIeF3T6xXkkF7M2By 8b3jdyJYKrSVBtEPjT56ctZu+a7xdx5EalWlSLVkHdq5aVFF3olMXUkZ4hPka36Nkso12p 3ggKlvNRKNYN3bN0tv8R51kkYFJ7+bClJ0yMv0C83ZzSK39AZlObp2geRwrokj+xmschVj 2qTaUrMX5zGagL2zbm11RZTt9gyOp32f+ZauWJ5MQTFQ8PSj/rJ0a13mFa1ffA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712192474; a=rsa-sha256; cv=none; b=Ncv/eJTzA+itocaHmpJVKCE9FI9aVbLANYtdHG6RUcr+HgLNg/sIJQNyZTJj/v5kAVVczh qs8RjatUO0pB+KVsTihQTcv6TMSx2mrfbU2IA8pes+C3267Bksa9po8GQoP7HJ8hBWGJIM DB2i/KNngwnguk9aGDw1SoVeBYc6OReS4LRv16RcTU4AaAwT8HCBCKPjlg+XxOX+Uk8Tk3 0NBxH3S4mwqcbgkBo9FubJyYNdLrBx83wHB0clS9rEFRkvYaVhRme/WYrO78wfn3IMRhcc 7cWigpmUr1RyuKy3iZI4zQO0X7hvT0FIOId8guT9qQuf2175s50NTyYeuSWcvQ== 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=1712192474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wqVt8A9wWQNU6ReMxLj+k8FweZPA78FCAqtwwDhzlYM=; b=cfnJ4enbniSs/sNysNorT/KHw1L4KysIYumwjUgVcXuQ6wx6Ef5ceLxcUp7T/e698k7kMp bhPO6f3WWCZsvr8XXXLWCN3WL12KCjOE8d9rC6Sq8WJQMpdv5aeAPljzMVlUVdVwTfkA6n UzqAHTxvZrRXxkOTt7ntWH6caSOMlk9M3Lb1d3n1WzgQHbwvcw70U+vQTM89TWEOjQ/bBA hNMP0JDBg9yjqg6InhbxRC/IHtNUykPd/sB8ueEK5HFEpl6yOGAXX+r818vJjGEkZI9paQ E/rC+1seye+96n3bWkNMdNOSdpQ9CfONM3WqSsq7blI+kXmrfwPA3n7/9oXLZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V93GL5cYNzw8y; Thu, 4 Apr 2024 01:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43411Ef7087388; Thu, 4 Apr 2024 01:01:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43411EQc087373; Thu, 4 Apr 2024 01:01:14 GMT (envelope-from git) Date: Thu, 4 Apr 2024 01:01:14 GMT Message-Id: <202404040101.43411EQc087373@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 9db3983983b6 - 2024Q1 - emulators/rpcs3: update to 0.0.31.16282 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 9db3983983b6cde132ef9d90f0963ff8280d7e55 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=9db3983983b6cde132ef9d90f0963ff8280d7e55 commit 9db3983983b6cde132ef9d90f0963ff8280d7e55 Author: Jan Beich AuthorDate: 2024-04-03 12:03:39 +0000 Commit: Jan Beich CommitDate: 2024-04-04 01:01:07 +0000 emulators/rpcs3: update to 0.0.31.16282 Changes: https://github.com/RPCS3/rpcs3/compare/e90b399329...2a89d87fab (cherry picked from commit b047995ba10897d61205d5cfeec3f2b39f3aa873) --- emulators/rpcs3/Makefile | 4 ++-- emulators/rpcs3/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index ebf89b9eb2dc..5f1f3768a074 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,7 +1,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.31-16276 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -ge90b399329 +DISTVERSION= 0.0.31-16282 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -g2a89d87fab CATEGORIES= emulators wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 4db916f70d68..a80b5dcacab3 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1711825106 -SHA256 (RPCS3-rpcs3-v0.0.31-16276-ge90b399329_GH0.tar.gz) = 1bb065dd73785fd5c626e16dcea56a637ae5d596681c78a3aa7b856aad94f22a -SIZE (RPCS3-rpcs3-v0.0.31-16276-ge90b399329_GH0.tar.gz) = 8632301 +TIMESTAMP = 1712145819 +SHA256 (RPCS3-rpcs3-v0.0.31-16282-g2a89d87fab_GH0.tar.gz) = 15a5872f38d7e2e25af4216a1d23638a418b7a532a0a6262edc01e9c1577f7fa +SIZE (RPCS3-rpcs3-v0.0.31-16282-g2a89d87fab_GH0.tar.gz) = 8632247 SHA256 (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 109ba77362885d60e274930f637735ee75df2850fe99e3f1c3a5b9d1187f8cb6 SIZE (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 348879 SHA256 (RPCS3-soundtouch-2.3.1-30-gced3ce8_GH0.tar.gz) = a041a2a857f52f7f0e4e5a8e774b702cd59f10fe9f39cfb87f5a6a2b4bc58d55 From nobody Thu Apr 4 01:01:15 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 4V93GN0rvxz5GGsD; Thu, 4 Apr 2024 01:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V93GM700Lz4sCd; Thu, 4 Apr 2024 01:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712192476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ZE4VMdj69XTFXI6s30bCbSDo/PDHuTwTrzwPZB2ZYQ=; b=APx+K3zFmyld9GcBpudq2TSyJHUS8ohEPnYWZCJvc5BjFbVoGbyck1jyhaCj9JVFVj38xG dJCIKXHyhjqOuFNmaRUQJWwdzYskTNDvvcakMA0KoljHQkHg4fXah7cQWHwWhqRd84r1zi dvrzqL6D+5irTrYd0Kx0BgVsL0vT7stP1Y+StZJVfPDgsxKJvO6cPdFxME0GzqhY5jfLY8 DpTERbe0P06Vz8jd3fhOCNWWl+ua8hrCgo7brI7RLOTOK+H3swgDHW4437ymBJxnY16/l6 y3QYY0q8kwjIIHR1zSQ9ofOnRTuts4gWRAY+Y7tvnSw+/hRGhYUSiap2eIaYsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712192476; a=rsa-sha256; cv=none; b=SNh307k2jkf918xj7xx0ByTw+0kJq6HtEgoTZVLYDYj/Dm6C1FaeqKoGSJshfxQbFOmWNo 9nGII5/pF2+6MT5Q/knXQY0ez0ETUnZP9GtdaX4I+5AtqSXmAzsX2No8Uiq0JZGF6m/qjs TYLmWMSZdj+9dmJI5poVSfEY1DRvffAHzzEOlrJEFn82/xPXvdDTKnxAhwdpISCWkHYeJD FijMu0Pmz4wTLLnHdA+ttZdtyEepN0X+faLBpb1JBTDCDTRyVbvchhxJHY3MXpDcyyraVp gbTQirnKB47xZ+UHYGRjusO6gNN2qqWfwZEmLTnHDXOkmD2z/2Z8Vm+fHwT6oA== 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=1712192476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/ZE4VMdj69XTFXI6s30bCbSDo/PDHuTwTrzwPZB2ZYQ=; b=oli3GRWk+X0nDK4Gp9Z5hfLr8+BCf7cWFM/YQktW2md5cgsYgPA4XTmqsQc+8wMklPwy2L ddEWfHW8PfaiWZ+0KU/nZXMM1ej9W8TUYoXEMpYpbTAXz2BxoFF6qHGP+Oyiy/QxoWMxKM YlBTjn+mOU4ZeTHWu5uxTrbQjgNLSYOIAP3uFI+j8Uw8VrUPGCKgUmBxlbKZl6WdVXes3a lqzOpzfbD3tQy/DuLV/DI1R8NurJBgedxR/AlVsRsjHflia2eLuovmMF8OgRlHtC1k4Jnj JSJ5TA2lx0RtDYYONjDMdLuMVnUA09gTXJJcgnuIahuq76pBl1YpFpHfD6eGZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V93GM6brrzw9F; Thu, 4 Apr 2024 01:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43411Ft2088000; Thu, 4 Apr 2024 01:01:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43411FtO087997; Thu, 4 Apr 2024 01:01:15 GMT (envelope-from git) Date: Thu, 4 Apr 2024 01:01:15 GMT Message-Id: <202404040101.43411FtO087997@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 655bcbcfb9e0 - 2024Q1 - x11-servers/xwayland-devel: backport recent secfixes 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 655bcbcfb9e0caff8e8e2705a78f5a5a3db3d83a Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=655bcbcfb9e0caff8e8e2705a78f5a5a3db3d83a commit 655bcbcfb9e0caff8e8e2705a78f5a5a3db3d83a Author: Jan Beich AuthorDate: 2024-04-04 00:38:43 +0000 Commit: Jan Beich CommitDate: 2024-04-04 01:01:09 +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) --- 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..ac786c9d01ab 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+= bdca6c3d1f50.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..54936c280248 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 (bdca6c3d1f50.patch) = fcec0b3e508ee12824e7b2e48ede67766104105605ff996ad0df9cb1d9ad389d +SIZE (bdca6c3d1f50.patch) = 3830 From nobody Thu Apr 4 01:01:16 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 4V93GP31pcz5GGsF; Thu, 4 Apr 2024 01:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V93GP0SgZz4s6d; Thu, 4 Apr 2024 01:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712192477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HdLPB9n19hvPBlpXxgvJ3Yh1XWOe7EwtyaBEJxbog0o=; b=jXx230Is0GQxa+EmEsqIPwZmHZO4qXr+Bn0HdXXGr+qA9P4mREYA7b/IZht8hnYm0WBkeL FHDjSM5UXyRQFECFCqa7305xQ0t4FQ8RpKnd86ZDyHS7kItEygIO5hafSXcLvPNKIvNeD5 9aZPx6oHslXLREJ8w5uWaRiJQgfWzUJU0AatF5lrBDZqJpAEWsi2Qgmp8u6qLce8q/L1gQ 8RG6/t092b+p/esmPJwy7ZOJ+B7hKIKH6JBes+9dpCTd3JPF6R9vdwD8nSTkbXU1OWJAGA IJT+8MFqHR3K7dBkEPl/BQcCKS1qVb5D0wkiDRxJ7xh4Fy6W166jU1ipeAMixQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712192477; a=rsa-sha256; cv=none; b=tfQqbSKGmG7ih80WOcMi1KjXpPF+aZRKivHe/sDczKZUIln8Oxpcelz3sAYZU5gQDyRG6G aw0imj1iWfi41QCvnQDiwWtZ0EzXIqGi2/hOI9NmDgUcTmzqzsi9aF0UT+DpWUFHWR2ee0 kPrbZH4rRRAnskTYvT+QfHGpsvtBJ23Y9Bt5LxOGdwYqgT2DRtMRPyH9JaUzeuM42cJ+1I ibPd1nswCG2PclYF6G1v06V9FBLGH8Vlhpoki2LUv1SX7wg8DM0rvWpfxhoGU6b1BJHRIP UQMmQrkYv2sP/Uo9jTZxn6Uwf3LlXMPnZ4+wH+I9lbl92qQdUU2/T+yVe6K0FA== 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=1712192477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HdLPB9n19hvPBlpXxgvJ3Yh1XWOe7EwtyaBEJxbog0o=; b=Cd6Utlx59i1m6wT5/nEEPf/vgPLgdbz4dal5opuwkKTiQ0BdpywDXgRzmRuwd0S3Iiyrc3 xzOiyB+r8TurFVlJ/GqpxSNvi6B7riv1tGETjR0ET/PHgg/oAKPVv6iTDpSHk5YOIWpvAo OxeKxUT21psrSA+/Lv96JxsrK3Jt70QfXWzyy6V53yHaS2jsPMZAi9Ed1+HIIccv1FaPrs 4OLNuA6K7e9TfhTH7i07mJeJAnkeosTK+XYmx7Uj0tDRJuWnSXiwCHmmrMHKIgf7Jf1KIY QHusJfE4Sr6gphIPlgia1TPdsvz4cj/ZT5eyMKrrb4v5MltBjSJPMebdChoLbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V93GP04kgzwCd; Thu, 4 Apr 2024 01:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43411GTY088043; Thu, 4 Apr 2024 01:01:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43411GW7088040; Thu, 4 Apr 2024 01:01:16 GMT (envelope-from git) Date: Thu, 4 Apr 2024 01:01:16 GMT Message-Id: <202404040101.43411GW7088040@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 67689a66b6cf - 2024Q1 - games/veloren-weekly: update to s20240403 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 67689a66b6cf65d3b0484fe1638b4cdde0f0f798 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=67689a66b6cf65d3b0484fe1638b4cdde0f0f798 commit 67689a66b6cf65d3b0484fe1638b4cdde0f0f798 Author: Jan Beich AuthorDate: 2024-04-03 20:23:33 +0000 Commit: Jan Beich CommitDate: 2024-04-04 01:01:12 +0000 games/veloren-weekly: update to s20240403 Changes: https://gitlab.com/veloren/veloren/-/compare/80fe5ca64...2f0c83992 (cherry picked from commit 1f0f2ea4a560eaabc830abff6269511a502a5e07) --- games/veloren-weekly/Makefile | 4 +- games/veloren-weekly/Makefile.crates | 35 +++++++--------- games/veloren-weekly/distinfo | 76 ++++++++++++++------------------- games/veloren-weekly/files/patch-gilrs | 77 ++++++++-------------------------- 4 files changed, 64 insertions(+), 128 deletions(-) diff --git a/games/veloren-weekly/Makefile b/games/veloren-weekly/Makefile index d88ec195ac89..90c04f65f2ac 100644 --- a/games/veloren-weekly/Makefile +++ b/games/veloren-weekly/Makefile @@ -1,5 +1,5 @@ PORTNAME= veloren -PORTVERSION= s20240330 +PORTVERSION= s20240403 CATEGORIES= games wayland PKGNAMESUFFIX= -weekly @@ -25,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl USES= cargo xorg USE_XORG= xcb USE_GITLAB= yes -GL_TAGNAME= v0.16.0 # git describe --match='v[0-9]*' weekly +GL_TAGNAME= v0.16.0-22-g2f0c83992 # git describe --match='v[0-9]*' weekly CARGO_ENV= VELOREN_USERDATA_STRATEGY=system SHADERC_LIB_DIR="${LOCALBASE}/lib" PLIST_FILES= bin/${PORTNAME}-server-cli \ bin/${PORTNAME}-voxygen \ diff --git a/games/veloren-weekly/Makefile.crates b/games/veloren-weekly/Makefile.crates index 13e3bc852e60..4c0a53c3096a 100644 --- a/games/veloren-weekly/Makefile.crates +++ b/games/veloren-weekly/Makefile.crates @@ -8,7 +8,7 @@ CARGO_CRATES= ab_glyph-0.2.23 \ ahash-0.8.11 \ aho-corasick-1.1.3 \ allocator-api2-0.2.16 \ - alsa-0.6.0 \ + alsa-0.9.0 \ alsa-sys-0.3.1 \ ambient-authority-0.0.2 \ android-activity-0.4.3 \ @@ -116,9 +116,9 @@ CARGO_CRATES= ab_glyph-0.2.23 \ core-foundation-sys-0.8.6 \ core-graphics-0.22.3 \ core-graphics-types-0.1.3 \ - coreaudio-rs-0.10.0 \ + coreaudio-rs-0.11.3 \ coreaudio-sys-0.2.15 \ - cpal-0.13.5 \ + cpal-0.15.3 \ cpp_demangle-0.3.5 \ cpufeatures-0.2.12 \ cranelift-bforest-0.104.2 \ @@ -154,12 +154,10 @@ CARGO_CRATES= ab_glyph-0.2.23 \ culpa-macros-1.0.2 \ d3d12-0.7.0 \ daggy-0.5.0 \ - darling-0.13.4 \ darling-0.20.8 \ - darling_core-0.13.4 \ darling_core-0.20.8 \ - darling_macro-0.13.4 \ darling_macro-0.20.8 \ + dasp_sample-0.11.0 \ data-encoding-2.5.0 \ debugid-0.8.0 \ deflate-1.0.0 \ @@ -313,7 +311,6 @@ CARGO_CRATES= ab_glyph-0.2.23 \ itoa-1.0.10 \ ittapi-0.4.0 \ ittapi-sys-0.4.0 \ - jni-0.19.0 \ jni-0.21.1 \ jni-sys-0.3.0 \ jobserver-0.1.28 \ @@ -374,15 +371,12 @@ CARGO_CRATES= ab_glyph-0.2.23 \ mumble-link-0.2.0 \ nanorand-0.7.0 \ native-dialog-0.6.4 \ - ndk-0.6.0 \ ndk-0.7.0 \ + ndk-0.8.0 \ ndk-context-0.1.1 \ - ndk-glue-0.6.2 \ - ndk-macro-0.3.0 \ - ndk-sys-0.3.0 \ ndk-sys-0.4.1+23.1.7779620 \ + ndk-sys-0.5.0+25.2.9519653 \ nibble_vec-0.1.0 \ - nix-0.23.2 \ nix-0.24.3 \ nix-0.25.1 \ nix-0.26.4 \ @@ -401,7 +395,6 @@ CARGO_CRATES= ab_glyph-0.2.23 \ num-complex-0.2.4 \ num-complex-0.4.5 \ num-conv-0.1.0 \ - num-derive-0.3.3 \ num-derive-0.4.2 \ num-integer-0.1.46 \ num-iter-0.1.44 \ @@ -411,8 +404,10 @@ CARGO_CRATES= ab_glyph-0.2.23 \ num_cpus-1.16.0 \ num_enum-0.5.11 \ num_enum-0.6.1 \ + num_enum-0.7.2 \ num_enum_derive-0.5.11 \ num_enum_derive-0.6.1 \ + num_enum_derive-0.7.2 \ number_prefix-0.4.0 \ objc-0.2.7 \ objc-foundation-0.1.1 \ @@ -422,8 +417,8 @@ CARGO_CRATES= ab_glyph-0.2.23 \ objc_exception-0.1.2 \ objc_id-0.1.1 \ object-0.32.2 \ - oboe-0.4.6 \ - oboe-sys-0.4.5 \ + oboe-0.6.1 \ + oboe-sys-0.6.1 \ ogg-0.8.0 \ once_cell-1.19.0 \ oorandom-11.1.3 \ @@ -437,9 +432,7 @@ CARGO_CRATES= ab_glyph-0.2.23 \ owned_ttf_parser-0.20.0 \ packed_simd-0.3.9 \ parking-2.2.0 \ - parking_lot-0.11.2 \ parking_lot-0.12.1 \ - parking_lot_core-0.8.6 \ parking_lot_core-0.9.9 \ parse-zoneinfo-0.3.0 \ paste-1.0.14 \ @@ -499,7 +492,6 @@ CARGO_CRATES= ab_glyph-0.2.23 \ rayon-1.9.0 \ rayon-core-1.12.1 \ rcgen-0.12.1 \ - redox_syscall-0.2.16 \ redox_syscall-0.3.5 \ redox_syscall-0.4.1 \ redox_users-0.4.4 \ @@ -518,7 +510,7 @@ CARGO_CRATES= ab_glyph-0.2.23 \ ring-0.17.8 \ rmp-0.8.12 \ rmp-serde-1.1.2 \ - rodio-0.15.0 \ + rodio-0.17.3 \ ron-0.8.1 \ roots-0.0.8 \ roxmltree-0.14.1 \ @@ -596,10 +588,8 @@ CARGO_CRATES= ab_glyph-0.2.23 \ stacker-0.1.15 \ static_assertions-1.1.0 \ stb_truetype-0.3.1 \ - stdweb-0.1.3 \ str-buf-1.0.6 \ strict-num-0.1.1 \ - strsim-0.10.0 \ strsim-0.11.0 \ strum-0.24.1 \ strum-0.26.2 \ @@ -745,8 +735,11 @@ CARGO_CRATES= ab_glyph-0.2.23 \ window_clipboard-0.3.0 \ windows-0.48.0 \ windows-0.51.1 \ + windows-0.54.0 \ windows-core-0.51.1 \ windows-core-0.52.0 \ + windows-core-0.54.0 \ + windows-result-0.1.0 \ windows-sys-0.45.0 \ windows-sys-0.48.0 \ windows-sys-0.52.0 \ diff --git a/games/veloren-weekly/distinfo b/games/veloren-weekly/distinfo index 054783027741..e11970826a7c 100644 --- a/games/veloren-weekly/distinfo +++ b/games/veloren-weekly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1711757008 +TIMESTAMP = 1712175813 SHA256 (rust/crates/ab_glyph-0.2.23.crate) = 80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225 SIZE (rust/crates/ab_glyph-0.2.23.crate) = 18537 SHA256 (rust/crates/ab_glyph_rasterizer-0.1.8.crate) = c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046 @@ -19,8 +19,8 @@ SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2d SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311 SHA256 (rust/crates/allocator-api2-0.2.16.crate) = 0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5 SIZE (rust/crates/allocator-api2-0.2.16.crate) = 59025 -SHA256 (rust/crates/alsa-0.6.0.crate) = 5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b -SIZE (rust/crates/alsa-0.6.0.crate) = 68171 +SHA256 (rust/crates/alsa-0.9.0.crate) = 37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce +SIZE (rust/crates/alsa-0.9.0.crate) = 72602 SHA256 (rust/crates/alsa-sys-0.3.1.crate) = db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527 SIZE (rust/crates/alsa-sys-0.3.1.crate) = 32748 SHA256 (rust/crates/ambient-authority-0.0.2.crate) = e9d4ee0d472d1cd2e28c97dfa124b3d8d992e10eb0a035f33f5d12e3a177ba3b @@ -235,12 +235,12 @@ SHA256 (rust/crates/core-graphics-0.22.3.crate) = 2581bbab3b8ffc6fcbd550bf46c355 SIZE (rust/crates/core-graphics-0.22.3.crate) = 29514 SHA256 (rust/crates/core-graphics-types-0.1.3.crate) = 45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf SIZE (rust/crates/core-graphics-types-0.1.3.crate) = 7063 -SHA256 (rust/crates/coreaudio-rs-0.10.0.crate) = 11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88 -SIZE (rust/crates/coreaudio-rs-0.10.0.crate) = 34487 +SHA256 (rust/crates/coreaudio-rs-0.11.3.crate) = 321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace +SIZE (rust/crates/coreaudio-rs-0.11.3.crate) = 42844 SHA256 (rust/crates/coreaudio-sys-0.2.15.crate) = 7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9 SIZE (rust/crates/coreaudio-sys-0.2.15.crate) = 5532 -SHA256 (rust/crates/cpal-0.13.5.crate) = 74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116 -SIZE (rust/crates/cpal-0.13.5.crate) = 93790 +SHA256 (rust/crates/cpal-0.15.3.crate) = 873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779 +SIZE (rust/crates/cpal-0.15.3.crate) = 100083 SHA256 (rust/crates/cpp_demangle-0.3.5.crate) = eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f SIZE (rust/crates/cpp_demangle-0.3.5.crate) = 75313 SHA256 (rust/crates/cpufeatures-0.2.12.crate) = 53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504 @@ -311,18 +311,14 @@ SHA256 (rust/crates/d3d12-0.7.0.crate) = e16e44ab292b1dddfdaf7be62cfd8877df52f2f SIZE (rust/crates/d3d12-0.7.0.crate) = 17319 SHA256 (rust/crates/daggy-0.5.0.crate) = 9293a0da7d1bc1f30090ece4d9f9de79a07be7302ddb00e5eb1fefb6ee6409e2 SIZE (rust/crates/daggy-0.5.0.crate) = 17832 -SHA256 (rust/crates/darling-0.13.4.crate) = a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c -SIZE (rust/crates/darling-0.13.4.crate) = 20895 SHA256 (rust/crates/darling-0.20.8.crate) = 54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391 SIZE (rust/crates/darling-0.20.8.crate) = 31234 -SHA256 (rust/crates/darling_core-0.13.4.crate) = 859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610 -SIZE (rust/crates/darling_core-0.13.4.crate) = 52937 SHA256 (rust/crates/darling_core-0.20.8.crate) = 9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f SIZE (rust/crates/darling_core-0.20.8.crate) = 64442 -SHA256 (rust/crates/darling_macro-0.13.4.crate) = 9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835 -SIZE (rust/crates/darling_macro-0.13.4.crate) = 1910 SHA256 (rust/crates/darling_macro-0.20.8.crate) = a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f SIZE (rust/crates/darling_macro-0.20.8.crate) = 1856 +SHA256 (rust/crates/dasp_sample-0.11.0.crate) = 0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f +SIZE (rust/crates/dasp_sample-0.11.0.crate) = 11617 SHA256 (rust/crates/data-encoding-2.5.0.crate) = 7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5 SIZE (rust/crates/data-encoding-2.5.0.crate) = 20632 SHA256 (rust/crates/debugid-0.8.0.crate) = bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d @@ -629,8 +625,6 @@ SHA256 (rust/crates/ittapi-0.4.0.crate) = 6b996fe614c41395cdaedf3cf408a953485109 SIZE (rust/crates/ittapi-0.4.0.crate) = 7446 SHA256 (rust/crates/ittapi-sys-0.4.0.crate) = 52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc SIZE (rust/crates/ittapi-sys-0.4.0.crate) = 144943 -SHA256 (rust/crates/jni-0.19.0.crate) = c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec -SIZE (rust/crates/jni-0.19.0.crate) = 65890 SHA256 (rust/crates/jni-0.21.1.crate) = 1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97 SIZE (rust/crates/jni-0.21.1.crate) = 105028 SHA256 (rust/crates/jni-sys-0.3.0.crate) = 8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130 @@ -751,24 +745,18 @@ SHA256 (rust/crates/nanorand-0.7.0.crate) = 6a51313c5820b0b02bd422f4b44776fbf479 SIZE (rust/crates/nanorand-0.7.0.crate) = 18437 SHA256 (rust/crates/native-dialog-0.6.4.crate) = 1bbf55edb2747e4e4b3a9cd3989194b88aae32274b4422635dcf98aa6e84197b SIZE (rust/crates/native-dialog-0.6.4.crate) = 19342 -SHA256 (rust/crates/ndk-0.6.0.crate) = 2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4 -SIZE (rust/crates/ndk-0.6.0.crate) = 39828 SHA256 (rust/crates/ndk-0.7.0.crate) = 451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0 SIZE (rust/crates/ndk-0.7.0.crate) = 54683 +SHA256 (rust/crates/ndk-0.8.0.crate) = 2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7 +SIZE (rust/crates/ndk-0.8.0.crate) = 79770 SHA256 (rust/crates/ndk-context-0.1.1.crate) = 27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b SIZE (rust/crates/ndk-context-0.1.1.crate) = 2205 -SHA256 (rust/crates/ndk-glue-0.6.2.crate) = 0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f -SIZE (rust/crates/ndk-glue-0.6.2.crate) = 5227 -SHA256 (rust/crates/ndk-macro-0.3.0.crate) = 0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c -SIZE (rust/crates/ndk-macro-0.3.0.crate) = 4884 -SHA256 (rust/crates/ndk-sys-0.3.0.crate) = 6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97 -SIZE (rust/crates/ndk-sys-0.3.0.crate) = 282815 SHA256 (rust/crates/ndk-sys-0.4.1+23.1.7779620.crate) = 3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3 SIZE (rust/crates/ndk-sys-0.4.1+23.1.7779620.crate) = 291699 +SHA256 (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691 +SIZE (rust/crates/ndk-sys-0.5.0+25.2.9519653.crate) = 307233 SHA256 (rust/crates/nibble_vec-0.1.0.crate) = 77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43 SIZE (rust/crates/nibble_vec-0.1.0.crate) = 11796 -SHA256 (rust/crates/nix-0.23.2.crate) = 8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c -SIZE (rust/crates/nix-0.23.2.crate) = 242042 SHA256 (rust/crates/nix-0.24.3.crate) = fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069 SIZE (rust/crates/nix-0.24.3.crate) = 266843 SHA256 (rust/crates/nix-0.25.1.crate) = f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4 @@ -805,8 +793,6 @@ SHA256 (rust/crates/num-complex-0.4.5.crate) = 23c6602fda94a57c990fe0df199a035d8 SIZE (rust/crates/num-complex-0.4.5.crate) = 29614 SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9 SIZE (rust/crates/num-conv-0.1.0.crate) = 7444 -SHA256 (rust/crates/num-derive-0.3.3.crate) = 876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d -SIZE (rust/crates/num-derive-0.3.3.crate) = 14545 SHA256 (rust/crates/num-derive-0.4.2.crate) = ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202 SIZE (rust/crates/num-derive-0.4.2.crate) = 14709 SHA256 (rust/crates/num-integer-0.1.46.crate) = 7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f @@ -825,10 +811,14 @@ SHA256 (rust/crates/num_enum-0.5.11.crate) = 1f646caf906c20226733ed5b1374287eb97 SIZE (rust/crates/num_enum-0.5.11.crate) = 16772 SHA256 (rust/crates/num_enum-0.6.1.crate) = 7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1 SIZE (rust/crates/num_enum-0.6.1.crate) = 17911 +SHA256 (rust/crates/num_enum-0.7.2.crate) = 02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845 +SIZE (rust/crates/num_enum-0.7.2.crate) = 18571 SHA256 (rust/crates/num_enum_derive-0.5.11.crate) = dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799 SIZE (rust/crates/num_enum_derive-0.5.11.crate) = 15552 SHA256 (rust/crates/num_enum_derive-0.6.1.crate) = 96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6 SIZE (rust/crates/num_enum_derive-0.6.1.crate) = 15403 +SHA256 (rust/crates/num_enum_derive-0.7.2.crate) = 681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b +SIZE (rust/crates/num_enum_derive-0.7.2.crate) = 17090 SHA256 (rust/crates/number_prefix-0.4.0.crate) = 830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3 SIZE (rust/crates/number_prefix-0.4.0.crate) = 6922 SHA256 (rust/crates/objc-0.2.7.crate) = 915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1 @@ -847,10 +837,10 @@ SHA256 (rust/crates/objc_id-0.1.1.crate) = c92d4ddb4bd7b50d730c215ff871754d0da6b SIZE (rust/crates/objc_id-0.1.1.crate) = 3258 SHA256 (rust/crates/object-0.32.2.crate) = a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441 SIZE (rust/crates/object-0.32.2.crate) = 286994 -SHA256 (rust/crates/oboe-0.4.6.crate) = 27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1 -SIZE (rust/crates/oboe-0.4.6.crate) = 24067 -SHA256 (rust/crates/oboe-sys-0.4.5.crate) = 3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd -SIZE (rust/crates/oboe-sys-0.4.5.crate) = 140656 +SHA256 (rust/crates/oboe-0.6.1.crate) = e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb +SIZE (rust/crates/oboe-0.6.1.crate) = 24588 +SHA256 (rust/crates/oboe-sys-0.6.1.crate) = 6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d +SIZE (rust/crates/oboe-sys-0.6.1.crate) = 169091 SHA256 (rust/crates/ogg-0.8.0.crate) = 6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e SIZE (rust/crates/ogg-0.8.0.crate) = 27128 SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92 @@ -877,12 +867,8 @@ SHA256 (rust/crates/packed_simd-0.3.9.crate) = 1f9f08af0c877571712e2e3e686ad79ef SIZE (rust/crates/packed_simd-0.3.9.crate) = 98340 SHA256 (rust/crates/parking-2.2.0.crate) = bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae SIZE (rust/crates/parking-2.2.0.crate) = 9730 -SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99 -SIZE (rust/crates/parking_lot-0.11.2.crate) = 39869 SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967 -SHA256 (rust/crates/parking_lot_core-0.8.6.crate) = 60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc -SIZE (rust/crates/parking_lot_core-0.8.6.crate) = 32567 SHA256 (rust/crates/parking_lot_core-0.9.9.crate) = 4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e SIZE (rust/crates/parking_lot_core-0.9.9.crate) = 32445 SHA256 (rust/crates/parse-zoneinfo-0.3.0.crate) = c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41 @@ -1001,8 +987,6 @@ SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caa SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701 SHA256 (rust/crates/rcgen-0.12.1.crate) = 48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1 SIZE (rust/crates/rcgen-0.12.1.crate) = 63815 -SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a -SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012 SHA256 (rust/crates/redox_syscall-0.3.5.crate) = 567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29 SIZE (rust/crates/redox_syscall-0.3.5.crate) = 23404 SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa @@ -1039,8 +1023,8 @@ SHA256 (rust/crates/rmp-0.8.12.crate) = 7f9860a6cc38ed1da53456442089b4dfa35e7ced SIZE (rust/crates/rmp-0.8.12.crate) = 28844 SHA256 (rust/crates/rmp-serde-1.1.2.crate) = bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a SIZE (rust/crates/rmp-serde-1.1.2.crate) = 30388 -SHA256 (rust/crates/rodio-0.15.0.crate) = ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e -SIZE (rust/crates/rodio-0.15.0.crate) = 7414161 +SHA256 (rust/crates/rodio-0.17.3.crate) = 3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611 +SIZE (rust/crates/rodio-0.17.3.crate) = 59247 SHA256 (rust/crates/ron-0.8.1.crate) = b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94 SIZE (rust/crates/ron-0.8.1.crate) = 63251 SHA256 (rust/crates/roots-0.0.8.crate) = 082f11ffa03bbef6c2c6ea6bea1acafaade2fd9050ae0234ab44a2153742b058 @@ -1195,14 +1179,10 @@ SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1 SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480 SHA256 (rust/crates/stb_truetype-0.3.1.crate) = f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51 SIZE (rust/crates/stb_truetype-0.3.1.crate) = 22111 -SHA256 (rust/crates/stdweb-0.1.3.crate) = ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e -SIZE (rust/crates/stdweb-0.1.3.crate) = 90221 SHA256 (rust/crates/str-buf-1.0.6.crate) = 9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0 SIZE (rust/crates/str-buf-1.0.6.crate) = 3828 SHA256 (rust/crates/strict-num-0.1.1.crate) = 6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731 SIZE (rust/crates/strict-num-0.1.1.crate) = 5104 -SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623 -SIZE (rust/crates/strsim-0.10.0.crate) = 11355 SHA256 (rust/crates/strsim-0.11.0.crate) = 5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01 SIZE (rust/crates/strsim-0.11.0.crate) = 13710 SHA256 (rust/crates/strum-0.24.1.crate) = 063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f @@ -1493,10 +1473,16 @@ SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb8150 SIZE (rust/crates/windows-0.48.0.crate) = 11864177 SHA256 (rust/crates/windows-0.51.1.crate) = ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9 SIZE (rust/crates/windows-0.51.1.crate) = 12250614 +SHA256 (rust/crates/windows-0.54.0.crate) = 9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49 +SIZE (rust/crates/windows-0.54.0.crate) = 11096265 SHA256 (rust/crates/windows-core-0.51.1.crate) = f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64 SIZE (rust/crates/windows-core-0.51.1.crate) = 42364 SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9 SIZE (rust/crates/windows-core-0.52.0.crate) = 42154 +SHA256 (rust/crates/windows-core-0.54.0.crate) = 12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65 +SIZE (rust/crates/windows-core-0.54.0.crate) = 44015 +SHA256 (rust/crates/windows-result-0.1.0.crate) = cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64 +SIZE (rust/crates/windows-result-0.1.0.crate) = 10486 SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0 SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659 SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9 @@ -1629,5 +1615,5 @@ SHA256 (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = ff1056ad3df5df0604440a4a SIZE (Imberflur-iced-veloren-winit-0.28_GH0.tar.gz) = 1130634 SHA256 (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 29252101e189bbe067f0bacba18181afc69a2fb9bc031bbba8dcbade45dec02f SIZE (xMAC94x-portpicker-rs-df6b37872f3586ac3b21d08b56c8ec7cd92fb172_GH0.tar.gz) = 2210 -SHA256 (veloren-v0.16.0.tar.bz2) = 82b59ef378deff21d229e914b2ed9c45fbb911fc77386519b97d3bf2c08c1587 -SIZE (veloren-v0.16.0.tar.bz2) = 298930444 +SHA256 (veloren-v0.16.0-22-g2f0c83992.tar.bz2) = 971be85e33c3af605198c563dd5f24cf7d0fd0d07327614408db5345a9b559fb +SIZE (veloren-v0.16.0-22-g2f0c83992.tar.bz2) = 299309537 diff --git a/games/veloren-weekly/files/patch-gilrs b/games/veloren-weekly/files/patch-gilrs index 92332d3aadce..1a01e3399772 100644 --- a/games/veloren-weekly/files/patch-gilrs +++ b/games/veloren-weekly/files/patch-gilrs @@ -23,9 +23,9 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` | | help: a similar name exists in the module: `event` | no `epoll` in `sys` ---- Cargo.lock.orig 2024-03-20 22:12:47 UTC +--- Cargo.lock.orig 2024-04-03 20:23:33 UTC +++ Cargo.lock -@@ -2515,9 +2515,9 @@ dependencies = [ +@@ -2484,9 +2484,9 @@ name = "gilrs" [[package]] name = "gilrs" @@ -37,7 +37,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` dependencies = [ "fnv", "gilrs-core", -@@ -2529,24 +2529,23 @@ dependencies = [ +@@ -2498,24 +2498,23 @@ name = "gilrs-core" [[package]] name = "gilrs-core" @@ -66,11 +66,10 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` ] [[package]] -@@ -3181,17 +3180,6 @@ dependencies = [ - "libc", +@@ -3151,17 +3150,6 @@ dependencies = [ ] --[[package]] + [[package]] -name = "inotify" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" @@ -81,10 +80,11 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` - "libc", -] - - [[package]] +-[[package]] name = "inotify-sys" version = "0.1.5" -@@ -3243,9 +3231,9 @@ dependencies = [ + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -3212,9 +3200,9 @@ name = "io-kit-sys" [[package]] name = "io-kit-sys" @@ -96,12 +96,10 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` dependencies = [ "core-foundation-sys", "mach2", -@@ -4054,6 +4042,17 @@ dependencies = [ - "memoffset 0.6.5", - ] +@@ -3971,6 +3959,17 @@ name = "nix" -+[[package]] -+name = "nix" + [[package]] + name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" @@ -111,10 +109,12 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` + "libc", +] + - [[package]] - name = "nix" ++[[package]] ++name = "nix" version = "0.28.0" -@@ -4102,7 +4101,7 @@ dependencies = [ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +@@ -4017,7 +4016,7 @@ dependencies = [ "crossbeam-channel", "filetime", "fsevent-sys", @@ -123,7 +123,7 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` "kqueue", "libc", "log", -@@ -6739,7 +6738,7 @@ version = "1.6.3" +@@ -6618,7 +6617,7 @@ dependencies = [ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ @@ -132,49 +132,6 @@ error[E0432]: unresolved imports `nix::sys::epoll`, `nix::sys::eventfd` "rand 0.8.5", "static_assertions", ] -@@ -8409,16 +8408,6 @@ dependencies = [ - "windows-targets 0.48.5", - ] - --[[package]] --name = "windows" --version = "0.54.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" --dependencies = [ -- "windows-core 0.54.0", -- "windows-targets 0.52.4", --] -- - [[package]] - name = "windows-core" - version = "0.51.1" -@@ -8437,25 +8426,6 @@ dependencies = [ - "windows-targets 0.52.4", - ] - --[[package]] --name = "windows-core" --version = "0.54.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" --dependencies = [ -- "windows-result", -- "windows-targets 0.52.4", --] -- --[[package]] --name = "windows-result" --version = "0.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" --dependencies = [ -- "windows-targets 0.52.4", --] -- - [[package]] - name = "windows-sys" - version = "0.45.0" --- cargo-crates/gilrs-0.10.2/examples/ev.rs.orig 1970-01-01 00:00:00 UTC +++ cargo-crates/gilrs-0.10.2/examples/ev.rs @@ -9,6 +9,8 @@ use std::process; From nobody Thu Apr 4 01:03:30 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 4V93Jz0HWcz5GHPD; Thu, 4 Apr 2024 01:03:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V93Jy6fVSz4sl5; Thu, 4 Apr 2024 01:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712192610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKfhFkmdWDHu22ZJvinXoLXrC5UJY6huED1ABEiVYGc=; b=BpaVCfXZ6HqFDe9sls+W/Wk8UTqMZN4mQWF/u6j9UeJPlIK1UzpewJXwz6k4SmYAbcyBXl DdV86drvpXLxmaDRQUMGfwkWnoI9mZlgMu9S5ZNxcQ0ZtDFb2eLIT17Fnl6ECSyYexQnkK 9pqVdCsUj/ddOJRvVQAtnqiWb8fGIuOCyL19uMZjWhmG/a8YCSj+bA5O+lZsxWXWuOD8A+ G/9N7VyREaFGCc4U62zO48SxNDRbOfUDTjoFSOgAnq68wPKTUpaKMalFXndmuGXVbnpKTr I00skuMFheFUo8SIeHWKOw2Rs8yBw/9ZMFmztvy1koEZDTz6oY+11N+Ogqi/Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712192610; a=rsa-sha256; cv=none; b=fDrl+IUy2YEUceuNuGvHTlsWC9oLhjDnKDYhN+2FHH9MF9f2jxyX+1vK4UKGaKTafF2Z5n Uy77pofc5Y0QwRrh5uMfFGb+x8A8ydstJ6xPpj4yQHUZpvacjBekC0ew/+KG8ap+LZs4wn CBUy1WF2z0xIv8EjuN+flc6kEFj53EUOV3yZKIxJobZPdpbC+AHT3IrHp54h10d5FybTPv enh/ctR9ADDEFzr1NCX+gxdex9tguxaVZ2Q4hHWKoFyVeEFXMZEjo21DmrjN85KOkEw8bK EF4Y9oThL1AH+FjnB3lMn4JB0VrHME+JlCOaRXgxpSRwMuNkTd6V5MYVjiimrw== 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=1712192610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xKfhFkmdWDHu22ZJvinXoLXrC5UJY6huED1ABEiVYGc=; b=t7IUccjCUI5mpBCcwXNrwX8oNcjs5fqZZD9Ium6TUPSvS5jG1IBMfo6FpUbGdRU4VyIiXT 1evumvGJg/fBa7/KzeEjmQ0Uvk+PxQkYj+0wclkg5Jn0fMParJJYHzzx7+yvReiiLxgVwB RobPmOe8AWEE8Djn78ONsYQvVBZBaQk5yyVzfV9tmu0Ht+du+M5EuPOGY7iJ5VlNQ7Pznc MiFU4q0zzmUUQu3kKKW5ePsEw9WzpSuDsC56Krr3QOWoJ8Dj9lfbeN0WDo6q0LGFtqHJ7V qvftu285E5g5HuxbAaGwlWKOwe7WPnIFvZH/OkNnAAKHmgRMHshg8MhD3h4Bcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V93Jy6CnWzvSY; Thu, 4 Apr 2024 01:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43413Ue3092963; Thu, 4 Apr 2024 01:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43413UgL092960; Thu, 4 Apr 2024 01:03:30 GMT (envelope-from git) Date: Thu, 4 Apr 2024 01:03:30 GMT Message-Id: <202404040103.43413UgL092960@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: f9b86bcabf6c - 2024Q1 - x11-servers/xwayland-devel: temporarily revert backports 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: f9b86bcabf6ca076e48cbe9af6d922bc19115c2a Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9b86bcabf6ca076e48cbe9af6d922bc19115c2a commit f9b86bcabf6ca076e48cbe9af6d922bc19115c2a Author: Jan Beich AuthorDate: 2024-04-04 01:02:42 +0000 Commit: Jan Beich CommitDate: 2024-04-04 01:03:15 +0000 x11-servers/xwayland-devel: temporarily revert backports ===> Applying distribution patches for xwayland-devel-21.0.99.1.671_1 No file to patch. Skipping... 1 out of 1 hunks ignored--saving rejects to render/glyphstr_priv.h.rej ===> FAILED Applying distribution patch bdca6c3d1f50.patch with -p1 *** Error code 1 This reverts commit 655bcbcfb9e0caff8e8e2705a78f5a5a3db3d83a. --- x11-servers/xwayland-devel/Makefile | 5 ----- x11-servers/xwayland-devel/distinfo | 8 -------- 2 files changed, 13 deletions(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index ac786c9d01ab..010672cbfeac 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -2,7 +2,6 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 21.0.99.1-671 DISTVERSIONSUFFIX= -gf0a187f55 -PORTREVISION= 1 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel @@ -11,10 +10,6 @@ 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+= bdca6c3d1f50.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 54936c280248..356dcaddd63d 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -7,11 +7,3 @@ 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 (bdca6c3d1f50.patch) = fcec0b3e508ee12824e7b2e48ede67766104105605ff996ad0df9cb1d9ad389d -SIZE (bdca6c3d1f50.patch) = 3830 From nobody Thu Apr 4 09:55:13 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 4V9H6V1vzSz5GhF6; Thu, 4 Apr 2024 09:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9H6V1Nxfz4xLP; Thu, 4 Apr 2024 09:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712224514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+NZ+FUuSS8WFnu6rqyoVFyKU8qO8W1HKLXhLOkQ6UIo=; b=Furuw12KBrPFbQp4W9f04cJo0FLDSKDJIveUbzFDscNNpgtCyj+tjG1qj7UcLVaO0E9D4V /lmJZvr+P1pJ6Yl1u8gj5L8pc0xTcMUZ4bsx5DqC24sF6vhsMNlfER0iiwK4c+oTBla5GV BqwvO/EtgY3TIjDCHOvvIgPxSpyWeZt5afPQ1wZZGRzfNCFgreNp4TUpkMBWbn1WqtfBBs zlSnfa/WlcIT0GXtVJktyX975uackBsqRlpqhs/WMXGWX4BRAw8wTw5vIXqVIR5mH6u+EX 0OTrFnDynYHjm4MJJeHoXb9VoJmuw7fN/KWUydPMOQAqzSAqrZwjPHAh5zxIuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712224514; a=rsa-sha256; cv=none; b=LYqACbsIlhgcT/HRXDNWTLL57nruA7j57n+ccMk6bA7g3tTyrBhSePXKOepQJOZ8bi434W 2P+2u/Pl+5PAYVvRxuR3TB2HK+16KkNqJQPrYvEyNTyE6tSI9e52gH4RImahYJPbcSfqxl H3FtxZVSiu3V5WSxEfnaJ0BpqI6MtCBV2Kbl0IoFhBnsMvzTZ+hqaEMj+i4lyXexOqMDAR C5DOAwyruTyzCfLcNKsjf4iDPOi9rL0tpG9iGnKadDJiXF/z9REUbpCqOH9javiFI7JFvP C0EGpMmF+2lvEev+mWi+urTPgkidkiwwIzIbu2YBHzOv7Bpic8gwc1FXd9Fi1A== 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=1712224514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+NZ+FUuSS8WFnu6rqyoVFyKU8qO8W1HKLXhLOkQ6UIo=; b=LN6kObT8HIUww4OrOebHMW0HMgZTBu6fzDWUkzdJw+XP2ZZV+h8AYrn6jfCytLJ+eaG/de Nb25YZn6ddipM/qXoaz4j2nNVcx1rDwKFp+3deOVFc686rDbObIQO2+tkuoafNMx7BJst+ FrcZdBQ9A1nE/26BLY8MPvkBOW7X7agMF60Xhmh4vkMUzftapvnmXPi0hLaXZFCOxekovl BxkwiDrZ0AWahkm/qCKxTqMkmCW8O3hIST1rIYq5e3HmxkIYoZz+s51DVO1fgah7ONn/su xqvRb/n6iE+a5KM8CF4+LxcvnelBkJcDKHGuVgspnlIx/P+c6MacwWMWAEbo4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9H6V0hJtz1BhV; Thu, 4 Apr 2024 09:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4349tDqC089065; Thu, 4 Apr 2024 09:55:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4349tDrM089062; Thu, 4 Apr 2024 09:55:13 GMT (envelope-from git) Date: Thu, 4 Apr 2024 09:55:13 GMT Message-Id: <202404040955.4349tDrM089062@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 77f72c463b90 - 2024Q1 - x11-servers/xwayland-devel: backport recent secfixes 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 77f72c463b90237feeba97e05b597101cc407ebd Auto-Submitted: auto-generated 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) --- 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 From nobody Thu Apr 4 09:55:15 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 4V9H6W48XSz5GhBZ; Thu, 4 Apr 2024 09:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9H6W24v2z4xLQ; Thu, 4 Apr 2024 09:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712224515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bdiXzcsLfLuXorA3jFksgvU27VwYnI4wFQFkgJKtEeU=; b=HelYBLWAVlEX0juLhYzNKffKqQCBw1O9l37CyHV7KzNbXV3V/pNOLbJLpABgeskHioXlHv 9/EYQd08W1xpYc+mOAYiAh2a9hrn4PDohnv48fh/bUNM3AGX1lfuWF3oKg7XPzUnDMaGiQ k5bj9Ex2H65o2iiMiFfB+gdpRlABCd7+VIfuWUHB2wt4nHqFQZqf0w4NZyHN41leJ5BGTo sExUORksx0+oTS6eo6DfpaLKyRQIBpG45uRAX+OtHOjRMoz9ytfsqOH3cQBs55YbB15ial 2cAN7WsHA11NpxIYMBKQThhC6Pcbgjupx6L5OlWRCxBA1sbu1wK1FmSE47AOlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712224515; a=rsa-sha256; cv=none; b=RYFx4entu1zOEiL5r6rRagjecIdF3KV+uZtbpedAHM54f/YkqAmJg4L8KMivZ+92W4y9PJ oWgU5J9W68Gl5BLLHd+5jm9U95Vyb6p7ltLovyb/qHVn8vrs3aEebkm1Bzgd0SUXPEQBz9 9F07biRrbgKV70FHXdnep8a1l7oHfM1UKMTk6Tt7smXybSHT1/SN5KEEcD3l8HuZXQ8Lyd 6xcRhVdE0BZ0eHGZDLHjjcejNQUT0yzsJLZYNoUBnOlJp/NoJmwz2cw6INgDEThEagfA0M kFYkLQUQGp+D/kKTN6n6o1C2KMRw9yROfxRbC4ny3uAYsTegaHdiVpN1tCLo/A== 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=1712224515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bdiXzcsLfLuXorA3jFksgvU27VwYnI4wFQFkgJKtEeU=; b=GmrgJVufoqOLLoZqELBRJ8LqPNwRxbP9nCIXNGk0x8qJswXGb5sBLt2zY0aeEfN6hZ/c6n SWPSrs1AfdwAlgF9U+gjVsMDHRbr8bD5a5IOOcZ6+WVe7zSr4NIqebvM1EJGUQP2yMm8ji jY6tsXSf8XmT9RTFJ8V+wuW8mXkCKViuGqGAxvGymKXBT9vxpKTCjdoImOtf8F7KPPQtOq +VdUEnmRg4U6+MYd4J8n5DdQFPdJSRhPNDHpWLGyAD7rRwI+TEma4bv9lnsi0vH5YyLv+I cLhOMY9b38cy8/6wBtEfUTVFRlwSgfT/DN67zRcSrCY2QxQyHPaTfSSvoYdQXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9H6W1h9Hz1BDy; Thu, 4 Apr 2024 09:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4349tFk4089107; Thu, 4 Apr 2024 09:55:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4349tFkd089104; Thu, 4 Apr 2024 09:55:15 GMT (envelope-from git) Date: Thu, 4 Apr 2024 09:55:15 GMT Message-Id: <202404040955.4349tFkd089104@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: b2767b9fea26 - 2024Q1 - x11/i3bar-river: unbreak build after dfc55c4ee063 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: b2767b9fea26ec7726e2cdd9eb61b66133332e0c Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2767b9fea26ec7726e2cdd9eb61b66133332e0c commit b2767b9fea26ec7726e2cdd9eb61b66133332e0c Author: Jan Beich AuthorDate: 2024-04-04 09:50:39 +0000 Commit: Jan Beich CommitDate: 2024-04-04 09:54:46 +0000 x11/i3bar-river: unbreak build after dfc55c4ee063 error[E0658]: `c".."` literals are experimental --> src/bar.rs:61:13 | 61 | c"i3bar-river".into(), | ^^^^^^^^^^^^^^ | = note: see issue #105723 for more information error[E0658]: `c".."` literals are experimental --> src/wm_info_provider/river.rs:118:33 | 118 | PointerBtn::Left => c"set-focused-tags", | ^^^^^^^^^^^^^^^^^^^ | = note: see issue #105723 for more information error[E0658]: `c".."` literals are experimental --> src/wm_info_provider/river.rs:119:34 | 119 | PointerBtn::Right => c"toggle-focused-tags", | ^^^^^^^^^^^^^^^^^^^^^^ | = note: see issue #105723 for more information Reported by: pkg-fallout (direct commit to 2024Q1 as 73941e6741d6 is missing on the branch) --- x11/i3bar-river/files/patch-rust-1.76 | 60 +++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/x11/i3bar-river/files/patch-rust-1.76 b/x11/i3bar-river/files/patch-rust-1.76 new file mode 100644 index 000000000000..79eb4aa8dccb --- /dev/null +++ b/x11/i3bar-river/files/patch-rust-1.76 @@ -0,0 +1,60 @@ +Revert https://github.com/MaxVerevkin/i3bar-river/commit/d1ba22747e9e +until lang/rust >= 1.77 update. + +error[E0658]: `c".."` literals are experimental + --> src/bar.rs:61:13 + | +61 | c"i3bar-river".into(), + | ^^^^^^^^^^^^^^ + | + = note: see issue #105723 for more information + +error[E0658]: `c".."` literals are experimental + --> src/wm_info_provider/river.rs:118:33 + | +118 | PointerBtn::Left => c"set-focused-tags", + | ^^^^^^^^^^^^^^^^^^^ + | + = note: see issue #105723 for more information + +error[E0658]: `c".."` literals are experimental + --> src/wm_info_provider/river.rs:119:34 + | +119 | PointerBtn::Right => c"toggle-focused-tags", + | ^^^^^^^^^^^^^^^^^^^^^^ + | + = note: see issue #105723 for more information + +--- src/bar.rs.orig 2024-03-30 19:50:32 UTC ++++ src/bar.rs +@@ -58,7 +58,7 @@ impl Bar { + surface, + Some(output.wl), + zwlr_layer_shell_v1::Layer::Top, +- c"i3bar-river".into(), ++ wayrs_client::cstr!("i3bar-river").into(), + layer_surface_cb, + ); + +--- src/wm_info_provider/river.rs.orig 2024-03-30 19:50:32 UTC ++++ src/wm_info_provider/river.rs +@@ -2,7 +2,7 @@ use wayrs_client::proxy::Proxy; + + use wayrs_client::global::*; + use wayrs_client::proxy::Proxy; +-use wayrs_client::EventCtx; ++use wayrs_client::{cstr, EventCtx}; + + use super::*; + +@@ -115,8 +115,8 @@ impl WmInfoProvider for RiverInfoProvider { + btn: PointerBtn, + ) { + let cmd = match btn { +- PointerBtn::Left => c"set-focused-tags", +- PointerBtn::Right => c"toggle-focused-tags", ++ PointerBtn::Left => cstr!("set-focused-tags"), ++ PointerBtn::Right => cstr!("toggle-focused-tags"), + _ => return, + }; + self.control.add_argument(conn, cmd.to_owned()); From nobody Thu Apr 4 10:57:43 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 4V9JVh57x9z5GnSD; Thu, 4 Apr 2024 10:57:48 +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 4V9JVd4mNKz53fB; Thu, 4 Apr 2024 10:57:45 +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=1712228264; 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=j8V23umhGvH/Gq2u+u8oGVMSQtnLaBLOLtRBT/2s3HI=; b=rwxDJ0E1czyBSviosjI+mRz0fd4bsaBDMlfliml0ksSj7ln4Ik/flIGNgvIaLQ2ExVvGi8 DATTjQNv5FibpsDga9sTPGfetFb69yCdeFsT4EzBgBc8ehnOMuAL0bCiExw1YCtntQ9Dhj SXNAeq1eAS9BK4G7kpq22dn3l76FBIs= 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 3ffbe68d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 4 Apr 2024 10:57:44 +0000 (UTC) Date: Thu, 4 Apr 2024 12:57:43 +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: <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> In-Reply-To: <202404040955.4349tDrM089062@gitrepo.freebsd.org> References: <202404040955.4349tDrM089062@gitrepo.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: 4V9JVd4mNKz53fB 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. 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 From nobody Thu Apr 4 11:54:52 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 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: 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 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. From nobody Thu Apr 4 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 From nobody Thu Apr 4 12:15:32 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 4V9LDN4FpTz5Gv18; Thu, 4 Apr 2024 12:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9LDN1mmmz42QV; Thu, 4 Apr 2024 12:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712232932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kt5N6i57GnVDp6rjTbKaQzeJwDYJAM4kuukJttTeSzs=; b=Rn+R3gCXhJsJRMeoGAic55PKup1Wi0U8H4+UnUN9TndEDRW/chOUPsN68apW/bGvBMBufr kRAdMNnmr0tfAeLCaKisd9rgAyjS8m59VJEIwt7SmFAnPsZBU1HQBubPGGw6+y/mSMH0p+ 8oHf+UqsXOVGAfEM1VSqsSFnZ/pYmLailCBomgmn8xAzTEcPSugutmG7ZFooSnFKhca+BT 5y4fbeJMc4A4WH+gF9qER3wzOxwHnpJhkLO1fPAp3fOIFEdCl8udvuM+Afs4+cF9ux6wZt zHbL/IWfD/1LanB0ujCh7ZpdAsFed/AGckuHkbkBhfZ1HgsWbChrgF3+fTkijA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712232932; a=rsa-sha256; cv=none; b=gpl7chpWe49RYES+I4r+pOLCpT3JI3KT/yFdsrjFbB8/bCT88vQNQmRuTgfi8qfRoapNvt CoSM5+uJ1OkCLOr4pLocr5lIjN0zHq3ugW/Zb+qwZRyVRQbF+InrFDoP/ukPNfnyFgb4az y36IFUxFWrfTOUy/Iz1OjjFlJdbrHVSMtyGbIDWtNifvZltVyUp3srHfoZzuPV1YTO5CfK QrOFUKcu2LqKTfOb6b8R5dP4KcAsjIV+xZgWHrnhozpTacniZr/WJmkj+YzkKQcorVv164 35NcQn78rIlAsLBlehpVMGlS14wnMHqmIRsWz49omJW4+aRprzTDcioeUfTBEA== 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=1712232932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kt5N6i57GnVDp6rjTbKaQzeJwDYJAM4kuukJttTeSzs=; b=G2A8zu7FGT276kwrlAF6649PWXreyPbFPU+3oFmtz0IKSKzUNreKha21eQbZAmitHZrhTC 2DsZMpL1Fqmwl8Xz6H37xfWvSwlATbwYpQJ02uY1Rlcwxc8lyIfCG9nwsRRdTbW+IEcqki NHfDzTOXpHJZla8UHmLaJr9SRooqOSGCSUpv1MW6uzfkcsFFqvWIh553QvkA6NF+mLs/e/ vqu4ooO2ZAystpZZ3E5+lepLl1OHyeZN7zWKsKZV3tI2opxWMOpj1tsCxl8bwG0tiZV/kX IJm/6M9IXirJ5k8Jh8pbwb2oBRazKmEcFJGWsKT2G6RN0WgjkSU0qN+OeCE4NA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9LDN1N72zGNn; Thu, 4 Apr 2024 12:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434CFWPA027772; Thu, 4 Apr 2024 12:15:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434CFWY4027769; Thu, 4 Apr 2024 12:15:32 GMT (envelope-from git) Date: Thu, 4 Apr 2024 12:15:32 GMT Message-Id: <202404041215.434CFWY4027769@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: e58e58740ba8 - 2024Q1 - x11-servers/xorg-server: Update to 21.1.12 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: e58e58740ba8eae8df3e16e52838c81ee6c76bcf Auto-Submitted: auto-generated The branch 2024Q1 has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e58e58740ba8eae8df3e16e52838c81ee6c76bcf commit e58e58740ba8eae8df3e16e52838c81ee6c76bcf Author: Emmanuel Vadot AuthorDate: 2024-04-04 06:35:41 +0000 Commit: Emmanuel Vadot CommitDate: 2024-04-04 12:14:05 +0000 x11-servers/xorg-server: Update to 21.1.12 Release notes: https://lists.x.org/archives/xorg-announce/2024-April/003499.html Security: CVE-2024-31080 CVE-2024-31081 CVE-2024-31083 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 0df7783381d70c4df74dda76d22425446e09b4c5) --- x11-servers/xorg-server/Makefile | 3 +-- x11-servers/xorg-server/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 9aced67a4f08..5ed0aa7760ff 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -1,6 +1,5 @@ PORTNAME= xorg -PORTVERSION= 21.1.11 -PORTREVISION= 1 +PORTVERSION= 21.1.12 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index f5d94f359780..ada27e1a96b8 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1705425028 -SHA256 (xorg-server-21.1.11.tar.xz) = 1d3dadbd57fb86b16a018e9f5f957aeeadf744f56c0553f55737628d06d326ef -SIZE (xorg-server-21.1.11.tar.xz) = 4985464 +TIMESTAMP = 1712212486 +SHA256 (xorg-server-21.1.12.tar.xz) = 1e016e2be1b5ccdd65eac3ea08e54bd13ce8f4f6c3fb32ad6fdac4e71729a90f +SIZE (xorg-server-21.1.12.tar.xz) = 4957972 From nobody Thu Apr 4 12:15:34 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 4V9LDQ5srfz5GvGH; Thu, 4 Apr 2024 12:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9LDQ3WNsz42jC; Thu, 4 Apr 2024 12:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712232934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FS/DX6C101nyY04wiXAimPVaB332iqoUF2e03TuJwAs=; b=L0s5jJuY0c4iqhS4HR4FQE57R4+P9OZHj0FbfKxOVjhta6gC+MSDWq+5Ppg7Sh4NwIJ7bL v+Fl8OTeInhbDEFZM/SG1+qiD0Sa3I23+UDqs3B4DpcNU3jXCFyGdbQcikW2f4HkuJ8bLK UmwMLhT43tlPUqNvEb/soUWuG/yksIuO12z+XsKLNYsqLGWtA5CyvQiQHmWv2lXzh3wYS2 vY42sggORpcV0Hw0H6GXitL4ACRKHDMHuJ5aqUtbqN/IcU844dCTzFiUkESl+HtvignRQZ /0H8ZBKFGXpQyMv0UAccV/wLW4yWiA/TevCcmWQzVZNK6n1gZSSiTNRdUPxhyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712232934; a=rsa-sha256; cv=none; b=TrUx+J1w+/nbapOsVCKIHwHuehiQSZIBpn4dfxeOgPnwQxbrnEjMMKLD3Z3UoYjc+7UU6Y vUygklii3NvW96GnXpzqEcMvo4XeSJZC8thSnwiMBFZxgiXy1FQZxHNOYequ9MhPnjr4/S bYMoxuav0AaQf2Zqr4t93cSCEPzI1yJPkWjxj7wcWOIb9JT6waSD2uTqF9lXp05d/Gg3uO 8dWAKy7Vnr7Tn3yYGATvL+IDJdrfQcehtH3ylGpNSTrJlhIX60QEM+NRjU8uUvYZoEPvOB eST5nH8vlveQjfUeG4mFqK+VWWGNvzBPxT8A0G5df7AKafT6uVYR4TNZU+wEMQ== 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=1712232934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FS/DX6C101nyY04wiXAimPVaB332iqoUF2e03TuJwAs=; b=ewioDRb4M8CiymcFKvvb1xU1aQiaUzzqTi6XwbsZuk2faeK7gpf0Ix5jzR0mZXhVeLuq8z 2JMn69YyYENyegb97xiveFcSyJyiGSZYoTBZAuiqtmKL2drnltrJNBQCmozrxyQ9VvnkRf kOZO3x5wKYW+mQLfxwD7ELkND+PxW79NHaiLwYi2VzKoANfQzJCDcWdkPKO50hle24a7vY ZeCJKLnf4V+tNWeKnzS/FBvz4+yaHjhv6BgIvOiJJUp3elapaJA6cw68LGf9Fqs2djw7gX 3uLozuBg8mBaRA2njzNvxaklVVzydN3ehXbPoUOHiB+BnPyui+UIYoDFakJG3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9LDQ36dxzFx5; Thu, 4 Apr 2024 12:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434CFYwX027856; Thu, 4 Apr 2024 12:15:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434CFYWu027853; Thu, 4 Apr 2024 12:15:34 GMT (envelope-from git) Date: Thu, 4 Apr 2024 12:15:34 GMT Message-Id: <202404041215.434CFYWu027853@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 37a47acf8f67 - 2024Q1 - x11-servers/xwayland: Update to 23.2.5 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 37a47acf8f673cd17eaf7b185df097e257716ce7 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=37a47acf8f673cd17eaf7b185df097e257716ce7 commit 37a47acf8f673cd17eaf7b185df097e257716ce7 Author: Emmanuel Vadot AuthorDate: 2024-04-04 06:38:10 +0000 Commit: Emmanuel Vadot CommitDate: 2024-04-04 12:15:16 +0000 x11-servers/xwayland: Update to 23.2.5 Release notes: https://lists.x.org/archives/xorg-announce/2024-April/003498.html Security: CVE-2024-31080 CVE-2024-31081 CVE-2024-31083 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit fc136e65991746d25e325e7423635a13aa554a11) --- x11-servers/xwayland/Makefile | 2 +- x11-servers/xwayland/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile index d84662f4cb7e..a97e274c8778 100644 --- a/x11-servers/xwayland/Makefile +++ b/x11-servers/xwayland/Makefile @@ -1,5 +1,5 @@ PORTNAME= xwayland -PORTVERSION= 23.2.4 +PORTVERSION= 23.2.5 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xwayland/distinfo b/x11-servers/xwayland/distinfo index 3d8d77e3a980..94819e6f2c43 100644 --- a/x11-servers/xwayland/distinfo +++ b/x11-servers/xwayland/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1705425188 -SHA256 (xwayland-23.2.4.tar.xz) = a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b -SIZE (xwayland-23.2.4.tar.xz) = 1299748 +TIMESTAMP = 1712212647 +SHA256 (xwayland-23.2.5.tar.xz) = 33ec7ff2687a59faaa52b9b09aa8caf118e7ecb6aed8953f526a625ff9f4bd90 +SIZE (xwayland-23.2.5.tar.xz) = 1299988 SHA256 (cd6c9c1246af.patch) = a50fd4511793a53cacefbca2c8436cf43d36ce21d245aadb5d17e16653580d75 SIZE (cd6c9c1246af.patch) = 3730 SHA256 (707c37b7ab9e.patch) = db8a2acbc8b8ceeeef0c6aa4b06b632ef074b1319194cc9794e3ae715062e425 From nobody Thu Apr 4 12:15:33 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 4V9LDP4kZpz5GvF6; Thu, 4 Apr 2024 12:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9LDP2VQzz431w; Thu, 4 Apr 2024 12:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712232933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8lOYMTTZmP56pQITaLdkxEVbalr9vgAqjHJI4C2UUI=; b=TvAr7CN/dxOeS/w9iyTxJiAFrIRqvcSEJMvk1CxDBmTuzzkQBcXcslgS4EpXQUG3Uk+L4w /a51ocRrouqiKqg7HZ6qjmWU85i6Lv7QojI3l+RoGBZ6+3ntBvNvNwJnwXujNTSv5CxB2P rdCZnD9eNVuTPVZngQ6IFi8s0EXxWYR2ETjotU4EtE54npN/Fn5kXmHD1sFF0ml0UHI+0b nVfm8bDeUX9Z6vYYc3vu3ZQxkeJSKbKIRcPDmXMe0UYcn0q5w6KTG58I7hKaMs2F0Oj9tS l0YTPIpHOmElt6P6f2Zn/qZ/7BlO31iMffGlngFo3N7Ngh0pbmYekqXihJKebw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712232933; a=rsa-sha256; cv=none; b=OYuTvkb+wfDEl0/yA4khj/MTysPO0co3hA9z7oi9RuiT3MVMp59Bxeksukbz69LmJ17Fhc Wtk9Vln/BdTyjtt9viPsl+Ib5aIPuYnqy08jy+T0aKScWyYib7pq90PO3PHCCqLwx/B90b dbYceQCpdcQCGY3/EvklBGHk52PrVBym4d/2AkoUrang6VFPlRPMwLC3mhKZNwNvYnFQPw 3wlcxlGmIAe3STxQuCQ8Vx8Hae0A1XflP4r2lAOk8nC9tYeW02e6vLpbribG7LGqzkDtNb eJevUqviK2QrCC7wLgsDzsD9TmxFO+bgRSGhKimo+DVy079bSkxddsCU4mi7Ug== 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=1712232933; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8lOYMTTZmP56pQITaLdkxEVbalr9vgAqjHJI4C2UUI=; b=mH/zQxLdR9nX0/aiYvUMd680JPi94b61IPkcEVxEhSnm+13r12xhzL5pxLQ/8+Iuf7ry1O MoO3ukQEGsvNLEX1TInYP/g9694yVqBG7pd/bUKz8KOINgiGtDwL8euzsSloAaxS8iZF9F BLRaeoLBvVKbkhKjtMqxejlJa/hfpsYF70quWmh4J5VRcg1Hor/t9/WwFw5xMB33C4aSZm wbD0LRdsDIMODyZHaG1cHgiTH/HpipEZET4IorCvdQKPtWJYB/KKqTsBH+LOufc+kOXBcD ZY40pRdxjzB92eaFMnj3jOiK2Fw2/sg9lZqCpT7YoAwtyMJ5JCOy9xTNk1sA+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9LDP25rvzGl2; Thu, 4 Apr 2024 12:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434CFXur027817; Thu, 4 Apr 2024 12:15:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434CFXGk027814; Thu, 4 Apr 2024 12:15:33 GMT (envelope-from git) Date: Thu, 4 Apr 2024 12:15:33 GMT Message-Id: <202404041215.434CFXGk027814@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: f3775bdcbaf5 - 2024Q1 - x11-servers/xwayland: Update to 23.2.4 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: f3775bdcbaf54bcfab1ef5f97952f659de03747d Auto-Submitted: auto-generated The branch 2024Q1 has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3775bdcbaf54bcfab1ef5f97952f659de03747d commit f3775bdcbaf54bcfab1ef5f97952f659de03747d Author: Emmanuel Vadot AuthorDate: 2024-01-16 17:14:00 +0000 Commit: Emmanuel Vadot CommitDate: 2024-04-04 12:15:08 +0000 x11-servers/xwayland: Update to 23.2.4 Security: CVE-2023-6816, CVE-2024-0229, CVE-2024-21885, CVE-2024-21886 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 55a7d982d01e3dce58ad06aae44a0dce9880b92f) --- x11-servers/xwayland/Makefile | 2 +- x11-servers/xwayland/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile index 81e11a262a9c..d84662f4cb7e 100644 --- a/x11-servers/xwayland/Makefile +++ b/x11-servers/xwayland/Makefile @@ -1,5 +1,5 @@ PORTNAME= xwayland -PORTVERSION= 23.2.3 +PORTVERSION= 23.2.4 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xwayland/distinfo b/x11-servers/xwayland/distinfo index 0388d149b12f..3d8d77e3a980 100644 --- a/x11-servers/xwayland/distinfo +++ b/x11-servers/xwayland/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1702458969 -SHA256 (xwayland-23.2.3.tar.xz) = eb9d9aa7232c47412c8835ec15a97c575f03563726c787754ff0c019bd07e302 -SIZE (xwayland-23.2.3.tar.xz) = 1298840 +TIMESTAMP = 1705425188 +SHA256 (xwayland-23.2.4.tar.xz) = a99e159b6d0d33098b3b6ab22a88bfcece23c8b9d0ca72c535c55dcb0681b46b +SIZE (xwayland-23.2.4.tar.xz) = 1299748 SHA256 (cd6c9c1246af.patch) = a50fd4511793a53cacefbca2c8436cf43d36ce21d245aadb5d17e16653580d75 SIZE (cd6c9c1246af.patch) = 3730 SHA256 (707c37b7ab9e.patch) = db8a2acbc8b8ceeeef0c6aa4b06b632ef074b1319194cc9794e3ae715062e425 From nobody Thu Apr 4 12:40:21 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 4V9Ln6242hz5GxBy; Thu, 4 Apr 2024 12:40:26 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 4V9Ln61D33z44k8; Thu, 4 Apr 2024 12:40:26 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712234426; 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=79Inabi2uM8M8usEmWBebpGTQl992RwRuW5vTsZFEvA=; b=DW1sAJPlVHUyIY4D4X4kE+eF/BsxqgZ1Up3Zw9ri7qM8WvZ+myiNKhmLmtXt7u2gLzQ+kU mOiC0S03I9S4ckFUk50hMg+K0I0MgpF2Nj5Do7tS9X3g+ffpkQ/vtiHZU46DtmiggDmigW /2KTEaiWFO1Q+BpcSnSUNNdVOcjheohzpzaX5MKQaWZLiAh/MGiXVnImbSTL3weq+9PahL PSt7mP0pWzPRCyeiqwJEAUp5u4+CoZu8yddpwwppKb34M3T4HOYuW9c65nGZS3Cf+yS1vZ j7DvZmjzAXijSBBSrmSqK+cmkURHnBRepotMNlt5f6fJooZ0lW02OI3Ojf74Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712234426; a=rsa-sha256; cv=none; b=DSyzjnBMtt7bXRsJ3GdU2LIgKH3Up75Zk/MUtK5F898HGl+6iArEVB0SBYjpwmhpCMF+h3 Pw4zZ3MBBn0ffJdFG7cV6jVKfdSRMVTkA+xXVW4TXKPD1zf84TD0+F5QcqRY3JdrF1Ewm/ amYMVC8ZSBM14jm4eTUEM61Q7iS3vccO2KJx2pwxkyUNhhZwRfHHFvEeUpz9BOf0GyXsWL eamTn+PKahVHdvZCduRUAXKhnuXONdQl0BkazUwg3HkAAlFlRCXttejAzkw0zRDmucNgtE xzEnmKto3b4+IGuzZ2cHS2exGOejhaMv4KapbIl1nYsKPG+/Q0XzKkZrReM3MQ== 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=1712234426; 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=79Inabi2uM8M8usEmWBebpGTQl992RwRuW5vTsZFEvA=; b=BFAiatoRDafzKg3x7G6s0+LrnpySzwCwVkbJ7d4mP8FACqxJJ+OLL7OAQ2figgKwm8UpfU IS22FZn1mjQKbGDOHRuacn8tGwiaGBPMW0aVHQUYAn1ua3F+iE7wvccSx0QoADsXxrxXBg hb2wu9mJ+hobnnVcEy/fk7beHWeKgMUchaP8sBJzp/5W4GLu8TDBHCMC64C3BUp55t3Yxj CvyqkS7q/5TOTbHZEkc8DMzioTjQ2ljdqA391WttnSNIvpfIj4W8WpYQNslRZ+bl97Bqd1 k6s1qPUBDtvzghWQ5guEDsmfJXoDcPBA+UNvcaOpaqRK9tDX9IEhh06zorx54Q== Received: by freefall.freebsd.org (Postfix, from userid 1354) id EDFC31A609; Thu, 4 Apr 2024 12:40:25 +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: <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> (Emmanuel Vadot's message of "Thu, 4 Apr 2024 14:12:39 +0200") References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> Date: Thu, 04 Apr 2024 14:40:21 +0200 Message-ID: <7chd-l2ru-wny@FreeBSD.org> 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 Emmanuel Vadot writes: >> 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. It's not fine. Not only the current version was based on my port without crediting prior art[1] but also introduced a number of regressions that don't exist in my port, all of which were documented in my reviews. Besides, all consumers except Plasma are maintained by me. If you disagree feel free to adjust Mk/bsd.default-versions.mk and/or help with provides/requires integration. [1] Meson conversion, parity with Xorg after the split, HiDPI rebases From nobody Thu Apr 4 12:44:09 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 4V9LsQ1zGNz5GxCb; Thu, 4 Apr 2024 12:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9LsQ18K7z468t; Thu, 4 Apr 2024 12:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712234650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJsQEz479fLuvk0+xsaf4mUnJAR9LPoq4FQNgt1fH3k=; b=V62rTYu2PajkJk+y71unQw15Vs4B6hPJIH0Dka5I+vWCqrSwscntoVKNEN7hTIXMGSHI/A 8G2739nBPnL/ddtEYb8kB/Eu/agnzPG7Hml0URB3HyZm+HDM2OUntH2ARsG6aTMPe3RAFi YiWV/H9di24OnuExWwCMnpVN2KNuwiGbP5xsLEj3hmSt8qUES8i7IMLn4wcuneNSM1214P zwjndlP9ZemHBSBq7sWkmb0MtX50VhcYudDj7eCU/aop+M/LqzBxrUwLKpzHe9blgqAFbN dYdoiVwF8yuJjmANP3XbfghcMvcm90JSxHcRL3e1Il0X8od1bafqVWKuB7wkCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712234650; a=rsa-sha256; cv=none; b=eRsA54sgqzHZ03W72iUXXBQMRhmTnQuZnEovbRuxXGZq6qEceaNkvvsE8YluKGlGazkdQf PvAAjGFbaSg6ZVpqhoqmniOpT37mA6lhuSbkxhWNN6YjLx8Z3exhuDUyrLV26RGzs72SdY FmlKamFGYzjKZ14KXkGpjz2A6MJXE3O2fZPST2YN1no6trbX++ZEtnsr+Q4swcm9Mm0RmR Xwd+Kr+abuS+HhcNyOELuTYm2K/JCXNBZeCGnR8vpFky6xBl0krgMQZuxcozdmr3d+GLBX QpMfYo5lyxd3VaiAK2/yEr/doOa9Y7BYXrr9QxyiD+8Vvky2WkpJOC4E2aaraA== 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=1712234650; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iJsQEz479fLuvk0+xsaf4mUnJAR9LPoq4FQNgt1fH3k=; b=UDxDkuPRKy0sjzUqsrzNGz2vn0SGFbrqdRl7K9oO3Dveel5PBaczAMdyOwKjlQWs0aZqZJ ezhQWIzyg0dsUOmpH3n8MxR2aeLa+0YK8ErHUvVPxJ7EKJrOHvpWy2ys3iRMd/WoD7umEP t+0zJWxseao05eh58FtGxMI7RF810cuNQ03Wv4ws8o9wqfvcFYz1frGl5JmWYNSK5IepKB u75H2nn9qTOL8+94QL401MqE43gqoQF86JlIh4WSq6TEW4E+4jXaqLnlOcUMYbJCdlFA62 dxUEfnJ2+oahJ/7sE/4fhLgrMxGk2GjSnrhAtwHC0Vw6Is3B8HLCGz8LhlpZ9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9LsQ0kSvzHRb; Thu, 4 Apr 2024 12:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434CiATW078169; Thu, 4 Apr 2024 12:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434Ci9lX078166; Thu, 4 Apr 2024 12:44:09 GMT (envelope-from git) Date: Thu, 4 Apr 2024 12:44:09 GMT Message-Id: <202404041244.434Ci9lX078166@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: c302c31eba10 - 2024Q1 - x11-servers/xwayland-devel: adjust upstream reference after 77f72c463b90 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: c302c31eba10db78e273b3ee4df494439fe63ca9 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c302c31eba10db78e273b3ee4df494439fe63ca9 commit c302c31eba10db78e273b3ee4df494439fe63ca9 Author: Jan Beich AuthorDate: 2024-04-04 12:20:45 +0000 Commit: Jan Beich CommitDate: 2024-04-04 12:42:26 +0000 x11-servers/xwayland-devel: adjust upstream reference after 77f72c463b90 Only using 1 rebased patch from 23.2 branch as the rest apply fine "as is". --- bdca6c3d1f50.patch 2024-04-04 00:37:36 UTC +++ 01941a831811.patch 2024-04-04 09:39:24 UTC @@ -1,4 +1,4 @@ -From bdca6c3d1f5057eeb31609b1280fc93237b00c77 Mon Sep 17 00:00:00 2001 +From 01941a831811c9fd47ffed5ea96375abeb20c9fc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 30 Jan 2024 13:13:35 +1000 Subject: [PATCH] render: fix refcounting of glyphs during ProcRenderAddGlyphs @@ -20,15 +20,17 @@ Jan-Niklas Sohn working with Trend Micro Zero Day Init This vulnerability was discovered by: Jan-Niklas Sohn working with Trend Micro Zero Day Initiative -Part-of: +(backported from commit bdca6c3d1f5057eeb31609b1280fc93237b00c77) + +Part-of: --- - render/glyph.c | 5 +++-- - render/glyphstr_priv.h | 1 + - render/render.c | 15 +++++++++++---- - 3 files changed, 15 insertions(+), 6 deletions(-) + render/glyph.c | 5 +++-- + render/glyphstr.h | 3 +++ + render/render.c | 15 +++++++++++---- + 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/render/glyph.c b/render/glyph.c -index 850ea8440d..13991f8a12 100644 +index f3ed9cf4c1..d5fc5f3c91 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -245,10 +245,11 @@ FreeGlyphPicture(GlyphPtr glyph) @@ -53,20 +55,22 @@ + glyph->refcnt = 1; glyph->size = size + sizeof(xGlyphInfo); glyph->info = *gi; dixInitPrivates(glyph, (char *) glyph + head_size, PRIVATE_GLYPH); -diff --git a/render/glyphstr_priv.h b/render/glyphstr_priv.h -index 90a90fa4f6..dd1bc54825 100644 ---- a/render/glyphstr_priv.h -+++ b/render/glyphstr_priv.h -@@ -56,6 +56,7 @@ void AddGlyph(GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id); - Bool DeleteGlyph(GlyphSetPtr glyphSet, Glyph id); - GlyphPtr FindGlyph(GlyphSetPtr glyphSet, Glyph id); - GlyphPtr AllocateGlyph(xGlyphInfo * gi, int format); -+void FreeGlyph(GlyphPtr glyph, int format); - Bool ResizeGlyphSet(GlyphSetPtr glyphSet, CARD32 change); - GlyphSetPtr AllocateGlyphSet(int fdepth, PictFormatPtr format); - int FreeGlyphSet(void *value, XID gid); +diff --git a/render/glyphstr.h b/render/glyphstr.h +index 2f51bd244a..fb6589d3e2 100644 +--- a/render/glyphstr.h ++++ b/render/glyphstr.h +@@ -102,6 +102,9 @@ HashGlyph(xGlyphInfo * gi, + extern void + AddGlyph(GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id); + ++extern void ++FreeGlyph(GlyphPtr glyph, int format); ++ + extern Bool + DeleteGlyph(GlyphSetPtr glyphSet, Glyph id); + diff --git a/render/render.c b/render/render.c -index 29c5055c62..fe5e37dd9a 100644 +index 456f156d43..5bc2a204b7 100644 --- a/render/render.c +++ b/render/render.c @@ -1076,6 +1076,7 @@ ProcRenderAddGlyphs(ClientPtr client) Reported by: manu --- x11-servers/xwayland-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 2edd4156938c..5fa6714f7f49 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -14,7 +14,7 @@ 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 +PATCHFILES+= 01941a831811.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1464 MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Wayland client (development snapshot) From nobody Thu Apr 4 13:15:54 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 4V9MZ76Xykz5H0rp; Thu, 4 Apr 2024 13:15:59 +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 4V9MZ71CsMz47sT; Thu, 4 Apr 2024 13:15:58 +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=1712236557; 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=iXgSwrML7liEjdc55429tvmXZ7oHfdlpFgf5Ytc2zFo=; b=mxL/vr5gsIE+TxHrc9tJjIYNyn1XiXszLgWQHZAaYBOre9s9YnztI1tyjxEYvEuEj8x0lN xyV44m+x+DPyIcbyIWfN1jIY82HewkM+XSskNvRRuvCct8IYAZl0d67JoeQoP2DEebBvcy 4OqGAUTLjzioVmigNkQLPQNjAAm/dnI= 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 dde6d347 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 4 Apr 2024 13:15:57 +0000 (UTC) Date: Thu, 4 Apr 2024 15:15:54 +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: <20240404151554.04340786db8562e522f7b1a8@bidouilliste.com> In-Reply-To: <7chd-l2ru-wny@FreeBSD.org> References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> <7chd-l2ru-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: 4V9MZ71CsMz47sT On Thu, 04 Apr 2024 14:40:21 +0200 Jan Beich wrote: > Emmanuel Vadot writes: > > >> 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. > > It's not fine. Not only the current version was based on my port without > crediting prior art[1] I won't comment on this. > but also introduced a number of regressions that > don't exist in my port, all of which were documented in my reviews. What regressions ? I'm using xwayland for more than a year on my desktop instead of -devel and haven't seen a problem. > Besides, all consumers except Plasma are maintained by me. That's not the point, you're not the only user of those. > If you disagree feel free to adjust Mk/bsd.default-versions.mk and/or help with > provides/requires integration. No, if you want to use a -devel version do it all the way and create a wlroots-devel and a sway-devel that uses all devel version. > [1] Meson conversion, parity with Xorg after the split, HiDPI rebases -- Emmanuel Vadot From nobody Thu Apr 4 13:48:55 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 4V9NJD1B3Xz5H39C; Thu, 4 Apr 2024 13:49:00 +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 4V9NJD0gBGz4D8Z; Thu, 4 Apr 2024 13:49:00 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712238540; 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=+Y6NE8ZzvuaV3udodsLdCMWhPnxt56hB/47cc6zW2f0=; b=B5bV350GPtQay1cjTICi5UXKoboazjUXBTJuhwdZn79Tm+VnaiQdA/940ZIdviUJ0X1H2E Jjv8nm/3DGeezra+gXl16Bxu6l8OXKP556baOn766sIVwEdPieUIRTZZpA0Ekgtookn7eZ RA6Ru2QuqbQ9R1K/P43Rqqi5iDWR+uDMbZeNkgiSU6MaUyvm8RwQ2s+FrNBuLbXzdN+jt+ md632xir5TrJOjhrMHElSKW8EYiq3FPGdjckp2q3LoaaYSeFoHE+YQ34GKkIkKIXOWWKws A7KvI0VbKCi9w69wNSQX0tATmzRth7o5WpjQOJPvTEuQnJBzd2Wb6bYlfF4sWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712238540; a=rsa-sha256; cv=none; b=LOr0e3a+laQgbLEW6lXvG7YUp95y6bF3rlIA8db/rtUFCAAvHefVooYKC6f+4iMWXOller KP42j7MSzPDhvGgRfwVMPOe5wKe648MnFv12As+8t3zlDwJF89KeMWLlXqG36/hooRvtDg diizRJJzAGsQOO0AiQiE4wvUFSaJiomV3Lca4jZyqq70P0FdHFE2KiAqI2iyJsD9GyE1n3 HdvDbhIDLsazaSM0GZkzxoPjF06d7n4kuZzt8EvAVssDBE9WOrjOOOOlzYdiA4HqWv+WaX XGsd1xiAliAVsAkwUEJedLSbyXdI6RCCJrsJ3WzZNO3xRQoeNfLBx0/nwH2pIg== 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=1712238540; 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=+Y6NE8ZzvuaV3udodsLdCMWhPnxt56hB/47cc6zW2f0=; b=i3ipAaHl78g7j0ybYY+gXNsuUU4CxfWMn05lF4h2VCjfU69PY0UcDwmzzVbvsjJz1OYoqm gcWuvZQpVQ7q1Z3zCXoYuNGl/XTMHEIlmTRWYzt/N/4o4ChC3xHvednxrFIcneNUhGauTb MZVBiBWYnwVHv+CQX8Cc8HrWNglWl4pUs0VvlT1/K/b48HHW063Xqz1sf0vbXd1FFBfKdS zyB7mr3NAfw52x4tMfQMgm8diljArn1rv8o3QF6Vyv5bX42w2ZaJafuOF3JanRQAu36UI7 sKEZIzb1uf9QqWgvg0uG5djBBbghXwvYzcQpkPHw+502GqbxPgu5S8YOhw6vjA== Received: by freefall.freebsd.org (Postfix, from userid 1354) id C9EAB1A81E; Thu, 4 Apr 2024 13:48:59 +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: <20240404151554.04340786db8562e522f7b1a8@bidouilliste.com> (Emmanuel Vadot's message of "Thu, 4 Apr 2024 15:15:54 +0200") References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> <7chd-l2ru-wny@FreeBSD.org> <20240404151554.04340786db8562e522f7b1a8@bidouilliste.com> Date: Thu, 04 Apr 2024 15:48:55 +0200 Message-ID: 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 Emmanuel Vadot writes: >> but also introduced a number of regressions that >> don't exist in my port, all of which were documented in my reviews. > > What regressions ? I'm using xwayland for more than a year on my > desktop instead of -devel and haven't seen a problem. Try diff xwayland{,-devel}/Makefile: - Missing XSECURITY (ssh -X vs. ssh -Y; xorg-server parity per bug 221984) - Missing XDMCP (xorg-server parity, maybe used with rootful Xwayland and GUI login managers) - Missing XTEST input emulation (XDG Portal API, required by GNOME, Plasma and maybe rootful Xwayland) - Missing CSD for rootful (mainly for GNOME, optional even if preferred elsewhere) - Broken on DragonFly due to forcing -Dsha1 (already default after I've fixed upstream bug years ago) - Redundant -Dglamor, -Dipv6, -Dxkb_*, libEGL dependency From nobody Thu Apr 4 14:08:04 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 4V9NkJ0Lxzz5H4Vc; Thu, 4 Apr 2024 14:08:08 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9NkH6xyPz4FqP; Thu, 4 Apr 2024 14:08:07 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712239688; 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=SbO9TmDlLlmKvflVHxvuGPB1bkRzKq6a+h7U6Z73ASw=; b=E60EwPP22aoFlm+Tgmwd7WXAIb4cJ92wtg9Y9+2Etg9Ian2nG08eTkdyC2u6CFgpA4CN0D qxldBL/nvEPb3KbrVfQ/blKq64b630nWYf11QrXV8YNJuhOy6LZgmVyeYD7He5COzWLI1b KHkGbI3H//+31h73+jGNZsm7sTiFD3KJzWd7AeqGhU+dNYXJ8N2j51p1oggPnBlJzH8+Ps GdxbxR9WFXC4B6hg8eItH/lMumdsZY999A2BFkCaUPx6gsBU95RZ7N6QhGO82UeY+X5hm2 N3C3FedLJNwLJt0kU6A28aJ2SB2/lE+eNnQFxsgboJS6lPP3Zge1IUOr+ANDZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712239688; a=rsa-sha256; cv=none; b=IfMFdzF4RKE7Z1Ov+AUwjnnrGePsvmFXTkZA9r4ZzMtp1rTlFtM4XYquYXK3MNaPeE83D4 f3kGtoTZz6N1YK6x4l7tduZwPR88oMz3Da8j1jyw5ucXzSIGMCljIkfS2qyTLRSqKN844D BL4pAjyKlO9SOPCSmlfiBwRsnMOH5ibwlCeq02XClvXIOeSwwuJ5xIeD2QNJJxfuP8N7Fm bSxmYAqLwQP+aWz/eF+e8ikGpdMchk0n5LZnmTl2MptnrVR1ogSRH9cR3fdRkaQE4RulGJ t8e+s4dQfOAUaYwlqkAUNhCe6dtPqxskqdBPNOV6EwkANDYFE40QblTF3VlchA== 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=1712239688; 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=SbO9TmDlLlmKvflVHxvuGPB1bkRzKq6a+h7U6Z73ASw=; b=sfIpALyvjNO5t6LWZCeL/I/9gh9gzRdURcWqXbJfXeC92MJeUHKK0Z89Ebja3plckLG0wj BWUBA+DNxmsRZAvw8IAfwlgUNbfxBk3IdO+/2rBqBJIMUfrB+5yGbwrNGMdp43EH+Mu4zw 0oORvrPCGYYAbiHe1BxNiQOBVr0KSacEBUBMEXZXYW6gKQ2o+TpyLF2784LsvKphSY5ArA O6Eg4B/igfXiogxqHbxKm9xD4+53Aazqnpqm/Y3HB0isjz+3cQwN1kHmnlTzJQI3iJKOz7 PeCp1HeRX0IRsN5/zsTfL6ETlylBVW0yXDqKIz9b9X7Ty0jxAlMb9xzQ/JqWXA== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4V9NkH5q17zRHp; Thu, 4 Apr 2024 14:08:07 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id D07D21AAC75; Thu, 4 Apr 2024 16:08:04 +0200 (CEST) Date: Thu, 4 Apr 2024 16:08:04 +0200 From: Baptiste Daroussin To: Jan Beich Cc: Emmanuel Vadot , 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: References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> <7chd-l2ru-wny@FreeBSD.org> <20240404151554.04340786db8562e522f7b1a8@bidouilliste.com> 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-Disposition: inline In-Reply-To: On Thu 04 Apr 15:48, Jan Beich wrote: > Emmanuel Vadot writes: > > >> but also introduced a number of regressions that > >> don't exist in my port, all of which were documented in my reviews. > > > > What regressions ? I'm using xwayland for more than a year on my > > desktop instead of -devel and haven't seen a problem. > > Try diff xwayland{,-devel}/Makefile: > - Missing XSECURITY (ssh -X vs. ssh -Y; xorg-server parity per bug 221984) > - Missing XDMCP (xorg-server parity, maybe used with rootful Xwayland and GUI login managers) > - Missing XTEST input emulation (XDG Portal API, required by GNOME, Plasma and maybe rootful Xwayland) > - Missing CSD for rootful (mainly for GNOME, optional even if preferred elsewhere) > - Broken on DragonFly due to forcing -Dsha1 (already default after I've fixed upstream bug years ago) > - Redundant -Dglamor, -Dipv6, -Dxkb_*, libEGL dependency Those feature are not present as well in non of the Xwayland used in production in linux distributions. They are in development, and that is what -devel is for, you can test in advance, but this is not needed for production Even linux distros are not including those patches, beside them being more mainstream for Wayland than we are. Archlinux: https://archlinux.org/packages/extra/x86_64/xorg-xwayland/ Fedora: https://src.fedoraproject.org/rpms/xorg-x11-server-Xwayland/tree/rawhide Alpine: https://pkgs.alpinelinux.org/packages?name=xwayland Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-base/xwayland/xwayland-23.2.5.ebuild Best regards, Bapt From nobody Thu Apr 4 14:47:09 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 4V9PbR07PYz5H76v; Thu, 4 Apr 2024 14:47:15 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 4V9PbQ6ntHz4LDj; Thu, 4 Apr 2024 14:47:14 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712242035; 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=/6NzHig53ul6nCPsoTfNxtiwqWjMBiJsTAXZLuIYs9E=; b=RsOUC/WoKqjqO2iU18DS4OMdaLuy0TYOcIrD5SsWCUoC8mYhch9kPXmk0xz1H57pqZI7No 5J5VI9zEE+Sk0jbgclvdoRYfjt+KHQ+vfP+5Qcqkk3HIdLck0q4M7jP56AgjpTEwhn0dqq mat8j2kp/UX5cWa7VfS3hxmMmOkJNnvStgR/tVGVgdd9NRWb3aHfJJSn3VgluDERhkYGYX SeZXqBYJGTQkwTxoIMTUB51TJC+9FhVGIs1nGGFiUjttCdfyd+zKSb1H3dIL0tg7JkBDBh B89mdga+MwijkZRuUka6+RscbO9wz4iJra5jacvYDomgpOWIC15ZMKq5XQLZGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712242035; a=rsa-sha256; cv=none; b=s81X2XJGxbGt1CDPPY2nwF8ddCvSm2laEj19OcEh80LALUC5bcextueZ/D+bgW5G/+Ay3A ofEVEgcZc0FxExjWj7ZsSWhwR+oK9XRdXNl4XuZq8hEWndIicvdU64TIrcLLzEIhIkLnQZ TknGMhVlzxN0jdd6VOxc+YhxN80qrEh8o7v4pWWYn/EiR+Mq0BSWDub5/QpEIxJKxV+ppM eipB8mMAHoeBXnPbHniOF2nhC9hzMDW/hc/h2MYMddan4V6ZVdZznaSD9TxA53nHOZg9b3 3xDKXCxVF5qkJbEiZdOBZVpraJYVACxemoLkMZ+6HFek2hi+njrJ7aGhSn4Fuw== 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=1712242035; 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=/6NzHig53ul6nCPsoTfNxtiwqWjMBiJsTAXZLuIYs9E=; b=WE8fIDrSKEXNHujZA91H+mX5KbW3Y1Tu1bCvPxxzfu4nN85azenfk4lswZnZYRz6gVFBLV uGfxpcEQXOm1G0fG1JjI2mcCdWVDNDh4lxufD47oweGqo9JFTb4t1ksH+ts4eAlMMruWft HjljmYZ285t1jHDbUiVkC1whYDDm39b3chdvVxpwcKdM160LUXzaHbinIzDRDuiKdPhY/5 Q6Q02ZJIQ8fqqJnbh4xdVhmbimuSooTR3XNo8WpqJtknsqnutC7xF+ScUv3qSig/oTU59h 5sx3qLa/fJjMIAk6N0+1wQwCj0v1Gu3n5rQ63xzt2oLLeH3lzKW0F9mcl9WqXQ== Received: by freefall.freebsd.org (Postfix, from userid 1354) id A4BAD1A8D1; Thu, 4 Apr 2024 14:47:14 +0000 (UTC) From: Jan Beich To: Baptiste Daroussin Cc: Emmanuel Vadot , 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: (Baptiste Daroussin's message of "Thu, 4 Apr 2024 16:08:04 +0200") References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> <7chd-l2ru-wny@FreeBSD.org> <20240404151554.04340786db8562e522f7b1a8@bidouilliste.com> Date: Thu, 04 Apr 2024 16:47:09 +0200 Message-ID: <8r1t-chhu-wny@FreeBSD.org> 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 Baptiste Daroussin writes: > On Thu 04 Apr 15:48, Jan Beich wrote: > >> Emmanuel Vadot writes: >> >> >> but also introduced a number of regressions that >> >> don't exist in my port, all of which were documented in my reviews. >> > >> > What regressions ? I'm using xwayland for more than a year on my >> > desktop instead of -devel and haven't seen a problem. >> >> Try diff xwayland{,-devel}/Makefile: >> - Missing XSECURITY (ssh -X vs. ssh -Y; xorg-server parity per bug 221984) >> - Missing XDMCP (xorg-server parity, maybe used with rootful Xwayland and GUI login managers) >> - Missing XTEST input emulation (XDG Portal API, required by GNOME, Plasma and maybe rootful Xwayland) >> - Missing CSD for rootful (mainly for GNOME, optional even if preferred elsewhere) >> - Broken on DragonFly due to forcing -Dsha1 (already default after I've fixed upstream bug years ago) >> - Redundant -Dglamor, -Dipv6, -Dxkb_*, libEGL dependency > > Those feature are not present as well in non of the Xwayland used in production > in linux distributions. How did you check? I see * -Dxcsecurity=true (XCSECURITY) in Arch, Fedora, Alpine, Gentoo recipes * libXdmcp (XDMCP) being used on Fedora and Gentoo * libei (XTEST) being used on Fedora and Gentoo * libdecor (CSD) being used on Fedora > They are in development, and that is what -devel is for, you can test in > advance, but this is not needed for production That's reasonable if not for the above bugs shrugged off under "works for me" blanket aka "maintainer's discretion". > Even linux distros are not including those patches, beside them being more > mainstream for Wayland than we are. Do you mean HiDPI patches? Plasma and Hyprland implemented their own scaling while the rest rely on buggy workarounds. I'll probably drop the patches if I can't manage to rebase after upstream rootful HiDPI. To reduce POLA violation this was postponed until 2024Q2 branches. IIRC, one Arch-based distro included HiDPI patches and old version of Hyprland used to bundle those via Nix flake. From nobody Thu Apr 4 15:42:08 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 4V9Qpw0nfrz5HCNB; Thu, 4 Apr 2024 15:42:16 +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 4V9Qpv0kZqz4SPn; Thu, 4 Apr 2024 15:42:14 +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=1712245332; 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=SP4klEmpdo0bxcp5L34G/DqloYdVqX5MVIBTKwVeqvw=; b=Z1R0KaYboQc6FAWRmCLabVZfbSzMyNTpGAugtcTutZOqBP55P2WLm/Do5t9Di2FluDeEQ2 //iB21UHwJ78h2T7qSmFzXXqyxgeGJqMo/3eW4N4Ny5MQPLLDcqgcrh3uqsnJFzb1d29wO J06PWAZ484vuN844crZXD+3aUH1xhUc= 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 f0b97a50 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 4 Apr 2024 15:42:11 +0000 (UTC) Date: Thu, 4 Apr 2024 17:42:08 +0200 From: Emmanuel Vadot To: Jan Beich Cc: Baptiste Daroussin , 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: <20240404174208.2eaefae74933715eeb31ccbc@bidouilliste.com> In-Reply-To: <8r1t-chhu-wny@FreeBSD.org> References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> <7chd-l2ru-wny@FreeBSD.org> <20240404151554.04340786db8562e522f7b1a8@bidouilliste.com> <8r1t-chhu-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: 4V9Qpv0kZqz4SPn On Thu, 04 Apr 2024 16:47:09 +0200 Jan Beich wrote: > Baptiste Daroussin writes: > > > On Thu 04 Apr 15:48, Jan Beich wrote: > > > >> Emmanuel Vadot writes: > >> > >> >> but also introduced a number of regressions that > >> >> don't exist in my port, all of which were documented in my reviews. > >> > > >> > What regressions ? I'm using xwayland for more than a year on my > >> > desktop instead of -devel and haven't seen a problem. > >> > >> Try diff xwayland{,-devel}/Makefile: > >> - Missing XSECURITY (ssh -X vs. ssh -Y; xorg-server parity per bug 221984) > >> - Missing XDMCP (xorg-server parity, maybe used with rootful Xwayland and GUI login managers) > >> - Missing XTEST input emulation (XDG Portal API, required by GNOME, Plasma and maybe rootful Xwayland) > >> - Missing CSD for rootful (mainly for GNOME, optional even if preferred elsewhere) All those options could be added. The main reason that they are not is that x11-server/xwayland isn't used by anyone but me as it requires patching ports to use it. So obviously if they aren't needed for my case no one will stand up and ask for them to be enabled. Another way to view this is that you enabled all those options without consulting anyone, why would you you might ask, it's your port ? Well yes but since this port is forced to be used by everyone enabling option and dependencies should be a concensus between multiple users. For some, (like XSECURITY) you've explained in the commit message so that's good at least. Other like CSD was enabled without anything in the commit message except that this was an update, this is not good. > >> - Broken on DragonFly due to forcing -Dsha1 (already default after I've fixed upstream bug years ago) I don't care about Dragonfly, they are grown ups and can manage their own ports. > >> - Redundant -Dglamor, -Dipv6, -Dxkb_*, libEGL dependency I'll fix those if that's the case. > > > > Those feature are not present as well in non of the Xwayland used in production > > in linux distributions. > > How did you check? I see > * -Dxcsecurity=true (XCSECURITY) in Arch, Fedora, Alpine, Gentoo recipes > * libXdmcp (XDMCP) being used on Fedora and Gentoo > * libei (XTEST) being used on Fedora and Gentoo > * libdecor (CSD) being used on Fedora > > > They are in development, and that is what -devel is for, you can test in > > advance, but this is not needed for production > > That's reasonable if not for the above bugs shrugged off under > "works for me" blanket aka "maintainer's discretion". Lol, very bold of you to say this as all your ports forced on others follow your views. I think that you should fork the ports tree to JanPorts, do your stuff there and for the FreeBSD ports tree please start engaging discussion with the community, you are not alone. Cheers, > > Even linux distros are not including those patches, beside them being more > > mainstream for Wayland than we are. > > Do you mean HiDPI patches? Plasma and Hyprland implemented their own > scaling while the rest rely on buggy workarounds. I'll probably drop > the patches if I can't manage to rebase after upstream rootful HiDPI. > To reduce POLA violation this was postponed until 2024Q2 branches. > > IIRC, one Arch-based distro included HiDPI patches and old version of > Hyprland used to bundle those via Nix flake. -- Emmanuel Vadot From nobody Thu Apr 4 17:55:05 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 4V9TmG0Fbpz5FhWH; Thu, 4 Apr 2024 17:55:10 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 4V9TmF6rn3z4n4y; Thu, 4 Apr 2024 17:55:09 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712253310; 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=j5LPoxF9MHO/hDPNJnTuLgxmrIUcMmrx0S8YVgjhuEI=; b=P3N2aIMsdhXJk8RQL8cBTaqUlJzBOsLBT3U1cujwP/rrd+D60XwITgc3+Npdn/bl7KK+qn g3i7wuf8ZNgeLMhL3TEMBMP95wLJw+IfthbNxLwNsZsz5dP+ZjTVizdzQ7iBDQqkNtXbS6 zMwKsZqS9OS8F9i3UgmraVjpOdXDVnVWQm+pfvDJ3qiCqRI0+kPWc7hRKGzUxlPEbKWLoQ I9tKDAc1AxlC+GmPCx61Gr7z0ZPsQ4W7q0iaVYQ6bRMjawm6dxMC8/80W3cX/+OkdWGlK4 OCgg1vFilXkMK5FWZCzvW4pyb05pe6USuajjXZAu3QJ7RFAyvpP7scC314AoBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712253310; a=rsa-sha256; cv=none; b=GPuSwPiEbtZAHfI9L9jZ7jGS85LaQNT3kvkUwU8sF4d7pVZeufv852dhcpAKN8CJftKuU1 Skpd/Uukf7x8wlH7qEMZLu4T+8CDe6CqhJ6QUrf1GS30iI5gL6We8KAi89rOtjDHx9wK8t t4FSZkFc900AEXImZ7Hh3pEUBNq7ZloOxsnM80kiDQjLpfUiVnv02rrFv0x32GrhFYc4xp ZstNNbWnhEPXT1ejHT2NUOSAdAd+OIDlJVinMyoh3YF5sWHMvI8CH73I63Sr7YRH7155+d DHG2pL+c3awFxpTbkaGss+oy1dSBru2qxTOASI8gfZz5yQVMbGdv0u20/IKuQg== 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=1712253310; 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=j5LPoxF9MHO/hDPNJnTuLgxmrIUcMmrx0S8YVgjhuEI=; b=a0MVFjK1UL3IaU20soWRKhZxfXXh6FbNx34eKJCJZlPANCsKY7ferlUp+m0FX7zwlF2HMp HgH18OVV4XHlknoHsBXkLfH2nnG4KeY5qIK2QnjWVWn/lctCOSPs1279bz+lSnysnssKAn zp+8mxOkx+0Pk5kNvEqGPsZlyNHKOZ3YFyU1/d/FIcj0nHzok+EIexDj+iWAxDFr/DCcPg zy6zO9dZuHlWRGUCgsqiPe1v2Sn7V0FpRrt0fQks2AZkGVi+R6UmjVm+RKBklKY0myL4kU WlmjULZfO1kOCjp/fmAH5weyfrIwYNuf87fdhlZrVsf8FqKlh/zVt+a0k2Da1w== Received: by freefall.freebsd.org (Postfix, from userid 1354) id D499B1B257; Thu, 4 Apr 2024 17:55:09 +0000 (UTC) From: Jan Beich To: Emmanuel Vadot Cc: Baptiste Daroussin , 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: <20240404174208.2eaefae74933715eeb31ccbc@bidouilliste.com> (Emmanuel Vadot's message of "Thu, 4 Apr 2024 17:42:08 +0200") References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> <7chd-l2ru-wny@FreeBSD.org> <20240404151554.04340786db8562e522f7b1a8@bidouilliste.com> <8r1t-chhu-wny@FreeBSD.org> <20240404174208.2eaefae74933715eeb31ccbc@bidouilliste.com> Date: Thu, 04 Apr 2024 19:55:05 +0200 Message-ID: <4jch-t3ly-wny@FreeBSD.org> 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 Emmanuel Vadot writes: > On Thu, 04 Apr 2024 16:47:09 +0200 > Jan Beich wrote: > >> Baptiste Daroussin writes: >> >> > On Thu 04 Apr 15:48, Jan Beich wrote: >> > >> >> Emmanuel Vadot writes: >> >> >> >> >> but also introduced a number of regressions that >> >> >> don't exist in my port, all of which were documented in my reviews. >> >> > >> >> > What regressions ? I'm using xwayland for more than a year on my >> >> > desktop instead of -devel and haven't seen a problem. >> >> >> >> Try diff xwayland{,-devel}/Makefile: >> >> - Missing XSECURITY (ssh -X vs. ssh -Y; xorg-server parity per bug 221984) >> >> - Missing XDMCP (xorg-server parity, maybe used with rootful Xwayland and GUI login managers) >> >> - Missing XTEST input emulation (XDG Portal API, required by GNOME, Plasma and maybe rootful Xwayland) >> >> - Missing CSD for rootful (mainly for GNOME, optional even if preferred elsewhere) > > All those options could be added. The main reason that they are not is > that x11-server/xwayland isn't used by anyone but me as it requires > patching ports to use it. So obviously if they aren't needed for my > case no one will stand up and ask for them to be enabled. > Another way to view this is that you enabled all those options without > consulting anyone, why would you you might ask, it's your port ? Well > yes but since this port is forced to be used by everyone enabling > option and dependencies should be a concensus between multiple users. > For some, (like XSECURITY) you've explained in the commit message so > that's good at least. Other like CSD was enabled without anything in > the commit message except that this was an update, this is not good. - XDMCP was enabled (auto-detection) in xwayland up until 5f87249229d3 - xwayland-devel was created before 5f87249229d3 thus used xwayland and xorg-server from back then as the reference for feature defaults - CSD and EI are enabled due upstream default (auto-detection) and as part of "batteries included" policy for binary packages >> >> - Broken on DragonFly due to forcing -Dsha1 (already default after I've fixed upstream bug years ago) > > I don't care about Dragonfly, they are grown ups and can manage their > own ports. Sure but the option is redundant on FreeBSD. libmd is already preferred and auto-detected over OpenSSL, nettle or gcrypt. > Lol, very bold of you to say this as all your ports forced on others > follow your views. Sure but the proposal is no different. Under the guise of changing to a stable version of dependency you also want to change maintainership into one that benefits you. For example, all these x11@ updates you land haven't been submitted through Bugzilla for peer review. > I think that you should fork the ports tree to JanPorts, do your stuff > there and for the FreeBSD ports tree please start engaging discussion > with the community, you are not alone. Bug 244016 is an example discussion. Looks civil? Now look at bug 276614. Many years have passed but I see x11@ culture of brandishing authority hasn't disappeared. From nobody Thu Apr 4 19:17:52 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 4V9Wbn0XVjz5Fqrb; Thu, 4 Apr 2024 19:17:57 +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 4V9Wbm1xb6z40XW; Thu, 4 Apr 2024 19:17:55 +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=1712258273; 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=A83OHuFVBWeLvmLJkv2Z2rhv/kjdXnBY+FKMfkDsmdY=; b=GfSyLkAu/3IuyAWOpIxTtpaMVZKQvOC6x5NACQ6S2N7Dlr00POWk+R8lw2QFFzIF8ijitw 1Uze2Cs/UClTiU4+INgy7gA0A1fgkESqgdgDz++9ulvq/tPoYtU/rvwyajkSf3skXO+jhx 42MrHSNol1biSzPjP6cGlgf5G0pyVfk= 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 631c5fa9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 4 Apr 2024 19:17:53 +0000 (UTC) Date: Thu, 4 Apr 2024 21:17:52 +0200 From: Emmanuel Vadot To: Jan Beich Cc: Baptiste Daroussin , 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: <20240404211752.63f24eade7958ef662aa78ec@bidouilliste.com> In-Reply-To: <4jch-t3ly-wny@FreeBSD.org> References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> <7chd-l2ru-wny@FreeBSD.org> <20240404151554.04340786db8562e522f7b1a8@bidouilliste.com> <8r1t-chhu-wny@FreeBSD.org> <20240404174208.2eaefae74933715eeb31ccbc@bidouilliste.com> <4jch-t3ly-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: 4V9Wbm1xb6z40XW On Thu, 04 Apr 2024 19:55:05 +0200 Jan Beich wrote: > Emmanuel Vadot writes: > > > On Thu, 04 Apr 2024 16:47:09 +0200 > > Jan Beich wrote: > > > >> Baptiste Daroussin writes: > >> > >> > On Thu 04 Apr 15:48, Jan Beich wrote: > >> > > >> >> Emmanuel Vadot writes: > >> >> > >> >> >> but also introduced a number of regressions that > >> >> >> don't exist in my port, all of which were documented in my reviews. > >> >> > > >> >> > What regressions ? I'm using xwayland for more than a year on my > >> >> > desktop instead of -devel and haven't seen a problem. > >> >> > >> >> Try diff xwayland{,-devel}/Makefile: > >> >> - Missing XSECURITY (ssh -X vs. ssh -Y; xorg-server parity per bug 221984) > >> >> - Missing XDMCP (xorg-server parity, maybe used with rootful Xwayland and GUI login managers) > >> >> - Missing XTEST input emulation (XDG Portal API, required by GNOME, Plasma and maybe rootful Xwayland) > >> >> - Missing CSD for rootful (mainly for GNOME, optional even if preferred elsewhere) > > > > All those options could be added. The main reason that they are not is > > that x11-server/xwayland isn't used by anyone but me as it requires > > patching ports to use it. So obviously if they aren't needed for my > > case no one will stand up and ask for them to be enabled. > > Another way to view this is that you enabled all those options without > > consulting anyone, why would you you might ask, it's your port ? Well > > yes but since this port is forced to be used by everyone enabling > > option and dependencies should be a concensus between multiple users. > > For some, (like XSECURITY) you've explained in the commit message so > > that's good at least. Other like CSD was enabled without anything in > > the commit message except that this was an update, this is not good. > > - XDMCP was enabled (auto-detection) in xwayland up until 5f87249229d3 > - xwayland-devel was created before 5f87249229d3 thus used xwayland and > xorg-server from back then as the reference for feature defaults > - CSD and EI are enabled due upstream default (auto-detection) and > as part of "batteries included" policy for binary packages > > >> >> - Broken on DragonFly due to forcing -Dsha1 (already default after I've fixed upstream bug years ago) > > > > I don't care about Dragonfly, they are grown ups and can manage their > > own ports. > > Sure but the option is redundant on FreeBSD. libmd is already preferred > and auto-detected over OpenSSL, nettle or gcrypt. > > > Lol, very bold of you to say this as all your ports forced on others > > follow your views. > > Sure but the proposal is no different. Under the guise of changing to a > stable version of dependency you also want to change maintainership into > one that benefits you. For example, all these x11@ updates you land > haven't been submitted through Bugzilla for peer review. You're absolutely right about my x11@ updates. Truth is I've started to put everything on phab when I took over (not willingly) x11@ and got tired that no one was reviewing patches. Now I'm alone on x11@ and no one seems to care to step up and help. Three or four years ago when I started to do x11@ stuff I've asked for your help and at this time you refused. Now I'm asking you again, if you want to join x11@ so we can combine our forces I would be more than happy. I really believe that the force of FreeBSD is it's community and doing things alone is never a good thing, I have plan to change that and I would prefer that it will include you. > > I think that you should fork the ports tree to JanPorts, do your stuff > > there and for the FreeBSD ports tree please start engaging discussion > > with the community, you are not alone. > > Bug 244016 is an example discussion. Looks civil? Sure do, but what I get from this PR is that we switch kde to xwayland-devel because of no good reason. The only "good" one was that users couldn't install kde and sway in // because sway was bringing -devel and kde wasn't. This is the worst reason to switch a port to a -devel version dep. > Now look at bug 276614. I am very familiar with this one, I was probably not civil on it, not sure if I was the least civil person. > Many years have passed but I see x11@ culture of brandishing authority > hasn't disappeared. We need guidelines, this is the thing that FreeBSD needs the most and have the least IMHO. Cheers, -- Emmanuel Vadot From nobody Thu Apr 4 19:24:07 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 4V9Wkv2NXsz5FrBV; Thu, 4 Apr 2024 19:24:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9Wkv278lz41G8; Thu, 4 Apr 2024 19:24:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712258647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dT1/fbNYqfllPuT3zKLKqIrWkpR4VL5A3Ad7Ps/hfs4=; b=a/5BmguPuERz5M864iyCSN/DQhvUtQAXy3IhpCN6p3d2VwnGA4QqwkvwDuP4SqA7j9Edkp inC0Fr2gM0odyyyVqpJSBgIxLNhua9F1e1n0FdJr9/bg2pcbtQvuUtoongjutmSdtlEFWA TDaJmsR9Z82P2K5AnQXQ42g8MRX0T0AwqultJG8HTIjKhqDpvI9RDWdyB8y0mkf4Rvw8ro b1PsvKfQ3HZg1QNg6NQlHafDT3H+fhKFTqQVHhxB1ZJbNfscVsAFVvvXlp8ZA4hAMQAszL fqhubbL9DT6C6GyXXkP/TPEWW/yBb2jWtxuB4Iyz1f7uJn+7zDbytT5BocdBeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712258647; a=rsa-sha256; cv=none; b=LJFW/I0BgCdyAJQ8dsQiSzYeEiXnv7z1cJ+H2j4qNxhFHoBevT+zcmsJ9BKV44cV7wYIDS VDAObGVC8c7zZXrm+APE0eLoXwme7v2OXVxI+xo0wwDSCRH5HNR+7jxSIUMd0iSzT1w8Fc zDSAK8Ai9gIGzHYwuIsjTB09jqpQ7P84U13mjFZ9HDgKN77z7Hv9/MXvaTEHKaJn2EFzDH BCIBWWi/jgthXub6Y87DFa5lePmuen1RPnYJ2lgUzmjpPIjRNuCQv0VQhl2UpHZK9O73bS pS/0i3kheBF2Thjv/b1YPeY3ml7CQVT6xjMS6hfiqaSq31LjUV3IjTFkyphebQ== 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=1712258647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dT1/fbNYqfllPuT3zKLKqIrWkpR4VL5A3Ad7Ps/hfs4=; b=iG7X811RzFtn9u3heCfCoY2ghI03mXHv+98Jsp6hndVZJ/+Bq3KKVM+F72z8ypksDT1zb4 lW7/8yo5tzvyZvrKYCk6ZvWh8z6DFIEjnXm2c+yDLMOFLhdcWGZFEeCUDyu8X9c+Y4WtBl V1Fj37UCm3VKjvCXyK3F41l1O12jgnvyxuPb0oRn4t/Bt9Bvqq3utYGIWsK3JyphtNt0Pj El8R5j/1cxClqVCmrMTqpv0Ah7A9vK+jZkojZLDQqKp7TFz5rhjtRNnhkzQEF+IgoHguZg pND0ZQLfvvRv55pNOcaLBJ28Lv8U7rRi+cKNlwlHV5PeO+OC4rj0phELzn0jaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9Wkv1kk1zTj5; Thu, 4 Apr 2024 19:24:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434JO7W1058519; Thu, 4 Apr 2024 19:24:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434JO7Rd058516; Thu, 4 Apr 2024 19:24:07 GMT (envelope-from git) Date: Thu, 4 Apr 2024 19:24:07 GMT Message-Id: <202404041924.434JO7Rd058516@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Nagy Subject: git: 3365d285449a - 2024Q1 - www/*chromium: update to 123.0.6312.105 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 3365d285449a67246d45f5d6eeef380a963d276b Auto-Submitted: auto-generated The branch 2024Q1 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3365d285449a67246d45f5d6eeef380a963d276b commit 3365d285449a67246d45f5d6eeef380a963d276b Author: Robert Nagy AuthorDate: 2024-04-04 19:19:30 +0000 Commit: Robert Nagy CommitDate: 2024-04-04 19:24:00 +0000 www/*chromium: update to 123.0.6312.105 Security: https://vuxml.freebsd.org/freebsd/4a026b6c-f2b8-11ee-8e76-a8a1599412c6.html (cherry picked from commit 8fcc3c46edffbbb90f1e2b2d10371510e8ed9e48) --- www/chromium/Makefile | 2 +- www/chromium/distinfo | 14 +++++----- .../files/patch-media_base_media__switches.cc | 18 ++++++------- www/ungoogled-chromium/Makefile | 2 +- www/ungoogled-chromium/distinfo | 14 +++++----- .../files/patch-chrome_browser_about__flags.cc | 24 ++++++++--------- ..._updater_widevine__cdm__component__installer.cc | 21 +++++---------- .../patch-chrome_browser_flag__descriptions.cc | 22 +++++++-------- .../patch-chrome_browser_flag__descriptions.h | 20 +++++++------- .../patch-chrome_common_media_cdm__registration.cc | 31 ++++++++-------------- .../patch-chrome_common_media_cdm__registration.h | 11 -------- ...a_component__widevine__cdm__hint__file__linux.h | 4 +-- .../files/patch-media_base_media__switches.cc | 18 ++++++------- ..._platform_headless_ozone__platform__headless.cc | 4 +-- 14 files changed, 88 insertions(+), 117 deletions(-) diff --git a/www/chromium/Makefile b/www/chromium/Makefile index af8f3debef74..2330ed0d7e94 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= chromium -PORTVERSION= 123.0.6312.86 +PORTVERSION= 123.0.6312.105 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ https://nerd.hu/distfiles/:external diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 94063dd4d8b7..174f430a683d 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1711546354 -SHA256 (chromium-123.0.6312.86.tar.xz) = f4a78c1955dac4354d57ab45e93051fcda50fc5fccd681457f8116630746dffe -SIZE (chromium-123.0.6312.86.tar.xz) = 3472393888 -SHA256 (chrome-linux-123.0.6312.86-llvm17.profdata.tar.xz) = da2ed7c8ad49133d811df0306253fc834875e132d546528a3c342acd5007739f -SIZE (chrome-linux-123.0.6312.86-llvm17.profdata.tar.xz) = 29847172 -SHA256 (chromium-123.0.6312.86-testdata.tar.xz) = d6b7cc20884f3f0e26b2320e4346134cfcc83549ac804ac526586f973680e831 -SIZE (chromium-123.0.6312.86-testdata.tar.xz) = 280595032 +TIMESTAMP = 1712258158 +SHA256 (chromium-123.0.6312.105.tar.xz) = 0a14fba1fb1a288d99b188160e3138295aa8604bdf492e62a94c0ec35a4e229d +SIZE (chromium-123.0.6312.105.tar.xz) = 3481204616 +SHA256 (chrome-linux-123.0.6312.105-llvm17.profdata.tar.xz) = 0904993faf06565a538b1eaab56119642204b8ca8748ea51a436ac55a5723f8b +SIZE (chrome-linux-123.0.6312.105-llvm17.profdata.tar.xz) = 29802596 +SHA256 (chromium-123.0.6312.105-testdata.tar.xz) = c843a48cdeb6e140cd60121b4bf94ce81a109912def7488b341244f188d8f91b +SIZE (chromium-123.0.6312.105-testdata.tar.xz) = 279677040 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index fcc53f033a85..139083b6a5f9 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2024-03-22 08:19:40 UTC +--- media/base/media_switches.cc.orig 2024-04-04 19:13:34 UTC +++ media/base/media_switches.cc @@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" @@ -20,7 +20,7 @@ // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", -@@ -608,7 +608,7 @@ BASE_FEATURE(kUseWritePixelsYUV, +@@ -602,7 +602,7 @@ BASE_FEATURE(kUseWritePixelsYUV, BASE_FEATURE(kUseMultiPlaneFormatForHardwareVideo, "UseMultiPlaneFormatForHardwareVideo", #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \ @@ -29,7 +29,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -721,7 +721,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -715,7 +715,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -38,7 +38,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -749,7 +749,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -743,7 +743,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -47,7 +47,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -761,7 +761,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -755,7 +755,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -56,7 +56,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -790,7 +790,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -784,7 +784,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -65,7 +65,7 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -881,7 +881,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, +@@ -875,7 +875,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, "VaapiVp9SModeHWEncoding", base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -74,7 +74,7 @@ // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. BASE_FEATURE(kV4L2FlatStatelessVideoDecoder, "V4L2FlatStatelessVideoDecoder", -@@ -1000,7 +1000,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, +@@ -994,7 +994,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, // Live Caption can be used in multiple languages, as opposed to just English. BASE_FEATURE(kLiveCaptionMultiLanguage, "LiveCaptionMultiLanguage", @@ -83,7 +83,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1472,7 +1472,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, +@@ -1466,7 +1466,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, ); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 691a71e898b3..83c1c13363de 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,5 +1,5 @@ PORTNAME= ungoogled-chromium -PORTVERSION= 123.0.6312.58 +PORTVERSION= 123.0.6312.105 UGVERSION= ${DISTVERSION}-1 CATEGORIES= www wayland MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo index e681327e9782..3b7133cff75b 100644 --- a/www/ungoogled-chromium/distinfo +++ b/www/ungoogled-chromium/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1711138219 -SHA256 (chromium-123.0.6312.58.tar.xz) = f8dae4a2ff7b00bb44fa136c2101638fea4f232e4819be3f73381ddc0d3bf718 -SIZE (chromium-123.0.6312.58.tar.xz) = 3465099244 -SHA256 (ungoogled-chromium-123.0.6312.58-1.tar.gz) = 3234f01b3918a080a3a42798fc59c88b0d0515e355ada4022c70ec314bd3b02e -SIZE (ungoogled-chromium-123.0.6312.58-1.tar.gz) = 667470 -SHA256 (chromium-123.0.6312.58-testdata.tar.xz) = a5dbcc3dd4a7469db1a85e31739508c8919fb37ca6050a617f059329e0d45940 -SIZE (chromium-123.0.6312.58-testdata.tar.xz) = 275371844 +TIMESTAMP = 1712258253 +SHA256 (chromium-123.0.6312.105.tar.xz) = 0a14fba1fb1a288d99b188160e3138295aa8604bdf492e62a94c0ec35a4e229d +SIZE (chromium-123.0.6312.105.tar.xz) = 3481204616 +SHA256 (ungoogled-chromium-123.0.6312.105-1.tar.gz) = 4786ed32d19a0c960ce8aa4a2c87ea80b9527d1bbcbcf6b3a18a253efe3b667b +SIZE (ungoogled-chromium-123.0.6312.105-1.tar.gz) = 668197 +SHA256 (chromium-123.0.6312.105-testdata.tar.xz) = c843a48cdeb6e140cd60121b4bf94ce81a109912def7488b341244f188d8f91b +SIZE (chromium-123.0.6312.105-testdata.tar.xz) = 279677040 SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734 diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc index 11fe30ce0474..5c0c1274fd29 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_about__flags.cc @@ -1,4 +1,4 @@ ---- chrome/browser/about_flags.cc.orig 2024-03-22 14:16:19 UTC +--- chrome/browser/about_flags.cc.orig 2024-04-04 19:16:34 UTC +++ chrome/browser/about_flags.cc @@ -235,7 +235,7 @@ #include "ui/ui_features.h" @@ -117,7 +117,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(net::features::kAsyncDns)}, -@@ -7787,7 +7787,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7794,7 +7794,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kPrivacyIndicators)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -126,7 +126,7 @@ {"enable-network-service-sandbox", flag_descriptions::kEnableNetworkServiceSandboxName, flag_descriptions::kEnableNetworkServiceSandboxDescription, -@@ -7820,7 +7820,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7827,7 +7827,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( supervised_user::kFilterWebsitesForSupervisedUsersOnDesktopAndIOS)}, @@ -135,7 +135,7 @@ {"enable-family-link-extensions-permissions", flag_descriptions:: kEnableExtensionsPermissionsForSupervisedUsersOnDesktopName, -@@ -8718,7 +8718,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8725,7 +8725,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)}, #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -144,7 +144,7 @@ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName, flag_descriptions::kGetAllScreensMediaDescription, kOsCrOS | kOsLacros | kOsLinux, -@@ -8760,7 +8760,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8767,7 +8767,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -153,7 +153,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -9049,7 +9049,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9056,7 +9056,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -162,7 +162,7 @@ {"policy-indication-for-managed-default-search", flag_descriptions::kPolicyIndicationForManagedDefaultSearchName, flag_descriptions::kPolicyIndicationForManagedDefaultSearchDescription, -@@ -9353,7 +9353,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -9360,7 +9360,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ @@ -171,7 +171,7 @@ {"media-session-enter-picture-in-picture", flag_descriptions::kMediaSessionEnterPictureInPictureName, flag_descriptions::kMediaSessionEnterPictureInPictureDescription, -@@ -10343,7 +10343,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10350,7 +10350,7 @@ const FeatureEntry kFeatureEntries[] = { kOsDesktop | kOsAndroid, FEATURE_VALUE_TYPE(features::kProcessPerSiteUpToMainFrameThreshold)}, @@ -180,7 +180,7 @@ {"camera-mic-effects", flag_descriptions::kCameraMicEffectsName, flag_descriptions::kCameraMicEffectsDescription, static_cast(kOsMac | kOsWin | kOsLinux), -@@ -10374,7 +10374,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10381,7 +10381,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kSiteInstanceGroupsForDataUrls)}, #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -189,7 +189,7 @@ {"site-search-settings-policy", flag_descriptions::kSiteSearchSettingsPolicyName, flag_descriptions::kSiteSearchSettingsPolicyDescription, kOsAll, -@@ -10504,7 +10504,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10511,7 +10511,7 @@ const FeatureEntry kFeatureEntries[] = { password_manager::features::kFillingAcrossAffiliatedWebsitesAndroid)}, #endif @@ -198,7 +198,7 @@ {"third-party-profile-management", flag_descriptions::kThirdPartyProfileManagementName, flag_descriptions::kThirdPartyProfileManagementDescription, -@@ -10847,7 +10847,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -10854,7 +10854,7 @@ const FeatureEntry kFeatureEntries[] = { trusted_vault::kTrustedVaultFrequentDegradedRecoverabilityPolling)}, #endif @@ -207,7 +207,7 @@ {"restart-to-gain-access-to-keychain", flag_descriptions::kRestartToGainAccessToKeychainName, flag_descriptions::kRestartToGainAccessToKeychainDescription, -@@ -11101,7 +11101,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -11108,7 +11108,7 @@ const FeatureEntry kFeatureEntries[] = { // Controls the view mode for (history) sync screen. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc index 1cd4ff849dda..0215a62a83b9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_component__updater_widevine__cdm__component__installer.cc @@ -1,15 +1,15 @@ ---- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-03-22 14:16:19 UTC +--- chrome/browser/component_updater/widevine_cdm_component_installer.cc.orig 2024-04-04 19:16:34 UTC +++ chrome/browser/component_updater/widevine_cdm_component_installer.cc -@@ -41,7 +41,7 @@ +@@ -40,7 +40,7 @@ #include "third_party/widevine/cdm/buildflags.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/path_service.h" - #include "chrome/common/chrome_paths.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" -@@ -74,7 +74,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto:: + #endif + +@@ -78,7 +78,7 @@ static_assert(std::size(kWidevineSha2Hash) == crypto:: const char ImageLoaderComponentName[] = "WidevineCdm"; #endif @@ -18,16 +18,7 @@ // On Linux and ChromeOS the Widevine CDM is loaded at startup before the // zygote is locked down. As a result there is no need to register the CDM // with Chrome as it can't be used until Chrome is restarted. -@@ -102,7 +102,7 @@ void RegisterWidevineCdmWithChrome(const base::Version - } - #endif // !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // On Linux and ChromeOS the Widevine CDM is loaded at startup before the - // zygote is locked down. To locate the Widevine CDM at startup, a hint file - // is used. Update the hint file with the new Widevine CDM path. -@@ -388,7 +388,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat +@@ -364,7 +364,7 @@ void WidevineCdmComponentInstallerPolicy::UpdateCdmPat return; } diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc index 35b96bbe82cd..3aec5ff203e6 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2024-03-22 14:16:19 UTC +--- chrome/browser/flag_descriptions.cc.orig 2024-04-04 19:16:34 UTC +++ chrome/browser/flag_descriptions.cc -@@ -2935,7 +2935,7 @@ const char kCbdTimeframeRequiredDescription[] = +@@ -2940,7 +2940,7 @@ const char kCbdTimeframeRequiredDescription[] = "value to the list."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ const char kPolicyIndicationForManagedDefaultSearchName[] = "Enable policy indication for managed Default Search provider"; const char kPolicyIndicationForManagedDefaultSearchDescription[] = -@@ -3260,7 +3260,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] +@@ -3265,7 +3265,7 @@ const char kSiteInstanceGroupsForDataUrlsDescription[] "but in the same SiteInstanceGroup, and thus the same process."; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ const char kSiteSearchSettingsPolicyName[] = "Enable SiteSearchSettings policy"; const char kSiteSearchSettingsPolicyDescription[] = "Allow site search engines to be defined by the SiteSearchSettings policy."; -@@ -7489,7 +7489,7 @@ const char kLacrosMergeIcuDataFileDescription[] = +@@ -7494,7 +7494,7 @@ const char kLacrosMergeIcuDataFileDescription[] = "Enables sharing common areas of icudtl.dat between Ash and Lacros."; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -27,7 +27,7 @@ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API"; const char kGetAllScreensMediaDescription[] = "When enabled, the getAllScreensMedia API for capturing multiple screens " -@@ -7735,7 +7735,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] +@@ -7740,7 +7740,7 @@ const char kV4L2FlatStatefulVideoDecoderDescription[] // Linux ----------------------------------------------------------------------- @@ -36,7 +36,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -7783,7 +7783,7 @@ const char kZeroCopyVideoCaptureDescription[] = +@@ -7788,7 +7788,7 @@ const char kZeroCopyVideoCaptureDescription[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -45,7 +45,7 @@ const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; const char kFollowingFeedSidepanelDescription[] = "Enables the following feed in the sidepanel."; -@@ -7798,7 +7798,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] +@@ -7803,7 +7803,7 @@ const char kEnableProtoApiForClassifyUrlDescription[] "instead of JSON."; #endif @@ -54,7 +54,7 @@ const char kEnableNetworkServiceSandboxName[] = "Enable the network service sandbox."; const char kEnableNetworkServiceSandboxDescription[] = -@@ -7830,7 +7830,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -7835,7 +7835,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -63,7 +63,7 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -7850,7 +7850,7 @@ const char kRestartToGainAccessToKeychainDescription[] +@@ -7855,7 +7855,7 @@ const char kRestartToGainAccessToKeychainDescription[] "to restart Chrome to gain access to computer's password manager."; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -72,7 +72,7 @@ const char kAsyncDnsName[] = "Async DNS resolver"; const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -@@ -7951,7 +7951,7 @@ const char kElementCaptureDescription[] = +@@ -7956,7 +7956,7 @@ const char kElementCaptureDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -81,7 +81,7 @@ const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; -@@ -8000,7 +8000,7 @@ const char kComposeTextSelectionDescription[] = +@@ -8005,7 +8005,7 @@ const char kComposeTextSelectionDescription[] = "Enables feature for different heuristics for selecting text for Compose"; #endif // BUILDFLAG(ENABLE_COMPOSE) diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h index 2027b64d730c..4b993d9ba591 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/ungoogled-chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2024-03-22 14:16:19 UTC +--- chrome/browser/flag_descriptions.h.orig 2024-04-04 19:16:34 UTC +++ chrome/browser/flag_descriptions.h -@@ -1694,7 +1694,7 @@ extern const char kCbdTimeframeRequiredName[]; +@@ -1697,7 +1697,7 @@ extern const char kCbdTimeframeRequiredName[]; extern const char kCbdTimeframeRequiredDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ extern const char kPolicyIndicationForManagedDefaultSearchName[]; extern const char kPolicyIndicationForManagedDefaultSearchDescription[]; #endif -@@ -1879,7 +1879,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] +@@ -1882,7 +1882,7 @@ extern const char kSiteInstanceGroupsForDataUrlsName[] extern const char kSiteInstanceGroupsForDataUrlsDescription[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -18,7 +18,7 @@ extern const char kSiteSearchSettingsPolicyName[]; extern const char kSiteSearchSettingsPolicyDescription[]; #endif -@@ -4305,7 +4305,7 @@ extern const char kLacrosMergeIcuDataFileName[]; +@@ -4308,7 +4308,7 @@ extern const char kLacrosMergeIcuDataFileName[]; extern const char kLacrosMergeIcuDataFileDescription[]; #endif // #if BUILDFLAG(IS_CHROMEOS_LACROS) @@ -27,7 +27,7 @@ extern const char kGetAllScreensMediaName[]; extern const char kGetAllScreensMediaDescription[]; #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -@@ -4445,7 +4445,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip +@@ -4448,7 +4448,7 @@ extern const char kV4L2FlatStatefulVideoDecoderDescrip // Linux --------------------------------------------------------------------- @@ -36,7 +36,7 @@ extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -4487,7 +4487,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -4490,7 +4490,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa extern const char kWebBluetoothConfirmPairingSupportDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -45,7 +45,7 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; -@@ -4498,13 +4498,13 @@ extern const char kRestartToGainAccessToKeychainName[] +@@ -4501,13 +4501,13 @@ extern const char kRestartToGainAccessToKeychainName[] extern const char kRestartToGainAccessToKeychainDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) @@ -61,7 +61,7 @@ extern const char kFollowingFeedSidepanelName[]; extern const char kFollowingFeedSidepanelDescription[]; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -4515,7 +4515,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; +@@ -4518,7 +4518,7 @@ extern const char kEnableProtoApiForClassifyUrlName[]; extern const char kEnableProtoApiForClassifyUrlDescription[]; #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -70,7 +70,7 @@ extern const char kEnableNetworkServiceSandboxName[]; extern const char kEnableNetworkServiceSandboxDescription[]; -@@ -4592,7 +4592,7 @@ extern const char kElementCaptureDescription[]; +@@ -4595,7 +4595,7 @@ extern const char kElementCaptureDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -79,7 +79,7 @@ extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; -@@ -4626,7 +4626,7 @@ extern const char kComposeTextSelectionName[]; +@@ -4629,7 +4629,7 @@ extern const char kComposeTextSelectionName[]; extern const char kComposeTextSelectionDescription[]; #endif // BUILDFLAG(ENABLE_COMPOSE) diff --git a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc index 2799b4bfc691..3ad0289702a9 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc +++ b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.cc @@ -1,6 +1,6 @@ ---- chrome/common/media/cdm_registration.cc.orig 2024-03-22 14:16:19 UTC +--- chrome/common/media/cdm_registration.cc.orig 2024-04-04 19:16:34 UTC +++ chrome/common/media/cdm_registration.cc -@@ -30,11 +30,11 @@ +@@ -26,11 +26,11 @@ #if BUILDFLAG(ENABLE_WIDEVINE) #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck @@ -14,7 +14,7 @@ #include "base/no_destructor.h" #include "chrome/common/media/component_widevine_cdm_hint_file_linux.h" #include "media/cdm/supported_audio_codecs.h" -@@ -60,7 +60,7 @@ using Robustness = content::CdmInfo::Robustness; +@@ -56,7 +56,7 @@ using Robustness = content::CdmInfo::Robustness; #if BUILDFLAG(ENABLE_WIDEVINE) #if (BUILDFLAG(BUNDLE_WIDEVINE_CDM) || \ BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)) && \ @@ -23,25 +23,25 @@ // Create a CdmInfo for a Widevine CDM, using |version|, |cdm_library_path|, and // |capability|. std::unique_ptr CreateWidevineCdmInfo( -@@ -105,7 +105,7 @@ std::unique_ptr CreateCdmInfoFromWid +@@ -101,7 +101,7 @@ std::unique_ptr CreateCdmInfoFromWid // BUILDFLAG(IS_CHROMEOS)) #if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) // On Linux/ChromeOS we have to preload the CDM since it uses the zygote - // sandbox. On Windows and Mac, CDM registration is handled by Component - // Update (as the CDM can be loaded only when needed). -@@ -129,7 +129,7 @@ content::CdmInfo* GetBundledWidevine() { + // sandbox. On Windows and Mac, the bundled CDM is handled by the component + // updater. +@@ -125,7 +125,7 @@ content::CdmInfo* GetBundledWidevine() { // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) #if BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) && \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - // This code checks to see if Component Updater picked a version of the Widevine - // CDM to be used last time it ran. (Component Updater may choose the bundled - // CDM if there is not a new version available for download.) If there is one -@@ -171,7 +171,7 @@ void AddSoftwareSecureWidevine(std::vector* cd - DVLOG(3) << __func__ << " done with " << cdms->size() << " cdms"; - } - --#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(ENABLE_WIDEVINE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - std::vector GetSoftwareSecureWidevineForTesting() { - std::vector cdms; - AddSoftwareSecureWidevine(&cdms); diff --git a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h b/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h deleted file mode 100644 index 6e19520303e2..000000000000 --- a/www/ungoogled-chromium/files/patch-chrome_common_media_cdm__registration.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/common/media/cdm_registration.h.orig 2024-03-22 14:16:19 UTC -+++ chrome/common/media/cdm_registration.h -@@ -14,7 +14,7 @@ - // Register CdmInfo for Content Decryption Modules (CDM) supported. - void RegisterCdmInfo(std::vector* cdms); - --#if BUILDFLAG(ENABLE_WIDEVINE) && BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(ENABLE_WIDEVINE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - // Returns the software secure Widevine CDM. - std::vector GetSoftwareSecureWidevineForTesting(); - #endif diff --git a/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h b/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h index 745938ba73d3..ffcbde91973d 100644 --- a/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h +++ b/www/ungoogled-chromium/files/patch-chrome_common_media_component__widevine__cdm__hint__file__linux.h @@ -1,6 +1,6 @@ ---- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2024-03-22 14:16:19 UTC +--- chrome/common/media/component_widevine_cdm_hint_file_linux.h.orig 2024-04-04 19:16:34 UTC +++ chrome/common/media/component_widevine_cdm_hint_file_linux.h -@@ -17,7 +17,7 @@ +@@ -15,7 +15,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc index f77a948b479b..b4f13b0bfce6 100644 --- a/www/ungoogled-chromium/files/patch-media_base_media__switches.cc +++ b/www/ungoogled-chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2024-03-22 14:16:19 UTC +--- media/base/media_switches.cc.orig 2024-04-04 19:16:34 UTC +++ media/base/media_switches.cc @@ -21,7 +21,7 @@ #include "ui/gl/gl_features.h" @@ -20,7 +20,7 @@ // Enables system audio mirroring using pulseaudio. BASE_FEATURE(kPulseaudioLoopbackForCast, "PulseaudioLoopbackForCast", -@@ -608,7 +608,7 @@ BASE_FEATURE(kUseWritePixelsYUV, +@@ -602,7 +602,7 @@ BASE_FEATURE(kUseWritePixelsYUV, BASE_FEATURE(kUseMultiPlaneFormatForHardwareVideo, "UseMultiPlaneFormatForHardwareVideo", #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \ @@ -29,7 +29,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -721,7 +721,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, +@@ -715,7 +715,7 @@ BASE_FEATURE(kFallbackAfterDecodeError, // Show toolbar button that opens dialog for controlling media sessions. BASE_FEATURE(kGlobalMediaControls, "GlobalMediaControls", @@ -38,7 +38,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -749,7 +749,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, +@@ -743,7 +743,7 @@ BASE_FEATURE(kGlobalMediaControlsUpdatedUI, // If enabled, users can request Media Remoting without fullscreen-in-tab. BASE_FEATURE(kMediaRemotingWithoutFullscreen, "MediaRemotingWithoutFullscreen", @@ -47,7 +47,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -761,7 +761,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, +@@ -755,7 +755,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen, BASE_FEATURE(kGlobalMediaControlsPictureInPicture, "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -56,7 +56,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -790,7 +790,7 @@ BASE_FEATURE(kUnifiedAutoplay, +@@ -784,7 +784,7 @@ BASE_FEATURE(kUnifiedAutoplay, "UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT); @@ -65,7 +65,7 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. BASE_FEATURE(kVaapiVideoDecodeLinux, -@@ -881,7 +881,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, +@@ -875,7 +875,7 @@ BASE_FEATURE(kVaapiVp9SModeHWEncoding, "VaapiVp9SModeHWEncoding", base::FEATURE_DISABLED_BY_DEFAULT); #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS) @@ -74,7 +74,7 @@ // Enables the new V4L2StatefulVideoDecoder instead of V4L2VideoDecoder. BASE_FEATURE(kV4L2FlatStatelessVideoDecoder, "V4L2FlatStatelessVideoDecoder", -@@ -1000,7 +1000,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, +@@ -994,7 +994,7 @@ BASE_FEATURE(kLiveCaptionUseWaitK, // Live Caption can be used in multiple languages, as opposed to just English. BASE_FEATURE(kLiveCaptionMultiLanguage, "LiveCaptionMultiLanguage", @@ -83,7 +83,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1472,7 +1472,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, +@@ -1466,7 +1466,7 @@ BASE_FEATURE(kUseOutOfProcessVideoDecoding, ); #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER) diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc index baa34a8b9c3b..667090dc5194 100644 --- a/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc +++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2022-10-01 07:40:07 UTC +--- ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2024-04-04 19:16:34 UTC +++ ui/ozone/platform/headless/ozone_platform_headless.cc -@@ -102,7 +102,7 @@ class OzonePlatformHeadless : public OzonePlatform { +@@ -103,7 +103,7 @@ class OzonePlatformHeadless : public OzonePlatform { } // Desktop Linux, not CastOS. From nobody Fri Apr 5 08:41:11 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 4V9sQk1092z5G01Y; Fri, 5 Apr 2024 08:41:18 +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 4V9sQh65n9z4Vxm; Fri, 5 Apr 2024 08:41:16 +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=1712306474; 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=otsIDP6nfmJ9lYQmrxjgz9wsn70QE2AKdJXyi0w2kVY=; b=D7pvtilVrQ6qi/xL1ib63SVI9GQm3BnhECvvM95OoSs7K53wpXQoPGhkRhbOSVdeBa9pSG NBM7V8KOdDlpdb8cT9TXk+uaBgUiWNw6+PZhAQWM3VWrBHTFTMBFsccI8xggbhTXmaH9vT hqFX3nDDLyDuFKEJ/EyHl9h3nxd/tiw= 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 adec314b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 5 Apr 2024 08:41:14 +0000 (UTC) Date: Fri, 5 Apr 2024 10:41:11 +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: <20240405104111.9d9263dfe7ce99a01d620ab3@bidouilliste.com> In-Reply-To: References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> <7chd-l2ru-wny@FreeBSD.org> <20240404151554.04340786db8562e522f7b1a8@bidouilliste.com> 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: 4V9sQh65n9z4Vxm On Thu, 04 Apr 2024 15:48:55 +0200 Jan Beich wrote: > Emmanuel Vadot writes: > > >> but also introduced a number of regressions that > >> don't exist in my port, all of which were documented in my reviews. > > > > What regressions ? I'm using xwayland for more than a year on my > > desktop instead of -devel and haven't seen a problem. > > Try diff xwayland{,-devel}/Makefile: > - Missing XSECURITY (ssh -X vs. ssh -Y; xorg-server parity per bug 221984) I admit that I'm a bit lost on this one, I did some test and here is what I found : - Using sway and xwayland (so without xcsecurity enabled) I can't ssh -X to a xorg host and run applications (DISPLAY is not set), but I can ssh -Y fine - If I enable xcsecurity for xwayland behavior is exactly the same (i.e. -X doesn't work, -Y does). - I've confirmed that -X works from another xorg host So what I did next was to recompile xorg-server with xcsecurity set to false. And to my surprise ssh -X from a xorg host to the one with the modified xorg-server still worked. xcsecurity was added in 2018 via PR 221984 which states that it fixes -X, and that doesn't seems to be the case, xcsecurity doesn't seems to be related to X11 forwarding but something for grouping client so they can't access to each other or something (see https://www.x.org/wiki/Development/Documentation/Security/#index2h2 for more info). xcsecurity is disabled by default in xorg-server upstream (in meson) and I think that we should do the same (granted that XACE works correctly). The TLDR is that this has nothing to do with X11 forwarding and that I think that not enabling this option in xwayland (and in -devel too) is a good thing, one of the benefit of wayland is to drop the old X11 crappy model. > - Missing XDMCP (xorg-server parity, maybe used with rootful Xwayland and GUI login managers) I've lost 2 hours looking at xcsecurity so unless you can prove to me that this option is good to have enabled (and explained what it does exactly) I won't look into it for now. > - Missing XTEST input emulation (XDG Portal API, required by GNOME, Plasma and maybe rootful Xwayland) > - Missing CSD for rootful (mainly for GNOME, optional even if preferred elsewhere) I do agree that both should be enabled, bapt@ started a patch and I've asked him to wait so I could have a look at XCSECURITY before. > - Broken on DragonFly due to forcing -Dsha1 (already default after I've fixed upstream bug years ago) > - Redundant -Dglamor, -Dipv6, -Dxkb_*, libEGL dependency Cheers, -- Emmanuel Vadot From nobody Fri Apr 5 09:38:06 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 4V9thL0mRDz5G591; Fri, 5 Apr 2024 09:38:10 +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 4V9thJ6HW0z4c7D; Fri, 5 Apr 2024 09:38:08 +0000 (UTC) (envelope-from manu@bidouilliste.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mx header.b=d4mVFUrT; dmarc=pass (policy=none) header.from=bidouilliste.com; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.155.74 as permitted sender) smtp.mailfrom=manu@bidouilliste.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1712309887; 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=TpMj7hTg0aHT54LlwNsdNyUMs8H+DMjInr1+z1LgotA=; b=d4mVFUrT/Bz69r7Yc15c1WROBELKFY1BGWDcWErmkZf9QiXLvbkvJyHMFUvZjht7Pfxa/x oJ5CeG/1od7kENcvry9qKKp+PlJ8BTYOSKcAape6IyrfYaDnaznyUPKJb4puooUdwff+q2 OhBmYItB0kW8g8ym6/MtTdbHRl/ee2o= 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 35606cd1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 5 Apr 2024 09:38:07 +0000 (UTC) Date: Fri, 5 Apr 2024 11:38:06 +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: <20240405113806.889fae681a45e844579c453c@bidouilliste.com> In-Reply-To: <20240405104111.9d9263dfe7ce99a01d620ab3@bidouilliste.com> References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> <7chd-l2ru-wny@FreeBSD.org> <20240404151554.04340786db8562e522f7b1a8@bidouilliste.com> <20240405104111.9d9263dfe7ce99a01d620ab3@bidouilliste.com> 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-Spamd-Result: default: False [-3.38 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.977]; DMARC_POLICY_ALLOW(-0.50)[bidouilliste.com,none]; MV_CASE(0.50)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mx]; R_SPF_ALLOW(-0.20)[+ip4:212.83.155.74/32]; ONCE_RECEIVED(0.10)[]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR]; FREEFALL_USER(0.00)[manu]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-ports-branches@FreeBSD.org,dev-commits-ports-all@FreeBSD.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+] X-Rspamd-Queue-Id: 4V9thJ6HW0z4c7D On Fri, 5 Apr 2024 10:41:11 +0200 Emmanuel Vadot wrote: > On Thu, 04 Apr 2024 15:48:55 +0200 > Jan Beich wrote: > > > Emmanuel Vadot writes: > > > > >> but also introduced a number of regressions that > > >> don't exist in my port, all of which were documented in my reviews. > > > > > > What regressions ? I'm using xwayland for more than a year on my > > > desktop instead of -devel and haven't seen a problem. > > > > Try diff xwayland{,-devel}/Makefile: > > - Missing XSECURITY (ssh -X vs. ssh -Y; xorg-server parity per bug 221984) > > I admit that I'm a bit lost on this one, I did some test and here is > what I found : > > - Using sway and xwayland (so without xcsecurity enabled) I can't ssh > -X to a xorg host and run applications (DISPLAY is not set), but I can > ssh -Y fine > - If I enable xcsecurity for xwayland behavior is exactly the same > (i.e. -X doesn't work, -Y does). > - I've confirmed that -X works from another xorg host > > So what I did next was to recompile xorg-server with xcsecurity > set to false. And to my surprise ssh -X from a xorg host to the one > with the modified xorg-server still worked. > xcsecurity was added in 2018 via PR 221984 which states that it fixes > -X, and that doesn't seems to be the case, xcsecurity doesn't seems to > be related to X11 forwarding but something for grouping client so they > can't access to each other or something (see > https://www.x.org/wiki/Development/Documentation/Security/#index2h2 for > more info). > xcsecurity is disabled by default in xorg-server upstream (in meson) > and I think that we should do the same (granted that XACE works > correctly). > > The TLDR is that this has nothing to do with X11 forwarding and that I > think that not enabling this option in xwayland (and in -devel too) is > a good thing, one of the benefit of wayland is to drop the old X11 > crappy model. > > > - Missing XDMCP (xorg-server parity, maybe used with rootful Xwayland and GUI login managers) > > I've lost 2 hours looking at xcsecurity so unless you can prove to me > that this option is good to have enabled (and explained what it does > exactly) I won't look into it for now. bapt@ convinced me that it would be a good thing to have. Also we enable it for xephyr so no good reason to not have it in xwayland. Both gdm and lightdm support xdcmp. > > - Missing XTEST input emulation (XDG Portal API, required by GNOME, Plasma and maybe rootful Xwayland) > > - Missing CSD for rootful (mainly for GNOME, optional even if preferred elsewhere) > > I do agree that both should be enabled, bapt@ started a patch and I've > asked him to wait so I could have a look at XCSECURITY before. > > > - Broken on DragonFly due to forcing -Dsha1 (already default after I've fixed upstream bug years ago) > > - Redundant -Dglamor, -Dipv6, -Dxkb_*, libEGL dependency > > Cheers, > > -- > Emmanuel Vadot -- Emmanuel Vadot From nobody Fri Apr 5 12:48:21 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 4V9yvp0nwgz5GPXd; Fri, 5 Apr 2024 12:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9yvp0HHQz4v9X; Fri, 5 Apr 2024 12:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712321302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yl8cT6GYDmqYCifYnAjTdLEm3NF3jTLnG1yapCnziBg=; b=RqGU8ntwsd1gaQafdN3WQ8T7sMVBdDi6JiY8GOwF0j84hzlSTQrAyYVlYnxPssDfCq+Ibc 2X5L9p5jo46zUPLeSkjp5kA6kY9OkeQWmUzFGHgWd+4KwjSzynVhMuTimjcXlJIHUO0aJv eBLr2xW46hWRFfTZafcw+FS5aA/33gxk/PEXR/EtRQJas6kdiGthdyNbpk/2Rfd+JYcrUc EXQFBA0bQDISbu7LkGVb2sfO7kEDajhKqXsagffcbf0lX31MU3f+uLun4T5gxjGStwfnMm PH11Q3O4ydYZp/bZYC9dPF+Oej6Rt20a97d5FY1/QFJ7ApOh++M/KhVMFw05/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712321302; a=rsa-sha256; cv=none; b=lIjrh8qQFpG+2lLLhuC/c2slKjYnKIcz2yjHVVwuqNQ1h/0fbr+jcYwNvC/gVk64eR9GgF DSI6FgoJ3dMOGDPOApKJqVnaZweeLVlSKP/PEoVseSJhD7OS2+amx6JI2xoIb5jygGGB/M CgRyI5GYdi9ZqbH3wfVxeh2PTFERMtTP5kIZR/IsDQ8QZOogKf/U06Gt7AN9Dy9+aq3uE9 Q2v85KinIe+7yBJbk2K3RZzidiN6ftyOaPfDgomTWB6W7F597jxrHWMz2h3tAQaguvb+6Q nsA8jXq6V1gcErg723HLAQEWhBHFC0dDBW97C2DO9K6NP+qw+xbOzr8GlEdkAw== 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=1712321302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yl8cT6GYDmqYCifYnAjTdLEm3NF3jTLnG1yapCnziBg=; b=A7joWBbx68cCEDjv8F2HO7iCfJWNGcdnIo1RJ7jo3V1YQ314sAOMXBJG0nCWNf8LGui5Od cZBRYhWna+YNAKLcPKznl9Z1UnPjCdxgKPmmodQWxgwAVy09ofoUKbuQ0PeWgAlKHT9cGZ GE44thmUHr3+a5yhiGNh67jhz9fuIY8L1Uz7RVG67ELRVXAE4VbiD2DrvkscDBb3FBFFw3 42Aw1g2RzMvmBTw6xK7U0ZRpZ4PYyZ36T8WJPVeJnOAC6cd4yFP9lQWsynsQ7fIc4njLVR EK+QLq8c1wpGclSHPcrrDen0ekgIIomKHS+TiJtvwI/PM58Ru0H4LfVJSZJ/Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9yvn70s5z10qJ; Fri, 5 Apr 2024 12:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435CmLrE022774; Fri, 5 Apr 2024 12:48:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435CmLNL022771; Fri, 5 Apr 2024 12:48:21 GMT (envelope-from git) Date: Fri, 5 Apr 2024 12:48:21 GMT Message-Id: <202404051248.435CmLNL022771@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 40a3b61a4aa9 - 2024Q1 - x11-servers/xwayland: Fix plist 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 40a3b61a4aa9331b250cbe5df796c5e66824c53b Auto-Submitted: auto-generated The branch 2024Q1 has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=40a3b61a4aa9331b250cbe5df796c5e66824c53b commit 40a3b61a4aa9331b250cbe5df796c5e66824c53b Author: Emmanuel Vadot AuthorDate: 2024-04-05 12:43:16 +0000 Commit: Emmanuel Vadot CommitDate: 2024-04-05 12:48:12 +0000 x11-servers/xwayland: Fix plist Add the desktop file PR: 278165 (cherry picked from commit 5b56d02bb1391f147ba737448d8125e153b11928) --- x11-servers/xwayland/Makefile | 1 + x11-servers/xwayland/pkg-plist | 1 + 2 files changed, 2 insertions(+) diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile index a97e274c8778..084043c848c2 100644 --- a/x11-servers/xwayland/Makefile +++ b/x11-servers/xwayland/Makefile @@ -1,5 +1,6 @@ PORTNAME= xwayland PORTVERSION= 23.2.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver diff --git a/x11-servers/xwayland/pkg-plist b/x11-servers/xwayland/pkg-plist index 76fbca053230..ebd6bbdda320 100644 --- a/x11-servers/xwayland/pkg-plist +++ b/x11-servers/xwayland/pkg-plist @@ -2,4 +2,5 @@ bin/Xwayland @comment lib/xorg/protocol.txt libdata/pkgconfig/xwayland.pc @comment man/man1/Xserver.1.gz +share/applications/org.freedesktop.Xwayland.desktop man/man1/Xwayland.1.gz From nobody Fri Apr 5 17:45:52 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 4VB5W46q25z5GtRL; Fri, 5 Apr 2024 17:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VB5W46Ckvz4cYL; Fri, 5 Apr 2024 17:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712339152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+EN+wuRPD8inpVl8zLRL2uAFrcWAhW0KhFVN+R4rjUw=; b=MYa3xcYx3/jHRCmaMD3t6JD4QlF1dkiB8oDq2Ipi3TlkUTHr+kPsGTbpfrKA8xsxosp7KZ 89zceqMG3M+48HxZ6SxcduFKPwdjEoVY5OYPwIzJDf1uvS1RfD3zQvTne6kAfew8yp6ePe mbzp6iAXS/J7EX5tZ1rs7iQ1znIWXhbuq1tIR7QSK4B3f3cEPehBQ7uck50pFTH1AXsFE9 aCR/LNZeJ0vWLO7eUXLVvv3ZQnp+fUTQ01FsqORn8ahl8kklj0D+CuSv0QYWotM2G9ejJJ G7tTJLHTA6GQpuyeDtOiD0oGZbgS7xj6lMux1L1cWMfsWq+BnFsgAab3omBj6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712339152; a=rsa-sha256; cv=none; b=DDuyxABuusBers+Dsz/N91kaOwHwaIe/gBN9jM6qP3g7fB4J9MjgC/q20hpV4hTwz5M/mk 5+1NLAon9P/0AzL83dkCLsxdZiC+1npeBeA1PHs/7NNdh82EAP2oN0mopzLffwIBNHlw8a rRHQnfQU1KvFLzjVm70bZEsrud53uq/NJ8nqpPllY7/loiYozn9Ug6ZI2dz+4PtxifLIDK sifkbrMUdhKu+23ABOcBgPFvEz/SAE2ikqrOKvDjCSRiy5UiQZ+7HFOpL6dOi5WUi9fpz5 96bOQiEOqU2DAFu151n09d1CW4Kez9lahcKpFiw/MlgPJAASehprJES1AaMuNw== 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=1712339152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+EN+wuRPD8inpVl8zLRL2uAFrcWAhW0KhFVN+R4rjUw=; b=jeyNMSfCCiAXJbVaw69iDqwvdgH95alkOrg8IVS05lKKlkFJJ6aw6RBzHNrfVLRNCfKvFo 8YDvdnKNuzCQsIksv43guN9qDuAPU3N3IieNiCDSsTnF0bRl+crJUnAS2TI7f1/Gjppz/T SV28hYKlikvRTKHsmKZDc6esEqBjbFFoLian18d8KweNllna0LrCtPxl8C21l4bZcNMlzj OxxMX5dLPiSqbbnv9RbyRm8cVzgMI3mBO4Zgxxwrb+sJ5zLa7oUKSdefeHMxQyQcdf7pT1 uDT3P2dsBa4cqzU3FpU+CH+rab4Fgj5ylY0dYwFSJuExlwoYyPBZnYFXDkDQbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VB5W45WQhz18Lp; Fri, 5 Apr 2024 17:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 435Hjq1Y032883; Fri, 5 Apr 2024 17:45:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 435HjqGO032880; Fri, 5 Apr 2024 17:45:52 GMT (envelope-from git) Date: Fri, 5 Apr 2024 17:45:52 GMT Message-Id: <202404051745.435HjqGO032880@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Hiroki Tagato Subject: git: ebcece552f2f - 2024Q1 - devel/electron27: update to 27.3.9 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: ebcece552f2f0fce192b017e98232cdfc24ed54d Auto-Submitted: auto-generated The branch 2024Q1 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=ebcece552f2f0fce192b017e98232cdfc24ed54d commit ebcece552f2f0fce192b017e98232cdfc24ed54d Author: Hiroki Tagato AuthorDate: 2024-04-05 17:41:03 +0000 Commit: Hiroki Tagato CommitDate: 2024-04-05 17:45:41 +0000 devel/electron27: update to 27.3.9 Changelog: https://github.com/electron/electron/releases/tag/v27.3.9 Reported by: GitHub (watch releases) MFH: 2024Q1 Security: c2431c4e-622c-4d92-996d-d8b5258ae8c9 (cherry picked from commit 58e18094c2d0dcaae88fd78b78452c6f961e4047) --- devel/electron27/Makefile.version | 2 +- devel/electron27/distinfo | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/electron27/Makefile.version b/devel/electron27/Makefile.version index 569133feb0b0..80e4cf7c3870 100644 --- a/devel/electron27/Makefile.version +++ b/devel/electron27/Makefile.version @@ -1,2 +1,2 @@ -ELECTRON_VER= 27.3.8 +ELECTRON_VER= 27.3.9 ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//} diff --git a/devel/electron27/distinfo b/devel/electron27/distinfo index b7f01f03f10e..af6f81ccc2b6 100644 --- a/devel/electron27/distinfo +++ b/devel/electron27/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1711732560 +TIMESTAMP = 1712297587 SHA256 (electron/chromium-118.0.5993.159.tar.xz) = 47fdd7677470f4f4daf68e59dcacbafb99f5ed0c07501162b6af168f760b4359 SIZE (electron/chromium-118.0.5993.159.tar.xz) = 1602730244 SHA256 (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = f7f7f38661b107fc1d91b7918f36362d9180e87f34e3027562eb5db8735746fe SIZE (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = 8881070 SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8 SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734 -SHA256 (electron/electron-yarn-cache-27.3.8.tar.xz) = b1d33fa2bf412990a64b1720140fdd712b5945f41f781a4b2c154915061c6d75 -SIZE (electron/electron-yarn-cache-27.3.8.tar.xz) = 29116528 -SHA256 (electron/electron-electron-v27.3.8_GH0.tar.gz) = 0bb7f937207e627fe831cdd69f5ded49c47d665d921cde134d9af6637331e503 -SIZE (electron/electron-electron-v27.3.8_GH0.tar.gz) = 11435196 +SHA256 (electron/electron-yarn-cache-27.3.9.tar.xz) = b1d33fa2bf412990a64b1720140fdd712b5945f41f781a4b2c154915061c6d75 +SIZE (electron/electron-yarn-cache-27.3.9.tar.xz) = 29116528 +SHA256 (electron/electron-electron-v27.3.9_GH0.tar.gz) = 5c020dee60ba2849cf8bc97ce0605262355392aefa278e1b3f8b63dbbbf92b34 +SIZE (electron/electron-electron-v27.3.9_GH0.tar.gz) = 11453705 SHA256 (electron/nodejs-node-v18.17.1_GH0.tar.gz) = 1cc1670bc183eaf9e0afe0258391695d1d6ae1be02ba4c26e0218cf5f19b96f7 SIZE (electron/nodejs-node-v18.17.1_GH0.tar.gz) = 112512847 SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39 From nobody Fri Apr 5 23:13:17 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 4VBDn82vHkz5HNtb; Fri, 5 Apr 2024 23:13:32 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBDn73Jw8z40H2; Fri, 5 Apr 2024 23:13:31 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of bsdkaffee@gmail.com designates 209.85.208.45 as permitted sender) smtp.mailfrom=bsdkaffee@gmail.com Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-56e2b41187aso2443559a12.1; Fri, 05 Apr 2024 16:13:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712358809; x=1712963609; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F6E9g/TCcIo2YBaBBX+E4t7fvseywmwjSuCXQut7Zlw=; b=DEJHDuChxSbJn6bFuTnWJMgohf4NmaxwC2BP15FfYi/iuPBqWGGUg6Lm98fhTWXP9x j5Ba6KkBHDeVLB5wYKd18dzwT0UN/3uHj7HmqUodP6n23uyPzdsQzRV6YlNleW1xF3xE g2Eq7tgn07twc4XoHGT3U0r1kFEu07DX3V8ufbZb9gSCNPCbaIewSRxZGvQnN5Lokc2q kn+9pfWQhOFBDVMELNtfSRHTOBsX9J9zaBpB94GAn/C9uodMWe58Z2744JxlTbuwBEDu 2cDaPllykFcLx0x7RLfVJs8fZtIwUJKUNgS1YbOjSNcCkUsyIkJFE4G0mxpfFYfCT9pu B4Fw== X-Forwarded-Encrypted: i=1; AJvYcCUI7hUiJ4eYYgr5YF+cTDoZ4+SgIqrOAJ+9Gw87ZijBd34YMzOCgwAH3xYjzXKo6LSHjNlXYJmtCi2RPdNeiKmYIO3Kv3n8i51nL5hgRgYTDsks6nqG2cqWINtp5LS30BB09Pmkm6QCn/d8MFNp7y04YhdH2+PpU6ov X-Gm-Message-State: AOJu0YwcD4ZAnlozq1Gd2YTiU7Pi1a5H+E8CBiuzDdXKqgBojsOyQleD mBOPM22r2Mioaf5cpyb8tIzRK76HWVWaiAExDd8vLpa4P/JfM5ixpEnNQ3qr+sPICrpcMtZAIur YJBoVHNRJmUUVoXNliOc1BE7Ef+Wa1r/iYTo= X-Google-Smtp-Source: AGHT+IGyz0mgbsDexXDGCcSXLgrusaXQkSN34/6hgJ2upnQhU18dfLUh6rEy+dPRkJ5yX7DtnVdGn4yAFIBFa9ByKZ8= X-Received: by 2002:a05:6402:1c07:b0:56e:2d0a:b9f6 with SMTP id ck7-20020a0564021c0700b0056e2d0ab9f6mr2410676edb.14.1712358808826; Fri, 05 Apr 2024 16:13:28 -0700 (PDT) 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 References: <202403262357.42QNvEQP032101@gitrepo.freebsd.org> In-Reply-To: <202403262357.42QNvEQP032101@gitrepo.freebsd.org> From: "Jason E. Hale" Date: Fri, 5 Apr 2024 19:13:17 -0400 Message-ID: Subject: Re: git: 082542e6c694 - 2024Q1 - */*: Chase editors/emacs update To: Joseph Mingrone Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.89 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; NEURAL_HAM_SHORT(-0.99)[-0.988]; FORGED_SENDER(0.30)[jhale@freebsd.org,bsdkaffee@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_COUNT_ONE(0.00)[1]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.45:from]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.45:from]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jhale@freebsd.org,bsdkaffee@gmail.com]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-ports-all@freebsd.org,dev-commits-ports-branches@freebsd.org]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4VBDn73Jw8z40H2 On Tue, Mar 26, 2024 at 7:57=E2=80=AFPM Joseph Mingrone w= rote: > > The branch 2024Q1 has been updated by jrm: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D082542e6c694d58c24d1c425= c9f06441c6a16db7 > > commit 082542e6c694d58c24d1c425c9f06441c6a16db7 > Author: Joseph Mingrone > AuthorDate: 2024-01-26 14:13:34 +0000 > Commit: Joseph Mingrone > CommitDate: 2024-03-26 23:41:02 +0000 > > */*: Chase editors/emacs update > > - Bump Emacs version in Mk/Uses/emacs.mk to update version-specific > paths > > - Bump PORTREVISION of ports with USES=3Demacs. This is required for= two > reasons. Emacs lisp files need to be byte compiled for the new Ema= cs > version, and files installed under, e.g., EMACS_VERSION_SITE_LISPDI= R > need to be relocated. > > Reviewed by: ashish > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D43615 > > (cherry picked from commit ab463bdca9c29ec22be0c7e6d7aa27bb2a980b48) > --- Hi, You bumped more than PORTREVISION on several ports with this cherry pick, leading to breakage in the 2024Q1 branch since the (POR|DIS)TVERSIONs no longer match distinfo. - Jason > diff --git a/audio/emms/Makefile b/audio/emms/Makefile > index 4349f2ae3c57..e9b960de7b04 100644 > --- a/audio/emms/Makefile > +++ b/audio/emms/Makefile > @@ -1,5 +1,6 @@ > PORTNAME=3D emms > -DISTVERSION=3D 16 > +DISTVERSION=3D 18 > +PORTREVISION=3D 1 > CATEGORIES=3D audio elisp > MASTER_SITES=3D https://elpa.gnu.org/packages/ > PKGNAMESUFFIX=3D ${EMACS_PKGNAMESUFFIX} > > diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile > index 8e212af2195c..b1597381a0ef 100644 > --- a/devel/clojure-cider/Makefile > +++ b/devel/clojure-cider/Makefile > @@ -1,5 +1,6 @@ > PORTNAME=3D clojure-cider > -PORTVERSION=3D 1.12.0 > +PORTVERSION=3D 1.13.0 > +PORTREVISION=3D 1 > DISTVERSIONPREFIX=3D v > CATEGORIES=3D devel elisp > PKGNAMESUFFIX=3D ${EMACS_PKGNAMESUFFIX} > diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile > index 05a181702f9d..e3a5916f15fd 100644 > --- a/mail/anubis/Makefile > +++ b/mail/anubis/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D anubis > -PORTVERSION=3D 4.2 > -PORTREVISION=3D 17 > +PORTVERSION=3D 4.3 > +PORTREVISION=3D 1 > CATEGORIES=3D mail > MASTER_SITES=3D GNU > From nobody Sat Apr 6 02:32:25 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 4VBKBg4xkZz5Hj1l; Sat, 6 Apr 2024 02:32:27 +0000 (UTC) (envelope-from jrm@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBKBg13TPz4Vss; Sat, 6 Apr 2024 02:32:27 +0000 (UTC) (envelope-from jrm@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712370747; 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=a241d0crLs38nfFF82u6jLgZky+VyO2vmm3mDsl9HDM=; b=Bhln+3NeE5K5g808fOMxdL+64QYYcNbSSUM5lAe+CEjtmOLc8qJ2fKzh834nXq2xstYrU2 5F/tJpH/OsT1yJjGQ9iTf+m1Geg2M8rFoHn5XoN3oV6KwDDhetHVMKcBeBFI8Vut7+t+3Y nHklZgYsuMKBlxrn7wT2BjMu9NpyXtClyXvFI8zjgvqCfPg/zK6xEo1WIq9c5WyFeKZkuT AOi7p0uFLUHfkgT3XjaDYJIR1y+o7kCC426aaObze7eg+KPvo7Bx/jXhi81vWFlNKu/bJG PRYnde612KQUYcqRunhCBtdZZlPokeprtHsOK9zUu1wtDkzrsPBNl9eTjg8EhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712370747; a=rsa-sha256; cv=none; b=aRuA+CAOzj5HndequS5lhYQLnTUReRxeRXA5QuBXiTEho2CO6q/HudBwpwRfGJZrlGmb/U Muc+eFYRkfc9THjU+rE66HSYYoz1Oo5fyN8bANwZ7F1kynqouO6w9sqzrZWabc3kResnXt 14XgIIBjd8WuKQQm0+eVO/pU912F0mw+bHNjMk8dMgv15oGS+1pNeattPwvR2f+7uyXlZb Mk3wiPjsnEyjKIvPYYVR8jfAcITYO5OR0MnLIVb2I+7DsMQlTVdZ9dOw5JmgS/mea0GFtf ZmcUEru4q2D9cqBq+iJUiK+OXhSlXzLbyHQ3YhDcjp+Pmhe06m2lZDf++9U3nQ== 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=1712370747; 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=a241d0crLs38nfFF82u6jLgZky+VyO2vmm3mDsl9HDM=; b=GlIpMGs+JG0ceHYlnso1jSfSnzgc7ini2WSeMoScTYhaCHCnGl3Sm/kDJ6KcJWwOaGp6xn /ahTucyZpmXklP7Mds5MFo34RqwbJP+6GW+/X9B0cUEkDQ5wVrKMh9LItFK0eQWApVPk6L MiG/vYoHjOTdJSEkT0HpnUqPQGErkBhipOtD848Ycp8VeXcfxBrTTiymo1u7FSONX2DmYU o8KSOVCK73Oh33/8z4t7OcRcG1YwZRQuiLok3SYNElKDYRiRCgxeNZ6CCG6mPaL79LvAyH DARlUvUZiYfQgHY8HbUITaGsZSN33DFsL2N9Bb5HAtMtZoekyJTkgbAftuu3cw== Received: from phe.ftfl.ca.ftfl.ca (drmons0544w-156-34-250-113.dhcp-dynamic.fibreop.ns.bellaliant.net [156.34.250.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: jrm/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VBKBf67PDz1Q7G; Sat, 6 Apr 2024 02:32:26 +0000 (UTC) (envelope-from jrm@freebsd.org) From: Joseph Mingrone To: "Jason E. Hale" Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Subject: Re: git: 082542e6c694 - 2024Q1 - */*: Chase editors/emacs update In-Reply-To: (Jason E. Hale's message of "Fri, 5 Apr 2024 19:13:17 -0400") References: <202403262357.42QNvEQP032101@gitrepo.freebsd.org> Date: Fri, 05 Apr 2024 23:32:25 -0300 Message-ID: <86jzlbmdae.fsf@phe.ftfl.ca> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 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: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Fri, 2024-04-05 at 19:13, "Jason E. Hale" wrote: > On Tue, Mar 26, 2024 at 7:57=E2=80=AFPM Joseph Mingrone = wrote: >> The branch 2024Q1 has been updated by jrm: >> URL: https://cgit.FreeBSD.org/ports/commit/?id=3D082542e6c694d58c24d1c42= 5c9f06441c6a16db7 >> commit 082542e6c694d58c24d1c425c9f06441c6a16db7 >> Author: Joseph Mingrone >> AuthorDate: 2024-01-26 14:13:34 +0000 >> Commit: Joseph Mingrone >> CommitDate: 2024-03-26 23:41:02 +0000 >> */*: Chase editors/emacs update >> - Bump Emacs version in Mk/Uses/emacs.mk to update version-specific >> paths >> - Bump PORTREVISION of ports with USES=3Demacs. This is required fo= r two >> reasons. Emacs lisp files need to be byte compiled for the new Em= acs >> version, and files installed under, e.g., EMACS_VERSION_SITE_LISPD= IR >> need to be relocated. >> Reviewed by: ashish >> Sponsored by: The FreeBSD Foundation >> Differential Revision: https://reviews.freebsd.org/D43615 >> (cherry picked from commit ab463bdca9c29ec22be0c7e6d7aa27bb2a980b48) >> --- > Hi, > You bumped more than PORTREVISION on several ports with this cherry > pick, leading to breakage in the 2024Q1 branch since the > (POR|DIS)TVERSIONs no longer match distinfo. > - Jason My apologies if I messed up the resolution of some of the many merge conflicts. I'll take a closer look this weekend, but since we're now in Q2, from a user perspective, isn't this now moot? J. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKkBAEBCgCOFiEEVbCTpybDiFVxIrrVNqQMg7DW754FAmYQtDlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU1 QjA5M0E3MjZDMzg4NTU3MTIyQkFENTM2QTQwQzgzQjBENkVGOUUQHGpybUBmcmVl YnNkLm9yZwAKCRA2pAyDsNbvnp1QD/9cHTnFyYdq7qQ/fBIccHmRbpCX7HZ8l6U5 Tq+0zh9LBe1dDsyJ4BqRjlyGOL9Vk9uIducxnTqKfjyEXaio3dCgjfFDyk6pUSgr b74M9tATarj2Lsq7HyCgMA8EiZR1n6dhJDIjnlFQ9Mq7ncaHRRUWCcpTeHc5Tnec 4Uk+gitgoflVeCPLMxcTCcc/e5VmETOGY8ObA3O3kyepoiOTC3+F7DbImms1nVQS vpuIEgnQ2FDl2qtsslfvVASpTPSmgVnC0VwhpCqVZS/kXEi2XUT1W7sJjswz6KYp qirTQRzW0jbD0ZcXQZz+rSP6eWht6CXRyS754hyubtyrsydj/Au67D+NM6ypK30i vzOgh2ye3ibEZ6UQa1cyKAdohoBOfrx+IycnlmObeKmqwuEWTnuoBt3ZUEBslr20 YBAza75aQ5nylIlf3p6LHPgeK4RpZoXEpcRdfsfbzoFYgU8MVp3wAT2C5LEis4Ly oyUNn58q+DRvh2V3eSzvV4UIWNChwYb8GwjEJfdPryIKbXbMFm5IQgnYdR+hrt2u LWxtEx2wNmf906eaCiHSUmo04jsW2Z13+P66ePZo1043hPyDtarmLm9BYQeOAn3O s69gYckuLveMT74Ac7lF2jxuanXQhUakomde+f2Ej+lEpQ587IWqk2qoNmdDXz49 bpq3fGeRdw== =akyW -----END PGP SIGNATURE----- --=-=-=-- From nobody Sat Apr 6 07:53:44 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 4VBSKy3Pljz5G4lr; Sat, 6 Apr 2024 07:54:14 +0000 (UTC) (envelope-from 6yearold@gmail.com) Received: from mail-vk1-f170.google.com (mail-vk1-f170.google.com [209.85.221.170]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBSKy1kp0z445l; Sat, 6 Apr 2024 07:54:14 +0000 (UTC) (envelope-from 6yearold@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-vk1-f170.google.com with SMTP id 71dfb90a1353d-4daa8466d6fso883135e0c.2; Sat, 06 Apr 2024 00:54:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712390053; x=1712994853; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8iIDdeBj85IXtNBldz44saDCKwZyEQgxcIT5r2llO7E=; b=mYZtdDjebzi2F5VdcecPV54YOLQKCAO6Qi4N8pw+pd6CaWW+QqUwXIHac33mi+rGXQ QpzxZnbjcAf59v5d1pbQ+ieCl98m0Fw+1SqUljwnGHyaCKS/u65/wroIGsa+KBjmvTo5 BocFHVLwXyMdV0kJA8ioiYVfq1nQrBEszvQg1lRBTa2VgNy4xzOq6zo/P7AOCOYAEDmb INBPH7711BE739h6QGPmqWX1X334fVYmW2dlIzUeZJRV0q2stxVK4IEWXhdvP2OX5gMX U9a8zZhknzOW9W48W1+QWf2EXwRPLLQSa+pzb1iQ3QVtvpFP3U6KJIe1FmAioWD4vnxS WaHA== X-Forwarded-Encrypted: i=1; AJvYcCUhGjR8Tqse2pUu8vHp3aZeanHocAG9Q0G5nuiLSBLS9ChVw4tBvp5CxA66ep498YFxWtRsN9NfcvNUe0bkxBDVypnqdHdJhXUDROVrdEyrR6fX/m0XY2IcE9XvqGOnAOtyVvZCpG/2UeFvWp+AmxmyjwpSEzdN2Sc2 X-Gm-Message-State: AOJu0Yx7WHNz2ocfaJnncZs4U5LW4jsvctb/XINY20hTnGUdG3IVUQ/r 9bw7q71s3mGZg3evV9SWYkdfSDoDPLh5Z6TL+Cxr39NW2+gcTRX+KuhP1fZE X-Google-Smtp-Source: AGHT+IHAfKHKw7YoGexniGE28qUhTvUMXmHJGE77HSTbOK6xQHvE3H7LNYEwLmkvSyjiqNbgHLOjKg== X-Received: by 2002:a05:6102:3749:b0:479:d50d:85de with SMTP id u9-20020a056102374900b00479d50d85demr3797025vst.19.1712390052756; Sat, 06 Apr 2024 00:54:12 -0700 (PDT) Received: from mail-vk1-f178.google.com (mail-vk1-f178.google.com. [209.85.221.178]) by smtp.gmail.com with ESMTPSA id o37-20020a0561023fa500b00479d68a2f95sm552930vsv.6.2024.04.06.00.54.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 06 Apr 2024 00:54:12 -0700 (PDT) Received: by mail-vk1-f178.google.com with SMTP id 71dfb90a1353d-4da702e48e0so1233449e0c.0; Sat, 06 Apr 2024 00:54:12 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUWlYVciJB0b94CeQgb4GmUTKXLKMjQQaD/BCN9+Cr5UEe/PWQCOkQWC0i7pdWkSod6nQp5j2CeS2bw3JeerRyy3YwoJ59ITA+g0aWVcpZHpNGEPGCH0EwOx0+uwBycrAEdWmlYUaen+YrCMVD+ZcLGgfbbAXljetIF X-Received: by 2002:a05:6102:3749:b0:479:d50d:85de with SMTP id u9-20020a056102374900b00479d50d85demr3797017vst.19.1712390052034; Sat, 06 Apr 2024 00:54:12 -0700 (PDT) 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 References: <202403262357.42QNvEQP032101@gitrepo.freebsd.org> <86jzlbmdae.fsf@phe.ftfl.ca> In-Reply-To: <86jzlbmdae.fsf@phe.ftfl.ca> From: Gleb Popov Date: Sat, 6 Apr 2024 10:53:44 +0300 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 082542e6c694 - 2024Q1 - */*: Chase editors/emacs update To: Joseph Mingrone Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4VBSKy1kp0z445l On Sat, Apr 6, 2024 at 5:32=E2=80=AFAM Joseph Mingrone wr= ote: > > My apologies if I messed up the resolution of some of the many merge > conflicts. I'll take a closer look this weekend, but since we're now in > Q2, from a user perspective, isn't this now moot? We should not leave the Q1 branch in an inconsistent state anyways. From nobody Sat Apr 6 10:01:54 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 4VBW9N6z75z5GJFs; Sat, 6 Apr 2024 10:02:00 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 4VBW9N6C19z4KvL; Sat, 6 Apr 2024 10:02:00 +0000 (UTC) (envelope-from jbeich@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712397720; 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=To8EUeNM2ZEHeZvUyQDZN2/Dz6LPkXA7ee0+tiwWYdo=; b=ATle1aPujSPA7tiEQx5ytZ9Az0Y1a0/j6RI2lQMFHfQptpwAMEp8ih2wQUikNUZQvx1Gai KNSCVdFKcZqm4RBA4wqLUuDG1k6SQlKoB1HmNO6ecfz78JI/4A1ajB4XUMHykRLzKPzkBF 8uR0xcxubvnjlbEFR3bNRhwj23XN857aUk3+kdeTOYCt5KMfcs+rNyDvYAjVGet4owa+h8 K9d1RrQAUJ0gLVbrn8OvQ9Il+tj/AlWQfU6+jm/erE3BZER+5cUcCRuO/xVxaY2rQ8yfvQ M88qJEDmk2Wz1eLh+4dPLOq4tSf1+eVMOAOGvICdT6/srkR5Wat48VM67JJQrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712397720; a=rsa-sha256; cv=none; b=KyZGcWLGRJoSQ5MzFt0dOlpAHtDiZoc6SUroEioPaMF4g/1Lw8UkwCBiUvCe8NVWoXpuuv atgx6Y7gOYF/duzeRQvHyUPg3Tf3cHi9IqKl566ph+DP6zXB/HdXHE6ULfC/sJt4+n4c9g xhd/kVOgrtOTwQy+zVEjLlsWatWOBWpJog94a8kq9ayEUdEddswwyUWAqVjsByuFU2n2rt iDnwpi+xs/NvvwLYRDLffOQd2t/UiGsyP6IORIeSc6teXQByXq6Cd+eTFgqm6Vf/1d7Uad B+UNEsUu3d9AbhK5owb2ubgXE/u7mzhjdxcGbKSQq5rsuRDCw7ILxclLmAryMQ== 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=1712397720; 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=To8EUeNM2ZEHeZvUyQDZN2/Dz6LPkXA7ee0+tiwWYdo=; b=mLZ50TFFPRHK7Rw22jQe3HBd5vJdYygvBUyuco8dJh4iVf6SaxnhCCjpSAAiHNZSDPo2Kt g2XiflJcPXXv8TP/PjJ7zlN6dd0Kc3OBE5AAZFLmUJdZKio4LV5Rfk5CY9QbykUPYMla4U mnJ7hptKkfaV/ZgHAoLpMvTNhqw4YVuAusZ5oEUnQhwEGpCEZREJoyjCljwzQw8LO9wb3F wqNfthfMKHjf4ZvZmIJjlQCeJ7sDtk0uhoCQUUoPZ/d1n0QxlxgF9e2Knkux0rb/1xA9ba v5nykk3opG/vqs2B6I3QWA9fc/nLj/RnZ0aiNXt9arWAPo/k2AJ1hNKiqNZeQg== Received: by freefall.freebsd.org (Postfix, from userid 1354) id B06861C4D; Sat, 6 Apr 2024 10:02:00 +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: <20240405104111.9d9263dfe7ce99a01d620ab3@bidouilliste.com> (Emmanuel Vadot's message of "Fri, 5 Apr 2024 10:41:11 +0200") References: <202404040955.4349tDrM089062@gitrepo.freebsd.org> <20240404125743.1e52876a69053b726cb456e4@bidouilliste.com> <8r1t-ny0j-wny@FreeBSD.org> <20240404141239.35d54535539b66cd6336ee5b@bidouilliste.com> <7chd-l2ru-wny@FreeBSD.org> <20240404151554.04340786db8562e522f7b1a8@bidouilliste.com> <20240405104111.9d9263dfe7ce99a01d620ab3@bidouilliste.com> Date: Sat, 06 Apr 2024 12:01:54 +0200 Message-ID: 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 Emmanuel Vadot writes: > On Thu, 04 Apr 2024 15:48:55 +0200 > Jan Beich wrote: > >> Emmanuel Vadot writes: >> >> >> but also introduced a number of regressions that >> >> don't exist in my port, all of which were documented in my reviews. >> > >> > What regressions ? I'm using xwayland for more than a year on my >> > desktop instead of -devel and haven't seen a problem. >> >> Try diff xwayland{,-devel}/Makefile: >> - Missing XSECURITY (ssh -X vs. ssh -Y; xorg-server parity per bug 221984) > > I admit that I'm a bit lost on this one, I did some test and here is > what I found : > > - Using sway and xwayland (so without xcsecurity enabled) I can't ssh > -X to a xorg host and run applications (DISPLAY is not set), but I can > ssh -Y fine Works fine here: # Prepare by removing existing permissions $ rm ~/.Xauthority $ ssh test@jail rm \~/.Xauthority # x11-servers/xwayland-devel $ ssh -X test@jail xeyes /usr/local/bin/xauth: file /home/test/.Xauthority does not exist Xlib: extension "XInputExtension" missing on display "localhost:10.0". ^C # x11-servers/xwayland $ ssh -X test@jail xeyes Warning: untrusted X11 forwarding setup failed: xauth key data not generated Error: Can't open display: Alternatively, SECURITY extension can be tested locally: $ xauth generate $DISPLAY . untrusted && xeyes xauth: file /home/jbeich/.Xauthority does not exist Xlib: extension "XInputExtension" missing on display ":0". ^C Curiously, wlroots starts Xwayland without -auth argument unlike others. https://gitlab.gnome.org/GNOME/mutter/-/commit/a8984a81c2e8 https://invent.kde.org/plasma/kwin/-/commit/335d9c41925d > So what I did next was to recompile xorg-server with xcsecurity > set to false. And to my surprise ssh -X from a xorg host to the one > with the modified xorg-server still worked. Did you run the modified xorg-server locally? ssh -X doesn't use xorg-server on the remote host, where sshd server is running. > xcsecurity is disabled by default in xorg-server upstream (in meson) > and I think that we should do the same (granted that XACE works > correctly). >From https://gitlab.freedesktop.org/xorg/xserver/-/blob/c93c2e7718bc/Xext/Makefile.am#L58-59 # X-ACE extension: provides hooks for building security policy extensions # like XC-Security, X-SELinux & XTSol X-SELinux is Linux-only. XTSol is Solaris-only. Everyone else is left with the legacy XC-Security (trusted/untrusted) or nothing. From nobody Sat Apr 6 11:04:12 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 4VBXY85tCNz5GPJ3; Sat, 6 Apr 2024 11:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBXY85LWHz4S7q; Sat, 6 Apr 2024 11:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712401452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tuwJ2gZqGhMpEk8wDZEvw4SnjyyfHnSIHdA5qDuayEo=; b=Sj3b567HwjxTfncGj8bsW0evp3E6MswAYzasgAof8jn5K0rOtJer26pCF1EOt3xoQSc7Pj CYnsd+C2BjZ61Gn8uaabJftEsG8f3jHtfI5SbefOZ0pChJP68adeU66ambaG9FrBbegmy0 sPo6t6g4jYKafO349PvUOQF6mTtOlEuCBMF6EKNfmXrrHKQftB/Hy6PjlZDWRweFt4P9T+ Hc0uV0Kzpu/53sj1HdNtqmhp0hMU4zWwl3mMxCOUU2L63OnOMV4NY2YFFF+24gXf6KwA/j I0UBsqrCYhyJEkgSlQ2mpd7qeilkfqgVb8vWnJy0rLBELSGlM7GXz8nJqpV6PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712401452; a=rsa-sha256; cv=none; b=iQiFKJXeSriXjnD4BZDO5HJFmNgBmxZOh/tQCO//Ekx8HKr4NB3CJn5ge7xpjx3Ikpw3Ng V6OpFlVTpeK48oKYoROWvU41R7pssFGf/72jQxhhx/cJwX96Hf2f8OaqLRILFDiTeOHvJJ rQDlEXmKebjqCcCGul65vZQCo2cjMZAYy6dlwIlCNKIIzUnbvlVvT7bcL2hg+gcweMue6u S/rAdU5MEv77inWBK8YtrSaNRG55ybuI8DWJabJPLtAl6rs711AAa8Fr9jF6gcrpO8SZ3Z ZYvyG+bm2r70IWIDlTwDM2gQpxznOErekpQaUyouEExK4KApyDrLie4FsTPUgg== 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=1712401452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tuwJ2gZqGhMpEk8wDZEvw4SnjyyfHnSIHdA5qDuayEo=; b=HHwwsTLy9HQX8suxsBiFU+dGPCJPMl9qARGkv/A42S9EsWRzBp2N/sIMdH0oSeRFWaDLiC MvxeJJeCrDu+WBfuOjAwR2tz2o6BlUDmGpdVxZoP0PxeTU7H5kV2RKOE7zcQgWFpKdiEq3 f7q0INuuCUGEt2HWO7FWLXGPBorBD4eYGMJkISN2kzIjkXzqbsx4yi2olumoxSOhxeOrGa GjYksUOpYK5tnA/iKqIxjkDdS2/PZBHGevJ9lkyDBIB4Phft3PwUZR/kqfCchqLAk0fpcA Gv3HKWn6d/vxjMz6t2XkD89Hqdh24r9C6oG9dnoUqIhpnzh4hK+4f9S4OCK/FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBXY84xvCzhVP; Sat, 6 Apr 2024 11:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436B4CUm098984; Sat, 6 Apr 2024 11:04:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436B4Ckt098981; Sat, 6 Apr 2024 11:04:12 GMT (envelope-from git) Date: Sat, 6 Apr 2024 11:04:12 GMT Message-Id: <202404061104.436B4Ckt098981@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 07eb689e5440 - 2024Q1 - net-im/dissent: update to 0.0.23 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 07eb689e5440197736a97954e223bf917bb6090d Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=07eb689e5440197736a97954e223bf917bb6090d commit 07eb689e5440197736a97954e223bf917bb6090d Author: Jan Beich AuthorDate: 2024-04-04 10:41:34 +0000 Commit: Jan Beich CommitDate: 2024-04-06 11:03:50 +0000 net-im/dissent: update to 0.0.23 Changes: https://github.com/diamondburned/dissent/releases/tag/v0.0.23 Reported by: GitHub (watch releases) (cherry picked from commit fd254b5001c0202df7d90c87d54e5441d98b53b6) --- net-im/dissent/Makefile | 2 +- net-im/dissent/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-im/dissent/Makefile b/net-im/dissent/Makefile index 709b984e7b5a..cf8a84db9b63 100644 --- a/net-im/dissent/Makefile +++ b/net-im/dissent/Makefile @@ -1,6 +1,6 @@ PORTNAME= dissent DISTVERSIONPREFIX= v -DISTVERSION= 0.0.22 +DISTVERSION= 0.0.23 CATEGORIES= net-im MAINTAINER= jbeich@FreeBSD.org diff --git a/net-im/dissent/distinfo b/net-im/dissent/distinfo index 41b2d22ff951..8be56bd3396f 100644 --- a/net-im/dissent/distinfo +++ b/net-im/dissent/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1710925564 -SHA256 (diamondburned-dissent-v0.0.22_GH0.tar.gz) = 756f7bf983e98e035655a66388a3409f02939c972d6bd024a5177a389cbde5c4 -SIZE (diamondburned-dissent-v0.0.22_GH0.tar.gz) = 4002142 +TIMESTAMP = 1712227294 +SHA256 (diamondburned-dissent-v0.0.23_GH0.tar.gz) = 7c5e10a6111cd8912c052337c56cb04cbb92b237453d560c85409f1c8f8cc01b +SIZE (diamondburned-dissent-v0.0.23_GH0.tar.gz) = 4032282 SHA256 (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = a8b6b241e8b72c95132497864c59a559fb35f6ae4b296c299e563a12a3a16fbe SIZE (KarpelesLab-weak-v0.1.1_GH0.tar.gz) = 3484 SHA256 (alecthomas-chroma-v0.10.0_GH0.tar.gz) = 98a517ae99f48e3b54d5c8cd7473d5c544f51bee7a4be17f5175736fce37da56 From nobody Sat Apr 6 17:26:26 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 4VBj2C1vv7z5H1jt; Sat, 6 Apr 2024 17:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBj2C0jnjz43b7; Sat, 6 Apr 2024 17:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712424387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sWdF41/mgCBmFa+LnzGi0dYoY1J5yNo0APCR/wRr6gc=; b=mki0ECQMxCVpl9Z2JlkPxH7EFu1HDN4l5MoCxMumMogS/zuIv6dVj9RSM4gYOdcZhJY6rR lDfydo30Psrdd227ETdwJNOlVcOeJDnjGHeVsaJGRUnCKqvVhAGN6WL5GZW8SK93cWSmtZ 5XwK02mlguic2NdO+lAsWILySiJeSoUI2EGr8CD2gNrRX+LqveReG1GjKwPeoSsP0srff0 HujWzPWqQNB/huOot1BAOcInemlqV//plEXuCW+PyzADiVx2d+JCzDKrJtpzs1StdTp0wo donfq6HN+i4HrRusRIif1VEdPgGh+uijDMFD6uFPjFRLWUGrP3m7vWeTSTH72A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712424387; a=rsa-sha256; cv=none; b=H7O/hJ6TmGpX/m0szlBmFtZQ2OmTeZo0CX6r67MpJlBIgL7qcMrnLPi+SBWlf5LyxdOMnM VQEVww9WRtdgUA6CEjoqY0crSlmTZim8cAt3y6+4d5YxncYLCyRch5W1lDcAzZVBTZUBwc 5kJVqsaQylIr96Q6utSikoFVQY+qgdlyq1KR6+9iUV6OxRxNgzxavThv31cwi0cSyXMl8Y FhjprkeoVrt8S/tBywYOjmEfRcF9ktFGmkrQZHrnL9FdPryJBBl+tUmtOozqPo9SMZS6SG qmvV1F3P+fHzs89lLqul47Awjg09sKIDCVpwxdc0f2/BXnOrdqCxabjV9RiWXg== 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=1712424387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sWdF41/mgCBmFa+LnzGi0dYoY1J5yNo0APCR/wRr6gc=; b=DfNj8vMT+WyX67gyxU4L++jJuOBn+IlpO76x4y7VmziHPziKZwFJE4hxq+EJO69dJoMONf f83elyPWkfxQU08ppMIZObqmDP4cCCOw+DyNmOrZ19LKXSU+RCg1Mim65V4z8yK90MPYRY 1gU/iBzs0tgtb33lzLelcAosn8Bk2l34gn9aGVi4/ybpYpYNVT7foOAGKLUjSn1p/zuNEP CSH6fFn13X0k/uDCP4QkDEroi/TR6a36J60+jGzCKn6/UZfLyxE8b3ycZaLFlEpG1hWNwc GWLq0LdEKY969RoLSqbRSUqwn9D23WEGR0jmtAijY+Kx8ZrxHr1cE5/RVcVHBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBj2C0Kp2zsR8; Sat, 6 Apr 2024 17:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436HQQAY041458; Sat, 6 Apr 2024 17:26:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436HQQER041455; Sat, 6 Apr 2024 17:26:26 GMT (envelope-from git) Date: Sat, 6 Apr 2024 17:26:26 GMT Message-Id: <202404061726.436HQQER041455@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 154a19da2a20 - 2024Q1 - databases/mysql80-server databases/mysql81-server: fix build with libc++ 18 on i386 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 154a19da2a20a6f899d7e1e92c1ddc56447a0b00 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=154a19da2a20a6f899d7e1e92c1ddc56447a0b00 commit 154a19da2a20a6f899d7e1e92c1ddc56447a0b00 Author: Dimitry Andric AuthorDate: 2024-03-22 20:49:01 +0000 Commit: Dimitry Andric CommitDate: 2024-04-06 17:26:12 +0000 databases/mysql80-server databases/mysql81-server: fix build with libc++ 18 on i386 When building against libc++ 18, several iostream classes now get inlined into C++ binaries for efficiency. But because the mysql ports use -malign-double on non-powerpc architectures, this causes an ABI problem with libc++.so, which has not been built with that flag, at least on i386. This can cause segfaults during the build of the port. If it is not the architecture default, as it is on amd64, -malign-double should not be used without recompiling basically the entire userspace runtime. Quoting the gcc docs: > Warning: if you use the -malign-double switch, structures containing > the above types are aligned differently than the published application > binary interface specifications for the x86-32 and are not binary > compatible with structures in code compiled without that switch. Hence, remove -malign-double from CXXFLAGS for these ports. PR: 277896 Approved by: maintainer timeout (2 weeks) MFH: 2024Q1 (cherry picked from commit b49518c5c7c16418d7da0a5ce786da139b905bb1) --- databases/mysql80-server/Makefile | 1 - databases/mysql81-server/Makefile | 1 - 2 files changed, 2 deletions(-) diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 8053ff41f708..a729a8155f68 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -189,7 +189,6 @@ SSP_UNSAFE= yes LDFLAGS+= -latomic USES+= compiler:gcc-c++11-lib .else -CXXFLAGS+= -malign-double USES+= compiler:c++17-lang .endif diff --git a/databases/mysql81-server/Makefile b/databases/mysql81-server/Makefile index dc321e3067ea..8e1a1ab072de 100644 --- a/databases/mysql81-server/Makefile +++ b/databases/mysql81-server/Makefile @@ -189,7 +189,6 @@ SSP_UNSAFE= yes LDFLAGS+= -latomic USES+= compiler:gcc-c++11-lib .else -CXXFLAGS+= -malign-double USES+= compiler:c++17-lang .endif From nobody Sat Apr 6 21:35:03 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 4VBpY35wzNz5HP4J; Sat, 6 Apr 2024 21:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBpY35SwBz4gMm; Sat, 6 Apr 2024 21:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712439303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26qtoCiSg1pk9b9EbMbBZlD7SR6Ny9C/CuS5Lrwbhqc=; b=Y6s88buOTd6TQp7m5DT7ke/T4bTkuSLVrzi3B2Fe1SeWhc8yzzm+Z3fERoDzZstsDFbk+u /B7eCj/zYslaOrpnIJr0Opdsbo1WtS97AsThDt8g9QvWCnukMbWRqtl9Rd990NkAHHTrpX 8TqZutQpoVU3bk3jruRp5fQGy2xWX1blRyal5qJ7YlM1hh8sHoVWdGNHZHUlSyrg8LR7e0 JNHUOlkh4qt6pCgjq4bsO/38piS5PIXya+J1ROgeRgicEOz5ZbcTT2dtzhm52gwGiSTrUz AviTf1dh8yQRP90bdcgvvVzOL9yUoIq3p5zvoxcx4UuX4Ff0b9hLHC8xmQH5Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712439303; a=rsa-sha256; cv=none; b=qWrIC0KexheA0dPCsR2Ah+OqGtY6Blf9Y/tQF9xXO2bcCEZdNt2e8o/mK53yt5AaGXnS/g 7rQgGQzZaH/Xg5iD8CnUdKbZawaYiZsxtDxmk3gSPU/YrFpVulQE1R+yBo6cWsQEQQPdph IbBGnBmJU5UG5MM3chLbd4/7vGHkyR8+cnwF8vW059U17oRX11aYswocHx7KF4jQipYuq0 8a3NJU2QS6rHbD0QE/pDPCzUqRexBZ2SG23cYU9DYBtHriGCWgWPaP1sQiQ6i1EQV+78yb sOwq5+tBL8D0EMTBhlhGOihNX+uEJdoZ+j657cXHwoWC+CpKVoMOnx9lGH+fUg== 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=1712439303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26qtoCiSg1pk9b9EbMbBZlD7SR6Ny9C/CuS5Lrwbhqc=; b=ql4PWM6c3xPjUfdjQlk+B85snP/3gzkj5Xeae9QdrNcWvfhLYEXFKaJUnWdljc3CoWOANH oz23YkbU9K9JTUC5ypaNT+1+fDPTZ5E1RXOHEMZtnRHM0d987dMVXVtDKMj/LrXEocnLgl n1Aw4M0S5zeY67CWKLi1qy5pupDfp+5idt2zN8TqE7Vsqit808lHMzUi6g4D0ithDiqUKj caElmkOkXvc+thqFCJQBUJxsygHf9BttKbB/QS+ko8DHk2nDR5DCbuVstFk87tsTr+ChCj rhEf4q5n9sACY5FFqJqouJWKVjArmYl6jmMluHe58sJwH0Q/ISbu+5ghtVdraQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBpY350xdz106S; Sat, 6 Apr 2024 21:35:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436LZ3FJ065494; Sat, 6 Apr 2024 21:35:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436LZ3cC065491; Sat, 6 Apr 2024 21:35:03 GMT (envelope-from git) Date: Sat, 6 Apr 2024 21:35:03 GMT Message-Id: <202404062135.436LZ3cC065491@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 76bd09eb6ca7 - 2024Q1 - emulators/rpcs3: update to 0.0.31.16295 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 76bd09eb6ca7736372951f2c4a9bf1765a2844f7 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=76bd09eb6ca7736372951f2c4a9bf1765a2844f7 commit 76bd09eb6ca7736372951f2c4a9bf1765a2844f7 Author: Jan Beich AuthorDate: 2024-04-05 23:47:08 +0000 Commit: Jan Beich CommitDate: 2024-04-06 21:34:26 +0000 emulators/rpcs3: update to 0.0.31.16295 Changes: https://github.com/RPCS3/rpcs3/compare/2a89d87fab...517f0e1bac (cherry picked from commit 23db575948a87f6485bfd482c8510a115f014ba1) --- emulators/rpcs3/Makefile | 6 +++--- emulators/rpcs3/distinfo | 10 +++++----- emulators/rpcs3/files/patch-soundtouch | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 5f1f3768a074..f5ae65e8ea0c 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,7 +1,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.31-16282 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -g2a89d87fab +DISTVERSION= 0.0.31-16295 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -g517f0e1bac CATEGORIES= emulators wayland MAINTAINER= jbeich@FreeBSD.org @@ -26,7 +26,7 @@ ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 USE_GITHUB= yes GH_ACCOUNT= RPCS3 GH_TUPLE= RPCS3:hidapi:hidapi-0.14.0-2-g8b43a97:hidapi/3rdparty/hidapi/hidapi \ - RPCS3:soundtouch:2.3.1-30-gced3ce8:soundtouch/3rdparty/SoundTouch/soundtouch \ + RPCS3:soundtouch:2.3.1-68-g394e1f5:soundtouch/3rdparty/SoundTouch/soundtouch \ asmjit:asmjit:416f735:asmjit/3rdparty/asmjit/asmjit \ jbeder:yaml-cpp:0.8.0-11-g456c68f:yamlcpp/3rdparty/yaml-cpp/yaml-cpp \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-323-ge867c06:spirv_headers/3rdparty/SPIRV/SPIRV-Headers \ diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index a80b5dcacab3..cae3ca938363 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1712145819 -SHA256 (RPCS3-rpcs3-v0.0.31-16282-g2a89d87fab_GH0.tar.gz) = 15a5872f38d7e2e25af4216a1d23638a418b7a532a0a6262edc01e9c1577f7fa -SIZE (RPCS3-rpcs3-v0.0.31-16282-g2a89d87fab_GH0.tar.gz) = 8632247 +TIMESTAMP = 1712360828 +SHA256 (RPCS3-rpcs3-v0.0.31-16295-g517f0e1bac_GH0.tar.gz) = 967e57c7ff98aa28d7c400815d64b659fb66ee7bc26e7646ffb2abae9ba00706 +SIZE (RPCS3-rpcs3-v0.0.31-16295-g517f0e1bac_GH0.tar.gz) = 8633268 SHA256 (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 109ba77362885d60e274930f637735ee75df2850fe99e3f1c3a5b9d1187f8cb6 SIZE (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 348879 -SHA256 (RPCS3-soundtouch-2.3.1-30-gced3ce8_GH0.tar.gz) = a041a2a857f52f7f0e4e5a8e774b702cd59f10fe9f39cfb87f5a6a2b4bc58d55 -SIZE (RPCS3-soundtouch-2.3.1-30-gced3ce8_GH0.tar.gz) = 582437 +SHA256 (RPCS3-soundtouch-2.3.1-68-g394e1f5_GH0.tar.gz) = e24af82c51547341e2dfd43af03c1847abfd8d27334d667e6a51943f7f505cbe +SIZE (RPCS3-soundtouch-2.3.1-68-g394e1f5_GH0.tar.gz) = 606828 SHA256 (asmjit-asmjit-416f735_GH0.tar.gz) = 65ba9c3487da09af02db0c34405d1bdd3e49e134062930777f272007d97940fd SIZE (asmjit-asmjit-416f735_GH0.tar.gz) = 1151444 SHA256 (jbeder-yaml-cpp-0.8.0-11-g456c68f_GH0.tar.gz) = 3793d936474b1e6366f934f128f168dae711fd5e248dac048226c7879cefd6a3 diff --git a/emulators/rpcs3/files/patch-soundtouch b/emulators/rpcs3/files/patch-soundtouch index cc365709e724..868d9717bd68 100644 --- a/emulators/rpcs3/files/patch-soundtouch +++ b/emulators/rpcs3/files/patch-soundtouch @@ -12,14 +12,14 @@ In file included from 3rdparty/SoundTouch/soundtouch/include/SoundTouch.h:68: #define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ ^ ---- 3rdparty/SoundTouch/soundtouch/include/STTypes.h.orig 2022-01-22 12:50:46 UTC +--- 3rdparty/SoundTouch/soundtouch/include/STTypes.h.orig 2024-04-04 20:36:27 UTC +++ 3rdparty/SoundTouch/soundtouch/include/STTypes.h -@@ -125,7 +125,7 @@ namespace soundtouch - #ifdef ST_NO_EXCEPTION_HANDLING - // Exceptions disabled. Throw asserts instead if enabled. - #include -- #define ST_THROW_RT_ERROR(x) {assert((const char *)x);} -+ #define ST_THROW_RT_ERROR(x) {assert(static_cast(x));} - #else - // use c++ standard exceptions - #include +@@ -125,7 +125,7 @@ namespace soundtouch + #ifdef ST_NO_EXCEPTION_HANDLING + // Exceptions disabled. Throw asserts instead if enabled. + #include +- #define ST_THROW_RT_ERROR(x) {assert((const char *)x);} ++ #define ST_THROW_RT_ERROR(x) {assert(static_cast(x));} + #else + // use c++ standard exceptions + #include From nobody Sat Apr 6 23:53:21 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 4VBscw2jMpz5FdQD; Sat, 6 Apr 2024 23:53:36 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBscv3QtZz4sWd; Sat, 6 Apr 2024 23:53:35 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-56e2e09fc27so3584213a12.0; Sat, 06 Apr 2024 16:53:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712447613; x=1713052413; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1sE+F7T2mGJKLln77D4E98v53k40xy3Iux5/kgL0Tjs=; b=AUSHnAN5ANLLqUHKuJPH5tgWE0AqHzPb/c93Ey2QKmQiFGq+0bouHkyWd3AKqkWGq0 SqZfknsbiVzz8u9OGbl3oxyKkXvSb7CZV4t45K9EoRTsVWTo/iEu3KPXvPyjbN2uzJZ0 xfY24e2TVT+Vl7thO24DxURTJ77gcJex5j9+2laEzC+OFtQP+Cls+P0hgUch9dD7kBJW 7b0NzJf6jw7ifIwawX8w9jhSFrXR46U9E/QiXmClhg/RkZGOHtuYbrs310J2JZr8UXDs hUREVs4zYdnNquhjtZJszGZjVjKa/8ZO7/imkg883IEzZRXVTtQyYM0lJ7K+I6MwwxGc KTAg== X-Forwarded-Encrypted: i=1; AJvYcCVjTEN+mPMQxR4P5zIlzeq71LtQzDgdDHeaz5kKUXYDVYUJaAEbGizxpJEUyAtC7dhZwDaYIP74XKO/Li402tLO9vOyeSLIvbtkHx0tSlTrzGfreQpo3bPoRX6J/jYWsemw45cFFErwuQ6RcTGvxitGOx0stn7LkgTD/voDG9QjLB9vnOCXw++04faIDXAy5ukQsW7cFu6X X-Gm-Message-State: AOJu0YwvB3ZH0hNPx2LA8pIZWk3fPUJmrQ8ICyNZTnZiu9mjfbROSlxx jQoIUXKU/4/3Hnxzn2cpdf+NrJ0kQ6an7A/DCmghmcUZP8LaY4PPsPL0iFoQ+YksP9tkwAf606u YfU8wVfPqRaCeVg7Xwx86hoMwJu7gqNIwcr8= X-Google-Smtp-Source: AGHT+IFllHEB2DvwZjpxRulL8Vz3I9c/LwkSHlrA2F6z2KaYFVs18VpH6ph0S1f0re+CXk3oIuYOk462ywjj7/rOV68= X-Received: by 2002:a05:6402:1f4b:b0:566:6a9d:6147 with SMTP id 11-20020a0564021f4b00b005666a9d6147mr6071623edz.0.1712447612874; Sat, 06 Apr 2024 16:53:32 -0700 (PDT) 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 References: <202403262357.42QNvEQP032101@gitrepo.freebsd.org> <86jzlbmdae.fsf@phe.ftfl.ca> In-Reply-To: <86jzlbmdae.fsf@phe.ftfl.ca> From: "Jason E. Hale" Date: Sat, 6 Apr 2024 19:53:21 -0400 Message-ID: Subject: Re: git: 082542e6c694 - 2024Q1 - */*: Chase editors/emacs update To: Joseph Mingrone Cc: "Jason E. Hale" , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4VBscv3QtZz4sWd On Fri, Apr 5, 2024 at 10:32=E2=80=AFPM Joseph Mingrone w= rote: > > On Fri, 2024-04-05 at 19:13, "Jason E. Hale" wrote: > > > On Tue, Mar 26, 2024 at 7:57=E2=80=AFPM Joseph Mingrone wrote: > > >> The branch 2024Q1 has been updated by jrm: > > >> URL: https://cgit.FreeBSD.org/ports/commit/?id=3D082542e6c694d58c24d1c= 425c9f06441c6a16db7 > > >> commit 082542e6c694d58c24d1c425c9f06441c6a16db7 > >> Author: Joseph Mingrone > >> AuthorDate: 2024-01-26 14:13:34 +0000 > >> Commit: Joseph Mingrone > >> CommitDate: 2024-03-26 23:41:02 +0000 > > >> */*: Chase editors/emacs update > > >> - Bump Emacs version in Mk/Uses/emacs.mk to update version-specifi= c > >> paths > > >> - Bump PORTREVISION of ports with USES=3Demacs. This is required = for two > >> reasons. Emacs lisp files need to be byte compiled for the new = Emacs > >> version, and files installed under, e.g., EMACS_VERSION_SITE_LIS= PDIR > >> need to be relocated. > > >> Reviewed by: ashish > >> Sponsored by: The FreeBSD Foundation > >> Differential Revision: https://reviews.freebsd.org/D43615 > > >> (cherry picked from commit ab463bdca9c29ec22be0c7e6d7aa27bb2a980b4= 8) > >> --- > > > Hi, > > > You bumped more than PORTREVISION on several ports with this cherry > > pick, leading to breakage in the 2024Q1 branch since the > > (POR|DIS)TVERSIONs no longer match distinfo. > > > - Jason > > My apologies if I messed up the resolution of some of the many merge > conflicts. I'll take a closer look this weekend, but since we're now in > Q2, from a user perspective, isn't this now moot? > > J. Considering the delay in cutting the 2024Q2 branch, I don't think it's moot to fix errors in the current quarterly branch which is still 2024Q1 at time of writing. Had the Q2 branch already been cut, I wouldn't have received the numerous pkg-fallout emails that caused me to investigate this in the first place, so I'm not pointing this out just to be petty. :) I'm not sure how much longer we'll be on Q1, so I think the responsible thing to do would be to revert the PORTVERSION/DISTVERSION changes for audio/emms, devel/clojure-cider, and mail/anubis. For mail/anubis, the PORTREVISION should then be 18, because it was 17 before this change. - Jason From nobody Sun Apr 7 01:00:15 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 4VBv5s5HSmz5FlHQ; Sun, 7 Apr 2024 01:00:17 +0000 (UTC) (envelope-from jrm@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBv5s4k86z40Nm; Sun, 7 Apr 2024 01:00:17 +0000 (UTC) (envelope-from jrm@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712451617; 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=xgtg8Xpdj4FvkKEWsOanulbY7fwx1WriUsGggi8KF0k=; b=W9lSZyD+mvV3Iq9GRCaFtMA4J0LMiQpdkSPHhQ5qV21yznO5NVw1/LIDWcbYIFE0WSJkCu 90m5GAO4pyVWOQms4Pnce61T9x5a/AGV+yj/2bnidk5CTbiz7Oin0u1M9W6MoSXYUwmA77 +HZOqkxqQQ28IG5C08FQxO1ZkkiAl12p9C8Juy9LrXCI/RNAyAsAKrfjEgMK2uhiyXFhfP Nem8nP5KqApvG40B4kPwZl5mjnaSOwd0Ln0+L7CGS7ClrUWTvZPURZy+Fm65gP3x9zxEGE owvJ7KmtG1OfTc25n2oXPI7GYYD1CSKrNvsBXpw/Y0hc+26whMz3OurBUn8WMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712451617; a=rsa-sha256; cv=none; b=NGBfQ28/EBGPJwYCLtcbGwpNJujjWVIrnU+Ho2UrOm9Sgx0hwphf2yi1YkTf+yLhrjNwdE zGR/kzCSzkfUntg6sSNB4295d/fLkiZJ2pSwSApTVXgmX4On1+hpXib0EVfJlzAqSryBJg qz2lsVtRPKhUj5xXCt6pDAeot9ylnhb8/dG3b0iK5iAOntA3RyODoStE1PxUOv5vtxYRJJ 1rfs3jSqIBEE3FiLiJm77YhqsrNFwKqMNohQacaUBqQup3JNKcsp6cHxkz5+RXxiCf0Msn W3H4fxkVem5J+g5CVsdFNn+gLkyaA96Ua+CCKQlyFDcCDSv7ihrzrlglsAnigw== 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=1712451617; 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=xgtg8Xpdj4FvkKEWsOanulbY7fwx1WriUsGggi8KF0k=; b=WqzkbeCzYn94QK5ynzHw8d7usStwPnQYsblCyrnVTorODCouW0FTnuHDzP4YotA0yqTm+b VXfVNsGy9fuyv3l/q42spDCbvnEydOvvGe9+8lvO5VQR9uWDiKTfgTObmfTR9KIkt713vt V7ItRrhLvnkuPY/IQkWl2fN5Qwj1Tj0x1LBMcYvYVx8XtgI4xI9FqEle85DAlTWskW6mZ2 9IYYSZsKjcpQt0JqiN/oZnVbPAUh/K0yRAG05Oa2n4fW+e1DWBO5crjW7kC6sViuwNRLs8 sLWTB+YT1eULJdCi23JPhQKcJWkEdGtZg6IJJvGuGsBwL5kP1n7B01bJlzR4XA== Received: from phe.ftfl.ca.ftfl.ca (drmons0544w-156-34-250-113.dhcp-dynamic.fibreop.ns.bellaliant.net [156.34.250.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: jrm/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VBv5s20QSzf18; Sun, 7 Apr 2024 01:00:17 +0000 (UTC) (envelope-from jrm@freebsd.org) From: Joseph Mingrone To: "Jason E. Hale" Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Subject: Re: git: 082542e6c694 - 2024Q1 - */*: Chase editors/emacs update In-Reply-To: (Jason E. Hale's message of "Sat, 6 Apr 2024 19:53:21 -0400") References: <202403262357.42QNvEQP032101@gitrepo.freebsd.org> <86jzlbmdae.fsf@phe.ftfl.ca> Date: Sat, 06 Apr 2024 22:00:15 -0300 Message-ID: <86edbim1gg.fsf@phe.ftfl.ca> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 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: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Sat, 2024-04-06 at 19:53, "Jason E. Hale" wrote: > On Fri, Apr 5, 2024 at 10:32=E2=80=AFPM Joseph Mingrone = wrote: >> On Fri, 2024-04-05 at 19:13, "Jason E. Hale" wrote: >> > On Tue, Mar 26, 2024 at 7:57=E2=80=AFPM Joseph Mingrone wrote: >> >> The branch 2024Q1 has been updated by jrm: >> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=3D082542e6c694d58c24d1= c425c9f06441c6a16db7 >> >> commit 082542e6c694d58c24d1c425c9f06441c6a16db7 >> >> Author: Joseph Mingrone >> >> AuthorDate: 2024-01-26 14:13:34 +0000 >> >> Commit: Joseph Mingrone >> >> CommitDate: 2024-03-26 23:41:02 +0000 >> >> */*: Chase editors/emacs update >> >> - Bump Emacs version in Mk/Uses/emacs.mk to update version-specif= ic >> >> paths >> >> - Bump PORTREVISION of ports with USES=3Demacs. This is required= for two >> >> reasons. Emacs lisp files need to be byte compiled for the new= Emacs >> >> version, and files installed under, e.g., EMACS_VERSION_SITE_LI= SPDIR >> >> need to be relocated. >> >> Reviewed by: ashish >> >> Sponsored by: The FreeBSD Foundation >> >> Differential Revision: https://reviews.freebsd.org/D43615 >> >> (cherry picked from commit ab463bdca9c29ec22be0c7e6d7aa27bb2a980b= 48) >> >> --- >> > Hi, >> > You bumped more than PORTREVISION on several ports with this cherry >> > pick, leading to breakage in the 2024Q1 branch since the >> > (POR|DIS)TVERSIONs no longer match distinfo. >> > - Jason >> My apologies if I messed up the resolution of some of the many merge >> conflicts. I'll take a closer look this weekend, but since we're now in >> Q2, from a user perspective, isn't this now moot? >> J. > Considering the delay in cutting the 2024Q2 branch, I don't think it's > moot to fix errors in the current quarterly branch which is still > 2024Q1 at time of writing. Had the Q2 branch already been cut, I > wouldn't have received the numerous pkg-fallout emails that caused me > to investigate this in the first place, so I'm not pointing this out > just to be petty. :) I'm not sure how much longer we'll be on Q1, so I > think the responsible thing to do would be to revert the > PORTVERSION/DISTVERSION changes for audio/emms, devel/clojure-cider, > and mail/anubis. For mail/anubis, the PORTREVISION should then be 18, > because it was 17 before this change. I only had a few minutes to write the last email and didn't have a chance to check the quarterly branch status and just assumed Q2 had been cut. I'm working on fixing things now and will loop you in soon. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKjBAEBCgCOFiEEVbCTpybDiFVxIrrVNqQMg7DW754FAmYR8B9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU1 QjA5M0E3MjZDMzg4NTU3MTIyQkFENTM2QTQwQzgzQjBENkVGOUUQHGpybUBmcmVl YnNkLm9yZwAKCRA2pAyDsNbvnm55D/iiAlcrjGNiXGbCiiY9FZ5HZmJ64m4pnDXa efd1JURCxtnS+BCCz9ZALC9zOclVZxJNfUIctDzVS+hEkQBDgC3U+wTX9KWpx4rm 8N2pehP09yoRiRd/NkDUG/kvXHvQnbzAREkBCb9aMBHLuj7UCFh9kuM0bZGOxeyt lX+arCEwC5/yxFSjUymLblQ+ox7LZEUUP/kAsvjYu97AQYcF6B+tOaukVtTxeHGq ktnCIKfXfcK8nUcdLeeaVgvAMPfDFzckN/VW8gLWC1w006fmdc+n/7J1PX4bR1PJ AXSL1cZ1nGzslGr8giBunUk+gu1s0dTwCxjmxHOa99sl+WTxkrNEROXxiagJGvAJ aqpfFuyGO9e7Bvk3P9ZDyelIG0FcxRI6O4tktO6wI7xUAZM7Fj8j0Id+941m81ei oEg28uxfYvmNqzjbziUnfp7syharLDHEu9iZUH4UghoYOxexUnokr5WxVMjkXXlO EEvBPT/mfZ4NDiQkhMkauBXBvdtctXoAZYbWhn3ZTAZTh3UB0p+obaQvqm6+8EfT dYKalWSHEjVTZZYn0MqCiDzW28HnA87YR4szsyTsjRAe1z976xdlc6IssbZZDeAL JnBA8Wb6cno3Laf6wERAI9oMPkpxxTa3xSAMNzhIrNc28fp8jH2gvQ2M5v7DZ94k nGn/S9/i =ychJ -----END PGP SIGNATURE----- --=-=-=-- From nobody Sun Apr 7 03:02:14 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 4VBxpZ5xyTz5FyZp; Sun, 7 Apr 2024 03:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VBxpZ5D3Vz4CWh; Sun, 7 Apr 2024 03:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712458934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cbxooCbgZdijIZzxnaA0r2QESuoeBTLd0xfRnjTQJrA=; b=aqH2B7yq4lTqIOzxn1Ba1w3w41KZ005Ori04I+meXrTynwSnqO9mzP+liDbmqG0dmXX8HR 0tEMpBjPklHNMMpcWJvfwv9a8oZaX74yVihKLYM4GZ0QBPqwTEiOmeTK3VN71VyP2BtdGs jflRv5V+y8ORi1A+eeDu/3q5+ncpVAw7bIx3UKI/2t77uAVdaD7kXL89HJIyDNB82NmOk6 giFS+9LJDo60X2ewym73BeC5tcK/hNa7Br6J95Kcqs8vB3gBtWSs6lqQ93gcwVfqD18LOk akuKeeZId7ysAVS8vN5+je6fFMKyAgVzhC08AqrkfxN1hLmOs4h9fJUfMomqYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712458934; a=rsa-sha256; cv=none; b=K5zAKPgKGuL6TdcVSVgx7NmR7UsY5A+BHE74yL8tzgXGipl45gn9GuTRXNe8Moh1nCpPk2 oaSQAv4d4OGwqvLGgl4XCaHENwc7Vt0XmMHK35+hB5TOpqFMfPb4FTmBr4NVqGzewmNoSi 0dkQveNh8ioMQWTagOGeFQ9Qb83CwZ3PaS/0avxr5mLb4Pg6a2SwzwxlfHaVgQV35iOTAd HAcd2f3EizPwNLbITCWCQ/LH4GQLBpVFlC0HK37IxJunFYK0Zq0Hp3dbyYUPDUz4hniLX1 +yiPV8Vwl4j7OssXXfSAj3hBkFlEwBdZ74DHC8F0IaCz2gbSBBw7h+iLhva8vQ== 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=1712458934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cbxooCbgZdijIZzxnaA0r2QESuoeBTLd0xfRnjTQJrA=; b=Krc+Zzo/ut+KM/rlqZPA9eAAccCj1iE6qo/t0iX6XEwbLZ8Gp+bLhve6XIHMNGWFqofhOe 1PcMXdQLoF9N7bf5RWhq39QBiKmuI5tz5y348cxWOnkenPTqsKoHDweeZIynuN2nKEppQe r4rYtpBFjmuLfDM/PNkaW5n5TszRUrgk4d5OlF0nrLnt+vCIoVTNs6DMZZ5jGxdtP3Ie5V CEH+iUsNGOa1e765/cHfl0XkCgOun9AVA8holi2TbzergSd0obm/I4W1MeYAV0xFIsYFMA k4HqiyW6HyE/ItUb6TayptZYfWRhzigHV/Ixs16f86P6kQt6o/1tibyXPEFitg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VBxpZ49z5z193X; Sun, 7 Apr 2024 03:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43732Etq023653; Sun, 7 Apr 2024 03:02:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43732Edt023650; Sun, 7 Apr 2024 03:02:14 GMT (envelope-from git) Date: Sun, 7 Apr 2024 03:02:14 GMT Message-Id: <202404070302.43732Edt023650@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Joseph Mingrone Subject: git: f78a53fb71d1 - 2024Q1 - *: Fix merge resolution errors after chasing editors/emacs updates 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: f78a53fb71d1755da714dfc20ee75829c59c3652 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=f78a53fb71d1755da714dfc20ee75829c59c3652 commit f78a53fb71d1755da714dfc20ee75829c59c3652 Author: Joseph Mingrone AuthorDate: 2024-04-07 02:45:57 +0000 Commit: Joseph Mingrone CommitDate: 2024-04-07 03:01:41 +0000 *: Fix merge resolution errors after chasing editors/emacs updates None of these ports built after the merges to chase editors/emacs because the distinfos were not updated. Revert the changes for these ports and just bump PORTREVSION. Reported by: jhale Fixes: 082542e6 */*: Chase editors/emacs update Fixes: bb5373b0 Chase editors/emacs update --- audio/emms/Makefile | 4 ++-- databases/closql-devel/Makefile | 4 ++-- databases/emacs-sqlite3-api/Makefile | 4 ++-- databases/emacsql-devel/Makefile | 4 ++-- databases/pg.el/Makefile | 2 +- devel/clojure-cider/Makefile | 2 +- devel/forge-devel/Makefile | 4 ++-- devel/ghub-devel/Makefile | 4 ++-- devel/magit-devel/Makefile | 4 ++-- devel/transient-devel/Makefile | 4 ++-- devel/transient/Makefile | 2 +- editors/with-editor-devel/Makefile | 4 ++-- japanese/ddskk/Makefile | 4 ++-- mail/anubis/Makefile | 4 ++-- math/coq/Makefile | 4 ++-- math/ess/Makefile | 4 ++-- misc/compat.el/Makefile | 2 +- textproc/yaml.el/Makefile | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/audio/emms/Makefile b/audio/emms/Makefile index 5dd550d80e18..2d6ffe07bf14 100644 --- a/audio/emms/Makefile +++ b/audio/emms/Makefile @@ -1,6 +1,6 @@ PORTNAME= emms -DISTVERSION= 18 -PORTREVISION= 2 +DISTVERSION= 16 +PORTREVISION= 1 CATEGORIES= audio elisp MASTER_SITES= https://elpa.gnu.org/packages/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/databases/closql-devel/Makefile b/databases/closql-devel/Makefile index 25d795ab4830..0db5d9fb42f4 100644 --- a/databases/closql-devel/Makefile +++ b/databases/closql-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= closql DISTVERSIONPREFIX= v -DISTVERSION= 1.2.1-39 +DISTVERSION= 1.2.1-28 PORTREVISION= 1 -DISTVERSIONSUFFIX= -g81f04f6 +DISTVERSIONSUFFIX= -g909752e CATEGORIES= databases elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/databases/emacs-sqlite3-api/Makefile b/databases/emacs-sqlite3-api/Makefile index 41bbb6106544..ca77f9d23af7 100644 --- a/databases/emacs-sqlite3-api/Makefile +++ b/databases/emacs-sqlite3-api/Makefile @@ -1,7 +1,7 @@ PORTNAME= emacs-sqlite3-api DISTVERSIONPREFIX= v -DISTVERSION= 0.18 -PORTREVISION= 1 +DISTVERSION= 0.17 +PORTREVISION= 2 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/databases/emacsql-devel/Makefile b/databases/emacsql-devel/Makefile index 9c1623da8995..a02cbe8d332c 100644 --- a/databases/emacsql-devel/Makefile +++ b/databases/emacsql-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= emacsql -DISTVERSION= 3.1.1-64 +DISTVERSION= 3.1.1-43 PORTREVISION= 1 -DISTVERSIONSUFFIX= -gfdcf447 +DISTVERSIONSUFFIX= -g59de83a CATEGORIES= databases elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile index 6891db040fd1..61558d54e1a2 100644 --- a/databases/pg.el/Makefile +++ b/databases/pg.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= pg.el DISTVERSIONPREFIX= v -DISTVERSION= 0.30 +DISTVERSION= 0.24 PORTREVISION= 1 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile index b6956f2d9392..97b0e1c68afb 100644 --- a/devel/clojure-cider/Makefile +++ b/devel/clojure-cider/Makefile @@ -1,5 +1,5 @@ PORTNAME= clojure-cider -PORTVERSION= 1.13.1 +PORTVERSION= 1.12.0 PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel elisp diff --git a/devel/forge-devel/Makefile b/devel/forge-devel/Makefile index e6d406f622bf..520d34051306 100644 --- a/devel/forge-devel/Makefile +++ b/devel/forge-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= forge DISTVERSIONPREFIX= v -DISTVERSION= 0.3.2-436 +DISTVERSION= 0.3.2-236 PORTREVISION= 1 -DISTVERSIONSUFFIX= -ga2b9227 +DISTVERSIONSUFFIX= -g13959d3 CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/ghub-devel/Makefile b/devel/ghub-devel/Makefile index ddac82f064fb..e4a61f840b7a 100644 --- a/devel/ghub-devel/Makefile +++ b/devel/ghub-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= ghub DISTVERSIONPREFIX= v -DISTVERSION= 3.6.0-14 +DISTVERSION= 3.6.0-8 PORTREVISION= 1 -DISTVERSIONSUFFIX= -gc59de91 +DISTVERSIONSUFFIX= -g0d7c81e CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile index f6cd7f45c7cd..6449e45b7a1a 100644 --- a/devel/magit-devel/Makefile +++ b/devel/magit-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= magit DISTVERSIONPREFIX= v -DISTVERSION= 3.3.0-889 +DISTVERSION= 3.3.0-822 PORTREVISION= 1 -DISTVERSIONSUFFIX= -g65ecb9c5 +DISTVERSIONSUFFIX= -g5cf664cd CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/transient-devel/Makefile b/devel/transient-devel/Makefile index 03578088979e..a982331ac7d5 100644 --- a/devel/transient-devel/Makefile +++ b/devel/transient-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= transient DISTVERSIONPREFIX= v -DISTVERSION= 0.6.0 +DISTVERSION= 0.4.3-45 PORTREVISION= 1 -DISTVERSIONSUFFIX= +DISTVERSIONSUFFIX= -g9257245 CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/transient/Makefile b/devel/transient/Makefile index 501b53d797c2..ab6dea5aff1b 100644 --- a/devel/transient/Makefile +++ b/devel/transient/Makefile @@ -1,6 +1,6 @@ PORTNAME= transient DISTVERSIONPREFIX= v -DISTVERSION= 0.6.0 +DISTVERSION= 0.4.3 PORTREVISION= 1 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/with-editor-devel/Makefile b/editors/with-editor-devel/Makefile index 28cf2b50ef50..1431a3f33284 100644 --- a/editors/with-editor-devel/Makefile +++ b/editors/with-editor-devel/Makefile @@ -1,8 +1,8 @@ PORTNAME= with-editor DISTVERSIONPREFIX= v -DISTVERSION= 3.3.2-5 +DISTVERSION= 3.3.2-1 PORTREVISION= 1 -DISTVERSIONSUFFIX= -g5db5f0e +DISTVERSIONSUFFIX= -gfcd186d CATEGORIES= editors elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile index 282301ba6632..23040873243c 100644 --- a/japanese/ddskk/Makefile +++ b/japanese/ddskk/Makefile @@ -1,6 +1,6 @@ PORTNAME= ddskk -DISTVERSION= 17.1.20230702 -PORTREVISION= 1 +DISTVERSION= 16.2 +PORTREVISION= 16 CATEGORIES= japanese elisp MASTER_SITES= ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \ http://www.ring.gr.jp/archives/elisp/skk/maintrunk/ \ diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile index 834fcdddfbeb..91d4a079ba13 100644 --- a/mail/anubis/Makefile +++ b/mail/anubis/Makefile @@ -1,6 +1,6 @@ PORTNAME= anubis -PORTVERSION= 4.3 -PORTREVISION= 3 +PORTVERSION= 4.2 +PORTREVISION= 18 CATEGORIES= mail MASTER_SITES= GNU diff --git a/math/coq/Makefile b/math/coq/Makefile index b249ca3c3965..04b86ca11c08 100644 --- a/math/coq/Makefile +++ b/math/coq/Makefile @@ -1,6 +1,6 @@ PORTNAME= coq -PORTVERSION= 8.19 -PORTREVISION= 1 +PORTVERSION= 8.6 +PORTREVISION= 20 PORTEPOCH= 3 CATEGORIES= math MASTER_SITES= http://coq.inria.fr/distrib/V${PORTVERSION}/files/ \ diff --git a/math/ess/Makefile b/math/ess/Makefile index bb2ba8dd472e..d450b09dcb78 100644 --- a/math/ess/Makefile +++ b/math/ess/Makefile @@ -1,6 +1,6 @@ PORTNAME= ess -DISTVERSION= 24.01.1 -PORTREVISION= 1 +DISTVERSION= 18.10.2 +PORTREVISION= 18 CATEGORIES= math MASTER_SITES= http://ess.r-project.org/downloads/ess/ \ http://stat.ethz.ch/ESS/downloads/ess/ diff --git a/misc/compat.el/Makefile b/misc/compat.el/Makefile index 4981c14d388e..65790972c6e8 100644 --- a/misc/compat.el/Makefile +++ b/misc/compat.el/Makefile @@ -1,5 +1,5 @@ PORTNAME= compat.el -DISTVERSION= 29.1.4.5 +DISTVERSION= 29.1.4.4 PORTREVISION= 1 CATEGORIES= misc elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/textproc/yaml.el/Makefile b/textproc/yaml.el/Makefile index 192343670363..dab174306d83 100644 --- a/textproc/yaml.el/Makefile +++ b/textproc/yaml.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= yaml.el DISTVERSIONPREFIX= v -DISTVERSION= 0.5.5 +DISTVERSION= 0.5.4 PORTREVISION= 1 CATEGORIES= textproc elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} From nobody Sun Apr 7 03:32:28 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 4VByTT3Gwcz5G2VX; Sun, 7 Apr 2024 03:32:29 +0000 (UTC) (envelope-from jrm@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VByTT2rlTz4GBt; Sun, 7 Apr 2024 03:32:29 +0000 (UTC) (envelope-from jrm@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712460749; 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=NNSfU6cicovCsBszPN1vA+GW8NTXfI2Vvp2RcSGm7to=; b=wGhwPDqRxOeS4WpyFia0LKr8wFKc1HN4J+ydbKehYEr4Khvojy5NPL92Gj4WggkvTbgbPd eXc1fuhC51cAl/rjv7iV76YDoBZ2297HrXJi+/4yelM06De1qabJpezYA0nAzv1rbZaz3R EQAOp3y+WacXmwRjzsjdp/xXtoU1SZX2TgFgY/U6LYSEDu6KLMJPTpZMoQVGCg9FZPeIQq JuRHKlCkmU8PgHx+J455CEe6KbdpX7mqBRNJgGgucrpvdstCXMwexEgv4ri8CIPnqcNZdc JE6NIjK3OUQmj06qsYZ6KqvHy1Xz2Sclqfr4MJXHfBq6Ni8K2gDTpZeSnioCJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712460749; a=rsa-sha256; cv=none; b=yTMKcUYcAyMm0AvYrJjmuyyKU7JhFkNmycpz208N9W7Zf0Do7C1iqkzEfB2GOalHMfUXxI Ip9mDx0E3kc7zKWS/jqiK9v4PdIvtzxftWQG/xui7ng8TCGZGkugi8LwXFtp9J0lfZ6AXq Zp7jdO7cNnpq/Qi8z4K/98jFNGu8Lmuh+dtiA9aD156uPurxNlOYJO31ZZBTh0jVeUmxDE VSC8SAMUfJTxWiUaF0FLovtwf3aW0kjXDFkc5+aOTURD9IlgEcu0NcZD+HjSb/P7B8X9Eu apZUl7pb7XwUGMLB2z5fxSqbfAafvuDCsjhEaziZpetSaEt1aTlcACKHJFwQaw== 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=1712460749; 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=NNSfU6cicovCsBszPN1vA+GW8NTXfI2Vvp2RcSGm7to=; b=wOaYscmXo+AQhu+7PMvzlwRMFag8fcoiUESIpKAzZP8JXheyGho1VbkmnT33BE7W6rvcpn Ij4rzochpEQnFNnjOp0DYBTGqtvxLGkzd3e4IKz4dAqCVL8m225BjmYJR3iRdM0hMVviGy cpyGXKEI18aC0r9t93raMcejB0dOehlSBnPqm5cDeWKiQEDVXYnRPXcjSkKOvvQeKX2ZJu +fx4Q9F+9NvnwtDAuJEwZRsehTjx0+SrJJ0tfAvISWtKtfDIC4EAuc7PLt71+8IlKbpduG UhKam7Kt7aThdQq1F7A+a39a2jBW7SIVDMUAnJGjH36MQYOxVM1VJzo7fa2MJQ== Received: from phe.ftfl.ca.ftfl.ca (drmons0544w-156-34-250-113.dhcp-dynamic.fibreop.ns.bellaliant.net [156.34.250.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: jrm/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VByTT0Pbfzh29; Sun, 7 Apr 2024 03:32:28 +0000 (UTC) (envelope-from jrm@freebsd.org) From: Joseph Mingrone To: "Jason E. Hale" Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-branches@freebsd.org Subject: Re: git: 082542e6c694 - 2024Q1 - */*: Chase editors/emacs update In-Reply-To: <86edbim1gg.fsf@phe.ftfl.ca> (Joseph Mingrone's message of "Sat, 06 Apr 2024 22:00:15 -0300") References: <202403262357.42QNvEQP032101@gitrepo.freebsd.org> <86jzlbmdae.fsf@phe.ftfl.ca> <86edbim1gg.fsf@phe.ftfl.ca> Date: Sun, 07 Apr 2024 00:32:28 -0300 Message-ID: <86y19pluer.fsf@phe.ftfl.ca> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 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: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Sat, 2024-04-06 at 22:00, Joseph Mingrone wrote: > On Sat, 2024-04-06 at 19:53, "Jason E. Hale" wrote: >> On Fri, Apr 5, 2024 at 10:32=E2=80=AFPM Joseph Mingrone wrote: >>> On Fri, 2024-04-05 at 19:13, "Jason E. Hale" wrote: >>> > On Tue, Mar 26, 2024 at 7:57=E2=80=AFPM Joseph Mingrone wrote: >>> >> The branch 2024Q1 has been updated by jrm: >>> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=3D082542e6c694d58c24d= 1c425c9f06441c6a16db7 >>> >> commit 082542e6c694d58c24d1c425c9f06441c6a16db7 >>> >> Author: Joseph Mingrone >>> >> AuthorDate: 2024-01-26 14:13:34 +0000 >>> >> Commit: Joseph Mingrone >>> >> CommitDate: 2024-03-26 23:41:02 +0000 >>> >> */*: Chase editors/emacs update >>> >> - Bump Emacs version in Mk/Uses/emacs.mk to update version-speci= fic >>> >> paths >>> >> - Bump PORTREVISION of ports with USES=3Demacs. This is require= d for two >>> >> reasons. Emacs lisp files need to be byte compiled for the ne= w Emacs >>> >> version, and files installed under, e.g., EMACS_VERSION_SITE_L= ISPDIR >>> >> need to be relocated. >>> >> Reviewed by: ashish >>> >> Sponsored by: The FreeBSD Foundation >>> >> Differential Revision: https://reviews.freebsd.org/D43615 >>> >> (cherry picked from commit ab463bdca9c29ec22be0c7e6d7aa27bb2a980= b48) >>> >> --- >>> > Hi, >>> > You bumped more than PORTREVISION on several ports with this cherry >>> > pick, leading to breakage in the 2024Q1 branch since the >>> > (POR|DIS)TVERSIONs no longer match distinfo. >>> > - Jason >>> My apologies if I messed up the resolution of some of the many merge >>> conflicts. I'll take a closer look this weekend, but since we're now in >>> Q2, from a user perspective, isn't this now moot? >>> J. >> Considering the delay in cutting the 2024Q2 branch, I don't think it's >> moot to fix errors in the current quarterly branch which is still >> 2024Q1 at time of writing. Had the Q2 branch already been cut, I >> wouldn't have received the numerous pkg-fallout emails that caused me >> to investigate this in the first place, so I'm not pointing this out >> just to be petty. :) I'm not sure how much longer we'll be on Q1, so I >> think the responsible thing to do would be to revert the >> PORTVERSION/DISTVERSION changes for audio/emms, devel/clojure-cider, >> and mail/anubis. For mail/anubis, the PORTREVISION should then be 18, >> because it was 17 before this change. > I only had a few minutes to write the last email and didn't have a > chance to check the quarterly branch status and just assumed Q2 had been > cut. I'm working on fixing things now and will loop you in soon. I reverted the changes for the messed-up ports and just gave them a PORTREVISION bump. As an aside, I think this is a good example of why another discussion on the costs versus benefits of having a quarterly branch is warranted. Ashish rightfully merged a security update for editors/emacs, but many ports would have been broken without a PORTREVISION bump. Merging the commits for the PORTREVSION bumps was a pain because of the divergence between the branches. I believe the results of the recent community survey will be released soon. If I recall correctly, something in the range of 15% of respondents prefer infrequent package updates. I think that begs the question whether maintaining two port branches is worth the effort. Joe --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKkBAEBCgCOFiEEVbCTpybDiFVxIrrVNqQMg7DW754FAmYSE8xfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU1 QjA5M0E3MjZDMzg4NTU3MTIyQkFENTM2QTQwQzgzQjBENkVGOUUQHGpybUBmcmVl YnNkLm9yZwAKCRA2pAyDsNbvngcnD/99Ee+GnbZO12sZv/ik3ygV9baSw3W6xRL5 ImWF8C+Zdd5fFjyUnsonMaCOLcmr75Otjp1TojQfax0M2K4v1+skFiG8smt7Rstm zOt+3hRhYniYVLp8I7n5I9zjEOLgq5xWMWhVKoghCD2IBqNWHc3wVNs2dW+WNHD1 l7m8pzLyOrMkWzlOCPYcVoXzsVACPBhI/fgzgZb2sLWI0+pCosFwHW9aSnLBHNVh v3NmkWFFa11JGMTCb57KEwXQNuzHETqQQ0/yeTQ7lvpet93+RTTAMFk1DoL0yttP Umjj1ZLlrBpiwI8ga33RIM/8wabDzQTvMTVprr8T50OxIHALGqnEAzA5qAyTt9k2 dignKYvz8Mo0znfVpXLoX1Ne+X83SpUCl6VoCUOx97o7lgAAe4pA46X7rq1cZ8jm L6T48HHIGcI3JUQ9koDwgIIA3GdvwckuzrbDQoOXwSyDhzmzWBFYXjfRcwlovSjt 9uONBwYpu5vkmMNRVX/Gv5rxFKOIFcAX167/3eKx5HfAgwOwvk1LJmTBEmxfclPq ejpRNgv/vcc/T8R+EAh0Iyiyhk7izlkTvgmBX/MF/DgU2HxfdTNEjtotpKHLvrhU UVra0EiuhU0jhRjEeT5W2YYAlXqJqRGZmMusLYGXcQP6yNlTc/WcZy8+mgoGSa2n h4Qj7E2kHQ== =Ad+S -----END PGP SIGNATURE----- --=-=-=--