From patchwork Sat Sep 3 12:08:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 42164 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 CF3E727BBEA; Sat, 3 Sep 2022 13:09:11 +0100 (BST) 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,FREEMAIL_FROM,MAILING_LIST_MULTI,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 7F41127BBE9 for ; Sat, 3 Sep 2022 13:09:11 +0100 (BST) Received: from localhost ([::1]:36568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oURxW-0007KN-Lq for patchwork@mira.cbaines.net; Sat, 03 Sep 2022 08:09:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oURxO-0007Iu-NI for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oURxO-0006cS-Eh for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oURxO-0002qg-AS for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57560] [PATCH 3/4] hashcat: Rewrite with G-exps. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Sep 2022 12:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57560 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57560@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 57560-submit@debbugs.gnu.org id=B57560.166220691310889 (code B ref 57560); Sat, 03 Sep 2022 12:09:02 +0000 Received: (at 57560) by debbugs.gnu.org; 3 Sep 2022 12:08:33 +0000 Received: from localhost ([127.0.0.1]:41105 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oURwv-0002pT-8Y for submit@debbugs.gnu.org; Sat, 03 Sep 2022 08:08:33 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:36482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oURws-0002p0-Os for 57560@debbugs.gnu.org; Sat, 03 Sep 2022 08:08:31 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by baptiste.telenet-ops.be with bizsmtp id FQ8U2800e20ykKC01Q8V2T; Sat, 03 Sep 2022 14:08:29 +0200 From: Maxime Devos Date: Sat, 3 Sep 2022 14:08:26 +0200 Message-Id: <20220903120827.25648-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220903120827.25648-1-maximedevos@telenet.be> References: <20220903120827.25648-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1662206909; bh=98FuedL64G2/KA9dmYLwbJOkYmByenn1M5bH5GD/XHI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=le1XbjVYX9JULMSc/OHzvM3jfq2NdETYnLiLv3utmG9qt/m0UFA4e4KMgs30OuHB9 35XdrciHhB22qNJOW7oDyi+myuff/IPVtc7fjGNCbI0jE8Q/Sw49Di5GT1a2nED36q PTEniUR4y+SEVDZmpusKtdGsLAvUaR5xw651CklnWOQc63Px+p0nym+ot/1Q9GEEcO ndXtJ76WdDFQAQjU4NNxO/SN1X8C2Tp84hmWMykzUCQS+depWj0XWSw9oD8v9QEmjs C0E80f45wKWRJBasNJLA/lsad4wt75XLn3OB4FL/ftcSpC6pTRjOMPOJrsRDfbupj9 rsIDG+nujx1+w== 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 This is required for cross-compilation, as %output does not exist when cross-compiling. * gnu/packages/password-utils.scm (hashcat)[arguments]: Rewrite with G-exps. --- gnu/packages/password-utils.scm | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index ec4aff048a..172f633449 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1135,21 +1135,19 @@ (define-public hashcat (inputs (list minizip xxhash zlib)) (build-system gnu-build-system) (arguments - '(#:tests? #f ;no tests - #:make-flags (list (string-append "PREFIX=" %output) - ;; TODO: unbundle - ;; (string-append "USE_SYSTEM_LZMA=1") - (string-append "USE_SYSTEM_ZLIB=1") - (string-append "USE_SYSTEM_OPENCL=1") - (string-append "USE_SYSTEM_XXHASH=1")) - #:phases - (modify-phases %standard-phases - ;; Don't embed timestamps, for bit-for-bit reproducibility. - (add-after 'unpack 'fix-reproducibility - (lambda _ - (substitute* "src/Makefile" - (("\\$\\(shell date \\+%s\\)") "0")))) - (delete 'configure)))) + (list #:tests? #f ;no tests + #:make-flags #~(list (string-append "PREFIX=" + #$output) + (string-append "USE_SYSTEM_ZLIB=1") + (string-append "USE_SYSTEM_OPENCL=1") + (string-append "USE_SYSTEM_XXHASH=1")) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-reproducibility + (lambda _ + (substitute* "src/Makefile" + (("\\$\\(shell date \\+%s\\)") + "0")))) + (delete 'configure)))) (home-page "https://hashcat.net/hashcat/") (synopsis "Advanced password recovery utility") (description "Hashcat is an password recovery utility, supporting five