From patchwork Sat Feb 23 01:29:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: mikadoZero X-Patchwork-Id: 1222 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5201F16CA4; Sat, 23 Feb 2019 03:06:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CC2B116C9F for ; Sat, 23 Feb 2019 03:06:38 +0000 (GMT) Received: from localhost ([127.0.0.1]:60256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxNeA-0000pa-0y for patchwork@mira.cbaines.net; Fri, 22 Feb 2019 22:06:38 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#34625] [PATCH] Documentation: Update `guix challenge` diffing Resent-From: mikadoZero Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Feb 2019 01:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34625 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34625@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155088460924809 (code B ref -1); Sat, 23 Feb 2019 01:17:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Feb 2019 01:16:49 +0000 Received: from localhost ([127.0.0.1]:48691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxLvt-0006S5-3e for submit@debbugs.gnu.org; Fri, 22 Feb 2019 20:16:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxLvp-0006Rq-UU for submit@debbugs.gnu.org; Fri, 22 Feb 2019 20:16:48 -0500 Received: from lists.gnu.org ([209.51.188.17]:49225) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gxLvk-0008G8-Ff for submit@debbugs.gnu.org; Fri, 22 Feb 2019 20:16:40 -0500 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) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback14o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 7XRiV8AcOP-GAVupvbe; Sat, 23 Feb 2019 04:16:10 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.com; s=mail; t=1550884570; bh=OiyYC60Mrn+OmPc3hDAlBQWL7+/oYDHV6+gJsQjiDk4=; h=Subject:To:From:Date:Message-ID; b=U1ySGFP0c2j9sS4S2NjOgHK3YU379ymBMXEwhanZsfIUWqQg8drDU/Y5temBuzwxZ VENVEP+xygwGpMN8Swe0m4XYv+D9e+Drm3wWzPB6ISHb8M8dYvyEUvlHu33Z+huAII n2Z5LG/qn+rkxwqnEl+pQAuYEX0B3pN0Wa3X8kC8= Authentication-Results: mxback14o.mail.yandex.net; dkim=pass header.i=@yandex.com Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id m0lEkBoub6-G9RuZ262; Sat, 23 Feb 2019 04:16:09 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) Date: Fri, 22 Feb 2019 20:29:31 -0500 From: mikadoZero Message-ID: <20190223012931.GA17575@z.z> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Fri, 22 Feb 2019 22:06:31 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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`. 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ábor Boskovits@* Copyright @copyright{} 2018 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* +Copyright @copyright{} 2019 mikadoZero@* 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}: @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 Single-item archives are different from multiple-item archives produced @@ -4215,7 +4216,8 @@ and they do @emph{not} embed a signature. Thus this operation does unsafe. 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}). @end table @@ -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}): @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 -- 2.20.1