From patchwork Mon Sep 23 14:47:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 31377 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 92D3327BBEA; Mon, 23 Sep 2024 15:48:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2821327BBE2 for ; Mon, 23 Sep 2024 15:48:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sskLq-0005Z5-5U; Mon, 23 Sep 2024 10:47:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sskLn-0005YB-2f for guix-patches@gnu.org; Mon, 23 Sep 2024 10:47:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sskLj-00063o-Hs for guix-patches@gnu.org; Mon, 23 Sep 2024 10:47:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=AM0FM17x7cXJh3YnTiEzk49RvpUoVjWiYNnXbtCKmcM=; b=ruiWcoI88PIdzBRAs566yOvPJVYCuqyU8QE3st6oF1W7Wg+5qaA+cNvDASVy7GvhxizDVx3ICRL6/EeEaRtuMzE9EqNJHycrpX7PGhKXaQS++hHODb0y1Yg8oz2zzpCnW5V9B7IXtMF3LRyQiPR8LuGTdvA1SrDzskXwmGIreRdL5AfQWUcRXfQPAykbhJscfzVGvAfLZjXxXU7/ncolZGq2vvzkGO+q7s0YFCJbM52V9h8BhBFb0AwTWLBjLkYnOEF0ox9I4DB7PNNFsyLVW/tMMszdKZZxOhBAJwHZF1+qcmkGHUkml3T1GvE/eN5nLPiXKQW0aaldr0sowTihiw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sskM6-00027H-5b for guix-patches@gnu.org; Mon, 23 Sep 2024 10:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73429] [PATCH v2 1/3] gnu: nss-rapid: Update to 3.104. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Sep 2024 14:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73429 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73429@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista , mhw@netris.org, jonathan.brielmaier@web.de, Ian Eure Received: via spool by 73429-submit@debbugs.gnu.org id=B73429.17271028658080 (code B ref 73429); Mon, 23 Sep 2024 14:48:02 +0000 Received: (at 73429) by debbugs.gnu.org; 23 Sep 2024 14:47:45 +0000 Received: from localhost ([127.0.0.1]:44566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sskLo-000264-BY for submit@debbugs.gnu.org; Mon, 23 Sep 2024 10:47:44 -0400 Received: from fhigh-a4-smtp.messagingengine.com ([103.168.172.155]:42929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sskLm-00025d-4q for 73429@debbugs.gnu.org; Mon, 23 Sep 2024 10:47:42 -0400 Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.phl.internal (Postfix) with ESMTP id D29E31140093; Mon, 23 Sep 2024 10:47:13 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Mon, 23 Sep 2024 10:47:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1727102833; x= 1727189233; bh=AM0FM17x7cXJh3YnTiEzk49RvpUoVjWiYNnXbtCKmcM=; b=N wAbNvfkoxhwc/HMDJpPy7ljf2wi5JzA5MUedQfBtC9VfBqQG/iyC0c3fqR9r8ABB /7hKZMS1jb8f8jigKT0cncBE6d3VtShp6NVZajTCpnq1lzzOt4veIxZvh31WOqge 3vxERaMhBJCr0Ocx1LlYPRo4ASNXWex5npzNMQprupvCMBvY4L1YrWAWA1WMgPfc RsRbW3jb6vU0E7F8RNEjO/EbWp38l7Mw6q+6PAvovyOtowxmI5Yp+w7JIEqP8h6A C1+Jy97w6rOivrEWuk2XrgoFLz/PJP4BgcIoGK9oche/Gzpz29QanPnF1Z3wY4+j SS32QcHSxBdCnBFJ09b5w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727102833; x= 1727189233; bh=AM0FM17x7cXJh3YnTiEzk49RvpUoVjWiYNnXbtCKmcM=; b=m EskPo8mx9czVMYP70ES1Ql7OZ3t9gxI14FjEitOHSFCmXJwNOg4MEeDu2ixgKv5Q sjpTglhLqBCvUm+zZ22b7DfHnICaHkRIwS9qZ0mdeigA6kindOSRoyL8rLUmTA9U yC+bHZFhk4VItA4jswtvr9mO1Z+W90gFkhYpJbEjRhksyCKAIiZlgCIUryGWYTaH /UptVku+z2mrKOhjbFJK0nLMQAvdmIUZHVPssMGzUXv8TggoZNwJ03yhSpmBHQvs AvzUWu4flIsLwEyLPK1ghzOKacpxKUjU9Q+aypElpjtKstievWTIEi5IN3hUmCxJ XHsBR3DnF48eGGoPGihxA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelledgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredttden ucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhesrhgvthhrohhsphgvtgdrthhvqeenuc ggtffrrghtthgvrhhnpeevveejffduvdetieeutefgueekvdefieeuvdevleefgefhudel feetvdfgfeegjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghrtghpthhtohephedpmhho uggvpehsmhhtphhouhhtpdhrtghpthhtohepjeefgedvleesuggvsggsuhhgshdrghhnuh drohhrghdprhgtphhtthhopehnrghnughrvgesrhhishgvuhhprdhnvghtpdhrtghpthht ohepjhhonhgrthhhrghnrdgsrhhivghlmhgrihgvrhesfigvsgdruggvpdhrtghpthhtoh epmhhhfiesnhgvthhrihhsrdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhrohhsphgv tgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 23 Sep 2024 10:47:12 -0400 (EDT) From: Ian Eure Date: Mon, 23 Sep 2024 07:47:04 -0700 Message-ID: <20240923144706.2073-2-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240923144706.2073-1-ian@retrospec.tv> References: <20240923144706.2073-1-ian@retrospec.tv> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/nss.scm (nss-rapid): Update to 3.104. Change-Id: I97545e2d106bc7e9694ee11bd76371fa170cc42e --- gnu/packages/nss.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 6c60e9fbae..b058df0175 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -333,7 +333,7 @@ (define-public nss-rapid (package (inherit nss) (name "nss-rapid") - (version "3.103") + (version "3.104") (source (origin (inherit (package-source nss)) (uri (let ((version-with-underscores @@ -344,7 +344,7 @@ (define-public nss-rapid "nss-" version ".tar.gz"))) (sha256 (base32 - "0qp9rs226rr6gh51b42cdbydr4mj80cli3bfqhh7bp3jyxbvcjkv")))) + "13mca2y92sm05kxb40qvlkq8l93ghmrhh0s3iawpc7idc8ik4xp2")))) (arguments (substitute-keyword-arguments (package-arguments nss) ((#:phases phases) From patchwork Mon Sep 23 14:47:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 31376 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5285E27BBE9; Mon, 23 Sep 2024 15:47:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 332F127BBE2 for ; Mon, 23 Sep 2024 15:47:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sskLp-0005Z3-4Q; Mon, 23 Sep 2024 10:47:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sskLn-0005Y8-1l for guix-patches@gnu.org; Mon, 23 Sep 2024 10:47:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sskLj-00063t-Io for guix-patches@gnu.org; Mon, 23 Sep 2024 10:47:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Se5sRY5hOt4Sq4kNr0gj47GHaUtS/JrbyjVubxY5WxQ=; b=hREzPzPPbOHdOT3qvdiVHHpFSxd2woY4lb7twKUZNuf1tdyPp9mbslPvcILMhcyAQZU15rgRAk2Gb2xsn81s9dJBdo46/xiTcJuuMVmlXtrjhC+NSNz7la3jQGhs+WOoAnzVS2dnI/oCcTYrSqNgTTnbP05gGgN6SsulGkeUPYAcAp0/lMxYRv4H5p2cLN+bxtnRBNADTuXp3FQZtANRmuoLVqO0pkbXGA3XDl97vmX8Q+nH5Q/+YC6jegHhFdA6HWW4sEKTLwdpRgUaWLDJwK3bGdxFeaM3rWXbAUgaVOGNhqJvO9p0NfUwihQO5TcBtBhGEruJm5dieNnE3UHd9Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sskM6-00027P-KE for guix-patches@gnu.org; Mon, 23 Sep 2024 10:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73429] [PATCH v2 2/3] gnu: librewolf: Update to 130.0.1-1. [security fixes] Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Sep 2024 14:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73429 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73429@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista , mhw@netris.org, jonathan.brielmaier@web.de, Ian Eure Received: via spool by 73429-submit@debbugs.gnu.org id=B73429.17271028718100 (code B ref 73429); Mon, 23 Sep 2024 14:48:02 +0000 Received: (at 73429) by debbugs.gnu.org; 23 Sep 2024 14:47:51 +0000 Received: from localhost ([127.0.0.1]:44571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sskLu-00026W-2C for submit@debbugs.gnu.org; Mon, 23 Sep 2024 10:47:50 -0400 Received: from fhigh-a4-smtp.messagingengine.com ([103.168.172.155]:37899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sskLn-00025i-Iz for 73429@debbugs.gnu.org; Mon, 23 Sep 2024 10:47:44 -0400 Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id 5AC261140187; Mon, 23 Sep 2024 10:47:15 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Mon, 23 Sep 2024 10:47:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1727102835; x=1727189235; bh=Se5sRY5hOt4Sq4kNr0gj47GHaUtS/JrbyjVubxY5WxQ=; b= NXOn4frVaKKzdhUbmYPZGkfnwaE2wlwYI4N19TUPWVBQqnBjONENrjCmjjM4feBU 1s2OTX+icK4I+VuAdynZEM57GWamO4yQUEuQV4tcOE1kfuIoY21hvwFX1w2YFXzA FY7q5TNP/Z58HDZU9gIyO6A6aTrDNUPrJe9/D+UvOpblwULNzmqepTPrdTkClyUb VXoDS1ATL+aVP+F+tj7m2yqQ0rB1e8bmrl/8brSxbjkMAv7XZ06faFUTkahy3ViP TVoCf0gT/cqMKus03dnq8Q/qSoyM0oj5NED/AoQDL+yaNRMUHiCXeyB01O3jkJXq FBLu5jdJjscY3EJLEdKnPQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727102835; x= 1727189235; bh=Se5sRY5hOt4Sq4kNr0gj47GHaUtS/JrbyjVubxY5WxQ=; b=q UNId8d1tLHjXiGu2VmUNjO/yc2XxqDH33lgdQ9fgB8LgNI7Ud4e4ZX3K6hg1pqF8 HEh7vLMByoURLBNdrCQM7o+DkUTz1dt2JMxip+sZLkx/IuuzCVAN0FVLeniFROTq cNZdgVez4vI3mcZIuHTQRGmV3/2NpW9XO8O1AdUFgngZZUcbb6192GjyOOnTuwlN E+Y62oya+8Y+xmgZJsnp/VUGZ1ZOCyZmVWLBnWKJis7GsH8B3LASuw+PQBHFrss4 8P4kiQYQ6dCwIakWqE36RPHrwKF3bIUZBLbe5tV2Qc//2/nQd+eWygcWQMTtbFy1 KbFNSaX5PRi05PZW34+Pw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelledgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdej necuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqne cuggftrfgrthhtvghrnhepvdejlefhhefgudefveetieekudeijeevgfdvtefgledviedt feelfeeuffejueegnecuffhomhgrihhnpegtohguvggsvghrghdrohhrghdpghhithhhuh gsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhho mhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopeehpdhmohguvg epshhmthhpohhuthdprhgtphhtthhopeejfeegvdelseguvggssghughhsrdhgnhhurdho rhhgpdhrtghpthhtohepnhgrnhgurhgvsehrihhsvghuphdrnhgvthdprhgtphhtthhope hjohhnrghthhgrnhdrsghrihgvlhhmrghivghrseifvggsrdguvgdprhgtphhtthhopehm hhifsehnvghtrhhishdrohhrghdprhgtphhtthhopehirghnsehrvghtrhhoshhpvggtrd htvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 23 Sep 2024 10:47:13 -0400 (EDT) From: Ian Eure Date: Mon, 23 Sep 2024 07:47:05 -0700 Message-ID: <20240923144706.2073-3-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240923144706.2073-1-ian@retrospec.tv> References: <20240923144706.2073-1-ian@retrospec.tv> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This patch: - Updates LibreWolf to the latest version - Removes the code which disabled encoding_rs.patch from upstream. It’s no longer in the repo, so the code did nothing, and the underlying issue (Guix being stuck with an old Rust version) has been fixed. - Integrates changes from #72265 with some slight tweaks. This should allow LibreWolf to use accelerated video decoding on supported hardware. - Neuters the GenAI chat feature, which direcly integrates with non-free services, by excluding it from the build and locking the preferences which would enable it. Fixes: CVE-2024-8385: WASM type confusion involving ArrayTypes CVE-2024-8381: Type confusion when looking up a property name in a "with" block CVE-2024-8388: Fullscreen notice on Android could be hidden under various panels and OS prompts CVE-2024-8382: Internal event interfaces were exposed to web content when browser EventHandler listener callbacks ran CVE-2024-8383: Firefox did not ask before openings news: links in an external application CVE-2024-8384: Garbage collection could mis-color cross-compartment objects in OOM conditions CVE-2024-8386: SelectElements could be shown over another site if popups are allowed CVE-2024-8387: Memory safety bugs fixed in Firefox 130, Firefox ESR 128.2, and Thunderbird 128.2 CVE-2024-8389: Memory safety bugs fixed in Firefox 130 * gnu/packages/librewolf.scm (librewolf): Update to 130.0.1-1. Change-Id: I764e6e66c5bfdc14a87b7ea59c29780a1f16769a --- gnu/packages/librewolf.scm | 55 ++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index 21f73f799d..bade479656 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -117,9 +117,11 @@ (define (librewolf-source-origin version hash) (define computed-origin-method (@@ (guix packages) computed-origin-method)) (define librewolf-source - (let* ((ff-src (firefox-source-origin "129.0.1" "0wy0fn0pavlhlkdybr59hhbn5ng0zn56mxa7gsknf8f2whiyipwx")) - (version "129.0.1-1") - (lw-src (librewolf-source-origin version "0pvv3v23q31hdjvqi1f3cqfyjrb8dbrrbfwxj2wacak1g0mzbxf4"))) + (let* ((ff-src (firefox-source-origin "130.0" + "0w4z3fq5zhm63a0wmhvmqrj263bvy962dir25q3z0x5hx6hjawh2")) + (lw-src (librewolf-source-origin + "130.0.1-1" + "0f80pihn375bdjhjmmg2v1w96wpn76zb60ycy39wafwh1dnzybrd"))) (origin (method computed-origin-method) @@ -164,11 +166,6 @@ (define librewolf-source (("^ff_source_tarball:=.*") (string-append "ff_source_tarball:=" #+ff-src))) - ;; Remove encoding_rs patch, it doesn't build with Rust 1.75. - (substitute* '("assets/patches.txt") - (("patches/encoding_rs.patch\\\n$") - "")) - ;; Stage locales. (begin (format #t "Staging locales...~%") @@ -215,13 +212,17 @@ (define rust-librewolf rust) ; 1.75 is the default in Guix, 1.65 is the minimum. ;; Update this id with every update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. ;; ex: date '+%Y%m%d%H%M%S' -(define %librewolf-build-id "20240817075827") +(define %librewolf-build-id "20240922110507") (define-public librewolf (package (name "librewolf") - (version "129.0.1-1") - (source librewolf-source) + (version "130.0.1-1") + (source + (origin + (inherit librewolf-source) + (patches + (search-patches "librewolf-add-paths-to-rdd-allowlist.patch")))) (build-system gnu-build-system) (arguments (list @@ -318,6 +319,22 @@ (define (write-setting key value) (substitute* "dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp" (("libavcodec\\.so") libavcodec))))) + (add-after 'unpack 'neuter-genai + (lambda* _ + ;; Don't compile the code in. + (substitute* "browser/components/moz.build" + (("\"genai\",") "")) + ;; Lock the preferences so they can't be enabled. + (substitute* "lw/librewolf.cfg" + (("defaultPref\\(\"browser\\.ml\\.") + "lockPref(\"browser.ml.")) + ;; Correct a preference typo + ;; see https://codeberg.org/librewolf/issues/issues/1919#issuecomment-2325954 + ;; Remove this in the next update. + (substitute* "lw/librewolf.cfg" + (("browser\\.ml\\.enabled") + "browser.ml.enable")) + )) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ (use-modules (guix build cargo-utils)) @@ -575,26 +592,12 @@ (define (runpaths-of-input label) ;; For U2F and WebAuthn "eudev"))) - ;; VA-API is run in the RDD (Remote Data Decoder) sandbox - ;; and must be explicitly given access to files it needs. - ;; Rather than adding the whole store (as Nix had - ;; upstream do, see - ;; and - ;; linked upstream patches), we can just follow the - ;; runpaths of the needed libraries to add everything to - ;; LD_LIBRARY_PATH. These will then be accessible in the - ;; RDD sandbox. - (rdd-whitelist (map (cut string-append <> "/") - (delete-duplicates (append-map - runpaths-of-input - '("mesa" - "ffmpeg"))))) (gtk-share (string-append (assoc-ref inputs "gtk+") "/share"))) (wrap-program (car (find-files lib "^librewolf$")) `("LD_LIBRARY_PATH" prefix - (,@libs ,@rdd-whitelist)) + ,libs) `("XDG_DATA_DIRS" prefix (,gtk-share)) `("MOZ_LEGACY_PROFILES" = From patchwork Mon Sep 23 14:47:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 31378 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 48BA927BBE2; Mon, 23 Sep 2024 15:48:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E09A927BBE9 for ; Mon, 23 Sep 2024 15:48:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sskLq-0005Z8-91; Mon, 23 Sep 2024 10:47:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sskLn-0005YA-2W for guix-patches@gnu.org; Mon, 23 Sep 2024 10:47:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sskLk-00063u-1w for guix-patches@gnu.org; Mon, 23 Sep 2024 10:47:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3sT0ppAnBRIDtX1SrJbWEv2hTTwTuT+1+iLSPxtg08A=; b=egRXeeczM+G8EuUBhgJfQ/rd9LveR8KSi4TcF007MT6LucW/Auo60qokTMqLCge6bAuFiiQlbpM8Ry6sVLVHDApmep7JaMABPoAE8W3vnDWN5zPFlibGYxnYgtIXm35kE9In3Xr0bIQHuvr8CFrwlteQoZsLGMby3086vyUAlb6ijYqz20kFfLA25cqVQnYuKaMn8cIt3XHvInOXueEauOrxC3pGmTSGJCBY1LHajaQn5goBLWADrrI87l4hJm9lHzGhzbKO16p0IAbK9PmejaInm4l0TXutrGmD746UKn5WaXzYXk6GBWRVCztNltjhyTIQRKowgxfzSyOaiI1qAA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sskM7-00027Z-2l for guix-patches@gnu.org; Mon, 23 Sep 2024 10:48:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73429] [PATCH v2 3/3] gnu: librewolf-source: Turn into a procedure. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Sep 2024 14:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73429 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73429@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista , mhw@netris.org, jonathan.brielmaier@web.de, Ian Eure Received: via spool by 73429-submit@debbugs.gnu.org id=B73429.17271028718106 (code B ref 73429); Mon, 23 Sep 2024 14:48:03 +0000 Received: (at 73429) by debbugs.gnu.org; 23 Sep 2024 14:47:51 +0000 Received: from localhost ([127.0.0.1]:44573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sskLu-00026b-Tw for submit@debbugs.gnu.org; Mon, 23 Sep 2024 10:47:51 -0400 Received: from fout-a6-smtp.messagingengine.com ([103.168.172.149]:60077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sskLo-00025k-PT for 73429@debbugs.gnu.org; Mon, 23 Sep 2024 10:47:45 -0400 Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id 8BF651380262; Mon, 23 Sep 2024 10:47:16 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Mon, 23 Sep 2024 10:47:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1727102836; x= 1727189236; bh=3sT0ppAnBRIDtX1SrJbWEv2hTTwTuT+1+iLSPxtg08A=; b=g 0SgSVeK0Y/ex/8pPhHn+iDOznLLEUDZ4bFOFYXc4rqy1MEAaXD0Qq4FDeAlAFYfQ kB15J729KO5xpBmMiEV+AyGfIvcaq38Vc+CaN6C46lGjtgRDcOdB7WN66SksjfJa WyOeNdxnp/CKM6bff2hNCCebPSAJwKP7q/ujlNxgfigbvYQ2T+GEXXA50DbxoH6T 2xWbtRR2Jf3VZTcfW55ICz9eM1Oa4M0+oT5J8FlFE4sktlStqjK+QrDu9dnFlBz7 YIg9mm3674E5/cLqlGHAoxdTI8c1DFOpYMXgSKrRpnN4K8ndeiZdfqfKn3zJCs0r TkmJ9QyeahN3L5cUgu3MA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1727102836; x= 1727189236; bh=3sT0ppAnBRIDtX1SrJbWEv2hTTwTuT+1+iLSPxtg08A=; b=e xJug5SDDYLvLZmtdyfnoAvZE3KZlfZJGXSThiOEFKGgTBm9YRnT442XQFvqWWpjN ic9Gvyhz/DEUNvAhrBz6b8U8lIjo1OlCAhXC1owE6JTrWyNDVGOZCXOS+K0VYsdM B1cERQc/TGwiP54FqC+TQECuphsgKSoaHF4hbF03uneKiZ2CBpoZctcNrBkq+d5K VSfEi6YV8R/A317BwfnRdbtHqpe7ljeqn4WVBeGhPHVHBymKK7UapxjhiuDs4tZE pM3RacvE/ZVOGmW2gz3dHIfFqvZh/iK700n0sVHyYDtI+Epr7JLzzAn+lm5hC/Ns Y3xCNVfakJ5u4DIym57uQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudelledgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredttden ucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhesrhgvthhrohhsphgvtgdrthhvqeenuc ggtffrrghtthgvrhhnpeffhfelgfeufeelfeeigfeivdffteeiuefhtdegudevfeelveeg gfejhfejhffhkeenucffohhmrghinhepghhnuhdrohhrghenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdht vhdpnhgspghrtghpthhtohephedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepje efgedvleesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnrghnughrvges rhhishgvuhhprdhnvghtpdhrtghpthhtohepjhhonhgrthhhrghnrdgsrhhivghlmhgrih gvrhesfigvsgdruggvpdhrtghpthhtohepmhhhfiesnhgvthhrihhsrdhorhhgpdhrtghp thhtohepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 23 Sep 2024 10:47:15 -0400 (EDT) From: Ian Eure Date: Mon, 23 Sep 2024 07:47:06 -0700 Message-ID: <20240923144706.2073-4-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240923144706.2073-1-ian@retrospec.tv> References: <20240923144706.2073-1-ian@retrospec.tv> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This patch changes the `librewolf-source' variable into the `make-librewolf-source' prodecure. This procedure accepts a LibreWolf version, source hash, and Firefox source hash. The Firefox source version is derived from the provided LibreWolf version. This eases package updates, since the hashes are inside the `librewolf' package, rather than `librewolf-source'; and the version no longer needs to be specified in three places. It also removes a blank line between the file header and `define-module'. * gnu/packages/librewolf.scm (librewolf-source): Turn into a procedure. Change-Id: I96ab1304acde246c179e7aa5dad9ff621be3de82 --- gnu/packages/librewolf.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index bade479656..6fd0aa51f1 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -40,7 +40,6 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . - (define-module (gnu packages librewolf) #:use-module ((srfi srfi-1) #:hide (zip)) #:use-module (guix build-system gnu) @@ -116,12 +115,13 @@ (define (librewolf-source-origin version hash) (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define librewolf-source - (let* ((ff-src (firefox-source-origin "130.0" - "0w4z3fq5zhm63a0wmhvmqrj263bvy962dir25q3z0x5hx6hjawh2")) +(define* (make-librewolf-source #:key version firefox-hash librewolf-hash) + (let* ((ff-src (firefox-source-origin + (car (string-split version #\-)) + firefox-hash)) (lw-src (librewolf-source-origin - "130.0.1-1" - "0f80pihn375bdjhjmmg2v1w96wpn76zb60ycy39wafwh1dnzybrd"))) + version + librewolf-hash))) (origin (method computed-origin-method) @@ -220,7 +220,10 @@ (define-public librewolf (version "130.0.1-1") (source (origin - (inherit librewolf-source) + (inherit (make-librewolf-source + #:version version + #:firefox-hash "0w4z3fq5zhm63a0wmhvmqrj263bvy962dir25q3z0x5hx6hjawh2" + #:librewolf-hash "0f80pihn375bdjhjmmg2v1w96wpn76zb60ycy39wafwh1dnzybrd")) (patches (search-patches "librewolf-add-paths-to-rdd-allowlist.patch")))) (build-system gnu-build-system)