From patchwork Thu May 8 00:06:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 42381 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 0AF0127BC49; Thu, 8 May 2025 01:07:21 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 964F527BC4B for ; Thu, 8 May 2025 01:07:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCon3-0003B5-WE; Wed, 07 May 2025 20:07:06 -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 1uCon0-0003Ah-RZ for guix-patches@gnu.org; Wed, 07 May 2025 20:07:03 -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 1uCon0-0005WJ-Io for guix-patches@gnu.org; Wed, 07 May 2025 20:07:02 -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=JaoEOCURHN5eT+aXL5m/F91mXENC+r2wS/dpmQ39p3Y=; b=NGkgP/aq/PUyjhcG/WpVPr4JF60EQfUY6oIpHfMZmacl0Wb4+Y0/B98EdbjbIAdh1Go5eeNLGQEA3KyLpPBrBdd6PQ2Ppxnu+0jTEMiH8MtvrJxEHUPY1esybnkgQ9i3jaJFUOggvdoBe5nUwTrjn4A6Hfrrr9rDeP1KC4aDY0wDMVdvzMmvq8JSkkmVKJXCEyY54nLoeQkMXSb/Azb2o+ZYkDBewZBShGqFiSBtoZDS84gI8dgcA2GZVSnSXtEVPn0z+0PWDIC/BGg56yYI9a7XKbkeB27924kKeGDiBxsf0lT/eAD9HalVKEVfjjiA48XfQbjKkxWOGKgUph5chw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCon0-0001Zr-De for guix-patches@gnu.org; Wed, 07 May 2025 20:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v3 1/7] gnu: Remove nspr-4.32. References: <20240909175249.8003-1-ian@retrospec.tv> In-Reply-To: <20240909175249.8003-1-ian@retrospec.tv> Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 00:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73152 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73152@debbugs.gnu.org Cc: Ian Eure Received: via spool by 73152-submit@debbugs.gnu.org id=B73152.17466627885910 (code B ref 73152); Thu, 08 May 2025 00:07:02 +0000 Received: (at 73152) by debbugs.gnu.org; 8 May 2025 00:06:28 +0000 Received: from localhost ([127.0.0.1]:50025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uComR-0001X9-HU for submit@debbugs.gnu.org; Wed, 07 May 2025 20:06:27 -0400 Received: from fout-b6-smtp.messagingengine.com ([202.12.124.149]:41465) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uComN-0001WD-3Z for 73152@debbugs.gnu.org; Wed, 07 May 2025 20:06:24 -0400 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfout.stl.internal (Postfix) with ESMTP id 178FD114012E; Wed, 7 May 2025 20:06:17 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Wed, 07 May 2025 20:06:17 -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=fm2; t=1746662776; x=1746749176; bh=JaoEOCURHN5eT+aXL5m/F 91mXENC+r2wS/dpmQ39p3Y=; b=EH4NU15mp0vFIrCMFrPRK/n0e9mJrznY2m+mn ug7ixSAH033NBtmuDLz93KxMQEBv7jUOZ1i9NC/tZR7SMe87RElwjB3dZPZwMdDc sDyNshaHG/mdLJYRMzLR9WsA58M0+mqyA+83c+sKbmpfN0iwKfYK4fguN9G5DknV xHAvD7gqkGhIcXnM1nQzCX43YRgGmwVGxi3IFm8pbzQFGzcPMhwC6h4iCWBEse4l 57r5XpWzygzz+JLTmuzuaTJp3ylyMhLSr+1Mcvy4kZBBN4boBQwLICTxOZaTUR/e kq/HF+r3QjL7u44z98pPS83VGppCoQbohrJNNH2V7eYrheUSA== 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-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1746662776; x=1746749176; bh=JaoEOCURHN5eT+aXL5m/F91mXENC+r2wS/d pmQ39p3Y=; b=RC6G8a4C3zLjiJY1DF+ZRGksxAxGp5ND5wci70TDD1g6tmXtxio HcYWRw80GX8pgM3mCAIuSMhvUPaizcFPGDnmFL4OIg1AO+/vFKx2ae2b0vwxVHCD 3YUK3/8CBbBO/YA7vdvB7CZYwBFVSJPzy5fAK7fbJhyQVY9gXytyNTmI2YXv0Lax Qry+FkPf3uyGSySgn/rbrCIwQCN5LY8SihMQiecIAcZnctRKHCOpFJT9BZ9CitcT jSh5l87NDcQHACBMGX4wZ8QRPM6TYQebD3y12OYJbQcz2mivwcZ0rCtkqyYRoPkX MnzLGdMOlHUY9Dh9JjQiRjVPNQI9mCEwRHw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeekvdehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghn sehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepgfdvjefhlefhfedtie elleefvdfhfeffteefueetlefgvdelffelvefgfeeukeejnecuffhomhgrihhnpehmohii ihhllhgrrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopedvpdhm ohguvgepshhmthhpohhuthdprhgtphhtthhopeejfeduhedvseguvggssghughhsrdhgnh hurdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 7 May 2025 20:06:16 -0400 (EDT) From: Ian Eure Date: Wed, 7 May 2025 17:06:03 -0700 Message-ID: <20250508000613.11272-1-ian@retrospec.tv> X-Mailer: git-send-email 2.49.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 Nothing uses this, so remove it. * gnu/packages/nss.scm (nspr-4.32): Delete variable. Change-Id: I05c97fe6fc32d045618334df118a84836c0d0261 --- gnu/packages/nss.scm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 8bcb593ed7..f253edce99 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -95,18 +95,6 @@ (define-public nspr in the Mozilla clients.") (license license:mpl2.0))) -(define-public nspr-4.32 - (package - (inherit nspr) - (version "4.32") - (source (origin - (method url-fetch) - (uri (string-append - "https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v" - version "/src/nspr-" version ".tar.gz")) - (sha256 - (base32 - "0v3zds1id71j5a5si42a658fjz8nv2f6zp6w4gqrqmdr6ksz8sxv")))))) ;; nss should track ESRs, but currently doesn't. 3.102.1 is the current ESR. From patchwork Thu May 8 00:06:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 42380 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 6183727BC4D; Thu, 8 May 2025 01:07: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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 9547127BC49 for ; Thu, 8 May 2025 01:07:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCon3-0003B4-VF; Wed, 07 May 2025 20:07:05 -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 1uCon0-0003Ag-Q5 for guix-patches@gnu.org; Wed, 07 May 2025 20:07:03 -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 1uCon0-0005WE-H3 for guix-patches@gnu.org; Wed, 07 May 2025 20:07:02 -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=CY6nW6Yr89AMZB0uE/jjhH4ubKDgO7NpBz0uSr7+i5Y=; b=KPjlAveZubIA437KBLwbs86+PjEogcvk2sdHU/mJkuGzg5YuNvBoptSM8vd5rimzHgU54QpTlidpcYbnrM3jo7+yzvf2AI3vGNyZAz9cO6NhOGbxI+us0j3zsZM6wlMlrZ7PGi1uyonkTNpUc3FolJAc2j1J6S5t62lgEwso+ZVfzuFpik2mwfmgQY/SKLC3OZk8W9o/CqHsiNbNJUGXsMsgkJ3Ae4NokGAlzpd1/6Lk2BMkrIWGQazHi4dlswOUo7TtbR75N084N53bf7v8OUvKy0RjLmHDcp8lKWqRX174v4Z/vNUZmBgFQQ1ytmeLgHtoJF3ZOajUk8D6jB8Mig==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uComz-0001Zj-T4 for guix-patches@gnu.org; Wed, 07 May 2025 20:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v3 2/7] gnu: nspr: Update to 4.36. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 00:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73152 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73152@debbugs.gnu.org Cc: Ian Eure Received: via spool by 73152-submit@debbugs.gnu.org id=B73152.17466627875902 (code B ref 73152); Thu, 08 May 2025 00:07:01 +0000 Received: (at 73152) by debbugs.gnu.org; 8 May 2025 00:06:27 +0000 Received: from localhost ([127.0.0.1]:50023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uComQ-0001X1-W2 for submit@debbugs.gnu.org; Wed, 07 May 2025 20:06:27 -0400 Received: from fhigh-b5-smtp.messagingengine.com ([202.12.124.156]:40383) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uComN-0001WG-SD for 73152@debbugs.gnu.org; Wed, 07 May 2025 20:06:24 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.stl.internal (Postfix) with ESMTP id 368E52540164; Wed, 7 May 2025 20:06:18 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Wed, 07 May 2025 20:06:18 -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=fm2; t=1746662778; x= 1746749178; bh=CY6nW6Yr89AMZB0uE/jjhH4ubKDgO7NpBz0uSr7+i5Y=; b=d y5z+mlPezkSMz252VZxP114Tslupjw11usX0cH0QC2GuHpOcbeD3XiAFDoJhreee beOZU+as6Zep90XCRBpwKoDohQdXBZrWOoo2qhBMhgBRaG5h0iZcXTVU+e2o/LmG QWpme8Iy69Kr0Tvf3tXxShlE2yGBcsm5XlzLjP4jdpeluEIqMEVVcjLsRUzAa0Em 8QwbTFu1xZ4A3TFe7Yrb7OfJf2MnhlsXcbbpquuoS5fj7D76Pxrv6XljH701hCJg +fnEw3jYDFYF6MykU0BzhI36s5u0nlOeQtkh2hUhE6VSnU2QUbR/dwIYQZtJ0+qn KZGZOv2WYy68jur25t3FA== 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=1746662778; x=1746749178; bh=C Y6nW6Yr89AMZB0uE/jjhH4ubKDgO7NpBz0uSr7+i5Y=; b=X8aDDUhQ1MeVsRydl AMJ0MfL/P61UYT/2ik+0FL66TGrBGnWAb7EKtvmPAcdxCthTz6UUIe1OrFHcp6JK sOajx+Fs3Ls/8km2Gehbp92RyOQeIXyoOEF7SppewsOlzVN/2HTVv6XIrW+XTqOo B9+ywd6yKapllOoK4/WdL2uGCWlrpRX7aRRGQJkqH6tqkLnheGIcGDH0heqWMLeO zkRgcYZnIwE2B0vn5nyjDgRfWNT4TdBXMGeA1UNg+LfWBiVVzcW1+aBfs/mxoF+S +P6ivFPipzTKr3iUx0AKCpwihgMoZ5bTZrppFgOyX4/ibU3awsbFZN5kPBF0E2SI JpmnA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeekvdehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepveevjeffuddvte eiueetgfeukedvfeeiuedvveelfeeghfduleeftedvgfefgeejnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtg drthhvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthho peejfeduhedvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrh gvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 7 May 2025 20:06:17 -0400 (EDT) From: Ian Eure Date: Wed, 7 May 2025 17:06:04 -0700 Message-ID: <20250508000613.11272-2-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250508000613.11272-1-ian@retrospec.tv> References: <20250508000613.11272-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 (nspr): Update to 4.36. Change-Id: Iac06cba18730773438f9de4e00376c0213bf4c15 --- 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 f253edce99..73b010eea9 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -47,7 +47,7 @@ (define-module (gnu packages nss) (define-public nspr (package (name "nspr") - (version "4.35") + (version "4.36") (source (origin (method url-fetch) (uri (string-append @@ -55,7 +55,7 @@ (define-public nspr version "/src/nspr-" version ".tar.gz")) (sha256 (base32 - "13xwda56yhp1w7v02qvlxvlqiniw8kr4g3fxlljmv6wnlmz2k8vy")))) + "15b83ipjxrmw0909l5qqz13pbarhp50d6i58vgjx4720y4bw7pjm")))) (build-system gnu-build-system) (inputs (list perl ;for 'compile-et.pl' From patchwork Thu May 8 00:06:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 42386 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 6662A27BC49; Thu, 8 May 2025 01:08:08 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 E4B9527BC4A for ; Thu, 8 May 2025 01:08:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCon4-0003Bs-TS; Wed, 07 May 2025 20:07:06 -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 1uCon2-0003Ay-Ot for guix-patches@gnu.org; Wed, 07 May 2025 20:07:05 -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 1uCon1-0005WX-Gh for guix-patches@gnu.org; Wed, 07 May 2025 20:07:04 -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=EDZkUfm5as8HW88bnFd8LN0DtqZovjMsEhdw5VQaF5Y=; b=EYkPmt5FXTw06VFCA/HdgcG/69ojnXOxun221GFz7exfR5+i/K05TTffMsPz8wb6M3f33KCEem+ZmPOdsCTuFNGYTvoaGphOuQ4pVf1HxB3xEpnWstjl4DMOdeXPJPCAHISDsFtLtLjlQFjiFh5JZ0d7HNMiSkgmQTvyz/GvemZoTU55PiL8mNvdK2EhOkaRIsp/2BHx3JQyQ4bPTd8UApJHGj8kwGp5m7rQD8xNPQpTzIC1eSbU5qtrWyUVCCW1ITKvhmSQ1PvYDdeZxGMprQhorPw5Rscmxj0cfYXN7dCU1sI4AuCOC0bEU0Q6RGOuZyavLjwZH8yLNaPPQMGfzQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCon0-0001Zy-U1 for guix-patches@gnu.org; Wed, 07 May 2025 20:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v3 3/7] gnu: Remove nss/fixed. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 00:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73152 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73152@debbugs.gnu.org Cc: Ian Eure Received: via spool by 73152-submit@debbugs.gnu.org id=B73152.17466627895922 (code B ref 73152); Thu, 08 May 2025 00:07:02 +0000 Received: (at 73152) by debbugs.gnu.org; 8 May 2025 00:06:29 +0000 Received: from localhost ([127.0.0.1]:50030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uComS-0001XH-2R for submit@debbugs.gnu.org; Wed, 07 May 2025 20:06:28 -0400 Received: from fout-b6-smtp.messagingengine.com ([202.12.124.149]:39819) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uComO-0001WK-K3 for 73152@debbugs.gnu.org; Wed, 07 May 2025 20:06:25 -0400 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.stl.internal (Postfix) with ESMTP id 341771140134; Wed, 7 May 2025 20:06:19 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Wed, 07 May 2025 20:06:19 -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=fm2; t=1746662779; x= 1746749179; bh=EDZkUfm5as8HW88bnFd8LN0DtqZovjMsEhdw5VQaF5Y=; b=T YrElU/kO6a2sVb2egKWBv9ti69Q8mOWZQWyYKK+oJ9+8cwxgTBKh4qhlWZP6qISh FskapzIrSiN7KdfLWhPzkeuF+aFstGMHyIW1dIMdufPxhbELrQ6Rgimhxk2US7Qe 72tXuvXyl4qtIsiRLgaGM4QUVVOlQk/HU7LJmJQNeg1A+paRjhjohjJ2HJ8U+WoY qV51cITss5SjiPaUgKX9sIk4CO7hn4NcHYpiz1Ejp9XqwuhS753AodImk1Lx5JY+ D6vShoQkFupq6W2ylg187XXVPCZTJzlimNy6s9OmlY2IKnbPOlnUdxHAPadY09eV nEXZ1rZZPO4KZ0YMMi+KA== 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=1746662779; x=1746749179; bh=E DZkUfm5as8HW88bnFd8LN0DtqZovjMsEhdw5VQaF5Y=; b=XHXARulfUiN4CeWPe xJELxs3AbbvjmqHy5r7bb92mjyFp0DZnDzSIbB1nvpQ2/AyuwUu+0zMDwKjreKfm LAFgMwHUVy+nYi9RSH0gBc15IBQjH4up41OJRBKZsazv1BziFT4BaJU8w1HCsLHL VOTGZrIkosAIHdYEogbTkOas/VR8HP+IzGEsMee098HMrc2YS5YO/H+S2K2zoC0e KGcwi8WphzdYB03QmJLz/EAYuVCcQuQGwVRs+SrVMIsx7NTVNSjk+pwZVkE71gTa F4e4jXzvw8MBNTJXuBvFl5957D4F252D0lGqM5VyNnfeyppiuemDwZBxgFP8+5ec Njz7A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeekvdeiucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepgfetieffvdelje elieeiveeggeelgeeiveejkeefveeludfgheettefgueffvefhnecuffhomhgrihhnpehm ohiiihhllhgrrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopedv pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejfeduhedvseguvggssghughhsrd hgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 7 May 2025 20:06:18 -0400 (EDT) From: Ian Eure Date: Wed, 7 May 2025 17:06:05 -0700 Message-ID: <20250508000613.11272-3-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250508000613.11272-1-ian@retrospec.tv> References: <20250508000613.11272-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/fixed): Delete variable. Change-Id: Iaff60eed7eb9e000da27f899973b230939bfb41a --- gnu/packages/nss.scm | 51 -------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 73b010eea9..ab238330a4 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -260,57 +260,6 @@ (define-public nss security standards.") (license license:mpl2.0))) -(define-public nss/fixed - (let ((actual-version "3.99")) - (hidden-package - (package - (inherit nss) - (version (string-append actual-version ".0")) ;for grafts requirements - (source (origin - (inherit (package-source nss)) - (uri (let ((version-with-underscores - (string-join (string-split actual-version #\.) "_"))) - (string-append - "https://ftp.mozilla.org/pub/mozilla.org/security/nss/" - "releases/NSS_" version-with-underscores "_RTM/src/" - "nss-" actual-version ".tar.gz"))) - (sha256 - (base32 - "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw")))) - (arguments - (substitute-keyword-arguments (package-arguments nss) - ((#:phases phases) - #~(modify-phases #$phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (begin - ;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for - ;; testing. The latter requires a working DNS or /etc/hosts. - (setenv "DOMSUF" "localdomain") - (setenv "USE_IP" "TRUE") - (setenv "IP_ADDRESS" "127.0.0.1") - - ;; This specific test is looking at performance "now - ;; verify that we can quickly dump a database", and - ;; we're not testing performance here (especially - ;; since we're using faketime), so raise the - ;; threshold - (substitute* "nss/tests/dbtests/dbtests.sh" - ((" -lt 5") " -lt 50")) - - ;; Since the test suite is very lengthy, run the test - ;; suite once, not thrice as done by default, by - ;; selecting only the 'standard' cycle. - (setenv "NSS_CYCLES" "standard") - - ;; The "PayPalEE.cert" certificate expires every six months, - ;; leading to test failures: - ;; . To - ;; work around that, set the time to roughly the release date. - (invoke "faketime" "2024-01-23" "./nss/tests/all.sh")) - (format #t "test suite not run~%")))))))))))) - ;; nss-rapid tracks the rapid release channel. Unless your package requires a ;; newer version, you should prefer the `nss' package, which tracks the ESR ;; channel. From patchwork Thu May 8 00:06:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 42384 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 BC9B127BC4B; Thu, 8 May 2025 01:07:34 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 3B85D27BC49 for ; Thu, 8 May 2025 01:07:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCon8-0003CR-AH; Wed, 07 May 2025 20:07:10 -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 1uCon2-0003Ax-Ox for guix-patches@gnu.org; Wed, 07 May 2025 20:07:05 -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 1uCon1-0005Wa-Mm for guix-patches@gnu.org; Wed, 07 May 2025 20:07:04 -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=Ucg53Xz/tvgDHOssspCpuqD+zONFydZfDBrYEZc/RDk=; b=prKROQRZZAh0/jNVeZqx0g8jJPTA7xgj8gVKFOGtrX8V8ZeCrbqi6F2Xsa1o4kJ0FKO+veowMPlCKU/9cIrMx09Pn5jvt7j1Cau9ELLxDqUtpmNO+EhZyh/j6d1xfEvisrsCGG/iQgknNTNdjw+sGEm4e5X5O9NFqu078t8U6eegX+KWrdaPiutaC8qnhVAZYs9sv2h4QwPnFhmKVe0gbvZe3J7mAHVWpo5eaXpNt+RK6WoPSF81ZH054iwuqEGvhXnT+KKEyX/tMIFtwqz8fwoa+Ah42/ib9SC4Njs6ahXsykWSHJqnac95fCYgmj3+AfxOQESkLCqEJePbCPA/bw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCon1-0001a6-FM for guix-patches@gnu.org; Wed, 07 May 2025 20:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v3 4/7] gnu: nss: Store the package release date in an environment variable. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 00:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73152 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73152@debbugs.gnu.org Cc: Ian Eure Received: via spool by 73152-submit@debbugs.gnu.org id=B73152.17466627955960 (code B ref 73152); Thu, 08 May 2025 00:07:03 +0000 Received: (at 73152) by debbugs.gnu.org; 8 May 2025 00:06:35 +0000 Received: from localhost ([127.0.0.1]:50035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uComY-0001Y2-1s for submit@debbugs.gnu.org; Wed, 07 May 2025 20:06:34 -0400 Received: from fout-b6-smtp.messagingengine.com ([202.12.124.149]:39505) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uComP-0001WM-Jz for 73152@debbugs.gnu.org; Wed, 07 May 2025 20:06:26 -0400 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfout.stl.internal (Postfix) with ESMTP id 31239114018E; Wed, 7 May 2025 20:06:20 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Wed, 07 May 2025 20:06:20 -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=fm2; t=1746662780; x= 1746749180; bh=Ucg53Xz/tvgDHOssspCpuqD+zONFydZfDBrYEZc/RDk=; b=d eiiaoVLQeixTjWj26Nw9R9FGv0SlDl/dxfZeXCkW7ACCQBjRpyCJ8KoyIVMPSpd6 JD8h4UiOL7lRcDSx+NB93j184b5SN0BpcXV8YabspKbtw672YSyJbjrHLDV1tiQg cYk+AnxqORB9m+Wh06OAsJ/JiOOeIk+iqUqpbeoLmCFG1d5Rp7F5OVNqx84HRxMl Yp0njI8QHebgFVkPFiiMwiPD4nr/IVtc51S+j7mGrf6rohnWcmjNyg6NH7g1domM AEMtEYV/YhJnI/gDCAnSNjh7F2zCuTlGo0Vf4VkK+Fx8tU+oBlFBF12yToi/dPhq EIOXS7NeWoG1cAeSZ4p1A== 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=1746662780; x=1746749180; bh=U cg53Xz/tvgDHOssspCpuqD+zONFydZfDBrYEZc/RDk=; b=s6+bnemDB3hKJVjDY VWHbVco9ynmgAMivfFKT0MM2CpAbS/XXxfF/udLdjEgDdvAPnW0dlZqcrwiruWfh wL68l6HEIfwZwqayDdBocduBG6AsPVWYzyAlxm857rcxZA0lBHsrt55MQC10JjIG 2G0/ykQwc1q+UpYsj/cSOqvhyg45GOhPkz7kkXTsdP0YBxvD8vOFap4CCQLpUpYe D8wGjbfJrNu1xsck/HbnEfQoHZVZ6fceX/XvmojWerXw6jbWqK3Qy/2wjrvnZVHO l9o+ccR4/Nxqk7JGW9e9Pk6jSgkBElook4zoWBwVsi7HtwqBuLYSvkCXukYistPK 0oZ6Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeekvdehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepgfetieffvdelje elieeiveeggeelgeeiveejkeefveeludfgheettefgueffvefhnecuffhomhgrihhnpehm ohiiihhllhgrrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopedv pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejfeduhedvseguvggssghughhsrd hgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 7 May 2025 20:06:19 -0400 (EDT) From: Ian Eure Date: Wed, 7 May 2025 17:06:06 -0700 Message-ID: <20250508000613.11272-4-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250508000613.11272-1-ian@retrospec.tv> References: <20250508000613.11272-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): Store the package release date in an environment variable. Change-Id: Ic3708c0a32e2fc15b0400e42611735f33839b78b --- gnu/packages/nss.scm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index ab238330a4..abaee7e980 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -172,6 +172,13 @@ (define-public nss (target-ppc32?))) #:phases #~(modify-phases %standard-phases + ;; The "PayPalEE.cert" certificate expires every six months, leading + ;; to test failures: + ;; . To work + ;; around that, set the time to roughly the release date. + (add-after 'unpack 'set-release-date + (lambda _ + (setenv "GUIX_NSS_RELEASE_DATE" "2024-01-23"))) (replace 'configure (lambda _ (setenv "CC" #$(cc-for-target)) @@ -212,12 +219,12 @@ (define-public nss (("SOURCE_DIR=.*") (string-append "SOURCE_DIR=" (getcwd) "/nss\n"))))) - ;; The "PayPalEE.cert" certificate expires every six months, - ;; leading to test failures: - ;; . To - ;; work around that, set the time to roughly the release date. - (invoke #$(if (target-64bit?) "faketime" "datefudge") - "2024-01-23" "./nss/tests/all.sh")) + + (let ((release-date (getenv "GUIX_NSS_RELEASE_DATE"))) + (when (string=? "" release-date) + (raise-exception "`GUIX_NSS_RELEASE_DATE' unset")) + (invoke #$(if (target-64bit?) "faketime" "datefudge") + release-date "./nss/tests/all.sh"))) (format #t "test suite not run~%")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) From patchwork Thu May 8 00:06:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 42383 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 B3A9427BC4B; Thu, 8 May 2025 01:07:25 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 20FB727BC49 for ; Thu, 8 May 2025 01:07:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCon9-0003Ca-JS; Wed, 07 May 2025 20:07:11 -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 1uCon2-0003Az-P0 for guix-patches@gnu.org; Wed, 07 May 2025 20:07:05 -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 1uCon2-0005Wd-5V for guix-patches@gnu.org; Wed, 07 May 2025 20:07:04 -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=xGY7pEUzTBL+dSMcAFJkIOCtlmTyaXOluQnFgR6+AkU=; b=IfzINukR1DCFuohws6H/ANLlxoWbpX5iJzLVlcHV5awz9wb5+4SsmvTo5XOoZKeWK93jyOKi9xoMT0lVsQewOq2zlZ59Z6v4cSqiWZ1BQ0sK+MelaUPke89Wzp5xyceRgBLvjShlZ6FAbXM7lZ1eZpfjJcRFvOTHBoMXrdcQ9JHvWp9yW6lXKoWVXD0tubedT+AZ12Y6mkYBlMSPxLkE4rzPd4DWBs5WYSAf27QsHcXPOJWqAbb1O9fW8rTSrU6Sg0i0B8tzOE6l3koAQaJ3CurbrQQQXhJZkvtKJLt6TSYo/sAwKYUwA9FpbgZ1in3tUF6Lo96NZhq+BqpCbeY1jQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCon2-0001aD-0E for guix-patches@gnu.org; Wed, 07 May 2025 20:07:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v3 5/7] gnu: nss: Clean up. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 00:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73152 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73152@debbugs.gnu.org Cc: Ian Eure Received: via spool by 73152-submit@debbugs.gnu.org id=B73152.17466627955967 (code B ref 73152); Thu, 08 May 2025 00:07:03 +0000 Received: (at 73152) by debbugs.gnu.org; 8 May 2025 00:06:35 +0000 Received: from localhost ([127.0.0.1]:50037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uComY-0001Y5-Rc for submit@debbugs.gnu.org; Wed, 07 May 2025 20:06:35 -0400 Received: from fout-b6-smtp.messagingengine.com ([202.12.124.149]:41427) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uComQ-0001WS-In for 73152@debbugs.gnu.org; Wed, 07 May 2025 20:06:27 -0400 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfout.stl.internal (Postfix) with ESMTP id 289441140193; Wed, 7 May 2025 20:06:21 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Wed, 07 May 2025 20:06:21 -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=fm2; t=1746662781; x= 1746749181; bh=xGY7pEUzTBL+dSMcAFJkIOCtlmTyaXOluQnFgR6+AkU=; b=P H8SirZhJH6Kw9LjathMIPA76s7L6KsvIc5YirVUNq3XcSKWkrBUk51t0pqYEyB+I S2r/s7Zs1Znwe/ppJsrEQQxAHfCSPP+IW8OlljIpJb2pORxAbFptqYLGNDx8xtE1 7WBZsUgdd3dPjvcxtWbacxZSsIKxNtCa81Z2DGuNVtPA8xmXfz7iXjFRPjn4H5os wu2dMUezank/2PVy3HcpToD0uWEbGqLOS5phdpJsLCKhKvJz1oGyRimn/Kg9hBUw O5BYSeqm45iYebQthAgaynQi/kMmLtGLwNKuUTDVCU9tZAnMH7KarbUK3/ITZj7V 4R8TMKgLqGpkYdL9E+Y7g== 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=1746662781; x=1746749181; bh=x GY7pEUzTBL+dSMcAFJkIOCtlmTyaXOluQnFgR6+AkU=; b=nu3f5bt4q06mgRCO+ 36OIfYcMA62mRR+X+dVMP5BocPX8u5EKH+YzJ9tgSdgvMae/bJdI8tWI8oevCb8r O/z94UljfB7xZlbGxLFw+Od80PiHiMaUFWhfxIABRko9t4Mndr2pnLaSmeq2CYnU g73V3kqoei550l292gs7hDYbCW0kBhiiXCeIa/qvFTGgXjtdZJUXsR7CTh6JubEv u6tD2cRdRC56UoI9zT/ZH9/roStgUujuLsf6/da6bMFeMQEo+44l5ov9J2NYzaHZ 8unqVeYX6P44y5aPMMvym6dKtezCIm50scrcpwurKJX5sD1ue/1GJBPeHaeg1K4N dUqgg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeekvdehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepkefgledvheeufe etkeefvdehteeuueeludfgtefgleevvdejffefgeefgfdvudeunecuffhomhgrihhnpehm ohiiihhllhgrrdhorhhgpdhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggp rhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejfeduhedvse guvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhrohhsphgv tgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 7 May 2025 20:06:20 -0400 (EDT) From: Ian Eure Date: Wed, 7 May 2025 17:06:07 -0700 Message-ID: <20250508000613.11272-5-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250508000613.11272-1-ian@retrospec.tv> References: <20250508000613.11272-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 Platform-specific build conditionals currently use ungexp to inject code into the build phase: #$@(if ... #~(...) #~(...)). Change these to use unless/when where appropriate, and ungexp the test value instead of the whole form. * gnu/packages/nss.scm (nss): Clean up gexps. * gnu/packages/nss.scm (nss): Extract URI code into `nss-uri'. * gnu/packages/nss.scm (nss-uri): New variable. Change-Id: I5843eb5bf80f01650e0e87a9c479d5d1ab187f9e --- gnu/packages/nss.scm | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index abaee7e980..1deb92c00f 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -95,8 +95,16 @@ (define-public nspr in the Mozilla clients.") (license license:mpl2.0))) - -;; nss should track ESRs, but currently doesn't. 3.102.1 is the current ESR. +(define (nss-uri version) + (let* ((versions (string-split version #\.)) + (directory-version (string-join versions "_")) + ;; 3.101.3 release has a typo in the filename. + (filename-version + (if (string=? "3.101.3" version) "3.101_3" version))) + (string-append + "https://ftp.mozilla.org/pub/mozilla.org/security/nss/" + "releases/NSS_" directory-version "_RTM/src/" + "nss-" filename-version ".tar.gz"))) (define-public nss (package @@ -107,12 +115,7 @@ (define-public nss (version "3.99") (source (origin (method url-fetch) - (uri (let ((version-with-underscores - (string-join (string-split version #\.) "_"))) - (string-append - "https://ftp.mozilla.org/pub/mozilla.org/security/nss/" - "releases/NSS_" version-with-underscores "_RTM/src/" - "nss-" version ".tar.gz"))) + (uri (nss-uri version)) (sha256 (base32 "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw")) @@ -185,13 +188,12 @@ (define-public nss (setenv "CCC" #$(cxx-for-target)) (setenv "NATIVE_CC" "gcc") ;; No VSX on powerpc-linux. - #$@(if (target-ppc32?) - #~((setenv "NSS_DISABLE_CRYPTO_VSX" "1")) - #~()) + (when #$(target-ppc32?) + (setenv "NSS_DISABLE_CRYPTO_VSX" "1")) + ;; Tells NSS to build for the 64-bit ABI if we are 64-bit system. - #$@(if (target-64bit?) - #~((setenv "USE_64" "1")) - #~()))) + (when #$(target-64bit?) + (setenv "USE_64" "1")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (if tests? @@ -210,15 +212,13 @@ (define-public nss (substitute* "nss/tests/dbtests/dbtests.sh" ((" -lt 5") " -lt 50")) - #$@(if (target-64bit?) - '() - ;; The script fails to determine the source - ;; directory when running under 'datefudge' (see - ;; ). Help it. - #~((substitute* "nss/tests/gtests/gtests.sh" - (("SOURCE_DIR=.*") - (string-append "SOURCE_DIR=" (getcwd) "/nss\n"))))) - + (unless #$(target-64bit?) + ;; The script fails to determine the source + ;; directory when running under 'datefudge' (see + ;; ). Help it. + ((substitute* "nss/tests/gtests/gtests.sh" + (("SOURCE_DIR=.*") + (string-append "SOURCE_DIR=" (getcwd) "/nss\n"))))) (let ((release-date (getenv "GUIX_NSS_RELEASE_DATE"))) (when (string=? "" release-date) From patchwork Thu May 8 00:06:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 42382 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 11C4A27BC4B; Thu, 8 May 2025 01:07:24 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 4B21927BC49 for ; Thu, 8 May 2025 01:07:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uConC-0003Ch-Nj; Wed, 07 May 2025 20:07:15 -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 1uCon4-0003Br-Lq for guix-patches@gnu.org; Wed, 07 May 2025 20:07:06 -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 1uCon2-0005Ws-Na for guix-patches@gnu.org; Wed, 07 May 2025 20:07:04 -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=iNkisRNV9cmKuH5vpfiFZ2w1Jjtd4JgAlzIexLzj4p8=; b=UI6KPYwHrsO9SldJnSKamcHC+Dh/XT5wGpoUrE4/ZhrKFDzPUCGy3hyikJMBM2QMUjZemB3/m3YWEocbbrEd70LGfEifS332jFFTBxVzfCOCtnL0KlA9Y0Lo37IbOmzVNeNgPZtIISu+Y8xC9bZyxwlNukHAObgnqbNZSN++hSHjhj6BZ+k29RMC3JuU1i5Uii/1k2ydgX45Ar2GtXzeOeQ3NT28oTp4xdCGGvyLCH3Yiqh/nlqx0+UCFYYZQtq2gq62FQlBmLwQdd1uxl90lhwddztl+5ZD3KYeayYvM5tSCJ+jgRRzwA1Niew4T3lroQMGlVPhjsm2dD5iC99h6g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCon2-0001aL-HG for guix-patches@gnu.org; Wed, 07 May 2025 20:07:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v3 6/7] gnu: nss: Update to 3.101.3. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 00:07:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73152 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73152@debbugs.gnu.org Cc: Ian Eure Received: via spool by 73152-submit@debbugs.gnu.org id=B73152.17466627965975 (code B ref 73152); Thu, 08 May 2025 00:07:04 +0000 Received: (at 73152) by debbugs.gnu.org; 8 May 2025 00:06:36 +0000 Received: from localhost ([127.0.0.1]:50039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uComZ-0001YH-D6 for submit@debbugs.gnu.org; Wed, 07 May 2025 20:06:35 -0400 Received: from fhigh-b5-smtp.messagingengine.com ([202.12.124.156]:40579) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uComR-0001WZ-Iv for 73152@debbugs.gnu.org; Wed, 07 May 2025 20:06:28 -0400 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfhigh.stl.internal (Postfix) with ESMTP id 279E5254009B; Wed, 7 May 2025 20:06:22 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Wed, 07 May 2025 20:06:22 -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=fm2; t=1746662782; x= 1746749182; bh=iNkisRNV9cmKuH5vpfiFZ2w1Jjtd4JgAlzIexLzj4p8=; b=O 8OJQyd9FKCO59oImY5zhix27teA/gKfFsHi9EsA1bQliFWyL8OwYL/eMwU+p3Y/u 19bmpJW2WEduU//Rqf6Iv3bIlTqBgNu3s2kIndNp/knv/9iB1995dbxKIxIrUHTt fJTLWXJBZ4nVirVfy3EQ9HZmT5r2GuTKEBHqRtHzc+EZYBkeVdY2fhKOTOlwvPUw DavsN/lAwOukvxEs2jleJbS85M5/QKGEP9mqukGn86asSqgEKmhfYiA+MsbQY8yk ousEQmQau+VNqPA55ZJMmDdF6IGDf5qJs2N4P0UZkrkIdYe+p+Ntb8uJbGmX2/OG nFiFqgA9fmyLzRDd4x+BA== 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=1746662782; x=1746749182; bh=i NkisRNV9cmKuH5vpfiFZ2w1Jjtd4JgAlzIexLzj4p8=; b=mdnJpQ08IVsZRzTjP 2/4qRbaXMx22c7iIl9cGQsl1ESK0TIeYqKyGMOo3vjTZ3HtvEkIqV4x4FHPuUyxC b2HLivYtzmCXWp52R6M7dchxwmtX/fHj7wLctUcrUtdqut3EPHhYH2TqwSCPSquJ 1vRvPFWu7QC4yCNgmKoy5qkOZtIJ7mTInahXw9DiA5uO1qIjgOhJnJ1Xdt68UYkN GbWEocejVJTY2pZuHEcsifwlW/XxHuLgHwXaWE57whFeONCV4PLHwGDUfnJsXfGk wYEBCBJ8WODSMB/giD/jziI1aE8aK9uul+KOmxIkRP4bAjkorzCKO/w1d1oGo+m/ 5j0kQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeekvdehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepgfetieffvdelje elieeiveeggeelgeeiveejkeefveeludfgheettefgueffvefhnecuffhomhgrihhnpehm ohiiihhllhgrrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopedv pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejfeduhedvseguvggssghughhsrd hgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 7 May 2025 20:06:21 -0400 (EDT) From: Ian Eure Date: Wed, 7 May 2025 17:06:08 -0700 Message-ID: <20250508000613.11272-6-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250508000613.11272-1-ian@retrospec.tv> References: <20250508000613.11272-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): Update to 3.101.3. Change-Id: Iaf474377f0441e6ee16bcb30265fec6de3d9c76a --- gnu/packages/nss.scm | 24 +++++++++----- .../patches/nss-disable-broken-tests.patch | 33 +++++++++++++++++++ 2 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/nss-disable-broken-tests.patch diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 1deb92c00f..424fa5cc66 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -42,7 +42,9 @@ (define-module (gnu packages nss) #:use-module (gnu packages compression) #:use-module (gnu packages perl) #:use-module (gnu packages sqlite) - #:use-module (gnu packages time)) + #:use-module (gnu packages time) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26)) (define-public nspr (package @@ -112,17 +114,18 @@ (define-public nss ;; IMPORTANT: Also update and test the nss-certs package, which duplicates ;; version and source to avoid a top-level variable reference & module ;; cycle. - (version "3.99") + (version "3.101.3") (source (origin (method url-fetch) (uri (nss-uri version)) (sha256 (base32 - "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw")) + "1gkpbyh90aw9yhjnyj1bsp79s2bxab886d9ihkaw1i2kzqfvf3dg")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-3.56-pkgconfig.patch" "nss-getcwd-nonnull.patch" - "nss-increase-test-timeout.patch")) + "nss-increase-test-timeout.patch" + "nss-disable-broken-tests.patch")) (modules '((guix build utils))) (snippet '(begin @@ -181,7 +184,7 @@ (define-public nss ;; around that, set the time to roughly the release date. (add-after 'unpack 'set-release-date (lambda _ - (setenv "GUIX_NSS_RELEASE_DATE" "2024-01-23"))) + (setenv "GUIX_NSS_RELEASE_DATE" "2025-02-05"))) (replace 'configure (lambda _ (setenv "CC" #$(cc-for-target)) @@ -258,13 +261,15 @@ (define-public nss (properties '((timeout . 216000))) ;60 hours (home-page "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS") - (synopsis "Network Security Services") + (synopsis "Network Security Services (ESR)") (description "Network Security Services (@dfn{NSS}) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other -security standards.") +security standards. + +This package tracks the Extended Support Release (ESR) channel.") (license license:mpl2.0))) ;; nss-rapid tracks the rapid release channel. Unless your package requires a @@ -289,7 +294,10 @@ (define-public nss-rapid "nss-" version ".tar.gz"))) (sha256 (base32 - "12y156frnhaqvwkla1c07gqr2lnp4yb3619g4088kk8qc4jnr95y")))) + "12y156frnhaqvwkla1c07gqr2lnp4yb3619g4088kk8qc4jnr95y")) + (patches + (remove (cut string-contains <> "nss-disable-broken-tests.patch") + (origin-patches (package-source nss)))))) (arguments (substitute-keyword-arguments (package-arguments nss) ((#:phases phases) diff --git a/gnu/packages/patches/nss-disable-broken-tests.patch b/gnu/packages/patches/nss-disable-broken-tests.patch new file mode 100644 index 0000000000..8d6e101471 --- /dev/null +++ b/gnu/packages/patches/nss-disable-broken-tests.patch @@ -0,0 +1,33 @@ +These tests are broken in 3.101.3. + +See https://bugzilla.mozilla.org/show_bug.cgi?id=1964304 + +--- nss-3.101.3/nss/tests/tools/tools.sh 1969-12-31 16:00:01.000000000 -0800 ++++ nss-3.101.3/nss/tests/tools/tools.sh 2025-05-05 16:36:47.835447542 -0700 +@@ -540,26 +540,6 @@ + ret=$? + html_msg $ret 0 "Importing private key pbmac1 hmac-sha-512 from PKCS#12 file" + check_tmpfile +- +- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'" +- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-iter.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1 +- ret=$? +- html_msg $ret 19 "Fail to list private key with bad iterator" +- check_tmpfile +- +- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'" +- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-bad-salt.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1 +- ret=$? +- echo "Fail to list private key with bad salt val=$ret" +- html_msg $ret 19 "Fail to import private key with bad salt" +- check_tmpfile +- +- echo "${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234'" +- ${BINDIR}/pk12util -l ${TOOLSDIR}/data/pbmac1-invalid-no-length.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W '1234' 2>&1 +- ret=$? +- echo "Fail to import private key with no length val=$ret" +- html_msg $ret 19 "Fail to import private key with no length" +- check_tmpfile + } + + ############################## tools_p12 ############################### \ No newline at end of file From patchwork Thu May 8 00:06:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 42385 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 7330327BC4B; Thu, 8 May 2025 01:07:47 +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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 ED96127BC49 for ; Thu, 8 May 2025 01:07:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uConE-0003D7-1t; Wed, 07 May 2025 20:07:16 -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 1uCon4-0003Bq-Ll for guix-patches@gnu.org; Wed, 07 May 2025 20:07:06 -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 1uCon3-0005X1-9l for guix-patches@gnu.org; Wed, 07 May 2025 20:07:06 -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=kRMFN1tcvhRHrB/xeqxMyNep1bgQyHMnlSKbN0iwTQU=; b=uBqCmgndUs0BaBg/yfJvrHTXCpVKvnvyAvvSNX+0BW7caVSjwSp+M2r6007WvzQfylT30inY8K9h2Q2f5M1mB1p6jvESP54/cAbjNQYAjXDvaiBJ5/TDWINN81aPxmjj9asvVpP81PWTjTDfXzWLtgSsX7Vp1x78xZX6dHMbyWjpC6x+dMdR3PiLWDWYvz+NlP3/88t3ayAVT/RQi9qFGGy8w3WZfzGqF6vO+K40PnpWq3qvaRywRHsW7AmcYXokIc90AxAcfZ1FiCdGA2hBSFUb1PyeHCS1z4LE/54BmbpwDZhrc2E9jfChc+r8RI09CEaUuhl/NIe+/Nkwgyn7ag==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCon3-0001aS-3U for guix-patches@gnu.org; Wed, 07 May 2025 20:07:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v3 7/7] gnu: nss-certs: Update to 3.101.3. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 00:07:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73152 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73152@debbugs.gnu.org Cc: Ian Eure Received: via spool by 73152-submit@debbugs.gnu.org id=B73152.17466627965983 (code B ref 73152); Thu, 08 May 2025 00:07:05 +0000 Received: (at 73152) by debbugs.gnu.org; 8 May 2025 00:06:36 +0000 Received: from localhost ([127.0.0.1]:50041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uComa-0001YK-2g for submit@debbugs.gnu.org; Wed, 07 May 2025 20:06:36 -0400 Received: from fhigh-b5-smtp.messagingengine.com ([202.12.124.156]:51823) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uComS-0001Wb-Go for 73152@debbugs.gnu.org; Wed, 07 May 2025 20:06:29 -0400 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfhigh.stl.internal (Postfix) with ESMTP id 1ADA92540159; Wed, 7 May 2025 20:06:23 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Wed, 07 May 2025 20:06:23 -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=fm2; t=1746662782; x=1746749182; bh=kRMFN1tcvhRHrB/xeqxMyNep1bgQyHMnlSKbN0iwTQU=; b= G0pl8s1tqkOhooYWQ0+PfQgsWIBqWbktCUImsU3yZxJ+0fU3X2DtpSxucY73CWmL FRMIjema49KgVUzFFAlYvQu/4zbOXVx+/VkxewMxqPEneCFeH2QBSrL7/n371F95 QfqSw+u4JBVb3onTYETisauxO4XYDfmgHYnK6N1a2wrTwyUaPmmvTacigB8fraFa 4dKq2HriAr5DPfv0nlvD56gnsRx1NsyCtYLgMPVWYIoa0AOq9ETmfBr1QRFy7MOY wcl5XRpjn9BG2pinq1MdTA8M3XO2ckYa7/kg57usxx/ApUpppMJGgG5WToNOdR29 WSgBV42qkMgAB+upoh8b5w== 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-sender:x-me-sender:x-sasl-enc; s=fm3; t=1746662782; x= 1746749182; bh=kRMFN1tcvhRHrB/xeqxMyNep1bgQyHMnlSKbN0iwTQU=; b=f ETX0gXqWCP96JM/ZqpcJQk+45ea9hkOV38AKKBiCkxwigQQICqRIPoScuVA1+xiq 61in8/HN34LZOIGLKvGMxS/G2+XsjLOY+Kf3EJJ480maBkEz6L3YaHH19U5Qnxek 3lk+M1roOakxbYcJOaUHCQ2Whs9z8H+ejegwrpZefkKViAXJmvhWXUQi5B2TumBc 61bppEXQ5w1rPiCfSL7KHDgshX9cdZCuDc9gsytfNbgm4OheihGHQwmYIxRKTK0f g/40YdLziVu5tcdh0ByKFuzYT1XFERt5qSa9WmbfPAWXHz1aMDJUKhusbqDwljLz c9COrlaMO55kYXu0sRI1g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeekvdehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepkfgrnhcugfhurhgvuceo ihgrnhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpeejfeffheeffe eghefhvdekiefggfeigfevheetffehtdetffefgfduveeuvedtffenucffohhmrghinhep mhhoiihilhhlrgdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghrtghpthhtohep vddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepjeefudehvdesuggvsggsuhhgsh drghhnuhdrohhrghdprhgtphhtthhopehirghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 7 May 2025 20:06:22 -0400 (EDT) From: Ian Eure Date: Wed, 7 May 2025 17:06:09 -0700 Message-ID: <20250508000613.11272-7-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250508000613.11272-1-ian@retrospec.tv> References: <20250508000613.11272-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/certs.scm (nss-certs): Update to 3.101.3. Change-Id: Ibe9aa969046d375eea308594ac1a3c1cf23f75c2 --- gnu/packages/certs.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index e2de6b168b..08db871bf2 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -133,18 +133,21 @@ (define-public nss-certs ;; FIXME We used to refer to the nss package here, but that eventually caused ;; module cycles. The below is a quick copy-paste job that must be kept in ;; sync manually. Surely there's a better way…? - (version "3.99") + (version "3.101.3") (source (origin (method url-fetch) - (uri (let ((version-with-underscores - (string-join (string-split version #\.) "_"))) + (uri (let* ((versions (string-split version #\.)) + (directory-version (string-join versions "_")) + ;; 3.101.3 release has a typo in the filename. + (filename-version + (if (string=? "3.101.3" version) "3.101_3" version))) (string-append "https://ftp.mozilla.org/pub/mozilla.org/security/nss/" - "releases/NSS_" version-with-underscores "_RTM/src/" - "nss-" version ".tar.gz"))) + "releases/NSS_" directory-version "_RTM/src/" + "nss-" filename-version ".tar.gz"))) (sha256 (base32 - "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw")) + "1gkpbyh90aw9yhjnyj1bsp79s2bxab886d9ihkaw1i2kzqfvf3dg")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-3.56-pkgconfig.patch" "nss-getcwd-nonnull.patch"