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.