From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:54893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxLw7-0007wq-DI for guix-patches@gnu.org; Fri, 22 Feb 2019 20:17:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxLw6-0000ON-HT for guix-patches@gnu.org; Fri, 22 Feb 2019 20:17:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35147) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxLw6-0000NU-Ba for guix-patches@gnu.org; Fri, 22 Feb 2019 20:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gxLw6-0006Sa-3T for guix-patches@gnu.org; Fri, 22 Feb 2019 20:17:02 -0500 Subject: [bug#34625] [PATCH] Documentation: Update `guix challenge` diffing Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:54752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxLvj-0007wV-D6 for guix-patches@gnu.org; Fri, 22 Feb 2019 20:16:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxLvi-0008Ex-Gx for guix-patches@gnu.org; Fri, 22 Feb 2019 20:16:39 -0500 Received: from forward103j.mail.yandex.net ([2a02:6b8:0:801:2::106]:35121) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gxLvg-0007uT-2t for guix-patches@gnu.org; Fri, 22 Feb 2019 20:16:38 -0500 Received: from mxback14o.mail.yandex.net (mxback14o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::65]) by forward103j.mail.yandex.net (Yandex) with ESMTP id E0354674067C for ; Sat, 23 Feb 2019 04:16:10 +0300 (MSK) Date: Fri, 22 Feb 2019 20:29:31 -0500 From: mikadoZero Message-ID: <20190223012931.GA17575@z.z> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="zYM0uCDKw75PZbzx" Content-Disposition: inline Content-Transfer-Encoding: 7bit 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: 34625@debbugs.gnu.org --zYM0uCDKw75PZbzx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Attached is a patch that updates the manual sections `Invoking guix challenge` and `Invoking guix archive`. The update involves changing a command in both sections to one that I verified worked as part of my submission of `guix challenge` diffs for bug#34597. The commands that are replaces did not work for me. There is also a cross reference added to the `Invoking guix challenge` in the relevant part of `Invoking guix archive`. --zYM0uCDKw75PZbzx Content-Type: text/x-diff; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-Documentation-Update-guix-challenge-diffing.patch" Content-Transfer-Encoding: quoted-printable >From ea59d81de86fd5179eebf9782fbe66213ed59397 Mon Sep 17 00:00:00 2001 From: mikadoZero Date: Fri, 22 Feb 2019 18:24:20 -0500 Subject: [PATCH] Documentation: Update `guix challenge` diffing. Add /gzip/ part into url which has the benefit of matching the output of `guix challenge`. Change the commands to include gunzip in the pipeline = as they are working on gzipped files. Add reference to `guix challenge` in = `guix archive` section where talking about challenging. --- doc/guix.texi | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9fb5cff06..43c12cd72 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -58,6 +58,7 @@ Copyright @copyright{} 2018 G=E1bor Boskovits@* Copyright @copyright{} 2018 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* +Copyright @copyright{} 2019 mikadoZero@* =20 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -4204,8 +4205,8 @@ served by @code{@value{SUBSTITUTE-SERVER}} to @file= {/tmp/emacs}: =20 @example $ wget -O - \ - https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-emacs-24.5 \ - | bunzip2 | guix archive -x /tmp/emacs + https://@value{SUBSTITUTE-SERVER}/nar/gzip/@dots{}-emacs-24.5 \ + | gunzip | guix archive -x /tmp/emacs @end example =20 Single-item archives are different from multiple-item archives produced @@ -4215,7 +4216,8 @@ and they do @emph{not} embed a signature. Thus thi= s operation does unsafe. =20 The primary purpose of this operation is to facilitate inspection of -archive contents coming from possibly untrusted substitute servers. +archive contents coming from possibly untrusted substitute servers +(@pxref{Invoking guix challenge}). =20 @end table =20 @@ -9559,8 +9561,8 @@ To find out what is wrong with this Git binary, we = can do something along these lines (@pxref{Invoking guix archive}): =20 @example -$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-git-2.5.0 \ - | guix archive -x /tmp/git +$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/gzip/@dots{}-git-2.= 5.0 \ + | gunzip | guix archive -x /tmp/git $ diff -ur --no-dereference /gnu/store/@dots{}-git.2.5.0 /tmp/git @end example =20 --=20 2.20.1 --zYM0uCDKw75PZbzx--