From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJjOn-0003JC-Pe for guix-patches@gnu.org; Sat, 10 Jun 2017 12:38:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJjOk-00021b-MB for guix-patches@gnu.org; Sat, 10 Jun 2017 12:38:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36446) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dJjOk-00021J-IP for guix-patches@gnu.org; Sat, 10 Jun 2017 12:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dJjOk-0003YY-6P for guix-patches@gnu.org; Sat, 10 Jun 2017 12:38:02 -0400 Subject: bug#27308: [PATCH] gnu: gnutls: Replace with 3.5.13. Resent-Message-ID: From: Marius Bakke In-Reply-To: <87poeblsxk.fsf@fastmail.com> References: <20170610135851.6341-1-mbakke@fastmail.com> <87bmpvykyv.fsf@gnu.org> <87poeblsxk.fsf@fastmail.com> Date: Sat, 10 Jun 2017 18:37:19 +0200 Message-ID: <87mv9flry8.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 27308@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Marius Bakke writes: > I tested this graft on my profile, but apparently the grafting code > checks the store item length and refuses since the .13 is one byte > longer than .9: [...] > ERROR: In procedure scm-error: > ERROR: replacement length differs from the original length "56dbd2gw33g3wdxmq78lr39lamg8gxnq-gnutls-3.5.9" "78kvf0ma45z3h14850wzkcvz3zqg59xy-gnutls-3.5.13" The attached patch allows the graft to proceed, but I'm not sure about the sanity of it all. Thoughts? --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-build-graft-Allow-longer-replacement-store-names.patch Content-Transfer-Encoding: quoted-printable From=205f122f6e1b73fb7a664142a20ac70890cb6956f9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Jun 2017 18:31:03 +0200 Subject: [PATCH] build: graft: Allow longer replacement store names. * guix/build/graft.scm (rewrite-directory): Only fail if replacement name i= s shorter. =2D-- guix/build/graft.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/build/graft.scm b/guix/build/graft.scm index 16df169ec..2b3b99cb1 100644 =2D-- a/guix/build/graft.scm +++ b/guix/build/graft.scm @@ -263,9 +263,9 @@ file name pairs." (((=3D hash+rest (origin-hash origin-string)) . (=3D hash+rest (replacement-hash replacement-string))) =2D (unless (=3D (string-length origin-string) =2D (string-length replacement-string)) =2D (error "replacement length differs from the original len= gth" + (unless (<=3D (string-length origin-string) + (string-length replacement-string)) + (error "replacement length is shorter than the original le= ngth" origin-string replacement-string)) (cons origin-hash (string->utf8 replacement-string))) ((origin . replacement) =2D-=20 2.13.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlk8ID8ACgkQoqBt8qM6 VPpZywf/WmooWOcauuE080e2xREfgj1IZ90r3Iy9OKUbsXnCsWv3kqh79lQX7y0R 2RBOAnWuevF73mmL0M7HBE8e8wDyry6HiqZJ+Fk1dFpBpsBsW8aUBLo6qMpkpsQP KboENh5vrRUbxFMB3LAv3KqKw4aaYaFaMEmF/MYzS8SIlZv6ojb+exH3lBVG2GE8 fuUCu+znXZOj2z4Sy1c948NGRx3NPaGJYXh0kn3kI+eL2kxVaIpNR929RlIpEbwn fX/cNzZVBUMYtWNsHuxo3+HKS060AsiAmgZzqMD+nXXxSVqLL1Dgu3D/YGr7quTz AK21gse2KpQol5BeL9VXsulAX5561Q== =bisz -----END PGP SIGNATURE----- --==-=-=--