From patchwork Sun Sep 22 20:53:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 31348 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 6C8C527BBEB; Sun, 22 Sep 2024 21:54:49 +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 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 12D1627BBE9 for ; Sun, 22 Sep 2024 21:54:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ssTbN-0006Ih-DB; Sun, 22 Sep 2024 16:54:41 -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 1ssTbM-0006IQ-El for guix-patches@gnu.org; Sun, 22 Sep 2024 16:54:40 -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 1ssTbM-0007Iv-57 for guix-patches@gnu.org; Sun, 22 Sep 2024 16:54:40 -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:Date:From:To:In-Reply-To:References:Subject; bh=AM0FM17x7cXJh3YnTiEzk49RvpUoVjWiYNnXbtCKmcM=; b=Gc4mUhVatdGTy0X1bhMVvjQvnniSnfcH+T/ae2nq53wAOQmlcv17EjYbR0zj02mZJLq3dl88IUohPWOPmHQe3mXK6EOthG35u9yXHrRHWThfgV/O7yqDMEBzIxqDAvpPpSz0ivC1AGkCoE7zUB1unLzZvNlDDmR+WjQstkj08WuKm5lFxMbgMuxScz1WQnI9IPnwifym64TwoV5b5q1aGOMYeZsRTCYW60YsrEbOqvArEdO1gZcoWwfGL/njhqH3/rXTLHNuoipwv4ouu06WHscXr3xjVVi8z+WVX1J5hdO0RJwqUluZ3vU9X2TAbJxvjN6MnLqJLmph32vxqnU4QA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ssTbi-0001fU-4V for guix-patches@gnu.org; Sun, 22 Sep 2024 16:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73429] [PATCH 1/3] gnu: nss-rapid: Update to 3.104. References: <20240922205139.21234-2-ian@retrospec.tv> In-Reply-To: <20240922205139.21234-2-ian@retrospec.tv> Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Sep 2024 20:55: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.17270384696344 (code B ref 73429); Sun, 22 Sep 2024 20:55:02 +0000 Received: (at 73429) by debbugs.gnu.org; 22 Sep 2024 20:54:29 +0000 Received: from localhost ([127.0.0.1]:42825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssTbA-0001eD-HE for submit@debbugs.gnu.org; Sun, 22 Sep 2024 16:54:28 -0400 Received: from fout3-smtp.messagingengine.com ([103.168.172.146]:60839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssTb8-0001dn-3S for 73429@debbugs.gnu.org; Sun, 22 Sep 2024 16:54:26 -0400 Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfout.phl.internal (Postfix) with ESMTP id 7CB3D138018A; Sun, 22 Sep 2024 16:53:57 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Sun, 22 Sep 2024 16:53:57 -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:message-id:mime-version:reply-to:subject:subject:to :to; s=fm1; t=1727038437; x=1727124837; bh=AM0FM17x7cXJh3YnTiEzk 49RvpUoVjWiYNnXbtCKmcM=; b=KOBbxf80Sq/lzG69JyB3macC7h//Cvhc63JvZ CqUy/E6C67D/du/p7I0qX/rPJrxXrHIbL+pqKZqHWGeRsaIxbVGVnYNPp2oxGh+l xWGNneqs0gIQq6YijtWIuafWn5KKbAknjjGCBsvnbZhnNXkQoOwWl/Ozu52TFqJl kLoAqZY9w0hENrs0e7U2e8NjJHiuHu6C3wX168rBa13EVixLHOXyRDSlM5UYdii5 PrroLGLDayFv7c+wzdRg+uVl3Peij49VAbZt2jN+akV2IE6K0lvBOYDGsQjHhKWo zQ8Tmi+s+30ykKTk6JDSsWqclp0W9KkZhSrQsUR0c4DuB4g+g== 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:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1727038437; x=1727124837; bh=AM0FM17x7cXJh3YnTiEzk49RvpUo VjWiYNnXbtCKmcM=; b=Htsp4m13YarrW3uuTjC5nu17dVKOnfjd7/uj5mycRo4m Tm92Ty//OnO9/5hYUWiCC0zoYWkusALi/g8IyTGCbP7FE+4u0KiqoBt1CcgABBvg ayJeoLyux+F2gBOIjJGWMTzdzZr5pG8fJYdueFvam76jMgpee0pU3K/BGvAyoevi ocrha9Bl7BUPLcEMdeoNo5lmYOI6qiimBQvZIPb74fy/fJvw7aVKXL5wmGq0G6Kx aIo5O30VwrMYD1z3VfKN1nn2R1cA0+X9Es/My2AbFei2hEiSHiu6FGxwHbusrNSN /3NBXP0wJBYt6KrTKhqjeqKCOZQ6KkIZZDYEVaMWnw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedgudehhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecu hfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqnecugg ftrfgrthhtvghrnhephfeiveeliedukeffhefhleeijedtveelleetgefggfehkeeljeeh tdeguddvvefgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopeehpdhmohgu vgepshhmthhpohhuthdprhgtphhtthhopeejfeegvdelseguvggssghughhsrdhgnhhurd horhhgpdhrtghpthhtohepnhgrnhgurhgvsehrihhsvghuphdrnhgvthdprhgtphhtthho pehjohhnrghthhgrnhdrsghrihgvlhhmrghivghrseifvggsrdguvgdprhgtphhtthhope hmhhifsehnvghtrhhishdrohhrghdprhgtphhtthhopehirghnsehrvghtrhhoshhpvggt rdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Sep 2024 16:53:56 -0400 (EDT) From: Ian Eure Date: Sun, 22 Sep 2024 13:53:41 -0700 Message-ID: <20240922205343.21437-1-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 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 Sun Sep 22 20:53:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 31349 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 C876627BBE9; Sun, 22 Sep 2024 21:54:49 +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 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 BA69927BBE2 for ; Sun, 22 Sep 2024 21:54:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ssTbO-0006K2-W9; Sun, 22 Sep 2024 16:54:43 -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 1ssTbN-0006IY-0s for guix-patches@gnu.org; Sun, 22 Sep 2024 16:54:41 -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 1ssTbM-0007J1-N8 for guix-patches@gnu.org; Sun, 22 Sep 2024 16:54:40 -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=Bd8o0UhzoNdzZRomYd/mMSUetDvGpT+PboIkIolcQhO5r3VmDoZ7HaQnyRMGUFch+CTpKqVjmhnaOruuk/IsxxXACS5+DA2SGHxuvYpPwcBgKW1IRli+Id2W9YIc3GuXVNgOInBxDiTdrt7UVYbuNluMgiyEzlRkfeWQ/NO1ohK1JnzEpwwqpHWcKG6nvmR9W/PEJc89BSnu+CSwreCDpUY461TwFH9yqOx2XQQUM7qg4dd3buEIMY6s7ioykJBPSJ/R190U9MgRyqWGz8zJ5Dr9IyElKYWYwJZURJ3uwQ8bnudmhX3sbSn/2zYnJuo+WUkEqK65Ywqu+9Ck5x5hLg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ssTbi-0001fb-MU for guix-patches@gnu.org; Sun, 22 Sep 2024 16:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73429] [PATCH 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: Sun, 22 Sep 2024 20:55: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.17270384696350 (code B ref 73429); Sun, 22 Sep 2024 20:55:02 +0000 Received: (at 73429) by debbugs.gnu.org; 22 Sep 2024 20:54:29 +0000 Received: from localhost ([127.0.0.1]:42827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssTbA-0001eG-RR for submit@debbugs.gnu.org; Sun, 22 Sep 2024 16:54:29 -0400 Received: from fhigh1-smtp.messagingengine.com ([103.168.172.152]:51403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssTb8-0001do-4J for 73429@debbugs.gnu.org; Sun, 22 Sep 2024 16:54:27 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id BCE2E1140120; Sun, 22 Sep 2024 16:53:58 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Sun, 22 Sep 2024 16:53:58 -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=1727038438; x=1727124838; bh=Se5sRY5hOt4Sq4kNr0gj47GHaUtS/JrbyjVubxY5WxQ=; b= Nh0dr5gPlZ4RCfEOZg9chLxoy+pNH6QonnTkCB13nXv8FFiJ2BU4WmFVf//xgxXY c59BjXN+BULbi9wWsmQ2oo8GQgv3FDyxg/x2PyXoRYjzr/iWOkqVmgs+BQ2jGie7 bAG7fqujrhNequ0TUCu5PNhEYwDFepCq61W2Ahwqw+cu+7hYTSFKPk+mjKEvKkD/ uWVe82WOSwBb6MxK4Y/SAek3NnOfzG2Rh4bsvivlM0wffjDOYgn1Z+r9dDQ1iZ48 Z5h2zqYt8D0V0qICr3IRg+8UJ3kTH12aq6q+3SNv7e3PBgiCZ9OQN3fEgEtoQyGS NR50bkUve/onIXWTOl+iQA== 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=1727038438; x= 1727124838; bh=Se5sRY5hOt4Sq4kNr0gj47GHaUtS/JrbyjVubxY5WxQ=; b=n E3l7RcpipZpUriGf/i1GeQ2gR5YYLy2wMWojlsKTO3mz5VScFcsYihX1/yH5+Wih ecqSJM6XYY9oaASmniR8XzSTtgKclMm41zRQ0b+45JPY0e2enZZ5rbb9nbsyO6S8 lMB3KoSNWmnZr2lKzm5TsXLugebDo+bufo9GXszjMGHggBJ8Ov+PgpiWRYs5HQmj ISVOL2QXvuLcE4aQIUKwGrcroHdPJvMtU92hLO/qyGCXvttJKQLkWoLJWo5Nofy+ sf/94w0RxN5pwStn5KRolFcl6Hl7QL4wNKzoNLojoAdrIkZY2YPCONA55KWYUYIb jHl9J9omjD1T6ybZwu15w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedgudehhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredt jeenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhesrhgvthhrohhsphgvtgdrthhvqe enucggtffrrghtthgvrhhnpedvjeelhfehgfdufeevteeikeduieejvefgvdetgfelvdei tdefleefueffjeeugeenucffohhmrghinheptghouggvsggvrhhgrdhorhhgpdhgihhthh husgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghrtghpthhtohephedpmhhoug gvpehsmhhtphhouhhtpdhrtghpthhtohepjeefgedvleesuggvsggsuhhgshdrghhnuhdr ohhrghdprhgtphhtthhopehnrghnughrvgesrhhishgvuhhprdhnvghtpdhrtghpthhtoh epjhhonhgrthhhrghnrdgsrhhivghlmhgrihgvrhesfigvsgdruggvpdhrtghpthhtohep mhhhfiesnhgvthhrihhsrdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhrohhsphgvtg drthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Sep 2024 16:53:57 -0400 (EDT) From: Ian Eure Date: Sun, 22 Sep 2024 13:53:42 -0700 Message-ID: <20240922205343.21437-2-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240922205343.21437-1-ian@retrospec.tv> References: <20240922205343.21437-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 Sun Sep 22 20:53:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 31350 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 7991A27BBEA; Sun, 22 Sep 2024 21:55:09 +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 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 EF19E27BBE2 for ; Sun, 22 Sep 2024 21:55:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ssTbO-0006Jo-LS; Sun, 22 Sep 2024 16:54:42 -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 1ssTbN-0006Ii-Ij for guix-patches@gnu.org; Sun, 22 Sep 2024 16:54:41 -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 1ssTbN-0007J7-8l for guix-patches@gnu.org; Sun, 22 Sep 2024 16:54:41 -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=tHXxby1qS+FImWrBuS/LX0sf+Hb78G1RWSHydjhKwcM=; b=NaoRqd3t46ZZX1BCAxeuyNdVXwWshq0ctBed8STneKfO40r/j0nPFYMvy/LAG4PzBmCYZ68hUd9VbjCG3P2+DJCi8jXIemtvtfBasELLJdfOQLwByaITDT6xwY1mXVyioWB7qV1HWpO0N8C5ZhSlRqyAEWKq/MMHifoNsf2EiuaX+tKWjY9wIHVvSbNbWc4MOo4h1n6s0YvqIsMRchemMUBYlN30jG7yaOh1kGmPH06MYqMeSsUMKsY50ULSUzMqHHw6vhwWa93NxbXz4BgTpLTYFxerkqIY9xXj6UlWqgtaploH8Nfslsq6Dl5ri78P4p3Vmf101uNs2Nxj88H2yA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ssTbj-0001fj-8K for guix-patches@gnu.org; Sun, 22 Sep 2024 16:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73429] [PATCH 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: Sun, 22 Sep 2024 20:55: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.17270384756364 (code B ref 73429); Sun, 22 Sep 2024 20:55:03 +0000 Received: (at 73429) by debbugs.gnu.org; 22 Sep 2024 20:54:35 +0000 Received: from localhost ([127.0.0.1]:42829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssTbG-0001ea-HC for submit@debbugs.gnu.org; Sun, 22 Sep 2024 16:54:34 -0400 Received: from fout3-smtp.messagingengine.com ([103.168.172.146]:40013) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssTb9-0001dq-6Z for 73429@debbugs.gnu.org; Sun, 22 Sep 2024 16:54:27 -0400 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id 047BD138011E; Sun, 22 Sep 2024 16:54:00 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sun, 22 Sep 2024 16:54:00 -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=1727038440; x= 1727124840; bh=tHXxby1qS+FImWrBuS/LX0sf+Hb78G1RWSHydjhKwcM=; b=H uiaTp2UIpsGhLBc+s+wsOpNvDpapgK+jbUR56b357l+R37RosDq7AL7B2n7yyy1H QEPelaUgpp0myK9WxD29BxWXAT6+AAccl6WyT1FadQgAiu49Olso7Ghve2stTPMU K4F+ZvEgS5oJaPZcQs/uXH7VWDpnyFAflpFaAjEbfWwuwMzHV2n5PT+JDbbVR/tM D4sXBNba9mvh8yFkcSs4bEsyn2MNWJXsAt0fE8qjMCfZG2927NmavyOwTBV+bOfe ISaV6FVH8soxQJq/6xkGd3Ux4O842wk81WiWnt2uFK84wC5peYeFNkyPadUjMg6K LCpfoTPzM7BP5+Oei9WWg== 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=1727038440; x= 1727124840; bh=tHXxby1qS+FImWrBuS/LX0sf+Hb78G1RWSHydjhKwcM=; b=i F9KxapGsnbKvLre0UpBOkX66U7K/lJ7Ax8aokVkf63aqTUwyLm960NndbS8vy+tY wJ15mgjLpJ3N6mixOlakPbGp8Q6OdFq1pUYGBAqMbDqMwtdoPb+tGlseQsBXjP3y TOZwAGl7aKOd2P03HJyRl8x7qIuhG1l+4wCf6FyUsCnKxXCoOWpbZHnHmU2zhK4p cXjW2XyaN6z5C4HW8MmHqpgAFTVLUuCFxMU+ZzES4hz4eHlthJYL0YJKkEubCp62 wMHJDEQIuhlCZfeHnxiczCgQVqxHaiM5+oP4LRrsnJBCh7TsLGUntfNQ+sezVs6b Xu07K0oPwFGdyh1BZGhGQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeljedgudehhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddt necuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqne cuggftrfgrthhtvghrnhepfffhlefgueefleefiefgiedvffetieeuhfdtgeduveefleev gefgjefhjefhhfeknecuffhomhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdr thhvpdhnsggprhgtphhtthhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhope ejfeegvdelseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhgrnhgurhgv sehrihhsvghuphdrnhgvthdprhgtphhtthhopehjohhnrghthhgrnhdrsghrihgvlhhmrg hivghrseifvggsrdguvgdprhgtphhtthhopehmhhifsehnvghtrhhishdrohhrghdprhgt phhtthhopehirghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 22 Sep 2024 16:53:58 -0400 (EDT) From: Ian Eure Date: Sun, 22 Sep 2024 13:53:43 -0700 Message-ID: <20240922205343.21437-3-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240922205343.21437-1-ian@retrospec.tv> References: <20240922205343.21437-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..dd741d22bc 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 #: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)