From patchwork Wed Nov 6 14:25:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 69924 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 D8EAE27BBE9; Wed, 6 Nov 2024 14:27:47 +0000 (GMT) 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_DNSWL_BLOCKED, 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 A05DE27BBE2 for ; Wed, 6 Nov 2024 14:27:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8gzx-0007QJ-8T; Wed, 06 Nov 2024 09:27:05 -0500 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 1t8gzv-0007Pk-FP for guix-patches@gnu.org; Wed, 06 Nov 2024 09:27:03 -0500 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 1t8gzv-0000Q7-5E for guix-patches@gnu.org; Wed, 06 Nov 2024 09:27:03 -0500 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=ZikFdNkmM2FwiuAMyRlCZ2xgIO4cO2os9WaOhXUt8G4=; b=F6cH1UyUoHANY/C735cdA+pxVJA6kzL20SjTFhK4aO8n8NM3kXZTLtdhiof8FJG9hf0pgJXG+SXfUx+mHM0m2xeQI2/DMYYu2yVDcHNG+LA6JObVTkgJyHfN41aFdmfF336WNXCpfjhuoEBrouVI7MjXb8SuVX7hLJ50P92jgZCb4tY5/Mh1UJZl791lu3Jvpxwp9Lk61IwRH0zyCYZz9alQOH3JsfbcO5v0SFZ8VRTWbDFqGOfIkSDKVS6Ts4Tn6O0BaCqGpnXtGuqibUyp0xYSN8lProPDyR+CSGQedM21GhOgTO40+iUhiv+ApK44VQl2B5aeQXHsjNtkUWIxMg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t8gzv-0001v4-0q for guix-patches@gnu.org; Wed, 06 Nov 2024 09:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74070] [PATCH v2 1/2] gnu: nss-rapid: Update to 3.105. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Nov 2024 14:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74070 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74070@debbugs.gnu.org Cc: Ian Eure Received: via spool by 74070-submit@debbugs.gnu.org id=B74070.17309031787307 (code B ref 74070); Wed, 06 Nov 2024 14:27:02 +0000 Received: (at 74070) by debbugs.gnu.org; 6 Nov 2024 14:26:18 +0000 Received: from localhost ([127.0.0.1]:40224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8gzC-0001ti-10 for submit@debbugs.gnu.org; Wed, 06 Nov 2024 09:26:18 -0500 Received: from fhigh-b8-smtp.messagingengine.com ([202.12.124.159]:56317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8gz7-0001t7-5G for 74070@debbugs.gnu.org; Wed, 06 Nov 2024 09:26:15 -0500 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.stl.internal (Postfix) with ESMTP id D2DC72540171; Wed, 6 Nov 2024 09:26:07 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Wed, 06 Nov 2024 09:26:07 -0500 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=fm2; t=1730903167; x= 1730989567; bh=ZikFdNkmM2FwiuAMyRlCZ2xgIO4cO2os9WaOhXUt8G4=; b=Q kVlVseq49+7J3eC5jaCRbg/nYxlTBdP3+eUrYF1NfAJh32FcpCpdv7Z9n4QFeD4Y 1ecDjUoJIPEBryvSI+uOjNNeQB9g0nQmT03KlWi2O16jnS753ibY2j1qK8RRF4vf FZRpsVea4N8TxCX6Fcm7YIKTYdk9rfYZq4He9mPmMKVEdDrldUDVNHY5gENMPOjq +3FKjamSVChRfSyPofq2s9xrblRtbOejVNlB3+gcuNsy5mX2M5GcgaCl2SXPGQjF G04EuVU53x/5cTSFxgdREmozyyZRLUojU+sVQ8TcoXkv4l38z/yO9ePZbIZ+8H7p TBVMKHqDef2sFOAk2R5PA== 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-sender :x-me-sender:x-sasl-enc; s=fm3; t=1730903167; x=1730989567; bh=Z ikFdNkmM2FwiuAMyRlCZ2xgIO4cO2os9WaOhXUt8G4=; b=hr2NhHs3bh8k6KlKq WT1m7+jRMmvbrH0O5gG3kD6GXUEMLJby+p00JJTzeFu+8VnUbhEX5p1Peobf8Ne4 6fq9BYtpRfpnqA5jvVL8dHT9n1EtbT+0iuiENiO3GTseUFsGc8rTfjW6LQrn9SxO UzhaFPLkNnbBKwh5yFUrb3a1i2eorzZzZQiS8MEKnYQAZqz9DWcZFQfUoHxe6BUx HeWhopoFjmU+cemv9V5/b6IW6ETYdaY9xX/Cbv8gYseUpdHKFgC59pr8KiuB6eks XKmITAzU+DeRmay2roQbgwFPBkNqHDv8ymK0jKa3URW+JlXp8erFQhuey5JU6Wo6 bC3hA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrtddvgdeifecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhes rhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpefgteeiffdvleejleeiie evgeegleegieevjeekfeevledugfehteetgfeuffevhfenucffohhmrghinhepmhhoiihi lhhlrgdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghrtghpthhtohepvddpmhho uggvpehsmhhtphhouhhtpdhrtghpthhtohepjeegtdejtdesuggvsggsuhhgshdrghhnuh drohhrghdprhgtphhtthhopehirghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 6 Nov 2024 09:26:06 -0500 (EST) From: Ian Eure Date: Wed, 6 Nov 2024 06:25:59 -0800 Message-ID: <20241106142600.3116-2-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241106142600.3116-1-ian@retrospec.tv> References: <20241106142600.3116-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.105. Change-Id: I8b502be10f5d577a258033417cf7faddc41ca214 --- gnu/packages/nss.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index b058df0175..86b3743656 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.104") + (version "3.105") (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 - "13mca2y92sm05kxb40qvlkq8l93ghmrhh0s3iawpc7idc8ik4xp2")))) + "06an746lrnmp7mnr866cjxngkrw8c5ngdykw425q4p6ai264r3lf")))) (arguments (substitute-keyword-arguments (package-arguments nss) ((#:phases phases) @@ -376,7 +376,7 @@ (define-public nss-rapid ;; leading to test failures: ;; . To ;; work around that, set the time to roughly the release date. - (invoke "faketime" "2024-08-17" "./nss/tests/all.sh")) + (invoke "faketime" "2024-09-2" "./nss/tests/all.sh")) (format #t "test suite not run~%")))))))) (synopsis "Network Security Services (Rapid Release)") (description From patchwork Wed Nov 6 14:26:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 69923 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 457CA27BBEA; Wed, 6 Nov 2024 14:27:16 +0000 (GMT) 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_DNSWL_BLOCKED, 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 6A82627BBE2 for ; Wed, 6 Nov 2024 14:27:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8gzw-0007QG-SQ; Wed, 06 Nov 2024 09:27:04 -0500 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 1t8gzu-0007PV-UC for guix-patches@gnu.org; Wed, 06 Nov 2024 09:27:03 -0500 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 1t8gzu-0000Pz-Lr for guix-patches@gnu.org; Wed, 06 Nov 2024 09:27:02 -0500 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=8tA+SKU8078DcFql5TRSJQJd8mn438u3xEc+skpSQhM=; b=Jomy97O2OmzsZeI3Ak6dxoTS9dp2MNMjsLJ3rOCCiSUyRyLWBg4rm1CT+wJk6zbICoD6t0ldjYQcjRRScn+Da3QNjBGvFOj+tX00dakn7abYWQcgCN4bY6Y8yvJXyVhPH073jDicKaIyJMu3eZuazKn0ByvYsd/58ey8j1LhsLFqVvM6If6+63G1KM29NlqvP5Pvshqpst8Rtak0/nsgbcgfy1dOtwDPaLin8PbmDMRO5tG68oLTzcwNG8I+dRRJYkAxBTI7cptknTA4ZvgDI2ZmQBVvzVHVMsvcq3ewtSHLXh2/+GNT7iTjfesuSUZGwvu/6TBS/JXPmo9Ipj94FQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t8gzu-0001ux-Gc for guix-patches@gnu.org; Wed, 06 Nov 2024 09:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74070] [PATCH v2 2/2] gnu: librewolf: Update to 132.0-1 [security fixes]. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Nov 2024 14:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74070 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74070@debbugs.gnu.org Cc: Ian Eure Received: via spool by 74070-submit@debbugs.gnu.org id=B74070.17309031787301 (code B ref 74070); Wed, 06 Nov 2024 14:27:02 +0000 Received: (at 74070) by debbugs.gnu.org; 6 Nov 2024 14:26:18 +0000 Received: from localhost ([127.0.0.1]:40222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8gzB-0001tf-6Q for submit@debbugs.gnu.org; Wed, 06 Nov 2024 09:26:17 -0500 Received: from fout-b5-smtp.messagingengine.com ([202.12.124.148]:51339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8gz8-0001t9-7o for 74070@debbugs.gnu.org; Wed, 06 Nov 2024 09:26:15 -0500 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfout.stl.internal (Postfix) with ESMTP id 00F2A1140133; Wed, 6 Nov 2024 09:26:08 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-08.internal (MEProxy); Wed, 06 Nov 2024 09:26:09 -0500 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=fm2; t=1730903168; x= 1730989568; bh=8tA+SKU8078DcFql5TRSJQJd8mn438u3xEc+skpSQhM=; b=e Sq61kQsRudIMI2R/EXXdYta5j8oBJAbH5Fagj2ZzxABvBMHbyUKSmPUFtRNm21t8 wrpwgkVPLwzcxHJZGi7uDtGEyQSojYo30WhUqMnniaw6+py87qAnMTEmZ2yLtaim 44CQBhkDWdBxPv/vmQeHmJw6H6doilOC//GYuNDNYg6wruai2Rm7aiyv5WkNqt2p Ym6uCzO2v0Ht5yG0uIzVtUwVeQu/PFS0zLJcfW4CzkvMigEPC38RqSlTrfvg7dRH TX5smv+INOgMnhONGFQK2mERoa2u97cM7d7rsTPRi+NtLByT05NQdXYQp/tA+Pak UFjVQudhtqhm4qUNpfzbg== 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-sender :x-me-sender:x-sasl-enc; s=fm3; t=1730903168; x=1730989568; bh=8 tA+SKU8078DcFql5TRSJQJd8mn438u3xEc+skpSQhM=; b=Ol665REBedOsevaQ/ tVfRA8iy+kYIMd2928CXwx2Vyh5tV8QHG/I7uVY/JsgGZMgspXF+MCvzEhiRn+X8 w2U7PqrnSR4R6o5Rypv4f21oGgXd8Cau89L8eC6IRSdbwSGAbFIeIC9YaWKWxd42 pHkiJkf2lG2kMDv0rlba8P0ieAUg46av8YZufKfV+/76WekjiWLp0gGVjPzr+TFH Q4ZwYLQvqp0nj3QEoYfjbEVtPVeFRuSrfumja/+kJfLBxaSYqo8CrBiVtTIGx8RD 58VoXWXRhE4Dx2ciiuVy2RehFNw4Suf1IYN4sM5RQ3sTf3/5wviw/W1q8kcDa5Yq Uo3Sw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrtddvgdeifecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhes rhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpeevffejtddtgeeggfehje eigfduveehhffftddvleetveejfeetgfeugfefieekgeenucffohhmrghinhepghhithhh uhgsrdgtohhmpdgtohguvggsvghrghdrohhrghenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgs pghrtghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepjeegtdejtd esuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehirghnsehrvghtrhhoshhp vggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 6 Nov 2024 09:26:08 -0500 (EST) From: Ian Eure Date: Wed, 6 Nov 2024 06:26:00 -0800 Message-ID: <20241106142600.3116-3-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241106142600.3116-1-ian@retrospec.tv> References: <20241106142600.3116-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 New upstream version. The 132.0-2-1 release switches to the firefox-l10n repository, necessitating rework of locale handling. 131.0.3-1 fixes CVEs: CVE-2024-9936: Undefined behavior in selection node cache 132.0-1 fixes CVEs: CVE-2024-10458: Permission leak via embed or object elements CVE-2024-10459: Use-after-free in layout with accessibility CVE-2024-10460: Confusing display of origin for external protocol handler prompt CVE-2024-10461: XSS due to Content-Disposition being ignored in multipart/x-mixed-replace response CVE-2024-10462: Origin of permission prompt could be spoofed by long URL CVE-2024-10463: Cross origin video frame leak CVE-2024-10468: Race conditions in IndexedDB CVE-2024-10464: History interface could have been used to cause a Denial of Service condition in the browser CVE-2024-10465: Clipboard "paste" button persisted across tabs CVE-2024-10466: DOM push subscription message could hang Firefox CVE-2024-10467: Memory safety bugs fixed in Firefox 132, Thunderbird 132, Firefox ESR 128.4, and Thunderbird 128.4 * gnu/packages/librewolf.scm (librewolf): Update to 132.0-1. Change-Id: I4afbcb496a8b0a329254762259cd1598d574761e --- gnu/packages/librewolf.scm | 68 +++++++------------ .../librewolf-neuter-locale-download.patch | 17 +++++ 2 files changed, 41 insertions(+), 44 deletions(-) create mode 100644 gnu/packages/patches/librewolf-neuter-locale-download.patch diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index d696a3058f..6517c1953d 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -111,10 +111,21 @@ (define (librewolf-source-origin version hash) (commit version) (recursive? #t))) (file-name (git-file-name "librewolf-source" version)) + (patches (search-patches "librewolf-neuter-locale-download.patch")) (sha256 (base32 hash)))) (define computed-origin-method (@@ (guix packages) computed-origin-method)) +(define firefox-l10n + (let ((commit "bdfd4e10606204450a3e88d219ecf2b252349c2b")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mozilla-l10n/firefox-l10n.git") + (commit commit))) + (file-name (git-file-name "firefox-l10n" commit)) + (sha256 (base32 "0i31b1024jck6467j9phcqvac32psl4nkyb0nm4h9zzyj8zw31xp"))))) + (define* (make-librewolf-source #:key version firefox-hash librewolf-hash) (let* ((ff-src (firefox-source-origin (car (string-split version #\-)) @@ -168,34 +179,10 @@ (define* (make-librewolf-source #:key version firefox-hash librewolf-hash) ;; Stage locales. (begin - (format #t "Staging locales...~%") - (force-output) - (mkdir "l10n-staging") - (with-directory-excursion "l10n-staging" - (for-each - (lambda (locale-dir) - (let ((locale - (string-drop - (basename locale-dir) - (+ 32 ; length of hash - (string-length "-mozilla-locale-"))))) - (format #t " ~a~%" locale) - (force-output) - (copy-recursively locale-dir locale - #:log (%make-void-port "w")) - (for-each make-file-writable (find-files locale)) - (with-directory-excursion locale - (when (file-exists? ".hgtags") - (delete-file ".hgtags"))))) - '#+all-mozilla-locales))) - - ;; Patch build script to use staged locales. - (begin - (substitute* '("scripts/generate-locales.sh") - (("wget") "# wget") - (("unzip") "# unzip") - (("mv browser/locales/l10n/\\$1-\\*/") - "mv ../l10n-staging/$1/"))) + (substitute* "scripts/librewolf-patches.py" + (("l10n_dir = Path(\"..\", \"l10n\")") + (string-append + "l10n_dir = \"" #+firefox-l10n "\"")))) ;; Run the build script (invoke "make" "all") @@ -212,18 +199,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 "20241010143544") +(define %librewolf-build-id "20241105185710") (define-public librewolf (package (name "librewolf") - (version "131.0.2-1") + (version "132.0-1") (source - (origin - (inherit (make-librewolf-source - #:version version - #:firefox-hash "05knnwfxqd3mb6a5y2yh73sn4g648dxnz9kpkmpj9madr55863h4" - #:librewolf-hash "1knx485kdjv8d0rn5ai1x1jp0403dvxz9m7lpim1y2d2ilyi26x7")))) + (make-librewolf-source + #:version version + #:firefox-hash "0zjwqn13rbzyxa3f63mvz5xv0158bsvr2llpqrh48davi52b2249" + #:librewolf-hash "1kfpcv89kh2521f3c296asjizb1swb15mfkkkrlis9ncm1gp6fw6")) (build-system gnu-build-system) (arguments (list @@ -325,14 +311,7 @@ (define (write-setting key value) ;; 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")) - )) + "lockPref(\"browser.ml.")))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ (use-modules (guix build cargo-utils)) @@ -417,6 +396,7 @@ (define (write-setting key value) (which "bash")) (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") + (setenv "LANG" "en_US.utf8") ;; This should use the host info probably (does it ;; build on non-x86_64 though?) (setenv "GUIX_PYTHONPATH" @@ -625,7 +605,7 @@ (define (runpaths-of-input label) (substitute* desktop-file (("^Exec=@MOZ_APP_NAME@") (string-append "Exec=" - #$output "/bin/librewolf %u")) + #$output "/bin/librewolf")) (("@MOZ_APP_DISPLAYNAME@") "LibreWolf") (("@MOZ_APP_REMOTINGNAME@") diff --git a/gnu/packages/patches/librewolf-neuter-locale-download.patch b/gnu/packages/patches/librewolf-neuter-locale-download.patch new file mode 100644 index 0000000000..da300542f5 --- /dev/null +++ b/gnu/packages/patches/librewolf-neuter-locale-download.patch @@ -0,0 +1,17 @@ +diff --git a/scripts/librewolf-patches.py b/scripts/librewolf-patches.py +index 48dc6bc..01a6c58 100755 +--- a/scripts/librewolf-patches.py ++++ b/scripts/librewolf-patches.py +@@ -147,12 +147,6 @@ def librewolf_patches(): + with open(file, "w") as f: + f.write("{}-{}".format(version,release)) + +- print("-> Downloading locales from https://github.com/mozilla-l10n/firefox-l10n") +- with TemporaryDirectory() as tmpdir: +- exec(f"wget -qO {tmpdir}/l10n.zip 'https://codeload.github.com/mozilla-l10n/firefox-l10n/zip/refs/heads/main'") +- exec(f"unzip -qo {tmpdir}/l10n.zip -d {tmpdir}/l10n") +- exec(f"mv {tmpdir}/l10n/firefox-l10n-main lw/l10n") +- + print("-> Patching appstrings.properties") + # Why is "Firefox" hardcoded there??? + exec("find . -path '*/appstrings.properties' -exec sed -i s/Firefox/LibreWolf/ {} \;")