From patchwork Mon Aug 2 03:27:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarah Morgensen X-Patchwork-Id: 31715 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 1048C27BC6B; Mon, 2 Aug 2021 04:28:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9388027BC78 for ; Mon, 2 Aug 2021 04:28:36 +0100 (BST) Received: from localhost ([::1]:43526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAOd1-00069D-LV for patchwork@mira.cbaines.net; Sun, 01 Aug 2021 23:28:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAOcX-00053w-Ke for guix-patches@gnu.org; Sun, 01 Aug 2021 23:28:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mAOcX-00035v-D1 for guix-patches@gnu.org; Sun, 01 Aug 2021 23:28:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mAOcX-0000KP-Au for guix-patches@gnu.org; Sun, 01 Aug 2021 23:28:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49813] [PATCH 27/34] gnu: john-the-ripper-jumbo: Fix regex in FIND-FILES invocation. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Aug 2021 03:28:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49813@debbugs.gnu.org Received: via spool by 49813-submit@debbugs.gnu.org id=B49813.16278748641101 (code B ref 49813); Mon, 02 Aug 2021 03:28:05 +0000 Received: (at 49813) by debbugs.gnu.org; 2 Aug 2021 03:27:44 +0000 Received: from localhost ([127.0.0.1]:37318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAOcC-0000Hb-9f for submit@debbugs.gnu.org; Sun, 01 Aug 2021 23:27:44 -0400 Received: from out2.migadu.com ([188.165.223.204]:37827) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAOcA-0000H5-7K for 49813@debbugs.gnu.org; Sun, 01 Aug 2021 23:27:42 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1627874860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hJ0w0m3HcEaaMpFp/Ezul5LcXrHxS6A21JHvi6CeACc=; b=EAnnxqHoDzANNgYX2/lJs+4dikKLmnB9nbwN4WS/Bna3atwfvZOPJqlimg3QGqNd4mPry+ u79buvawe2JJupC8nFBpHnML764ARFlwBTNKegrvqPLjyWdQTaEPycEgHV41SqV7oycwiE TlT2NecgOe00UF25MB9ANWukERAYqNE= From: Sarah Morgensen Date: Sun, 1 Aug 2021 20:27:21 -0700 Message-Id: <2ddd07a588c5de0c8b7cc3c164f730706518f102.1627850945.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev 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 See for more information. * gnu/packages/password-utils.scm (john-the-ripper-jumbo)[arguments]: Fix regex. --- gnu/packages/password-utils.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 6a0236e43b..bb5162be72 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -981,7 +981,7 @@ between hosts and entries in the password store.") (find-files "." symlink?)) (for-each (install-file-to execdir) (cons* "mailer" "benchmark-unify" "relbench" - (find-files "." ".*\\.js"))) + (find-files "." "\\.js$"))) (for-each (lambda (f) (let* ((base (basename f)) (name (substring base 0 (string-index base #\.))) @@ -990,11 +990,11 @@ between hosts and entries in the password store.") (when (and (executable-file? f) (not (file-exists? link))) (symlink (string-append execdir "/" base) link)))) - (find-files "." ".*\\.(pl|py|rb|lua)")) + (find-files "." "\\.(pl|py|rb|lua)$")) (for-each (install-file-to datadir) - (append (find-files "." "(stats|dictionary.*)") - (find-files "." "(.*\\.chr|.*\\.lst)") - (find-files "." ".*\\.conf"))) + (append (find-files "." "^(stats$|dictionary\\.)") + (find-files "." "\\.(chr|lst)$") + (find-files "." "\\.conf$"))) (copy-recursively "rules" (string-append datadir "/rules"))) (copy-recursively "../doc" docdir) #t)))