From patchwork Tue May 6 22:51: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: 42358 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 CC83327BC4B; Tue, 6 May 2025 23:52:52 +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 8DFA427BC49 for ; Tue, 6 May 2025 23:52:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCR8x-0001Wr-NU; Tue, 06 May 2025 18:52:07 -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 1uCR8t-0001Vg-64 for guix-patches@gnu.org; Tue, 06 May 2025 18:52: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 1uCR8s-00067y-Tz for guix-patches@gnu.org; Tue, 06 May 2025 18:52: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=CY6nW6Yr89AMZB0uE/jjhH4ubKDgO7NpBz0uSr7+i5Y=; b=ok7UY/IHOFz0zYWDldy3kAoVlzihtErIlCBrAswEVv8Mm6PiAZdX8Fn82JU5ytJ5t8fFb+JgKwM/M+ynMi5Z7j3em05E40kTh48uIMcSATemE4CQS3XlF3JTgOP24Mj6BdBcMM6+z5UKMM9WQ3/ycshzfzAZ1WT3cABRt1VTR6Gpw8HT0Hsc/cMjjZuxPbsZEiOTKjgHguit6TedXN0Flbj8vVgtVp2v2PBCyNFmO+ZKuz/A7tDlPD92vft2q7foE/wRsMitExkukV+9OuTBZ/d2AGYajgop66oKjncCE3SQX/kzpNiijuuhCXFfJyyaNHMG2jdDkd930514hYxPOA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCR8s-0003SK-Cm for guix-patches@gnu.org; Tue, 06 May 2025 18:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v2 1/6] gnu: nspr: Update to 4.36. 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: Tue, 06 May 2025 22:52: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.174657188813172 (code B ref 73152); Tue, 06 May 2025 22:52:02 +0000 Received: (at 73152) by debbugs.gnu.org; 6 May 2025 22:51:28 +0000 Received: from localhost ([127.0.0.1]:35198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCR8K-0003QM-DP for submit@debbugs.gnu.org; Tue, 06 May 2025 18:51:28 -0400 Received: from fhigh-a2-smtp.messagingengine.com ([103.168.172.153]:59993) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCR8H-0003Po-Fc for 73152@debbugs.gnu.org; Tue, 06 May 2025 18:51:27 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id CD62B1140243; Tue, 6 May 2025 18:51:19 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Tue, 06 May 2025 18:51: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:message-id:mime-version:reply-to:subject:subject:to :to; s=fm2; t=1746571879; x=1746658279; bh=CY6nW6Yr89AMZB0uE/jjh H4ubKDgO7NpBz0uSr7+i5Y=; b=oJ3WF4Z5CogWtRl60leM9oycWt+12xlk2KVyd YRXrJ7BJzipGTPaxM819eZ6oWHKM7qsBj35Dunch61xCr3IPvTKpE3hYT12KJ83i M/mo8XbEX8y/kJ7Hhzw4OCnwPHlKD6glB1sbfFBJLrQhzLpj2cfgdkY2Fb7lA+Tz zPIDXv8g0zHUCFe39hFyYu+VuXILYkBXH9/YJJAeKaKmn+pv4nGGqf11FEG1thCB 7vF2MgGnyJttlVENsupmyQJ19hoGE7/4I7NKo0/Y44FuVtU284mNZF7/u6Ixbchh gI2n9eFpFvLwIkmrRrviwlmoyqTDyasP20t1mjbNSMGjTSyIA== 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= 1746571879; x=1746658279; bh=CY6nW6Yr89AMZB0uE/jjhH4ubKDgO7NpBz0 uSr7+i5Y=; b=KwMzDLhyWA6cNuzAKs5EO1r1hMUPCLS79eUU/f1Hy20gnR/3vau Z5VrAVYJWp6udvZD1HRTYaYddME2kUKrmcnmywB05yL+icFlHfc9vFkb0rbwoh82 zBETXwocKRjzG50dhZmRGbKkWAZRlob413R50atbNjOKAzgX4RkiH+oDhX1DrExS Tf1nPJzNLiBhCQVoylusmAE5HbhhecV1wFPmgkCRpxUwIeiRQFHXYlAAEjLG2uNG jCVqSg43WfVAHULlQxy+cnzdxmWypeZX6Yl4B9Vh6cjJCNd51XFbb9hB87N54503 ombfwcz2YRsBggJ4Xeemd/8TRnq88gr/a1g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeehvddvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghn sehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhephfeiveeliedukeffhe fhleeijedtveelleetgefggfehkeeljeehtdeguddvvefgnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrth hvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeej feduhedvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvth hrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 6 May 2025 18:51:18 -0400 (EDT) From: Ian Eure Date: Tue, 6 May 2025 15:51:03 -0700 Message-ID: <20250506225115.22450-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 * 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 Tue May 6 22:51: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: 42353 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 B40D927BC4A; Tue, 6 May 2025 23:52:37 +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 2CA6627BC49 for ; Tue, 6 May 2025 23:52:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCR8w-0001Wk-8O; Tue, 06 May 2025 18:52: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 1uCR8t-0001Vi-9l for guix-patches@gnu.org; Tue, 06 May 2025 18:52: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 1uCR8t-000684-1H for guix-patches@gnu.org; Tue, 06 May 2025 18:52:03 -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=kUiat919AViaFLyhEDMPCWky/xhw5zolLsof6CH0rG+ag/KydDeWISxNSBqLUNCOzY0uCGXyZxHJyO0T3mNXDmMD/OX68m0HLXBsSq9zg7SopCZe8XfjzIRzfTZkbVlH6sbSMisGSYJENsFnkTr87imQIZzx4log90RKVMUuxdb+ZIje9BJYphKSd1P7oTN/7WwY/NXhWFBJYsIw7SXWcUjnbAIBSTD7OREUPyDUoZZxc+CUNZFtfU2WHIDPapUXe+lIuDD3FyMazNlD+1yHxk/qc9Y5q1yXBDX7LIiHWn4Cc+6rjHmIN8p7aBCms9n0CB7HJkqZT/jt4QlBMcBb6Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCR8s-0003SR-TY for guix-patches@gnu.org; Tue, 06 May 2025 18:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v2 2/6] gnu: Remove nss/fixed. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 May 2025 22:52: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.174657189013194 (code B ref 73152); Tue, 06 May 2025 22:52:02 +0000 Received: (at 73152) by debbugs.gnu.org; 6 May 2025 22:51:30 +0000 Received: from localhost ([127.0.0.1]:35203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCR8K-0003QP-Nz for submit@debbugs.gnu.org; Tue, 06 May 2025 18:51:30 -0400 Received: from fout-a8-smtp.messagingengine.com ([103.168.172.151]:36107) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCR8I-0003Pr-42 for 73152@debbugs.gnu.org; Tue, 06 May 2025 18:51: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 B55771380FCB; Tue, 6 May 2025 18:51:20 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Tue, 06 May 2025 18:51: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=1746571880; x= 1746658280; bh=EDZkUfm5as8HW88bnFd8LN0DtqZovjMsEhdw5VQaF5Y=; b=o kmeSs4sggjFbfc0EpQN9bBKJb2OlLGaQLW13yiiRCCiGbGonx4ZVE35LdszKoYSu HH4+jAhbdikpakK8gQbWfoMVsEa1084TgHv4xDe0KUeM7rVjfhaAN2PkZlj56eD/ LdjkBED9Gw2cqeQvBiKOxy81cvE/Ja5MuaVULU164MBg+vdnIg7mqH2sYiGVDGum IJVzRmfBs2yA+YZ7mZj+bibyzrFdulF0UmBV8bVhixlO2sAgN8dpSxGTzYAp6sFg T8yS7nn/gg0pZyurVDaxibsGHwX3W/B0vAKxrlwVDscLP+QULoIF/KodafiSJNZP 6nNyPGARiw6ASaA3RWc6g== 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=1746571880; x=1746658280; bh=E DZkUfm5as8HW88bnFd8LN0DtqZovjMsEhdw5VQaF5Y=; b=uI/s8/YhMz0gYaBgb ZTWLVmefMM9rJFNf/Isk13PgYORORqg/vDbJOIhgzXXmz2dzpWpiFfYYVpp4EVDi IoIE0/b6DMlw4IHM5Q94mR7mJ9/j8n6SmJbFps0A11/QCNv8WIvw/+nQ81b6HUvy K1NOukPmPwRyHsttIA5EfhURrQS1BM+igm7tFNpe08wjswLd6GHBkhDQJJkoLv6q 4fFiRld76iQ/davfZECwUZg8vFt4fshU0yd/Ka9nAm2GOf5K7Qv6Hp3bhpSkwvne lrSEyEcK6300MTeejdyBhuW8cJAgauC6v/2tEukwjb5l7PLUKnOElagw9J9yuS/1 IoGyA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeehvddvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepgfetieffvdelje elieeiveeggeelgeeiveejkeefveeludfgheettefgueffvefhnecuffhomhgrihhnpehm ohiiihhllhgrrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopedv pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejfeduhedvseguvggssghughhsrd hgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 6 May 2025 18:51:19 -0400 (EDT) From: Ian Eure Date: Tue, 6 May 2025 15:51:04 -0700 Message-ID: <20250506225115.22450-2-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250506225115.22450-1-ian@retrospec.tv> References: <20250506225115.22450-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 Tue May 6 22:51: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: 42356 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 9D5CB27BC4B; Tue, 6 May 2025 23:52:45 +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 2365127BC49 for ; Tue, 6 May 2025 23:52:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCR8y-0001XB-0r; Tue, 06 May 2025 18:52:08 -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 1uCR8t-0001Vv-RK for guix-patches@gnu.org; Tue, 06 May 2025 18:52:04 -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 1uCR8t-00068G-II for guix-patches@gnu.org; Tue, 06 May 2025 18:52:03 -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=QyBlFj1UBC8RWu4QE0eA100Fbcp6JaUZhyy4b80/cnja+aW13cTHHl3AqoIGk/QCOIT+QIS2Q3s/EyCpe0xIRqkieRtpCg0auw/Qobo8fx673Azdm2lEFz1GYGfsTFs1gwQKqJv/AiSdmsG2oayF3Vs8JAjxip4V7wg3huqop4y0euS4HDSRGUygIITPN3dPgsjZJFHbbIYSH2AvopkaooC7RhiukRCy89lQaWVgWWlPTZvsO8zg+dhf3XaqB1/+9mB17FviUw+HJBjeLQJQa27wbu3nvI88Q3zf8UpZreRrnVS3/u2Gld5FpCrZuSnb+PyzdAoLDGKj6QsQ0+O9uw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCR8t-0003SZ-D5 for guix-patches@gnu.org; Tue, 06 May 2025 18:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v2 3/6] 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: Tue, 06 May 2025 22:52: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.174657189013205 (code B ref 73152); Tue, 06 May 2025 22:52:03 +0000 Received: (at 73152) by debbugs.gnu.org; 6 May 2025 22:51:30 +0000 Received: from localhost ([127.0.0.1]:35208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCR8M-0003Ql-7D for submit@debbugs.gnu.org; Tue, 06 May 2025 18:51:30 -0400 Received: from fhigh-a2-smtp.messagingengine.com ([103.168.172.153]:49497) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCR8I-0003Pt-Qr for 73152@debbugs.gnu.org; Tue, 06 May 2025 18:51:27 -0400 Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfhigh.phl.internal (Postfix) with ESMTP id A0F7E114026C; Tue, 6 May 2025 18:51:21 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Tue, 06 May 2025 18:51: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=1746571881; x= 1746658281; bh=Ucg53Xz/tvgDHOssspCpuqD+zONFydZfDBrYEZc/RDk=; b=E mUOAkyzoZrtbKU50I3UxHz8y0mVcao9SuUoAmx3I0YYBR/rxEoAKCQHT+yHHaGLC zuhcht3z4ND95JAs84jowRGrDdngu9dSP56ajDIpSE4OavgSLOuavG9p5rTqHexv Dk6om0WFDAcoek8mpznBPcZacIoqQoJdnV71aws3tyI1bb4qxfWa4DKqFcBzX5ZB pbRx2TUFymWWL04vxYZMZ71/o64Z3qmrUFgPdKIv7VFolHwzO/SaGJLwaPk5IH97 FX9ljtxVSGWLV5uf8A3x9VAhj8XNnI2MrTm5Agas2xtHRZL+Jwkgs0MUvXtEcQQ1 tUDreOJpIArwg8MFlJAcQ== 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=1746571881; x=1746658281; bh=U cg53Xz/tvgDHOssspCpuqD+zONFydZfDBrYEZc/RDk=; b=UTIUH1KH9laxKN/mQ 2mMoFNb8JQkVlouCG9OdH+mBoH1pTeMfEPxOIK8gZG21Nbx0XDLC0NOGNE1rU/S3 Pq9HyVeXfIMpbTiM5SqA692sDkhMBMezku6wMvXt8ZNbhmAEMrHots+p3Q8uybRc wcZbpzohi2YDekzDhW8FQ26sRLD8+9BWJyLsPIk8PLyMeniAXS1PsoxcZYdIPnyC G8h9hU/xKzx7R/EwMDEApBmB14xk3Ir7DZIkOJN4blz5ajbnk0GT834JXgREuuMZ tNMa99D25jbQgOcPfyMcq/O3c3h92NHpjt7egaF1P4OC1bkmxjNwXnremL0yUdvC nBBRA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeehvddvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepgfetieffvdelje elieeiveeggeelgeeiveejkeefveeludfgheettefgueffvefhnecuffhomhgrihhnpehm ohiiihhllhgrrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopedv pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejfeduhedvseguvggssghughhsrd hgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 6 May 2025 18:51:20 -0400 (EDT) From: Ian Eure Date: Tue, 6 May 2025 15:51:05 -0700 Message-ID: <20250506225115.22450-3-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250506225115.22450-1-ian@retrospec.tv> References: <20250506225115.22450-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 Tue May 6 22:51: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: 42355 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 A3E4C27BC49; Tue, 6 May 2025 23:52:42 +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 E7F5127BC4B for ; Tue, 6 May 2025 23:52:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCR8z-0001Xp-Go; Tue, 06 May 2025 18:52:09 -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 1uCR8u-0001W5-Ia for guix-patches@gnu.org; Tue, 06 May 2025 18:52:04 -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 1uCR8u-00068U-1B for guix-patches@gnu.org; Tue, 06 May 2025 18:52: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=OSe6e3MyS1XWkdjZ2LXjPqfIQLKQ/RGowhO7j9PKYRfLZHXlFP4pYwAvfeNInZ1IX9hCGZhRT9MMW9SDGZNb1oF5FXYZtSVozKUz7KukHl8gZbE/6xerEnaocrgRchje0ttlDk9uaf4WiP8ZK37O76Lp3mkLAICiQhvTzS4Sqp8zoTBffJU+VZ2NHmEMdJsQW9XxwvKav1HcBlhEvZmMAt0ABGvUugfv8hJe5cDeJdu7eDa9ZoWr2Tq81axOn0S8Bj4zMJEmfEg5LLsfN4tLBr/bxkVT9RlCkAEiOl1DuLW3tFb/AdUVkncga2rDHdW9R6/gIzEBZgTe4plkNFn/vQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCR8t-0003Sg-Sv for guix-patches@gnu.org; Tue, 06 May 2025 18:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v2 4/6] gnu: nss: Clean up. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 May 2025 22:52: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.174657189513222 (code B ref 73152); Tue, 06 May 2025 22:52:03 +0000 Received: (at 73152) by debbugs.gnu.org; 6 May 2025 22:51:35 +0000 Received: from localhost ([127.0.0.1]:35210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCR8Q-0003R7-Rt for submit@debbugs.gnu.org; Tue, 06 May 2025 18:51:35 -0400 Received: from fout-a8-smtp.messagingengine.com ([103.168.172.151]:53795) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCR8J-0003Pv-Il for 73152@debbugs.gnu.org; Tue, 06 May 2025 18:51:29 -0400 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id 6B9CB1380FB8; Tue, 6 May 2025 18:51:22 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Tue, 06 May 2025 18:51: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=1746571882; x= 1746658282; bh=xGY7pEUzTBL+dSMcAFJkIOCtlmTyaXOluQnFgR6+AkU=; b=G eRGFi5NoE4FksjtKmUfFHuHytgdWuk3e9T2I+OAkGlijJ8pNn7ltuzZ44zsCHKEX 56c9N3ehYKi2CX7wu3PFhiIAR7F4AvAQ3/T0Nn5JIY9+KPQmrHDjg/eTlXXUjBP0 mINqpm5Cvfs8SaEVRF10/XSc2n471KlPof9xKeSxyMEwIfrhZkK4eYXXNpAqM/+T uOvwR/AUodc2vlwcpULLLeNwlHqld/N0Djmn9aF1XLXevWrlpCm1a/zD7iS+Yfd1 RH7FLL1qnH8FDMcmZDXddUZWZ87AloPa+O0hcrn3+3lUVaxqnUPpctuIzIO62gv8 /En6XxRgPJxxGaeJYZyRw== 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=1746571882; x=1746658282; bh=x GY7pEUzTBL+dSMcAFJkIOCtlmTyaXOluQnFgR6+AkU=; b=OPbh1/J2+GIs5VO8V 10HC4TzAl8NaCMzWeC3Ed8iQNZRiNC6RB60vZm1eYfbUdlALmMaGv9ZceOFdcHwT tTGmOQtUXa6tG51dkk6V3sn4DlTC7Ebp8+wqR91kpZV3drf6fo0xGTKICFXU7GJN 77qZt3/cCI6kALre7091SybvjE2A3GWAJrVQapiHVVMVBOWPNDa+5lO9Nr/zvJly gRCMvBv2xkzadq5Jz+PrF7JpKjyVLg5jBShUFN3aa4d47ALUg38+387WDUufjY9S bNxOlmt06czMRZVOjej7H3ZDFvXSiNGhopi6uiJEJ1KRfR2Zgi3cAPh4pAyRcTGP Inw6g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeehvddvucetufdoteggodetrf 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; Tue, 6 May 2025 18:51:21 -0400 (EDT) From: Ian Eure Date: Tue, 6 May 2025 15:51:06 -0700 Message-ID: <20250506225115.22450-4-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250506225115.22450-1-ian@retrospec.tv> References: <20250506225115.22450-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 Tue May 6 22:51: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: 42354 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 221F727BC49; Tue, 6 May 2025 23:52:42 +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 50DC127BC49 for ; Tue, 6 May 2025 23:52:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCR8y-0001Xh-LH; Tue, 06 May 2025 18:52:08 -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 1uCR8u-0001WC-Ow for guix-patches@gnu.org; Tue, 06 May 2025 18:52:04 -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 1uCR8u-00068b-GR for guix-patches@gnu.org; Tue, 06 May 2025 18:52: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=NhCcydTUFvf5uV954CDXfU6XeavCP1/ltM1q9a8OWqA17NNppm3QKY85TsgeYRlORPdApw8Vl3P26ZdVeyxZC0UvnZ3GB8S66Ebxp6BglVrRpiSmylLAi0AC7bIi4N2aVfPU2smpJBQ/Lk3nGLYAtrOwccPyZFe+bfp3qpsV19R07nKRg01/2cq2JnoE1I3Mbwu2lVkYb4jhF+jj+8STzH6Juf5rxI2iN0sM8DKPDQIjHt44XzGv+0XeJI1Vw52l3fj+0ZsY1B31bfWU/UhoJW8as6u/dp+jWPyR+cmeJRkgsBFP7+lF4WVH+G5dVZdhi/MYnH5GiDNNe/y5SFUKdw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCR8u-0003So-CE for guix-patches@gnu.org; Tue, 06 May 2025 18:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v2 5/6] gnu: nss: Update to 3.101.3. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 May 2025 22:52: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.174657189613229 (code B ref 73152); Tue, 06 May 2025 22:52:04 +0000 Received: (at 73152) by debbugs.gnu.org; 6 May 2025 22:51:36 +0000 Received: from localhost ([127.0.0.1]:35212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCR8R-0003RD-Jw for submit@debbugs.gnu.org; Tue, 06 May 2025 18:51:36 -0400 Received: from fout-a8-smtp.messagingengine.com ([103.168.172.151]:50595) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCR8K-0003Px-DS for 73152@debbugs.gnu.org; Tue, 06 May 2025 18:51:29 -0400 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfout.phl.internal (Postfix) with ESMTP id 432541380FCA; Tue, 6 May 2025 18:51:23 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Tue, 06 May 2025 18:51:23 -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=1746571883; x= 1746658283; bh=iNkisRNV9cmKuH5vpfiFZ2w1Jjtd4JgAlzIexLzj4p8=; b=b Da53xM3tLd0XYBbwv2O0r+yilnuKEQX9rPXmfFRJ2HDyNUZABozzFhsOyq1ooqON ksmjpcIxyPGRl49AgOBjQDYtVKttnSsQvLqzGtyJEidtRRPRn+OJLZCTwDvRmGxn xiB7lBYw3VgZEKFlUnN4hNZLShlHu3XUqBHPQLfk0mtG2DpGMXTLpQGjImVCV1Q9 p86omtVwykE66CJHh1TqC9MT2lh2FDA2dmi1NnGWKan+jzHsBq7gyBZv+JjL3LMd uYNzDwKqeBJxrr8+osZSf7SiHz5rOSmgH0xp5kH0QtTF3rf+N7xz9dkeLrTh8StX 2NuWFO+LPg7xyvjA8j1ig== 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=1746571883; x=1746658283; bh=i NkisRNV9cmKuH5vpfiFZ2w1Jjtd4JgAlzIexLzj4p8=; b=hAAyjn3CVyjPJqCAG b8fN+Ajx/CfmEKjChwg6E9OclunuexKVEMSuY7A9xKfev/ngga1xlkWE3E+9+Qom Dy5au/BlsSlFFzNNoaf2+DLZROXhu8JKubWUSXNyAY2/U+a+d3chbUkmytMr7oTu 1Ft3DnaW9bTxbplsdzNqLFiA2BE7WYCkSRJa09G6ZUlf2YbVbCcqcU7daEWqz7KZ mU6Qsnb4kuqSNnzhOBxF+ebe+PHwTuaoMBhWWASCcAUKhvVTa5mgOiht7jKC0qZ8 fMzQ4MePsuNItBtmS0bs0rDeamWP/KQQdsS0cQZ6OOa9jkFS//zSYHy2W/WiJ+J8 +ugMg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeehvddvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepgfetieffvdelje elieeiveeggeelgeeiveejkeefveeludfgheettefgueffvefhnecuffhomhgrihhnpehm ohiiihhllhgrrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopedv pdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeejfeduhedvseguvggssghughhsrd hgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 6 May 2025 18:51:22 -0400 (EDT) From: Ian Eure Date: Tue, 6 May 2025 15:51:07 -0700 Message-ID: <20250506225115.22450-5-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250506225115.22450-1-ian@retrospec.tv> References: <20250506225115.22450-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 Tue May 6 22:51:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 42357 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 E5B5E27BC4B; Tue, 6 May 2025 23:52: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.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 6F44127BC49 for ; Tue, 6 May 2025 23:52:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCR8y-0001Xj-Sv; Tue, 06 May 2025 18:52:08 -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 1uCR8v-0001WN-9s for guix-patches@gnu.org; Tue, 06 May 2025 18:52: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 1uCR8v-00068n-1S for guix-patches@gnu.org; Tue, 06 May 2025 18:52:05 -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=cf7JRTNSv5W+UP8pGfONxtY618qWkiH68o9eqX1Y7pYm7VGwiSRdQWqpd2jAwfO6bF7ipyZGJgjDNhQTEawygjW7peRYZJFN2dMD2WTpsdE4+jF0cBPlod4UkSijqeCoWYKRWIJOZ48U9wCc2NTXU3oq3oOebZadA05PuUXywIp1z6Nx9v8x7Y2c6BAIbzY55hmsTjH+cTKIkTODHljw16AXa24FxeW8Py5u5/TiKt2a7rKCvLZ2cDAe1ER5NXJrflXis2wj5huHfuu4Dmwk26w2f3Zr/bB2JfXijPuoqCR8D0perFgjVEa2vUlCkUXEaKTz5pKYtDiFteZgEgD1hw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCR8u-0003Sv-SU for guix-patches@gnu.org; Tue, 06 May 2025 18:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73152] [PATCH v2 6/6] gnu: nss-certs: Update to 3.101.3. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 May 2025 22:52: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.174657189613236 (code B ref 73152); Tue, 06 May 2025 22:52:04 +0000 Received: (at 73152) by debbugs.gnu.org; 6 May 2025 22:51:36 +0000 Received: from localhost ([127.0.0.1]:35214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCR8S-0003RK-7g for submit@debbugs.gnu.org; Tue, 06 May 2025 18:51:36 -0400 Received: from fhigh-a2-smtp.messagingengine.com ([103.168.172.153]:60477) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCR8L-0003Py-5r for 73152@debbugs.gnu.org; Tue, 06 May 2025 18:51:30 -0400 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfhigh.phl.internal (Postfix) with ESMTP id F27F6114029C; Tue, 6 May 2025 18:51:23 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Tue, 06 May 2025 18:51: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=1746571883; x=1746658283; bh=kRMFN1tcvhRHrB/xeqxMyNep1bgQyHMnlSKbN0iwTQU=; b= oe3qH9lGG/logOyeAW4Sl1r6TFmFGfTOUvmhwc+c2ANCkrfzdlUry4PIh5NPTWJf g4pSa2C7IrQJRilOR+RokyZe1YwwR6Fk8vSHf8mVcFxTQH1f/M1nmg7Q1FvhrNq8 wRGsn88qCiCQRexd8JDFf9SWVFvdshkeSQpgoobFjvCayKiCuUEVU1vT/HCkSogm FQXndWqg1g/YJtrMYrSp+02/qIZsO8JK6DDtT4DWnet8uv0etYcg5tL1RfGMbQOo KvG5wZQSwbmt0xbsi4kKnd126Zbo8OWKyhHEEsc5akVIKoHfAsPsuxeUPqYXpQnf ewFwBWzViA1TqLH0gLLiKg== 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=1746571883; x= 1746658283; bh=kRMFN1tcvhRHrB/xeqxMyNep1bgQyHMnlSKbN0iwTQU=; b=h P4htCv2uVHv0r9rH15tLLWGV8DxLSQTvsFHeplYrQZ1rqg1UjFNu2yOgbYBPbquv NDowCUCRItSA/SKSQIJ1UGrnSiHpis33/QFxK3hSBzsVEJX0NO0omlr7ON8rBb1U cdzYJTtle5pHZQMj9Fkudl/tQfeDkcH+wHaHEH6parNLjG7XHMeWb9m7oYxoJ0ka 3bCuXDZlxxHlE667jGb9NOTnbl6I0pz04mNG7FGYY23FAvVHeQkoE21Y8o8PzefC S8vhiKd1W9we8OEDWCBs/4NMfS/7V16INCFp4aox3JDptF8LyryC0z4tqG+IYrJ2 6I/q1mS+cFo+qxCJDWQsw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeehvddvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepkfgrnhcugfhurhgvuceo ihgrnhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpeejfeffheeffe eghefhvdekiefggfeigfevheetffehtdetffefgfduveeuvedtffenucffohhmrghinhep mhhoiihilhhlrgdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghrtghpthhtohep vddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepjeefudehvdesuggvsggsuhhgsh drghhnuhdrohhrghdprhgtphhtthhopehirghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 6 May 2025 18:51:23 -0400 (EDT) From: Ian Eure Date: Tue, 6 May 2025 15:51:08 -0700 Message-ID: <20250506225115.22450-6-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250506225115.22450-1-ian@retrospec.tv> References: <20250506225115.22450-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"