From patchwork Tue Dec 21 18:20:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 515 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 5FBB227BBEA; Tue, 21 Dec 2021 18:21:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 28A1B27BBE9 for ; Tue, 21 Dec 2021 18:21:26 +0000 (GMT) Received: from localhost ([::1]:33990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzjlN-0002eQ-6i for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 13:21:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzjl0-0002d2-SR for guix-patches@gnu.org; Tue, 21 Dec 2021 13:21:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzjl0-000325-JZ for guix-patches@gnu.org; Tue, 21 Dec 2021 13:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzjl0-0000oI-GK for guix-patches@gnu.org; Tue, 21 Dec 2021 13:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52710] [PATCH 0/2] Update Disarchive Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 18:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52710 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52710@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16401108523073 (code B ref -1); Tue, 21 Dec 2021 18:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Dec 2021 18:20:52 +0000 Received: from localhost ([127.0.0.1]:55607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzjkp-0000nT-BL for submit@debbugs.gnu.org; Tue, 21 Dec 2021 13:20:51 -0500 Received: from lists.gnu.org ([209.51.188.17]:35594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzjkl-0000nJ-0q for submit@debbugs.gnu.org; Tue, 21 Dec 2021 13:20:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzjkk-0002XS-Ro for guix-patches@gnu.org; Tue, 21 Dec 2021 13:20:46 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:57813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzjki-0002sX-Q6 for guix-patches@gnu.org; Tue, 21 Dec 2021 13:20:46 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 2331C5C010A for ; Tue, 21 Dec 2021 13:20:44 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Tue, 21 Dec 2021 13:20:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=S5NNfp P7a0Ro8fFl4d60RDFjM09MF93H1KrkAYkSMTI=; b=W/x8TN/xyuC8HBgfDBvy7Q azr4J6+HpcaZntX5nPBXa192ySnn+0aOJ9FmHuDlm/5ZKxzlCUfAwEZy8jDEuMMv AVWTzm6zEsRK7unDa6siKRaGmXBM/Jw4YkhusXCLGVAObyw38sbT+v/DH9tzs+DV dt3n1IWbKkx+ZOvgGjZR2uIsE0Uli/6fdLsGRxWg4QRDsLLI2nqKqAPsMlefajiC wk38AzbR90sXHd4nfBaPvtQRCtQByaBmlE70Pe84P8VdxhmmAtrLbFf71kyxLJ7K Ahwt7rPzxpH3V4dqtkTkyoV5wa/lY0kJH8mLPkJ/uIkoGlNXtOroh24PEWn8AlpA == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddtgedgudduvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkfgfgggtgfesthhqre dttderjeenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnhepjeehhffhhfelgeeihffhudetfe eiffegleffudegtdelffegjeetgfekjeevkeetnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 21 Dec 2021 13:20:43 -0500 (EST) From: Timothy Sample Date: Tue, 21 Dec 2021 13:20:42 -0500 Message-ID: <87bl19es5h.fsf@ngyro.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Received-SPF: pass client-ip=66.111.4.26; envelope-from=samplet@ngyro.com; helo=out2-smtp.messagingengine.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 Hello, These two patches update Disarchive to 0.4.0. This version of Disarchive has support for XZ, which requires Guile-LZMA. Since Disarchive is a dependency of the Guix package, I’m hoping someone else can look over the patches before I push them. I made sure to check the following things: • Building the Guix package • Running ‘guix pull’ • Recovering a GZip-compressed tarball from Guix • Recovering a XZ-compressed tarball from Guix • Cross-compiling Guile-LZMA, Disarchive, and Guix itself • Running Guix from a cross-built Hurd image I couldn’t use Disarchive recovery from the Hurd, but I’m inclined to assume that it’s not a regression [1]. Other than that, everything seemed okay to me. If you want to test recovering an XZ source, you can use (amusingly) the ‘gzip’ package source code (as of writing it’s the only XZ spec available). You need to run the Guix daemon in an environment that provides the new Disarchive and Guile-LZMA (I used ‘./pre-inst-env guix shell -D guix’). Then, you can run $ GUIX_DOWNLOAD_FALLBACK_TEST=disarchive-mirrors \ ./pre-inst-env guix build --check -S gzip Thanks in advance! [1]: AFAICS, it fails when the SWH downloader tries to pipe the tarball it’s downloading into ‘tar’ to extract it. -- Tim