From unknown Tue Jun 17 20:07:19 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#73152 <73152@debbugs.gnu.org> To: bug#73152 <73152@debbugs.gnu.org> Subject: Status: [PATCH 0/6] NSS updates Reply-To: bug#73152 <73152@debbugs.gnu.org> Date: Wed, 18 Jun 2025 03:07:19 +0000 retitle 73152 [PATCH 0/6] NSS updates reassign 73152 guix-patches submitter 73152 Ian Eure severity 73152 normal tag 73152 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 13:53:17 2024 Received: (at submit) by debbugs.gnu.org; 9 Sep 2024 17:53:17 +0000 Received: from localhost ([127.0.0.1]:34022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sniZh-0003E6-BM for submit@debbugs.gnu.org; Mon, 09 Sep 2024 13:53:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:45524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sniZe-0003Dx-V3 for submit@debbugs.gnu.org; Mon, 09 Sep 2024 13:53: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 1sniZW-0000l3-3E for guix-patches@gnu.org; Mon, 09 Sep 2024 13:53:08 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sniZS-0008V9-KS for guix-patches@gnu.org; Mon, 09 Sep 2024 13:53:05 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id 0E30C1140173; Mon, 9 Sep 2024 13:52:58 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-10.internal (MEProxy); Mon, 09 Sep 2024 13:52:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1725904378; x=1725990778; bh=A1 feogWvSVyy4RaIdcwm56skQHZKRBjGqCpt8GtugLI=; b=NZL9gDt9Jzl3Qh5Cvq 4Gq/occGfyhCbXtW18ro3GWQi5WP2sRiHXBPolqs3eozbo/7OSzPp9/tpKYE9iXz dZkTdgdWYjc3obs0MEHeg7rUu5DEhBqcmmFp3KybIq4fhW/O51oMg0+G6raAEN4P XSmry4krV9+YayrzuFggMZyM/5+ukSfVIUMZl+OfpGqhAIcC/cuc+J3GFVZI4EYk IhbPfsyjG9sdH8OBu0QGkn2WVkXD1jmNSfl6gSvm/mxY+VHYj3U3PEB+Sk8mwY2B LqIfPgwYWl1WJHxkNtZD4/hjvM8Z33igDE9f88B8huBztXdxLVbEPuDn0RtnyCfI L8pg== 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:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1725904378; x=1725990778; bh=A1feogWvSVyy4 RaIdcwm56skQHZKRBjGqCpt8GtugLI=; b=NfiU0N+7uKBH+5WJwwrbnW4PdRjHx Tz56vlkxQ+ihR+RRMqfccl3pIBaWdZFuuiK7vLx9KI6FW2PR6wBM77A8VhayMFWJ tRTC9jIeLPTbyRR8gMximDCEh5B74SIyPtdsUGvLy/oHnvm5wHsCDKIlJkviimNE 3oIdToBXkuKe7Fy8FkuX6HgKskVjlG94RUm9x9I2ZE0m0zYF6uzhICQthjzgk2zr bn4yCLFtN0Oww4pAWUN3M0F/PHisGk1o6svYMM43VxkBncZwsHUXzVty8XCrW9SW mPbGSD6g8U3cQygH/HOoK9Yh+fSHfdd3buc7Bz29bbj1Auio3dF+ZPOKg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeijedguddtvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvve fufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghn sehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepjeeugfehgffffeethe dvtdduudethfdvtdefudfhudfgvddvueelgfefhfehhfehnecuffhomhgrihhnpehgnhhu rdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopedvpdhmohguvgep shhmthhpohhuthdprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrgh dprhgtphhtthhopehirghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Sep 2024 13:52:57 -0400 (EDT) From: Ian Eure To: guix-patches@gnu.org Subject: [PATCH 0/6] NSS updates Date: Mon, 9 Sep 2024 10:52:48 -0700 Message-ID: <20240909175249.8003-1-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=103.168.172.157; envelope-from=ian@retrospec.tv; helo=fhigh6-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.7 (-) X-Debbugs-Envelope-To: submit Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.7 (--) Hello, This is a first pass at getting the nss packages into shape, as I proposed earlier this year[1]. Many packages depend on nss, so these patches need to be applied to a new branch -- my suggestion is `nss-updates', but I have no strong preference. This patch series: - Ungrafts nss - Factors out package creation into the `make-nss' procedure. - Updates nss and nss-rapid to use that procedure. - Updates nss and nss-certs to 3.102.1, the current ESR. - Updates nss-rapid to 3.104, the latest release. - Removes nspr-4.32, as it doesn’t appear to be used by anything. [1]: https://lists.gnu.org/archive/html/guix-devel/2024-06/msg00318.html Ian Eure (6): gnu: Remove nss/fixed. gnu: Remove nspr-4.32. gnu: Add make-nss. gnu: nss: Update to 3.102.1. gnu: nss-rapid: Update to 3.104. gnu: nss-certs: Update to 3.102.1. gnu/packages/certs.scm | 4 +- gnu/packages/nss.scm | 208 +++++++++++------------------------------ 2 files changed, 59 insertions(+), 153 deletions(-) -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 13:56:00 2024 Received: (at 73152) by debbugs.gnu.org; 9 Sep 2024 17:56:00 +0000 Received: from localhost ([127.0.0.1]:34051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicJ-0003Rm-Ng for submit@debbugs.gnu.org; Mon, 09 Sep 2024 13:55:59 -0400 Received: from fout2-smtp.messagingengine.com ([103.168.172.145]:38291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicI-0003RT-Eb for 73152@debbugs.gnu.org; Mon, 09 Sep 2024 13:55:59 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.phl.internal (Postfix) with ESMTP id 727041380167; Mon, 9 Sep 2024 13:55:49 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-12.internal (MEProxy); Mon, 09 Sep 2024 13:55:49 -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:message-id:mime-version:reply-to :subject:subject:to:to; s=fm3; t=1725904549; x=1725990949; bh=IA 0HG7y/gNi3ioVs0zjWg98Pb1MiQz2B58MCsePxsS4=; b=H3Ipg4e9ZlcKnnXosP gXTG/tsknppxekrTYbLAQtYxdQe5T9NQmKH9rhD1A0JgzS82XO5qVi34kmlSslDV T0EhJGYCqoaN0rueu5ZzKC4hgYRoS8n9c38koU3jay2vK6khItOHFqSYCuY0qgQc g+FV1KYu31b8pFnobYXnvtvi4Kr7Wdhyq6U14sphd1W2nuOVjbheh/1sr8viQmFI /wodLDjqQy6rFKT6zbp/8alZ2lQiQYQD9o4uPPOqX78+Gk4ta62YBApolHmiRvj0 id4wah1iEZeiL5TiUHsRLMzSgi1Z5PayemLGdj/2V71qDZAJXap4UBBp3DYwXeYs tceQ== 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:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1725904549; x=1725990949; bh=IA0HG7y/gNi3i oVs0zjWg98Pb1MiQz2B58MCsePxsS4=; b=h30KuBUGfZQ34ijgLJXfC9MXPopyz EchOzKvmMp/btZujkX2kkdHQtRu7/fOzZ2SZ6GHaTgJr8f9bThBRzc8fs18qN5EB hLsRjZfD57zbmsok5KAjbzXPkWybw3aB1E+Jv0W8BUQbm00MZK0SFmlHqIvvVLCG cwFeaq2z1YyENKoTpxROmDuCXzfa1jah/F9Q91jtLSbCDdL+nIk0S62h2OJQhlVy N8gwuEUa0hg3JV+Trn7dCF6krPG0mBCu0hxIn7w+bsci0ufrRVIGqaVKSd+TpH9j Xah7Bv0NoDRR/bqHRRbo4CGr1pyvb3oRKAUkyeAj6gM9kJAxjpAqSRnCg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeijedguddtvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvve fufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpefkrghnucfguhhrvgcuoehirghn sehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepgfeukeffjedugfdvve etleetiedtueduudffhfeuhfeihfejteeuhffgteetvdetnecuvehluhhsthgvrhfuihii vgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrth hvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeej feduhedvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrhgvth hrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Sep 2024 13:55:48 -0400 (EDT) From: Ian Eure To: 73152@debbugs.gnu.org Subject: [PATCH 1/1] gnu: nss-certs: Update to 3.102.1. Date: Mon, 9 Sep 2024 10:55:33 -0700 Message-ID: <20240909175540.8156-1-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/certs.scm (nss-certs): Update to 3.102.1. Change-Id: Ibb0b39ef97e04afc37c62c5dc23ab93eef1c1f10 --- gnu/packages/certs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index e2de6b168b..9756b089c0 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -133,7 +133,7 @@ (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.102.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -144,7 +144,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw")) + "1k1pjxz0ab4lg8xqggbb8pw77c1q8h4bldi09z4pj5g4hwsjv62l")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-3.56-pkgconfig.patch" "nss-getcwd-nonnull.patch" -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 13:56:03 2024 Received: (at 73152) by debbugs.gnu.org; 9 Sep 2024 17:56:03 +0000 Received: from localhost ([127.0.0.1]:34062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicM-0003SE-1E for submit@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:03 -0400 Received: from fout2-smtp.messagingengine.com ([103.168.172.145]:55147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicJ-0003RV-9H for 73152@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:00 -0400 Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id 4B20A1380210; Mon, 9 Sep 2024 13:55:50 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Mon, 09 Sep 2024 13:55:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1725904550; x= 1725990950; bh=/R5HIpxtk6n5/jQ3sLPQCccILYOji+gMipKlNYGvbDA=; b=i sFAdoX1jwPnEF6qy34qW1ZKiaVfNdy62shVquWEr1Pq83tGPcZpxGuftfhur6nJP S3vMuQz6G/gLHFWRmaXD2wj3yp/DzKX70JiEKkKJH4OWDBhGRWzbXgyzKUlwiYMi 1khDewUgght+gYXUD9GZHEg/bXmo5NHFF9xM94e4pg5Ag1KwVC/b52FSm5SgzxE6 aiQvo7yyFobl1xRKsK5e6McGe3w4/7uVfGBIFl118Uc7wcSl0JK3vtF+VK39IDqD igRWFAb6h4V7Lhx4aud9rdtlvO+6n7zO1qNlzGIFar0sPdyrfRntgqOKDNvzSkHS nm4Hokxfjel9qaJYGmPhA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1725904550; x= 1725990950; bh=/R5HIpxtk6n5/jQ3sLPQCccILYOji+gMipKlNYGvbDA=; b=M vI2xok1YZSI2R2H5i3g+C2YV+I+5Xpvn1IiNTg4Wx61cPYfEaru/ER/zrfAMbBvQ +WEpcON0yQ6PmlOnevOSDaNSfuEi19Iqe9XX+mS3eiiJ4SVQpftZjLiV9jj7R87J NDGT9BKFAKUo/H4+eFe+y7tVrTTKVFiCUUK95ENr+pZU1oTRwUTQaG4/V3pFjTpd zn6VeOTXlcQvH6GSO8MhQq3rYlHnIWUY81R/ckoEwiD/g0dAsU7c7E8mZDcbG16E FPF8Rxn2nwZnMwAuw1grLbzTJvQKPKaGj94tq9jHsb3NJ+UDtPTv/Ayjrq2PAioW +E7s5rxyKkCHHJDpAdO5A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeijedguddtvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvve fufffkofgjfhgggfestdekredtredttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgr nhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpefgteeiffdvleejle eiieevgeegleegieevjeekfeevledugfehteetgfeuffevhfenucffohhmrghinhepmhho iihilhhlrgdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghrtghpthhtohepvddp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepjeefudehvdesuggvsggsuhhgshdrgh hnuhdrohhrghdprhgtphhtthhopehirghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Sep 2024 13:55:49 -0400 (EDT) From: Ian Eure To: 73152@debbugs.gnu.org Subject: [PATCH 1/6] gnu: Remove nss/fixed. Date: Mon, 9 Sep 2024 10:55:34 -0700 Message-ID: <20240909175540.8156-2-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240909175540.8156-1-ian@retrospec.tv> References: <20240909175540.8156-1-ian@retrospec.tv> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/nss.scm (nss/fixed): Delete variable. Change-Id: I0a071a8c3c4a9e2a24b873177402735912192212 --- gnu/packages/nss.scm | 51 -------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 6c60e9fbae..718a3ba4c0 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -271,57 +271,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. -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 13:56:04 2024 Received: (at 73152) by debbugs.gnu.org; 9 Sep 2024 17:56:04 +0000 Received: from localhost ([127.0.0.1]:34071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicN-0003Sk-Ac for submit@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:04 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:49399) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicL-0003RX-6U for 73152@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:01 -0400 Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.phl.internal (Postfix) with ESMTP id 1EB3E114024D; Mon, 9 Sep 2024 13:55:51 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Mon, 09 Sep 2024 13:55:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1725904551; x= 1725990951; bh=jdcp3l2FNPMsXzmDpiqwwvdZl7/pKAz16Nb3EhX3SFo=; b=m 6G3TSsICG1SyI62FI4dspJkA8XW6LqLhplilZXA0bCv/FK+s8OtrOcRzPug1VAqm BvQIHJgrdqRAyY0tAdobYaWN1A8I2RTyPm4SyJtlbRRcb7+XTYxrGCXitkNLLuS2 Ez4kH+ZygQjta2F0wMgU0XaXZ9WEFPjBoxF6wSXaiSrYQ6kVkw1GHmV3+bRf3o60 mkciz7bmQ0BIeZUmEMmnN8ANm5m4ctVlsi/2CD+WZ9aL61YTdwzv8xdcHvv6NBBN Ns+HNanvXFEczVy2ms/+Ep/vNXod7UOJcQU/C1MaLLG/k2pphvMIPCNY60+8mXRU HEtUhFLdpJXEl1ZYmYLIQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1725904551; x= 1725990951; bh=jdcp3l2FNPMsXzmDpiqwwvdZl7/pKAz16Nb3EhX3SFo=; b=g 6oyuYqPuAYasNbJ5srL0H+cksVRV8Z5//I0seFzld1O8w1RrzJ30+hh9dUMCUWvg ne9rrtAIFBPt5L/BoG1JvV79+bu443xLGZH0aolBPzukwGAMMvqM/9XtQEl3RSrT DCQH5qd+HQnP0eYzgvIAAWca9wCPhtH7dbwpqUEmQjMKbkNjVL74HMVBPrlgroKr V7/wLT4GxY933LJYD1qoHdoMO3b37QQyK1AG2MHuQZpoNe+hOk9xu4SwJ2XC4yNv c3J5suMIZR9jsWbNznpm4fZoePWDpV6/Cub7N3GUNgac3o4a6pdDf79GzmTaLovV +yVno9XDC/1bmr3uumlvA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeijedguddtvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvve fufffkofgjfhgggfestdekredtredttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgr nhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpefgteeiffdvleejle eiieevgeegleegieevjeekfeevledugfehteetgfeuffevhfenucffohhmrghinhepmhho iihilhhlrgdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghrtghpthhtohepvddp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepjeefudehvdesuggvsggsuhhgshdrgh hnuhdrohhrghdprhgtphhtthhopehirghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Sep 2024 13:55:50 -0400 (EDT) From: Ian Eure To: 73152@debbugs.gnu.org Subject: [PATCH 2/6] gnu: Remove nspr-4.32. Date: Mon, 9 Sep 2024 10:55:35 -0700 Message-ID: <20240909175540.8156-3-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240909175540.8156-1-ian@retrospec.tv> References: <20240909175540.8156-1-ian@retrospec.tv> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 718a3ba4c0..60b4b34d4e 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -94,18 +94,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. -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 13:56:09 2024 Received: (at 73152) by debbugs.gnu.org; 9 Sep 2024 17:56:09 +0000 Received: from localhost ([127.0.0.1]:34076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicS-0003TY-8y for submit@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:08 -0400 Received: from fout2-smtp.messagingengine.com ([103.168.172.145]:44627) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicL-0003RZ-5F for 73152@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:02 -0400 Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id 29B56138018B; Mon, 9 Sep 2024 13:55:52 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Mon, 09 Sep 2024 13:55:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1725904552; x= 1725990952; bh=HfMxkMbpODFDJcRNJTb1cSoCT01RUYZ22MNtDoW7jUw=; b=N DWRChAgRpizz7Y2BcpUQumlA+OBm8SegeZQtMcnXOEfWuxxUTodaHuAOeb8rCxCu t3qe6wCHhqtk18aIQphwD+Vxim/fXai5/tf0OdHoTdJuxV4Rm4qGWN5XIRUmS1KN LAMmoFLcu6E2X24G1vR5zPhRdYhRR9+okSfhumI9UMsWIIX837MebWMx//oKZsFJ nupOX35zQQmFEeQUVgNS91qzET1t7AV27DjEl3+xCjkQq2oT4v2uDFsUi8UoJezK j1Sv2d3eshYhGqr+76RIsuH/KSZdtaqOTkBnbpk4Vqo091iMAiZ8nvgUgcIL9/cW tJPn6i6iGySFVagugAfYQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1725904552; x= 1725990952; bh=HfMxkMbpODFDJcRNJTb1cSoCT01RUYZ22MNtDoW7jUw=; b=l HOAnGiGNmYaDskJDgMw0r2MyBFzPIHjmuFYBIXaRFmKjZKx6D5rCgkTfXErgRuAr OTnn0HM2P79t2OdZgZzFj1JKz/rH4ahBsAMfHaUHButcVCsSvZiFyjTvg4xlWDX1 yzXkFWDu3FQN+y0SRooOUHVCQ3PqRARGXLfH3W8d4sXh6Fy/nMVfoNlgv0TzaEvt j7gV+HY8TCGCgENySyHX3b/stVbDKa38vzmSRBSsHW8MP6H46Oaf8zUFnY5WVz5c p1hWsKbrEr3SYpHDryd8qn5J5CqNvrvTwKiiv3KWaPl3aVM85NRrDzD5gTj5Eule 1YGFmID4zYjdikerxYmjA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeijedguddtvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvve fufffkofgjfhgggfestdekredtredttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgr nhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpeekgfelvdehueefte ekfedvheetueeuledugfetgfelvedvjefffeegfefgvdduueenucffohhmrghinhepmhho iihilhhlrgdrohhrghdpghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghr tghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepjeefudehvdesug gvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehirghnsehrvghtrhhoshhpvggt rdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Sep 2024 13:55:51 -0400 (EDT) From: Ian Eure To: 73152@debbugs.gnu.org Subject: [PATCH 3/6] gnu: Add make-nss. Date: Mon, 9 Sep 2024 10:55:36 -0700 Message-ID: <20240909175540.8156-4-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240909175540.8156-1-ian@retrospec.tv> References: <20240909175540.8156-1-ian@retrospec.tv> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/nss.scm (make-nss): New variable. NSS builds require time-shifting to their approximate release date to build repeatably, because it ships with test certificates which expire. To avoid duplicating the whole package definition between `nss' and `nss-rapid', move the bulk of the definition into `make-nss', which accepts a version, hash, and release date, allowing reuse between the two definitions. Change-Id: Iaab1bb167ceed985a3dcde57f7fe35dce3deaa36 --- gnu/packages/nss.scm | 166 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 60b4b34d4e..b51bebda3d 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -94,6 +94,172 @@ (define-public nspr in the Mozilla clients.") (license license:mpl2.0))) +(define* (make-nss #:key version release-date hash) + (package + (name "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 version) + (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"))) + (sha256 + (base32 hash)) + ;; Create nss.pc and nss-config. + (patches (search-patches "nss-3.56-pkgconfig.patch" + "nss-getcwd-nonnull.patch" + "nss-increase-test-timeout.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete the bundled copy of these libraries. + (delete-file-recursively "nss/lib/zlib") + (delete-file-recursively "nss/lib/sqlite"))))) + (build-system gnu-build-system) + (outputs '("out" "bin")) + (arguments + (list + #:make-flags + #~(let ((rpath (string-append "-Wl,-rpath=" #$output "/lib/nss"))) + (list "-C" "nss" + (string-append "PREFIX=" #$output) + "NSDISTMODE=copy" + "NSS_USE_SYSTEM_SQLITE=1" + ;; The gtests fail to compile on riscv64. + ;; Skipping them doesn't affect the test suite. + #$@(if (target-riscv64?) + #~("NSS_DISABLE_GTESTS=1") + #~()) + ;; Ensure we are building for the (%current-target-system). + #$@(if (%current-target-system) + #~((string-append + "OS_TEST=" + (string-take #$(%current-target-system) + (string-index #$(%current-target-system) #\-))) + (string-append + "KERNEL=" (cond (#$(target-hurd?) "gnu") + (#$(target-linux?) "linux") + (else "")))) + #~()) + #$@(if (%current-target-system) + #~("CROSS_COMPILE=1") + #~()) + (string-append "NSPR_INCLUDE_DIR=" + (search-input-directory %build-inputs + "include/nspr")) + ;; Add $out/lib/nss to RPATH. + (string-append "RPATH=" rpath) + (string-append "LDFLAGS=" rpath))) + #:modules '((guix build gnu-build-system) + (guix build utils) + (ice-9 ftw) + (ice-9 match) + (srfi srfi-26)) + #:tests? (not (or (%current-target-system) + ;; Tests take more than 30 hours on some architectures. + (target-riscv64?) + (target-ppc32?))) + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (setenv "CC" #$(cc-for-target)) + (setenv "CCC" #$(cxx-for-target)) + (setenv "NATIVE_CC" "gcc") + ;; No VSX on powerpc-linux. + #$@(if (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")) + #~()))) + (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") + + #$@(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"))))) + + ;; 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") + #$release-date "./nss/tests/all.sh")) + (format #t "test suite not run~%")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append (assoc-ref outputs "bin") "/bin")) + (inc (string-append out "/include/nss")) + (lib (string-append out "/lib/nss")) + (obj (match (scandir "dist" (cut string-suffix? "OBJ" <>)) + ((obj) (string-append "dist/" obj))))) + ;; Install nss-config to $out/bin. + (install-file (string-append obj "/bin/nss-config") + (string-append out "/bin")) + (delete-file (string-append obj "/bin/nss-config")) + ;; Install nss.pc to $out/lib/pkgconfig. + (install-file (string-append obj "/lib/pkgconfig/nss.pc") + (string-append out "/lib/pkgconfig")) + (delete-file (string-append obj "/lib/pkgconfig/nss.pc")) + (rmdir (string-append obj "/lib/pkgconfig")) + ;; Install other files. + (copy-recursively "dist/public/nss" inc) + (copy-recursively (string-append obj "/bin") bin) + (copy-recursively (string-append obj "/lib") lib))))))) + (inputs (list sqlite zlib)) + (propagated-inputs (list nspr)) ;required by nss.pc. + (native-inputs (list perl ;for tests + (if (target-64bit?) libfaketime datefudge) + which)) + + ;; The NSS test suite takes around 48 hours on Loongson 3A (MIPS) when + ;; another build is happening concurrently on the same machine. + (properties '((timeout . 216000))) ;60 hours + + (home-page "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS") + (synopsis "Network Security Services") + (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.") + (license license:mpl2.0))) ;; nss should track ESRs, but currently doesn't. 3.102.1 is the current ESR. -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 13:56:09 2024 Received: (at 73152) by debbugs.gnu.org; 9 Sep 2024 17:56:09 +0000 Received: from localhost ([127.0.0.1]:34078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicS-0003Tc-VE for submit@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:09 -0400 Received: from fout2-smtp.messagingengine.com ([103.168.172.145]:34259) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicL-0003Rb-Uq for 73152@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:03 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.phl.internal (Postfix) with ESMTP id ECC411380192; Mon, 9 Sep 2024 13:55:52 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-12.internal (MEProxy); Mon, 09 Sep 2024 13:55:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1725904552; x= 1725990952; bh=MUPRRdf+cAmkLD8XJqhNFF14tKcxCGs5rMFAndHva3s=; b=I 2uoBtXclXT6CXarN7ggi6ig1xOrdsfLBovE5A/CXxiN4iL38Xd53ZGx7+aAvuKj4 qqtGieFb/55f0pADkrrRp5hucNQdfUTVOekcK8hujtMSazUpX/msWoXSDgo9TvhY Oy6FeJRof5zzX/y8Rs/mHTuxTcDPavLJadz+rwESD42Aw6AMqo50Jf3IU0eLroOY QXlR0C5NpWy0BJ65nC20Ys6vq5+QRV2QMqAlUfJXhZtMP6MPMexU1H9Q+eaP+gey oN8fA9zseKu2O+dHdYQp54zUky58+pcmaRxqlIVhBuSJ9UfwfrEthypOIkXpwUfE AE+wADXOnu4Ln715cBhiw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1725904552; x= 1725990952; bh=MUPRRdf+cAmkLD8XJqhNFF14tKcxCGs5rMFAndHva3s=; b=i P43vOwpmJBQJ82fCMR5BUrpYTeCsycL19sVJHcpGsENyo4goqUgH3obFQvD6Yegd 13SNyYym4sVsOOjVCVNBgquGeSQJd1ClAIV2U4hvv6Bh3NiYEyshA9dOzl2ulNrV 2RZhW5A6kDqi4WR2qJN15m1ro4RQmWD6zjl4H99WnrOh+aSFQLZweebNIo5Fn2AE /+LaXwBfEdEzfT61/TbGJz0ygMYwKNGpTCSkzEXJ66XJI/4BTjVDlH10wzEMLUwd B6pWW8P/tgfEmW9zlLGLFTMcvTdjYdxOuz6TxV/DzxzRpbmRUbZCS+peXEZCJ8zW QlICrgDgTyp0twFg07SYQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeijedguddtvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvve fufffkofgjfhgggfestdekredtredttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgr nhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpeekgfelvdehueefte ekfedvheetueeuledugfetgfelvedvjefffeegfefgvdduueenucffohhmrghinhepmhho iihilhhlrgdrohhrghdpghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghr tghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepjeefudehvdesug gvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehirghnsehrvghtrhhoshhpvggt rdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Sep 2024 13:55:52 -0400 (EDT) From: Ian Eure To: 73152@debbugs.gnu.org Subject: [PATCH 4/6] gnu: nss: Update to 3.102.1. Date: Mon, 9 Sep 2024 10:55:37 -0700 Message-ID: <20240909175540.8156-5-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240909175540.8156-1-ian@retrospec.tv> References: <20240909175540.8156-1-ian@retrospec.tv> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) gnu/packages/nss.scm (nss): Update to 3.102.1. Change-Id: Ic24624279b1d2efbe6f4dd82cb73cc63f50f2e14 --- gnu/packages/nss.scm | 172 +++---------------------------------------- 1 file changed, 10 insertions(+), 162 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index b51bebda3d..b4fdd13abc 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -261,169 +261,17 @@ (define* (make-nss #:key version release-date hash) security standards.") (license license:mpl2.0))) -;; nss should track ESRs, but currently doesn't. 3.102.1 is the current ESR. - (define-public nss - (package - (name "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") - (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"))) - (sha256 - (base32 - "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw")) - ;; Create nss.pc and nss-config. - (patches (search-patches "nss-3.56-pkgconfig.patch" - "nss-getcwd-nonnull.patch" - "nss-increase-test-timeout.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete the bundled copy of these libraries. - (delete-file-recursively "nss/lib/zlib") - (delete-file-recursively "nss/lib/sqlite"))))) - (build-system gnu-build-system) - (outputs '("out" "bin")) - (arguments - (list - #:make-flags - #~(let ((rpath (string-append "-Wl,-rpath=" #$output "/lib/nss"))) - (list "-C" "nss" - (string-append "PREFIX=" #$output) - "NSDISTMODE=copy" - "NSS_USE_SYSTEM_SQLITE=1" - ;; The gtests fail to compile on riscv64. - ;; Skipping them doesn't affect the test suite. - #$@(if (target-riscv64?) - #~("NSS_DISABLE_GTESTS=1") - #~()) - ;; Ensure we are building for the (%current-target-system). - #$@(if (%current-target-system) - #~((string-append - "OS_TEST=" - (string-take #$(%current-target-system) - (string-index #$(%current-target-system) #\-))) - (string-append - "KERNEL=" (cond (#$(target-hurd?) "gnu") - (#$(target-linux?) "linux") - (else "")))) - #~()) - #$@(if (%current-target-system) - #~("CROSS_COMPILE=1") - #~()) - (string-append "NSPR_INCLUDE_DIR=" - (search-input-directory %build-inputs - "include/nspr")) - ;; Add $out/lib/nss to RPATH. - (string-append "RPATH=" rpath) - (string-append "LDFLAGS=" rpath))) - #:modules '((guix build gnu-build-system) - (guix build utils) - (ice-9 ftw) - (ice-9 match) - (srfi srfi-26)) - #:tests? (not (or (%current-target-system) - ;; Tests take more than 30 hours on some architectures. - (target-riscv64?) - (target-ppc32?))) - #:phases - #~(modify-phases %standard-phases - (replace 'configure - (lambda _ - (setenv "CC" #$(cc-for-target)) - (setenv "CCC" #$(cxx-for-target)) - (setenv "NATIVE_CC" "gcc") - ;; No VSX on powerpc-linux. - #$@(if (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")) - #~()))) - (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")) - - #$@(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"))))) - - ;; 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")) - (format #t "test suite not run~%")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append (assoc-ref outputs "bin") "/bin")) - (inc (string-append out "/include/nss")) - (lib (string-append out "/lib/nss")) - (obj (match (scandir "dist" (cut string-suffix? "OBJ" <>)) - ((obj) (string-append "dist/" obj))))) - ;; Install nss-config to $out/bin. - (install-file (string-append obj "/bin/nss-config") - (string-append out "/bin")) - (delete-file (string-append obj "/bin/nss-config")) - ;; Install nss.pc to $out/lib/pkgconfig. - (install-file (string-append obj "/lib/pkgconfig/nss.pc") - (string-append out "/lib/pkgconfig")) - (delete-file (string-append obj "/lib/pkgconfig/nss.pc")) - (rmdir (string-append obj "/lib/pkgconfig")) - ;; Install other files. - (copy-recursively "dist/public/nss" inc) - (copy-recursively (string-append obj "/bin") bin) - (copy-recursively (string-append obj "/lib") lib))))))) - (inputs (list sqlite zlib)) - (propagated-inputs (list nspr)) ;required by nss.pc. - (native-inputs (list perl ;for tests - (if (target-64bit?) libfaketime datefudge) - which)) - - ;; The NSS test suite takes around 48 hours on Loongson 3A (MIPS) when - ;; another build is happening concurrently on the same machine. - (properties '((timeout . 216000))) ;60 hours - - (home-page "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS") - (synopsis "Network Security Services") - (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.") - (license license:mpl2.0))) + (let ((base (make-nss + #:version "3.102.1" + #:release-date "2024-07-24" + #:hash "1k1pjxz0ab4lg8xqggbb8pw77c1q8h4bldi09z4pj5g4hwsjv62l"))) + (package + (inherit base) + (synopsis (string-append (package-synopsis base) " (ESR)")) + (description + (string-append (package-description base) " +This package tracks the Extended Support Release channel."))))) ;; nss-rapid tracks the rapid release channel. Unless your package requires a ;; newer version, you should prefer the `nss' package, which tracks the ESR -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 13:56:10 2024 Received: (at 73152) by debbugs.gnu.org; 9 Sep 2024 17:56:10 +0000 Received: from localhost ([127.0.0.1]:34080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicT-0003To-Q9 for submit@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:10 -0400 Received: from fout2-smtp.messagingengine.com ([103.168.172.145]:44757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicM-0003Rd-Pl for 73152@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:04 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.phl.internal (Postfix) with ESMTP id C7ABA1380218; Mon, 9 Sep 2024 13:55:53 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Mon, 09 Sep 2024 13:55:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1725904553; x= 1725990953; bh=csjlkF6BSlXrWoEzKE+PQ3amLZ/aJSt4QbQ6bQcGwJY=; b=o GClErLX8PSkycrsZiKne6NJ02NQySFub2vVQwUbFnw/zpYupVDcPfN+m+c7699Av FMuA0ys1hM3Pel/RPJPrpIHv3k4pUQYW+fwFZCzUw+2HQ4OQSviDgz/4oPhu+3/m z70dWL4ubpLslRkgAKQeVNZNVmK5xoptYeyExv5zFNeb+mJa6eBvSMk2KzEtoUZb guSzITcTZ5fEx9VdiroVIoii6bD4Y1oaKDzhWDyGzo5NGfxSerTxa4ryan/IXdLF WGwKCSXNlIsV9fP6fMLzhgB/2P2SkLY4OjowxUYPN+Za7NcphYC65D2WqwLfVTi3 b60reeQn4pdFuz5ogOB+A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1725904553; x= 1725990953; bh=csjlkF6BSlXrWoEzKE+PQ3amLZ/aJSt4QbQ6bQcGwJY=; b=E RFTx9Y487PNbUwqHXyED9qoSdSPxwfhHpoVuUo8ZU/6cIS/YPm9Y/MUzmu8cwD1w vo7nkiY4Ea32YXrSG5XSE1CaUFvyvu0XrZx1hAU+PhBbaCwwS0cAS/PphehnozfC 8jVtzWP7mzk4qxxTtVanUy0Fpq76a8AiT4LKm7OEOO7TGnhgGr7OBXaEv1C2PSo8 JlHHZIV5rVpUkI638j6mtO/MIjisc9d3Q1mC5nonp7vKDrY1PTwThlIhw4EfVhb0 aCPGfcUTfCbZqudsA6vS3SR1dpkSucOvGVl18FvjpEzawBimUOMEKIV8X3i7Xy9W jPU3GXIpqaqdiVu4e2HgA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeijedguddtvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvve fufffkofgjfhgggfestdekredtredttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgr nhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpefgteeiffdvleejle eiieevgeegleegieevjeekfeevledugfehteetgfeuffevhfenucffohhmrghinhepmhho iihilhhlrgdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghrtghpthhtohepvddp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepjeefudehvdesuggvsggsuhhgshdrgh hnuhdrohhrghdprhgtphhtthhopehirghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Sep 2024 13:55:53 -0400 (EDT) From: Ian Eure To: 73152@debbugs.gnu.org Subject: [PATCH 5/6] gnu: nss-rapid: Update to 3.104. Date: Mon, 9 Sep 2024 10:55:38 -0700 Message-ID: <20240909175540.8156-6-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240909175540.8156-1-ian@retrospec.tv> References: <20240909175540.8156-1-ian@retrospec.tv> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/nss.scm (nss-rapid): Update to 3.104. Change-Id: I22772d75a98a479a65717ea7bcbfbb7986bd0c77 --- gnu/packages/nss.scm | 67 ++++++++------------------------------------ 1 file changed, 11 insertions(+), 56 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index b4fdd13abc..b53e6e22cf 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -281,63 +281,18 @@ (define-public nss ;; and https://wiki.mozilla.org/Rapid_Release_Model (define-public nss-rapid - (package - (inherit nss) - (name "nss-rapid") - (version "3.103") - (source (origin - (inherit (package-source nss)) - (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"))) - (sha256 - (base32 - "0qp9rs226rr6gh51b42cdbydr4mj80cli3bfqhh7bp3jyxbvcjkv")))) - (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-08-17" "./nss/tests/all.sh")) - (format #t "test suite not run~%")))))))) - (synopsis "Network Security Services (Rapid Release)") - (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. + (let ((base (make-nss + #:version "3.104" + #:release-date "2024-08-30" + #:hash "13mca2y92sm05kxb40qvlkq8l93ghmrhh0s3iawpc7idc8ik4xp2"))) + (package + (inherit base) + (name (string-append (package-name base) "-rapid")) + (synopsis (string-append (package-synopsis base) " (Rapid Release)")) + (description + (string-append (package-description base) " +This package tracks the Rapid Release channel, which updates frequently."))))) -This package tracks the Rapid Release channel, which updates frequently."))) (define-public nsncd (package (name "nsncd") -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 09 13:56:10 2024 Received: (at 73152) by debbugs.gnu.org; 9 Sep 2024 17:56:10 +0000 Received: from localhost ([127.0.0.1]:34082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicU-0003Tr-9M for submit@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:10 -0400 Received: from fhigh6-smtp.messagingengine.com ([103.168.172.157]:56815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snicN-0003Rf-JI for 73152@debbugs.gnu.org; Mon, 09 Sep 2024 13:56:04 -0400 Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.phl.internal (Postfix) with ESMTP id 89D8C114022B; Mon, 9 Sep 2024 13:55:54 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Mon, 09 Sep 2024 13:55:54 -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=fm3; t=1725904554; x=1725990954; bh=IA0HG7y/gNi3ioVs0zjWg98Pb1MiQz2B58MCsePxsS4=; b= kfOWjMPhBfhlO+xmxW5U2sNyLLfQ4krKWAmEP0an/0enUkjhNnFpkAgjRkONC5xE bgclP8tRgOsN4OhJwfE4VqfG5HKeQ/byoFVsOKYosJYLMuchbrnug1Uzqe8RXYTh Myd1nMlkoDwbFSMYMYup74qkVnyzceYUV+gfbYVdJMEzAB5Xubvzk/34d13Dau2x LqCjC3wLZcqBl5mpIjlPCj7QttLd5Qgym7dMW/o/BsYnjoItijRJY7BQNhqUxAJg tj8LnY/NQPrZ6aPXVFPeXk0IxdAsNq1Xllw8Wd+d+GWZU3nudBCYBLRZwoE9ZgHZ 4IAL/2pkl05X3W5yn70cSA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1725904554; x= 1725990954; bh=IA0HG7y/gNi3ioVs0zjWg98Pb1MiQz2B58MCsePxsS4=; b=e OVJ8bC7+R31Hoafm4zwJJsRyRUdIzfqQzBWuPV6TpsYEaa2oZ7pasMZKbZBV6gfg N6K0SBQtxHDjuh1nvhKiYu5/3sw4vpxa78fuh3AhTKbxHryP39xwIUOX7A1eaoIl N7pAagtOyJ+cQlBVK1kLiUXvDGHiskaHykPK8C4fof45mMnjeEGZqbOkzvzZcC0t SSM8A+GRBvfDwgdeMyPeZ4w3ar0jUAtmxUy4OBqjZf3UFcU7ub7bx7N/rfG2HQm0 GBfEV/5mT5eXEMpo3vx+7fpzY0G8TAE6zlPbwV7PEif15SN1HTyMbPSKOlO8FL0x 7wgw5Sb7tcZUJsAk0iBRA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeijedguddtvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvve fufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepgfegheduleelge fgveeuhefffeegveeijeeitdetudelleeuhfejieduhfduffetnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtg drthhvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthho peejfeduhedvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrh gvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Sep 2024 13:55:53 -0400 (EDT) From: Ian Eure To: 73152@debbugs.gnu.org Subject: [PATCH 6/6] gnu: nss-certs: Update to 3.102.1. Date: Mon, 9 Sep 2024 10:55:39 -0700 Message-ID: <20240909175540.8156-7-ian@retrospec.tv> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240909175540.8156-1-ian@retrospec.tv> References: <20240909175540.8156-1-ian@retrospec.tv> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/certs.scm (nss-certs): Update to 3.102.1. Change-Id: Ibb0b39ef97e04afc37c62c5dc23ab93eef1c1f10 --- gnu/packages/certs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm index e2de6b168b..9756b089c0 100644 --- a/gnu/packages/certs.scm +++ b/gnu/packages/certs.scm @@ -133,7 +133,7 @@ (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.102.1") (source (origin (method url-fetch) (uri (let ((version-with-underscores @@ -144,7 +144,7 @@ (define-public nss-certs "nss-" version ".tar.gz"))) (sha256 (base32 - "1g89ig40gfi1sp02gybvl2z818lawcnrqjzsws36cdva834c5maw")) + "1k1pjxz0ab4lg8xqggbb8pw77c1q8h4bldi09z4pj5g4hwsjv62l")) ;; Create nss.pc and nss-config. (patches (search-patches "nss-3.56-pkgconfig.patch" "nss-getcwd-nonnull.patch" -- 2.46.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Sep 10 14:00:30 2024 Received: (at 73152) by debbugs.gnu.org; 10 Sep 2024 18:00:30 +0000 Received: from localhost ([127.0.0.1]:36983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1so5AD-0001eX-U0 for submit@debbugs.gnu.org; Tue, 10 Sep 2024 14:00:30 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:49512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1so5AB-0001eK-Ue for 73152@debbugs.gnu.org; Tue, 10 Sep 2024 14:00:28 -0400 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-5c251ba0d1cso1235083a12.3 for <73152@debbugs.gnu.org>; Tue, 10 Sep 2024 11:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725991157; x=1726595957; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=GfeFZc6GcmThQpSwC2z9AdLo2lkYi0Xx2H9hl1l8osY=; b=CSlmcc678e3GMAo0KEHClBp3a2PPNDWKlIBBS6DXq29l15w5gIlLfL46EANfTFbXA8 LIpJ9UJw6dRB79NZEjtbav0SnAPKAsF54M4QybbCP8aucNyHIYQXWH/1Ku7Un4ki3uhu 5cOxAwStzSihcgSRV51wVqE5Y0N/m6du1PhYXEztKMx9KH6csfqb9hI1+lZwxiX2rx5h hv75Prgi/G4B9cukIlCWcnhMvGttdfa+5WMaVH9iZ2yRRlQJR+iOfP3z7fzyrAdKtiLR pmvN+H48HxQGi8Z9UzSwHRkysjXKvlNIM/PmNl81/lHTMURl3dCUwrcqu81JWU/yaiSr jLrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725991157; x=1726595957; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GfeFZc6GcmThQpSwC2z9AdLo2lkYi0Xx2H9hl1l8osY=; b=cqP/4Iwiu4qA5LDKbW6Jn4KZHxMjrqvdgogqMxBiwk3Ef8h5U/DydDPgvAw6MOAUuh X9JhVtnpdwCp928Ktbs2pm+HHiNEGCctw3BtH+Lxw9qzAgU4Ma4smKzezwtThjOFc1pk UPC1uvwfmR3AsvsohIsjuC+zuKMRX48Qe5bcbUxrNCCvhNu3VLfnkKJGnuKyf3UX8KKK 1VKCCpTkhjARCb8a0PDNBHbtWxeBrurc5HjEJQ6N7nTCPnUxoY3nQVsUzc1cZlBz8kPQ YXvCWasGevaStUd/ebJx5RManCpGEa5wXUFUCdyk4j4ejDk6dxUuxWgE+bSULSiwZOhM 958A== X-Forwarded-Encrypted: i=1; AJvYcCU8Rq/XkEAOBVDKFUY1R2Kzx8r8kaF43Ik07S0gXh3+gWDuhGPJQ+C2yP5HB6h6KFN3/sIrEw==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yxt8U6zZUrOPLDlG35U9tTXG4MY1X1DuGb9xJLfh7pgSBHkM4/M KT/1VVKrdgVMQsnvuVSVblKEiWPYewf1lV5VqQHTZJu/O2qhXKWB X-Google-Smtp-Source: AGHT+IHh+aqMRGjdVvyN7a33uJ9efJYHoa4gY5uVHqFbpOkrpJUOaGyMXQdrHwiknxerqCLir+LsKw== X-Received: by 2002:a05:6402:34cb:b0:5c0:ad76:f70e with SMTP id 4fb4d7f45d1cf-5c40bc14898mr228494a12.6.1725991156331; Tue, 10 Sep 2024 10:59:16 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd523casm4502825a12.58.2024.09.10.10.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 10:59:15 -0700 (PDT) Message-ID: <04bf227b79ecc755e5137a8296c2a5458073393f.camel@gmail.com> Subject: Re: [PATCH 3/6] gnu: Add make-nss. From: Liliana Marie Prikler To: Ian Eure , 73152@debbugs.gnu.org Date: Tue, 10 Sep 2024 19:59:14 +0200 In-Reply-To: <20240909175540.8156-4-ian@retrospec.tv> References: <20240909175540.8156-1-ian@retrospec.tv> <20240909175540.8156-4-ian@retrospec.tv> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73152 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 09.09.2024 um 10:55 -0700 schrieb Ian Eure: > * gnu/packages/nss.scm (make-nss): New variable. > NSS builds require time-shifting to their approximate release date to > build repeatably, because it ships with test certificates which > expire.=C2=A0 To avoid duplicating the whole package definition between > `nss' and `nss-rapid', move the bulk of the definition into `make- > nss', which accepts a version, hash, and release date, allowing reuse > between the two definitions. >=20 > Change-Id: Iaab1bb167ceed985a3dcde57f7fe35dce3deaa36 > --- Note: the explanation should come before the ChangeLog. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 16 09:47:37 2025 Received: (at 73152) by debbugs.gnu.org; 16 Feb 2025 14:47:37 +0000 Received: from localhost ([127.0.0.1]:33088 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjfvk-000259-IH for submit@debbugs.gnu.org; Sun, 16 Feb 2025 09:47:36 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:43315) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjfvh-00024x-W1 for 73152@debbugs.gnu.org; Sun, 16 Feb 2025 09:47:34 -0500 Received: from localhost (unknown [IPv6:2a02:6b67:e390:8b00::1ce5]) by mira.cbaines.net (Postfix) with ESMTPSA id AC7A927BBE2; Sun, 16 Feb 2025 14:47:30 +0000 (GMT) Received: from fang (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 2cc5e4e4; Sun, 16 Feb 2025 14:47:30 +0000 (UTC) From: Christopher Baines To: Ian Eure Subject: Re: [bug#73152] [PATCH 3/6] gnu: Add make-nss. In-Reply-To: <20240909175540.8156-4-ian@retrospec.tv> (Ian Eure's message of "Mon, 9 Sep 2024 10:55:36 -0700") References: <20240909175540.8156-1-ian@retrospec.tv> <20240909175540.8156-4-ian@retrospec.tv> Date: Sun, 16 Feb 2025 14:47:28 +0000 Message-ID: <87seoehrpb.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73152 Cc: 73152@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Ian Eure writes: > * gnu/packages/nss.scm (make-nss): New variable. > NSS builds require time-shifting to their approximate release date to build > repeatably, because it ships with test certificates which expire. To avoid > duplicating the whole package definition between `nss' and `nss-rapid', move > the bulk of the definition into `make-nss', which accepts a version, hash, and > release date, allowing reuse between the two definitions. > > Change-Id: Iaab1bb167ceed985a3dcde57f7fe35dce3deaa36 > --- > gnu/packages/nss.scm | 166 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 166 insertions(+) I'm not sure the refactoring here is overall helpful, I think I understand the motivation but I think it would be simpler and more readable to stick with the package inheritance approach. If you just need to change the source, plus the faketime date in nss-rapid, but want to avoid replacing the entire check phase, maybe you could change the nss package to use an environment variable (e.g. GUIX_CHECK_FAKETIME_DATE) for this, and set this environment variable in a single phase. So in nss you'd have: (add-before 'check 'set-GUIX_CHECK_FAKETIME_DATE (lambda _ (setenv "GUIX_CHECK_FAKETIME_DATE" "2024-01-23"))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) ... (invoke #$(if (target-64bit?) "faketime" "datefudge") (getenv "GUIX_CHECK_FAKETIME_DATE") "./nss/tests/all.sh"))) Then in nss-rapid you'd just do (replace 'set-GUIX_CHECK_FAKETIME_DATE (lambda _ (setenv "GUIX_CHECK_FAKETIME_DATE" "2024-08-30"))) Maybe there's a more elegant way to share a value between phases in the builder, but I think even doing it via an environment variable is still preferable than using a procedure to create the package. I've spent many hours debugging complex functional and performance related issues caused by procedures returning packages, and while it's a powerful tool, it's something to be avoided unless necessary. In terms of how to make this kind of change, I'd split it in to two parts. Introducing the environment variable can definately go to the core-packages-team branch in my opinion, and the package updates could maybe as well, but I'd think of it as two separate patch series. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmex+oBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdA2Q//dFVt7L61b4Qud55zhUBaQIZh72XS3+65 cV4yliWz0UukDQicA54N3Wqju9LmuvoEU29rgZz4jYOfUvRlPP4rVCmpFPgCI5kc 6cwekVMentdRhCjwAqQecZAfw6lFUJkdzW46BwbHV2ELf78DhJtGidGq86/pMlsV v8FuYT6ZNXuofDAT0+pcbaCeqtUrZgl829RWPw4KPpRZJsvuOWymjlMt9J17uxau I3Pn9f3lbp6lXRF5TzxbjGTi4LwMJbBUgdCOcuizV5PGa/IDjcbOTnw+mHABFxAH +Y91T98Atj8E5ZHpmqUGtUyAIqzYadXsLm+RMbYfSDH8czOgw2xQWL4H1J1S7s0J Neo7UbbGbCyxTjOqlSoqcS0TiIuVYMAA2hqUT1q0xxPyx2XBuZkFcwmT5z8qCEt2 GzakTS8ndYcMFxbRkmgTtxc1Mx16PbKdyonwr4kzelHnaywaNM/EvxyTZYnCcklI ThNYnTipTgGqe9gSj8CWoP/jEV0Tf1Au763lUWCc2JskgFRtwW5mRp7t9H34i7Bk P2T/1Y22AVZPp4Xg8Y346blFDfDoF5N21HBuC/e9/D+UFv88f1zy1ucXmdo+cgLP ajfnBbGXuaZoOHBbVE7YtNiOGdiUilR625neIKL5kHaXWRyl8Z9yPHFRkJGVJ98b +HZw7yub5JA= =KidG -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 16 13:48:51 2025 Received: (at 73152) by debbugs.gnu.org; 16 Feb 2025 18:48:51 +0000 Received: from localhost ([127.0.0.1]:37334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjjhC-0006g3-Ig for submit@debbugs.gnu.org; Sun, 16 Feb 2025 13:48:51 -0500 Received: from fhigh-a5-smtp.messagingengine.com ([103.168.172.156]:41171) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tjjh9-0006fb-19 for 73152@debbugs.gnu.org; Sun, 16 Feb 2025 13:48:48 -0500 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfhigh.phl.internal (Postfix) with ESMTP id 65FCC1140250; Sun, 16 Feb 2025 13:48:41 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sun, 16 Feb 2025 13:48:41 -0500 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=1739731721; x=1739818121; bh=QYCkAV6nT6iFVABFRD2tPU3voCX0jkmshqcNZ7ea0iA=; b= YShJt2J78wY8WRg3pAnoiXkQDl8+PEsaqBXkPC1IOKsuB25Ub9KGYWt9Nr+0E4lV wJtKz6hUJeb+uoDiASko7H5TBu/F+Cx0oeWJ3/Cwa8+hxCDG2+5g2Lfkm1jQx/gT eunsbzG+vSppM9SOXsWXeD7YPZ94QFGujNx21r8TJri1iswQjSekBCXMDzDfNl9I NVOBtAvrf7yMh6JvOE5Z1niXhpC2wdkk0GKT13NnbFd3Jajkg2gTCMmC8yfFHLYO Q7DTiDigtj9lyMNfRjxU7xuydFwfYT5Y455y/XyfLOJNuzUnt4tjspQlzHbPy03U eIW9bY4jNYEtUd+c1QMqAQ== 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=1739731721; x= 1739818121; bh=QYCkAV6nT6iFVABFRD2tPU3voCX0jkmshqcNZ7ea0iA=; b=P MeE2tf0EeqoMTAxmQe/MOBUJo4n1BW4FX0DcljRJp55yUgq5OdHL978lPShTVGL4 FJ2Vta14uE344JMPqFJAZRtgll5/TtfkDyzCh9ipJ7PgIQ76jS7V/NA1gFOluZoX Qd0Da3rNHZrXNToayt9yu0mqsJ6FX4AtSto6F9ybok0t0wv3Pw7sLYTjtRlNHPV0 b4LXjTvTbMy8s/0y2TzGE9QvbatlLSOp16sQp7F/bNSbYch7R4k7f0w9jBv/0oI/ aqm+EAuyB/01Df2HWT5vBgc+LoDd02VUF4mqPtza/nPv8Hgd99ZwUq+aKjBs6zQZ GST0K9AUotte9dXgiaxwA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdehiedvvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvve fujghffgffkfggtgfgsehtqhertddtreejnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepveeuleeugeduje eukefhhffhlefgjeehfeffhefgffelkeevkeeutdegkeelgeffnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtg drthhvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthho peejfeduhedvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepmhgrihhlse gtsggrihhnvghsrdhnvght X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Feb 2025 13:48:40 -0500 (EST) From: Ian Eure To: Christopher Baines Subject: Re: [bug#73152] [PATCH 3/6] gnu: Add make-nss. In-Reply-To: <87seoehrpb.fsf@cbaines.net> (Christopher Baines's message of "Sun, 16 Feb 2025 14:47:28 +0000") References: <20240909175540.8156-1-ian@retrospec.tv> <20240909175540.8156-4-ian@retrospec.tv> <87seoehrpb.fsf@cbaines.net> User-Agent: mu4e 1.12.8; emacs 29.4 Date: Sun, 16 Feb 2025 10:48:38 -0800 Message-ID: <87frkdn2t5.fsf@retrospec.tv> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: 73152@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Christopher, Christopher Baines writes: > Ian Eure writes: > >> * gnu/packages/nss.scm (make-nss): New variable. >> NSS builds require time-shifting to their approximate release=20 >> date to build >> repeatably, because it ships with test certificates which=20 >> expire. To avoid >> duplicating the whole package definition between `nss' and=20 >> `nss-rapid', move >> the bulk of the definition into `make-nss', which accepts a=20 >> version, hash, and >> release date, allowing reuse between the two definitions. >> >> Change-Id: Iaab1bb167ceed985a3dcde57f7fe35dce3deaa36 >> --- >> gnu/packages/nss.scm | 166=20 >> +++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 166 insertions(+) > > I'm not sure the refactoring here is overall helpful, I think I > understand the motivation but I think it would be simpler and=20 > more > readable to stick with the package inheritance approach. > > If you just need to change the source, plus the faketime date in > nss-rapid, but want to avoid replacing the entire check phase,=20 > maybe you > could change the nss package to use an environment variable > (e.g. GUIX_CHECK_FAKETIME_DATE) for this, and set this=20 > environment > variable in a single phase. > > So in nss you'd have: > > (add-before 'check 'set-GUIX_CHECK_FAKETIME_DATE > (lambda _ > (setenv "GUIX_CHECK_FAKETIME_DATE" "2024-01-23"))) > (replace 'check > (lambda* (#:key tests? #:allow-other-keys) > ... > (invoke #$(if (target-64bit?) "faketime" "datefudge") > (getenv "GUIX_CHECK_FAKETIME_DATE")=20 > "./nss/tests/all.sh"))) > > Then in nss-rapid you'd just do > > (replace 'set-GUIX_CHECK_FAKETIME_DATE > (lambda _ > (setenv "GUIX_CHECK_FAKETIME_DATE" "2024-08-30"))) > > Maybe there's a more elegant way to share a value between phases=20 > in the > builder, but I think even doing it via an environment variable=20 > is still > preferable than using a procedure to create the package. I've=20 > spent many > hours debugging complex functional and performance related=20 > issues caused > by procedures returning packages, and while it's a powerful=20 > tool, it's > something to be avoided unless necessary. Thank you very much for the detailed review and suggestion. I=20 like the environment variable approach a lot, and will send an=20 updated patch series which uses it. I agree with you that=20 straightforward package definitions are preferable, and this is a=20 much simpler approach. > In terms of how to make this kind of change, I'd split it in to=20 > two > parts. Introducing the environment variable can definately go to=20 > the > core-packages-team branch in my opinion, and the package updates=20 > could > maybe as well, but I'd think of it as two separate patch series. The split that makes sense to me is to send one series to=20 core-packages-team, consisting of: one patch to use an environment=20 variable for the release date; a second patch to ungraft nss; and=20 a third package updatingd nss to the latest ESR. I believe each=20 patch in this series will cause nss dependents to rebuild, so it=20 seems preferable to put those into a single series, rather than=20 turn a 15k package build into a 45k one. Then, after core-packages-team merges, a second patch to master=20 which updates nss-rapid to use the environment variable mechainsm.=20 Since very little depends on this package, it=E2=80=99s safe to update in=20 master any time. If that sounds good to you, I=E2=80=99ll close this bug and open a new one= =20 with the first series. Thank you again for engaging with me on moving forward on this=20 work. -- Ian From debbugs-submit-bounces@debbugs.gnu.org Tue May 06 18:51:28 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v2 1/6] gnu: nspr: Update to 4.36. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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' -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue May 06 18:51:30 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v2 2/6] gnu: Remove nss/fixed. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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. -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue May 06 18:51:30 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v2 3/6] gnu: nss: Store the package release date in an environment variable. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue May 06 18:51:35 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v2 4/6] gnu: nss: Clean up. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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) -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue May 06 18:51:36 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v2 5/6] gnu: nss: Update to 3.101.3. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue May 06 18:51:36 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v2 6/6] gnu: nss-certs: Update to 3.101.3. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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" -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 07 20:06:27 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v3 2/7] gnu: nspr: Update to 4.36. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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' -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 07 20:06:28 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v3 1/7] gnu: Remove nspr-4.32. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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. -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 07 20:06:29 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v3 3/7] gnu: Remove nss/fixed. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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. -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 07 20:06:34 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v3 4/7] gnu: nss: Store the package release date in an environment variable. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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) -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 07 20:06:35 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v3 5/7] gnu: nss: Clean up. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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) -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 07 20:06:36 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v3 6/7] gnu: nss: Update to 3.101.3. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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 -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Wed May 07 20:06:36 2025 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 To: 73152@debbugs.gnu.org Subject: [PATCH v3 7/7] gnu: nss-certs: Update to 3.101.3. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: Ian Eure X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * 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" -- 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Sat May 17 14:19:26 2025 Received: (at 73152) by debbugs.gnu.org; 17 May 2025 18:19:26 +0000 Received: from localhost ([127.0.0.1]:50886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uGM86-00082R-3z for submit@debbugs.gnu.org; Sat, 17 May 2025 14:19:26 -0400 Received: from fout-b5-smtp.messagingengine.com ([202.12.124.148]:47489) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uGM82-000820-Ko for 73152@debbugs.gnu.org; Sat, 17 May 2025 14:19:23 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.stl.internal (Postfix) with ESMTP id 96A8E11400DA; Sat, 17 May 2025 14:19:16 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Sat, 17 May 2025 14:19:16 -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:message-id:mime-version:reply-to :subject:subject:to:to; s=fm2; t=1747505956; x=1747592356; bh=cO fqq/TGCF8+beuzfQudTO8pSjaVEhpeuC3ku61Y3qU=; b=eWd7WPZODVQoGrrFYd SDN7l20CQnYJ36tYrms2DuWSfXFn4GObUxo5URysqPno76cu1zQhkC/uG1vFgzGd ZxjRy6+lxoMzHe4LSqxc+Qn8x0KYyshu4iLmzP/6sGZpkfSnpMnqpkMo5GURJWhV AcVac9NSP2L/vu4qXtK3sZxSkZwx8L9+P5OrW28GD9GJ9HeoLO8ZJctyb0bbGHEf yws42alKvsEt9cEUUkkAleMg/dJLdV+ucbdwXB42Ma2YoBzlqWRcFkcjbsEKbteN ZcShokupaNR7to/qjoRUniZLmSfq98Tx3ifQdMnSxgnQjoD3z74Tj060l+KBzSmR zTSw== 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: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=1747505956; x=1747592356; bh=cOfqq/TGCF8+beuzfQudTO8pSjaV EhpeuC3ku61Y3qU=; b=vduyYcKlyElPT++w8wJVAu45Tm9XfTge0RIqsf/olHWh d2G8wN8cRmQs3RMVgZma7cMhmg+49GffduCr+DxGxBc7jFHy1oAX0qxsmmqYJCw9 YOJPaWtkUc5kIVn1AdwtMCybF8lP7XlX/iVoIAfpZqxj8KruMbYK0lS9xKYTeeW5 6oq8UfYxSa5jVAe8pXiHWLeFCipId4nqImC7HyDe67aeAxqKhC0qPAofgRhHuvvF ZkDqlgK46EQulPQz2lox1Gb6oIgiVq3mz6lPywXYO6HTOTpIk5MoiMhRyJ14T5MN VEwRsNDm+oBGT2Nqwu/e5tfG+UqZdO8BcDRHxa1YJA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdefudeifeefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufgffkfggtgfgsehtqhertddtreej necuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqne cuggftrfgrthhtvghrnheptdetkeffffefiefhueekvdeiueegieegffdthfelveelgfdt vdfhtdduheffuedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopeefpdhm ohguvgepshhmthhpohhuthdprhgtphhtthhopeejfeduhedvseguvggssghughhsrdhgnh hurdhorhhgpdhrtghpthhtoheplhhilhhirghnrgdrphhrihhklhgvrhesghhmrghilhdr tghomhdprhgtphhtthhopehmrghilhestggsrghinhgvshdrnhgvth X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 17 May 2025 14:19:15 -0400 (EDT) From: Ian Eure To: Christopher Baines , Liliana Marie Prikler Subject: Re: [bug#73152] [PATCH 3/6] gnu: Add make-nss. User-Agent: mu4e 1.12.9; emacs 29.4 Date: Sat, 17 May 2025 11:19:14 -0700 Message-ID: <87frh3drrx.fsf@retrospec.tv> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 73152 Cc: 73152@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Liliana, Christopher, Liliana Marie Prikler writes: > Note: the explanation should come before the ChangeLog. Fixed, thanks. Christopher Baines writes: > Maybe there's a more elegant way to share a value between phases=20 > in the > builder, but I think even doing it via an environment variable=20 > is still > preferable than using a procedure to create the package. I've=20 > spent many > hours debugging complex functional and performance related=20 > issues caused > by procedures returning packages, and while it's a powerful=20 > tool, it's > something to be avoided unless necessary. I adopted this suggestion, and it made for a much cleaner setup.=20 Thank you! The current patch series is working and ready for review. I=20 haven=E2=80=99t rebuilt all the dependent packages (and QA is down, so I=E2= =80=99m=20 not sure whether it has, but it=E2=80=99s had a week to do so), but the=20 direct nss/nspr changes build and seem to work for me. > In terms of how to make this kind of change, I'd split it in to=20 > two > parts. Introducing the environment variable can definately go to=20 > the > core-packages-team branch in my opinion, and the package updates=20 > could > maybe as well, but I'd think of it as two separate patch series. This patch series updates nss, but leaves nss-rapid for a later=20 series. I=E2=80=99d prefer not to block this on core-package-team, but if= =20 you feel strongly that some or all of these changes should go=20 there, I will direct them. Given that it=E2=80=99s been 8 months since I=20 opened the series and that will extend the timeline greatly, I=E2=80=99m=20 disinclined to complicate things more -- and would likely end up=20 needing to move all the changes to Codeberg with the added delay.=20 WDYT? -- Ian From debbugs-submit-bounces@debbugs.gnu.org Sun May 25 13:49:07 2025 Received: (at control) by debbugs.gnu.org; 25 May 2025 17:49:07 +0000 Received: from localhost ([127.0.0.1]:48181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uJFT8-0006Zb-LN for submit@debbugs.gnu.org; Sun, 25 May 2025 13:49:06 -0400 Received: from fhigh-a7-smtp.messagingengine.com ([103.168.172.158]:51139) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uJFT5-0006Yn-RC for control@debbugs.gnu.org; Sun, 25 May 2025 13:49:04 -0400 Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.phl.internal (Postfix) with ESMTP id 78164114013B for ; Sun, 25 May 2025 13:48:58 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Sun, 25 May 2025 13:48:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:content-type:date:date:from:from:in-reply-to:message-id :reply-to:subject:subject:to:to; s=fm3; t=1748195338; x= 1748281738; bh=0sjDIs5Bem1bRUBmYegVQMpVvUbgyDPa8fi8+gk/p2w=; b=D UVDqCny05cH6Ou86Gk5bcLZ3LJ6nh+Edt0BKL5LJ8oNXTmbrcWWajxZ6OPwaVuxQ oURhFz3EQ0KljjzrKd/7e2OxNW/+wmLU2sHwrVi2a+fq6rP0ljbTtr4Hv6F6m5q6 JXIGBiouKaonWWmzuYkeqhHMIe0kmgOfYvGEpcQ5Enr3pCorvgrMT/JXMTmA0nVD oL8v4exy42LFBSoKB8yO+enJ7eJcYBWOKjnSUYV+e8+xIfeEf7Z4UZB1QrkxuxW7 iPY88fX+YqgcF5CVDycmgx8Ywl7iaLwTT450kkJ15yxND21Y7Hp4mrMRluVNUIQq eSywHtzMQC2Q01J451ITw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:message-id:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1748195338; x=1748281738; bh=0sjDIs5Bem1bRUBmYegVQMpVvUbg yDPa8fi8+gk/p2w=; b=UMqRRr4jm19q7E460lGwgojqDoBeRuYg7e4qRErqvi+1 j+HiwWE6GAaT4gf5RWvvDJCN9U942gUfK2hXx1XESFTr0SanfBk+TB79Tw38+7Qr Jszfg3l9Ugi2RuQJr7QpTvpiOt7cTPkeIzy0q/qSdSN3eNn1i43amMEGdbLE8IHq CjwshNIexXoEA/YGGBDhH1S7cTGeKRM+CXK3LLff5s4kntYWo7PhP8dqCgfL6kvg k57C1xwDImQkh1DN7Xeon1YquABQlgvgthwAlqq0u3dBSWsGKJ6YRv6qvzf0QgSN mX/78UlbHHUkUG9S9/p+am2iI+D33ZNY389Wg0uN4Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgdduhedvheculddtuddrgeefvddrtd dtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggft fghnshhusghstghrihgsvgdpuffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftd dtnecunecujfgurhepfffkvffhufestddtredttddttdenucfhrhhomhepkfgrnhcugfhu rhgvuceoihgrnhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpeetke ejhfefhfetieegkeehheevvdefgffggeevffdtvddufeehiefgteeiueehkeenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrh hoshhpvggtrdhtvhdpnhgspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhr tghpthhtoheptghonhhtrhholhesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sun, 25 May 2025 13:48:57 -0400 (EDT) Date: Sun, 25 May 2025 10:48:57 -0700 Message-Id: <87a570funq.fsf@retrospec.tv> To: control@debbugs.gnu.org From: Ian Eure Subject: control message for bug #73152 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) close 73152 quit