From patchwork Sat Sep 3 12:08:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 42166 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 1EB3627BBEA; Sat, 3 Sep 2022 13:09:29 +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 A941427BBE9 for ; Sat, 3 Sep 2022 13:09:28 +0100 (BST) Received: from localhost ([::1]:35670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oURxn-0007dR-Sv for patchwork@mira.cbaines.net; Sat, 03 Sep 2022 08:09:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oURxP-0007JH-F3 for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oURxP-0006ch-6f for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oURxP-0002qv-2D for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57560] [PATCH 1/4] hashcat: Don't embed timestamp, fixing reproducibility. References: <2fb077fe-19b5-bc02-fd36-4de31fe414fa@telenet.be> In-Reply-To: <2fb077fe-19b5-bc02-fd36-4de31fe414fa@telenet.be> Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Sep 2022 12:09:03 +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.166220691510904 (code B ref 57560); Sat, 03 Sep 2022 12:09:03 +0000 Received: (at 57560) by debbugs.gnu.org; 3 Sep 2022 12:08:35 +0000 Received: from localhost ([127.0.0.1]:41109 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oURwx-0002pn-0D for submit@debbugs.gnu.org; Sat, 03 Sep 2022 08:08:35 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:36460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oURws-0002ox-Oi for 57560@debbugs.gnu.org; Sat, 03 Sep 2022 08:08:32 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by baptiste.telenet-ops.be with bizsmtp id FQ8U2800e20ykKC01Q8V2M; Sat, 03 Sep 2022 14:08:29 +0200 From: Maxime Devos Date: Sat, 3 Sep 2022 14:08:24 +0200 Message-Id: <20220903120827.25648-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1662206909; bh=x1SSy3HbX1fJBZf79eOJF1Z3xt0+3kGRGd3GDCf1jK8=; h=From:To:Cc:Subject:Date; b=VbeTpbHpWaWTPNuRRzOioQZuA56g0MxTK+wNUJvUNFL8ZMOaoXFB84yUUMGrSRAtC 2odJNOfn8wqMtc+kznEiiJlzkeYZu/csT5u9nKR738pTNxnk+cJxmYfkwb3LadkLMz aOlK29zfMrZCgoCAr67aPELpB6YlZ70kxQHeZaYYLrm9yLxS4+SPjtg7QOZpOyt43n Il24Dz+5YUoQdE/LfMFxE/D+SdMTd+UqWZnmoannad42WlFi1YQm3Sp38xR1FRmtXA c4MwTuqxFJtyYf6YMI+dzJERDwfuTyOxumyQSKAcYyZaSj+JEzHZMaR8c+I0TDe0G1 c/tYkBRTmXchw== 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 * gnu/packages/password-utils.scm (hashcat)[arguments]{#:phases}: Remove timestamp, fixing reproducibility. --- gnu/packages/password-utils.scm | 6 ++++++ 1 file changed, 6 insertions(+) base-commit: 57f8f69562e942557e3331bb81c7e4acd973d189 prerequisite-patch-id: 78c06b38a189109a5108a157d39ffe7eab8be109 prerequisite-patch-id: aaf0731113d36df901ed2186975e3bb872ec22c0 prerequisite-patch-id: 28e8223cfd59adf84007db9ceefd8a78c41fd10d prerequisite-patch-id: fb73228d99c36f50e2959c2303c7c707460fd147 prerequisite-patch-id: 7626f1464f4926416fb13daf3d846176aa93f51b prerequisite-patch-id: 445c6f624e99627959f2e54a6ee97337c44d9ea6 prerequisite-patch-id: 7a16c500faec9d58700a2b50b26bded079e9c3ac prerequisite-patch-id: f7d406c61e069c04c3b7da453192f51c04763db1 prerequisite-patch-id: 4674bf40052d97215f837c9dfd4e7e1ae999492d prerequisite-patch-id: 6259468375bfa157277521b17fdd97d6ab0748b7 prerequisite-patch-id: 9d14b38a33b68883c43d6b26dcdbdf7c28e417e7 prerequisite-patch-id: f0e3faffe768e9c660b0a9340042acfa0f790308 prerequisite-patch-id: 550485506255a67c0a1cb9ede7778d4d538b6e2a prerequisite-patch-id: 9282e95ff076cc2c742be8d2fede83ac14006f6f prerequisite-patch-id: 1503aa5c698f72ee47b7a987a95c0919efb203c4 prerequisite-patch-id: 24297940086a3780fd7e2e7fa345f262b12efb6f prerequisite-patch-id: c5f647b5472465666328b123f0f314a6138d6293 prerequisite-patch-id: 56386c4df9130221cad664ec161d1ad9713f4dc3 prerequisite-patch-id: f09ccfb7e53bc7934326af603a197344f4ef53f3 prerequisite-patch-id: 0c18c83d1f2da4639b43861103a028706a147022 prerequisite-patch-id: 066bfca8bf0c3d3bc57a14b48aa1e241555c1e86 prerequisite-patch-id: 13d9ac7b0fadc92b9351409df26b41443497a964 prerequisite-patch-id: ad831a04543475288aba1c938078dcc5ad05870e prerequisite-patch-id: ed9ec2d0bea23c2c2dbfa4c62290893f1a938f7f prerequisite-patch-id: 335ce9dbbb2b36b960203a79fdc8f6033ebda2fb prerequisite-patch-id: f2ca362056369913d0b8319187a8f46ea78b6dc7 prerequisite-patch-id: c02a17479ad4e01837fc307cf6defe0ae92e2435 prerequisite-patch-id: 3a794307f3bbd3641023d978f4b359eb2f5a46e4 prerequisite-patch-id: c545007535db365a29dc3a86e10866f5eef7b7d5 prerequisite-patch-id: 8b8fd18762282129e2d034f7cdceb368f53295d6 prerequisite-patch-id: d435d42bafa65f14049740a3d6cf1a163f855f97 prerequisite-patch-id: 27da1b857019b217b25b6795b84577fdc992a84c prerequisite-patch-id: aef95e76144ae5e92a41f81b11e84ddc7ececd91 prerequisite-patch-id: 95aa6b45d93026e4375b53a471f0f96e2016914e prerequisite-patch-id: 715d2bb93fe711e72388458846a0afde6babdc97 prerequisite-patch-id: 1851b8f26420465ac59f7447d9c8bd6698b77130 prerequisite-patch-id: 2bd6d4b30b6c71edef4bc6286a290f8eac5c18bd diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 0069fdd74c..f64a205610 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020 Hartmut Goebel ;;; Copyright © 2021 David Dashyan ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -1129,6 +1130,11 @@ (define-public hashcat #:make-flags (list (string-append "PREFIX=" %output)) #: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)))) (home-page "https://hashcat.net/hashcat/") (synopsis "Advanced password recovery utility") From patchwork Sat Sep 3 12:08:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 42167 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 0121727BBEA; Sat, 3 Sep 2022 13:09:30 +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 9B5C627BBE9 for ; Sat, 3 Sep 2022 13:09:30 +0100 (BST) Received: from localhost ([::1]:35672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oURxp-0007ef-QK for patchwork@mira.cbaines.net; Sat, 03 Sep 2022 08:09:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53342) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oURxP-0007J7-2u for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oURxO-0006cY-QO 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-0002qn-LH for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57560] [PATCH 2/4] hashcat: Unbundle everything but LZMA-SDK. 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.166220691410895 (code B ref 57560); Sat, 03 Sep 2022 12:09:02 +0000 Received: (at 57560) by debbugs.gnu.org; 3 Sep 2022 12:08:34 +0000 Received: from localhost ([127.0.0.1]:41107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oURwv-0002pa-Jx for submit@debbugs.gnu.org; Sat, 03 Sep 2022 08:08:33 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:36466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oURws-0002oy-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 FQ8U2800e20ykKC01Q8V2P; Sat, 03 Sep 2022 14:08:29 +0200 From: Maxime Devos Date: Sat, 3 Sep 2022 14:08:25 +0200 Message-Id: <20220903120827.25648-2-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=82Wsz2dmChD37Q4JROgnOBtQA0Wi2jhTlgfjq0oSjlA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QYykUgvvY44iL9zSIkzgghzgrHgSKxfb9JYyNk7PytUbXzetJbAFGZyldPH+cQCOd AQvsTRNllU+XHF/zo3bcz3lzNhaKXEu1fZBAKodV1DXN3Fqi7i9iWnvvg5LwBkPbW3 75XHe05A4x9jPinW/cDbxRTnoWPOEPeiHPb+4b96ZNTpaiN2pWmbdhD6R44XldCNgR sEPmguojKplUj0cL8BbNJ91c7/+Ffx13e7yDA9AS0e76YUYDt4VDZudllKM5OlZYzy 88z/uDmMicMUXUngQwQQTEFbmoQgVl8224f9jrOIHyNW3jfv9a1Irr3r5oHeIgKJMq ZgAKYC9Kz7L1A== 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 There does not appear to be a convenient Guix package for LZMA-SDK yet. I currently have a bit of a dirty working tree (fiddling with imports), so the use-modules is in the wrong place. Also, a small rebase conflict, the version and source hash of hashcat has been updated. * gnu/packages/password-utils.scm (hashcat)[source]{snippet}: Delete everything from deps except for deps/LZMA-SDK. (hashcat)[inputs]: Add minizip, xxhash and zlib. (hashcat)[arguments]<#:make-flags>: Add USE_SYSTEM_ZLIB, USE_SYSTEM_OPENCL and USE_SYSTEM_XXHASH. --- gnu/packages/password-utils.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index f64a205610..ec4aff048a 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1110,6 +1110,8 @@ (define-public pass-rotate your online accounts makes it necessary.") (license license:expat))) +;; XXX: move this import upwards before merging this patch +(use-modules (gnu packages digest)) (define-public hashcat (package (name "hashcat") @@ -1121,13 +1123,25 @@ (define-public hashcat version ".tar.gz")) (sha256 (base32 - "104z63m7lqbb0sdrxhf9yi15l4a9zwf9m6zs9dbb3gf0nfxl1h9r")))) + "104z63m7lqbb0sdrxhf9yi15l4a9zwf9m6zs9dbb3gf0nfxl1h9r")) + (modules '((guix build utils))) + ;; Delete bundled libraries. + (snippet + ;; TODO: Unbundle LZMA-SDK as well + #~(for-each delete-file-recursively + '("deps/zlib" "deps/xxHash" "deps/OpenCL-Headers"))))) (native-inputs (list opencl-headers)) + (inputs (list minizip xxhash zlib)) (build-system gnu-build-system) (arguments '(#:tests? #f ;no tests - #:make-flags (list (string-append "PREFIX=" %output)) + #: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. 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 From patchwork Sat Sep 3 12:08:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 42165 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 5B9C427BBEA; Sat, 3 Sep 2022 13:09:12 +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 E368027BBE9 for ; Sat, 3 Sep 2022 13:09:11 +0100 (BST) Received: from localhost ([::1]:36566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oURxW-0007JI-1f for patchwork@mira.cbaines.net; Sat, 03 Sep 2022 08:09:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oURxO-0007In-DV for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oURxO-0006cL-4C 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 1oURxN-0002qU-Uq for guix-patches@gnu.org; Sat, 03 Sep 2022 08:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57560] [PATCH 4/4] gnu: hashcat: Fix cross-compilation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Sep 2022 12:09:01 +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.166220691310882 (code B ref 57560); Sat, 03 Sep 2022 12:09:01 +0000 Received: (at 57560) by debbugs.gnu.org; 3 Sep 2022 12:08:33 +0000 Received: from localhost ([127.0.0.1]:41103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oURwu-0002pQ-UU for submit@debbugs.gnu.org; Sat, 03 Sep 2022 08:08:33 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:36488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oURws-0002p1-OV 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 FQ8U2800e20ykKC01Q8V2Y; Sat, 03 Sep 2022 14:08:29 +0200 From: Maxime Devos Date: Sat, 3 Sep 2022 14:08:27 +0200 Message-Id: <20220903120827.25648-4-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=qMf1Yl9J+0OdJjyvxxRKLy7IObywe7hVMb9Zuj2t7qM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CU8RCC1o1qxtqzwGpXjdB9XPInO6Skk43X/Gf+Xa07bb+ioNds6Xr2e28piLIMm+f 9GGvo66gnCBLF2ZlNeN5tAwyEQUG6N8Vt2JwZu6DkwI4nbShFNalmAUTlQHDKWIBEE WoELkq4pcmzndAnqkJGeCachTIOEIJecqeKJqJcjoZpXJOHr/GEf8+B5PNjy96EOOm cM87G0l718pWFnQXj1h3DSgTJ7xi/Qe25xTjlalS/q/a6ZdltZMWlHInq0HKKzvnof asY51LSTf5bfdC2jWlep/GKahtEQvCfrkVP8NQoW/1/Im6rma4euTIcQ0wWV3QQKlp ZU5jHnRoNfAmg== 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 * gnu/packages/password-utils.scm (hashcat)[native-inputs]: Move to ... (hashcat)[inputs]: ... here. (hashcat)[arguments]<#:make-flags>: Set AR and CC. --- gnu/packages/password-utils.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 172f633449..f92c47d539 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1110,8 +1110,8 @@ (define-public pass-rotate your online accounts makes it necessary.") (license license:expat))) -;; XXX: move this import upwards before merging this patch -(use-modules (gnu packages digest)) +;; XXX: move these imports upwards before merging this patch +(use-modules (gnu packages digest) (guix utils)) (define-public hashcat (package (name "hashcat") @@ -1130,13 +1130,13 @@ (define-public hashcat ;; TODO: Unbundle LZMA-SDK as well #~(for-each delete-file-recursively '("deps/zlib" "deps/xxHash" "deps/OpenCL-Headers"))))) - (native-inputs - (list opencl-headers)) - (inputs (list minizip xxhash zlib)) + (inputs (list minizip opencl-headers xxhash zlib)) (build-system gnu-build-system) (arguments (list #:tests? #f ;no tests - #:make-flags #~(list (string-append "PREFIX=" + #:make-flags #~(list (string-append "AR=" #$(ar-for-target)) + (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) (string-append "USE_SYSTEM_ZLIB=1") (string-append "USE_SYSTEM_OPENCL=1")