From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: 03/03: gnu: nss, nss-certs: Update to 3.27.2. Date: Wed, 21 Dec 2016 11:38:00 -0500 Message-ID: <20161221163800.GA4326@jasmine> References: <20161214151942.11288.43191@vcs.savannah.gnu.org> <20161214151942.79CB12201D1@vcs.savannah.gnu.org> <878traa0qk.fsf@netris.org> <20161221060938.GA5338@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="UHN/qo2QbUvPLonB" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cJju3-0002VR-41 for guix-devel@gnu.org; Wed, 21 Dec 2016 11:38:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cJjtz-0005Fw-G6 for guix-devel@gnu.org; Wed, 21 Dec 2016 11:38:07 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:51206) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cJjtz-0005Fk-9l for guix-devel@gnu.org; Wed, 21 Dec 2016 11:38:03 -0500 Content-Disposition: inline In-Reply-To: <20161221060938.GA5338@jasmine> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Mark H Weaver Cc: guix-devel@gnu.org --UHN/qo2QbUvPLonB Content-Type: multipart/mixed; boundary="envbJBWh7q8WU6mo" Content-Disposition: inline --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Dec 21, 2016 at 01:09:38AM -0500, Leo Famulari wrote: > At least some of these failures are caused by an expired test > certificate: >=20 > https://bugzilla.mozilla.org/show_bug.cgi?id=3D1323978 >=20 > This breaks compilation of NSS 3.27.1 and 3.27.2 across all of our > architectures. With the attached patch, I can build NSS 3.27.1 on x86_64. If we decide to use this patch, let's build it on its own Hydra branch, because I suspect there is some non-determinism in the test suite, and I'd rather not make everyone try building it themselves if it fails on Hydra for some reason. By the way, Git shows the upstream patch as binary data, but if you apply the attached patch to your work tree, there is plain text annotation you can use to reproduce it. I recreate the annotation here: Update expired test certificate: https://bugzilla.mozilla.org/show_bug.cgi?id=3D1323978 Patch copied from upstream source repository: https://hg.mozilla.org/projects/nss/rev/03429dfa184e # HG changeset patch # User Kai Engert # Date 1481895886 -3600 # Fri Dec 16 14:44:46 2016 +0100 # Node ID 03429dfa184ec0a11bda4e35e6621ee2ab16a928 # Parent 5e7b5e3d301d7c3395ee982e8f082b0babc333c7 Bug 1323978, The PayPalEE test cert has expired, r=3Dbustage diff -r 5e7b5e3d301d -r 03429dfa184e tests/libpkix/certs/PayPalEE.cert --- a/nss/tests/libpkix/certs/PayPalEE.cert Fri Dec 16 13:41:23 2016 +0= 100 +++ b/nss/tests/libpkix/certs/PayPalEE.cert Fri Dec 16 14:44:46 2016 +0= 100 @@ -1,8 +1,9 @@ [... binary data ...] --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-nss-Fix-build-failure-caused-by-expired-test-cer.patch" Content-Transfer-Encoding: quoted-printable =46rom e19cd9120b7e62f88dd5b0a1fae099d1e01650eb Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari Date: Tue, 20 Dec 2016 21:29:19 -0500 Subject: [PATCH] gnu: nss: Fix build failure caused by expired test certificate. * gnu/packages/patches/nss-update-expired-test-cert.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnuzilla.scm (nss)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 3 ++- gnu/packages/patches/nss-update-expired-test-cert.patch | Bin 0 -> 3403 by= tes 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/nss-update-expired-test-cert.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3a56c840b..77d8914bd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -741,6 +741,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/ninja-zero-mtime.patch \ %D%/packages/patches/node-9077.patch \ %D%/packages/patches/nss-pkgconfig.patch \ + %D%/packages/patches/nss-update-expired-test-cert.patch \ %D%/packages/patches/nvi-assume-preserve-path.patch \ %D%/packages/patches/nvi-dbpagesize-binpower.patch \ %D%/packages/patches/nvi-db4.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 07ed2af0b..7439af131 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -203,7 +203,8 @@ in the Mozilla clients.") (base32 "0sraxk26swlgl7rl742rkfp5k251v5z3lqw9k8ikin0cjfhkfdpx")) ;; Create nss.pc and nss-config. - (patches (search-patches "nss-pkgconfig.patch")))) + (patches (search-patches "nss-pkgconfig.patch" + "nss-update-expired-test-cert.patch= ")))) (build-system gnu-build-system) (outputs '("out" "bin")) (arguments diff --git a/gnu/packages/patches/nss-update-expired-test-cert.patch b/gnu/= packages/patches/nss-update-expired-test-cert.patch new file mode 100644 index 0000000000000000000000000000000000000000..4e7cd6eda46e7b016c92561e065= 1ade7dc90c91b GIT binary patch literal 3403 zcmdT`3se)?8P0?dBm#=3DzrAKspAe5NoP7*>uP{Knaf{P-eD65mnBpC=3Dvm`Mn@6(zd( z0&%TxMX4xVA6+Z8zHoiZ3S!p>tBY0<#kykG7YMp2bOuDR?b&WUr>CcLk~8`5|KI=3DK z@B9Dz-6WYcs0D}dY%@XP8rXtU78t`x3!x=3D2+7ZgrTP$WOR4i6ob@K>=3D0TpGKy5A;J zC#Li!+Z@^>!gRzqLKBWiCDM>!1&^12S};9~nal*8R7;vNV5^z3kT{wFQzk2k;V_At zO%!1IA)>5Mv4-Xc$OGQWs(q$7DW^?oW~mht0ush9yRK43b(*! zW=3DVQ5iNZ;E5=3Dy`^w1c$3Vd*G=3DN2FVcY>@^ZO9wi7?Vmvf^a-UA;A?|ppdA68dcMSQY@GkY1P4RsT>VY z)8ll8oCMSm6Z5`4upXs)sx}%X!_`*Gg6e2iG=3Dx?Q3&{@_W9;7h?Mg$54TRd9PGpOj zdQ;+_HAIZb6AFbe+C@Cm5D+JbD(ma-9S7RrzhM5Y*R^1o)(w>6!y5l1Ly1ruN416Y=3DZwXHaUU-*?VjX+C=3D^> zHaH435Ly#yBv8a1^kWb^@%tpAMmW|);qU4K^If{Tax_yG5i$t)bl1hbdl*h2O&Tj^ zAxuW(EpZNf9<2m9X4Jrx3)rFIy?KHhSq^rnAB!I63E6fCVtseM9Czw$&*TZe{nEDn zb;FJ&sX4!LxHD+Z>6e*Rdyif9y0b-8Q8##2&8qqLrtL}0NeIUFU(io~oHpx9f5o7n zw%`Ga>c}Zu553yrdwADhoBbMm*t--|IKkCG|58Hz<6{zkXy(Pi|ju&DTUc_4Ibh zYw^l8matF0s&0M0$9VykdC)&Q{$<0R{Ls8@wMjAlo$-m{jZp!=3D|EUTyX#(Weo6fKj zmgbjUTJ+WNjXr+m(TU|<;RisY@#0t+LRH?1UCe6ufUSEvf-!lFP#nL)ITh3kPQR>%pbbIPv zTWC?*a`(+=3Df^-|V6`wx2ciW?pGtS2zcS1k`;dHF?WXfglO2;;9b;rdG*-^^99@e(1 z{w+?58C2Th8AEp=3D^8+TBH{2d~onYtv{o1*j$g+m7B zChwjY6%hEWpv`qhT7i!>eMimj#P^3?&MT-r*20Qw4R$C+rR7bYGF9RtRkA_){7`%I z>!y0wOLr$i2S!wd&ufYNWCL$DJlO;rahriK;xKA~aiaz{X<;p4z$kREImFC+C`$v)7F1H=3D!Hk5u!bJ3xJPS6 z{ePkr&8tS@_k;cJvy<_^30?$lxxyOuCGcc=3D(w*Z5T+ed}4