From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH] gnu: gnutls: Replace with 3.5.8 [fixes GNUTLS-SA-2017-{1,2}]. Date: Wed, 11 Jan 2017 12:17:41 -0500 Message-ID: <20170111171741.GA21549@jasmine> References: <20170110181803.GB28153@jasmine> <20170110221532.3691-1-ludo@gnu.org> <20170110223626.GC8431@jasmine> <87inpmy1uj.fsf@gnu.org> <20170110230839.GA10774@jasmine> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mP3DRpeJDSE+ciuQ" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRMX0-0006x3-A6 for guix-devel@gnu.org; Wed, 11 Jan 2017 12:17:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRMWw-0001O3-QM for guix-devel@gnu.org; Wed, 11 Jan 2017 12:17:50 -0500 Content-Disposition: inline In-Reply-To: <20170110230839.GA10774@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: Ludovic =?iso-8859-1?Q?Court=E8s?= Cc: guix-devel@gnu.org --mP3DRpeJDSE+ciuQ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 10, 2017 at 06:08:39PM -0500, Leo Famulari wrote: > On Tue, Jan 10, 2017 at 11:41:40PM +0100, Ludovic Court=C3=A8s wrote: > > Leo Famulari skribis: > > > The last time I noticed an exported replacement, I found that it was > > > resolved non-deterministically (using `guix build -S` in a loop), and > > > we made the replacement private: > > > > > > http://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D69aa6e0995b55a= 38d5ce174602a107645be726d5 > >=20 > > I can=E2=80=99t seem to reproduce it here, but it sounds like an intere= sting > > bug. :-) >=20 > Me neither. IIRC, it would manifest at least 1/10 iterations of the > loop. I can reproduce it by applying the diff below on 88f2dd1ddf8123f628ee0b64406b6fd2a6a9f076 and running: $ while true; do ./pre-inst-env guix build gnutls -S; done guix build: warning: ambiguous package specification `gnutls' guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:139:2 /gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz guix build: warning: ambiguous package specification `gnutls' guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:216:2 /gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz guix build: warning: ambiguous package specification `gnutls' guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:216:2 /gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz guix build: warning: ambiguous package specification `gnutls' guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:139:2 /gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e577421fa..19d5049c3 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -138,6 +138,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") + (replacement gnutls-3.5.8) (version "3.5.4") (source (origin (method url-fetch) @@ -211,6 +212,20 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) =20 +(define-public gnutls-3.5.8 + (package + (inherit gnutls) + (source + (let ((version "3.5.8")) + (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/gnutls/v" + (version-major+minor version) + "/gnutls-" version ".tar.xz")) + (sha256 + (base32 + "1zyl2z63s68hx1dpxqx0lykmlf3rwrzlrf44sq3h7dvjmr1z55qf"))))))) + (define-public openssl (package (name "openssl") --mP3DRpeJDSE+ciuQ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlh2aLQACgkQJkb6MLrK fwjmPBAA1jsbDOqegmsTosiRLEkIcgw8G82mjv4Mt9jUQMNJ22SEl3o444WdYiUV ljR3eRW2gSFeNpUtM5sHGp4erRw+ClqmDnPMswGHgrXXkWyql9YJBensd32VfScm WIBvJ/D45xBBTd0EnbQ9/gk750SV619DjbaPDoPqhBRDZDPDtRTLUijvPF1JnXus kK226BDpRmPSh7sjBTZULVKl/aUqyA0EIWmcmo+cIK5/9+5//16jztPSH7gBU9in NI8ltrZYrlyPZeplXHNWljShlqPrGJz1KY0lJU1ChWXHcP4mAVbLKHk8jAfkcM0K 1+utctFNMaM+5HWSboB/CfmGF0fl1VIGPXk6lb477p/Czu4jO80qMkg9F1t6qxcD 74DOFeo4MyFyrt9KSI7YGW3KYlNmKdJLT5HWqSnerlislMNP5LdSxtu3fnlHOF0l 29hZHuUraUE80VcM2aznf2A+eTtf3IGtYYENhV0qHJJqQfZJrq0P+aPIy6WTvqvt BLvAJcqBsXm0yO3r+/5dybV6bQGszBFT0eWZwI7laEiIbS6Cn25oWQCsWKUjPtJv SDRj5BIr2DS189GSHr7ba2YMvGiA3d2VVi6+4da+nZ+kjJzLqsXOeD3XTgAQtAYb qJ9dYjWmTSe89DOTiYhIKH9l8Qh1cLk4zMYdG1+OU5weygijnrQ= =rKf6 -----END PGP SIGNATURE----- --mP3DRpeJDSE+ciuQ--