From patchwork Thu May 30 22:39:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 65008 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 EAC3327BBEA; Thu, 30 May 2024 23:41:20 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 2C2BA27BBE2 for ; Thu, 30 May 2024 23:41:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCoS4-0004Km-Q7; Thu, 30 May 2024 18:40:52 -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 1sCoS3-0004KA-Gd for guix-patches@gnu.org; Thu, 30 May 2024 18:40:51 -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 1sCoS3-0002kz-9A for guix-patches@gnu.org; Thu, 30 May 2024 18:40:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sCoSD-0003N3-Ua for guix-patches@gnu.org; Thu, 30 May 2024 18:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71121] [PATCH v2 3/3] gnu: librewolf: Update to 126.0-1. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 May 2024 22:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71121 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71121@debbugs.gnu.org Cc: Ian Eure Received: via spool by 71121-submit@debbugs.gnu.org id=B71121.171710882812578 (code B ref 71121); Thu, 30 May 2024 22:41:01 +0000 Received: (at 71121) by debbugs.gnu.org; 30 May 2024 22:40:28 +0000 Received: from localhost ([127.0.0.1]:52759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCoRg-0003Gh-1V for submit@debbugs.gnu.org; Thu, 30 May 2024 18:40:28 -0400 Received: from wfout1-smtp.messagingengine.com ([64.147.123.144]:41661) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCoRe-0003FU-IP for 71121@debbugs.gnu.org; Thu, 30 May 2024 18:40:26 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.west.internal (Postfix) with ESMTP id 37AAA1C00137; Thu, 30 May 2024 18:40:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 30 May 2024 18:40:10 -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=fm3; t=1717108809; x= 1717195209; bh=nqB31ALEi1/A0c4hn3b54/ZFbCHXm9t1Dr2EnwEeOdk=; b=n MuWi5y/G+PhBD7zV64m8XD4SNd2+h7XirKoY41kmN7wluQ2kJtJ6eXAT2LAEYFeb 9r3dE9yfFXhRUo1nX//7Gdopt2hu8ay1VDJ5Otq6M015iS1SlNmsSBHYCTKWPO9n rd6VgDXNSeWGOdmQYk3cvyU9rIcs9YMQZ4YGgyqJ4ZqRxj7PXlBizHXtT6lSrJXD 6RmZxogqnmh0oPv/JlU1aAHABp2j9hn22SdR1jRI0jznPPbV+XWfunziN1ygkJbA YEgTwlU/dXVBSkHQnNYrGZtEJk9qkavnXjUyomZod6BLMcEZIDv4Bm7cdhb55+8K Wveax/LL8BdyBr2AstSmg== 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=fm1; t=1717108809; x= 1717195209; bh=nqB31ALEi1/A0c4hn3b54/ZFbCHXm9t1Dr2EnwEeOdk=; b=A GDvRiEktuYyODZaYdC4UTPcRwD4XhSywE6WwR7jGTdGA+N+ahw1qCVaVHLLwBoQa NpbBqFNgQOWDow7Tm/vtpi/mQo6D+zsRIdcCikWrunzqcbVKAYMWB4xrt5dwiCe7 pSrc+bb505Kahjm4Kgg8GihYazBXTjjAmOJ1YunyGJNwJuoQciu0RXYiw1wpA5V8 cEXCVJYWPG14tPvo5nlVO5rpE5qF00EnJBS2zJrWcrTOof5MSAvB69RpPI49OOOL 5D/UVwzmXqmpao1iEULf9CKsyD7LpoqZVbQz2S+8hoPJdNENHiEXRp+Zd4Jrs9RS WAYLl1YjlBs99CTyi/NeQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdekhedgudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggt rdhtvheqnecuggftrfgrthhtvghrnhepveevjeffuddvteeiueetgfeukedvfeeiuedvve elfeeghfduleeftedvgfefgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghm pehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 30 May 2024 18:40:09 -0400 (EDT) From: Ian Eure Date: Thu, 30 May 2024 15:39:51 -0700 Message-ID: <20240530223951.13474-3-ian@retrospec.tv> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240530223951.13474-1-ian@retrospec.tv> References: <20240530223951.13474-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/librewolf.scm (librewolf): Update to 126.0-1. Fixes CVE-2024-4367, CVE-2024-4764, CVE-2024-4765, CVE-2024-4766, CVE-2024-4767, CVE-2024-4768, CVE-2024-4769, CVE-2024-4770, CVE-2024-4771, CVE-2024-4772, CVE-2024-4773, CVE-2024-4774, CVE-2024-4775, CVE-2024-4776, CVE-2024-4777, CVE-2024-4778. Change-Id: Iec010e516651588da389f747074cbd10f8c14377 --- gnu/packages/librewolf.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index bb8bc8a283..80b942ec12 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -115,9 +115,9 @@ (define (librewolf-source-origin version hash) (define computed-origin-method (@@ (guix packages) computed-origin-method)) (define librewolf-source - (let* ((ff-src (firefox-source-origin "125.0.2" "16gpd6n52lshvkkha41z7xicggj64dw0qhr5gd07bcxsc4rmdl39")) - (version "125.0.2-1") - (lw-src (librewolf-source-origin version "17i36s2ny1pv3cz44w0gz48fy4vjfw6vp9jk21j62f5d3dl726x8"))) + (let* ((ff-src (firefox-source-origin "126.0" "09l5hsyrkimmkd7wbhnamy5mwmwwxjfa742hpkjjkhlyk6hq43li")) + (version "126.0-1") + (lw-src (librewolf-source-origin version "1q8fjki6rgzrir84y7j2anra2w213bm0g74nw205gja9qsxlassc"))) (origin (method computed-origin-method) @@ -161,6 +161,11 @@ (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...~%") @@ -205,12 +210,12 @@ (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 "20240427150329") +(define %librewolf-build-id "20240530072108") (define-public librewolf (package (name "librewolf") - (version "125.0.2-1") + (version "126.0-1") (source librewolf-source) (build-system gnu-build-system) (arguments