From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 064DE138334 for ; Thu, 20 Dec 2018 04:09:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7CBBE0BD3; Thu, 20 Dec 2018 04:09:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72FD3E0BD3 for ; Thu, 20 Dec 2018 04:09:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53C50335C58 for ; Thu, 20 Dec 2018 04:09:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E6834ED for ; Thu, 20 Dec 2018 04:08:59 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1545278917.358201d61352b1b840c4721cf02efef7048f8513.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper-jumbo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild X-VCS-Directories: app-crypt/johntheripper-jumbo/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 358201d61352b1b840c4721cf02efef7048f8513 X-VCS-Branch: master Date: Thu, 20 Dec 2018 04:08:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9c22b421-0ea3-4252-a7ac-113593859710 X-Archives-Hash: e241f886be52d043c98954f000f742ab commit: 358201d61352b1b840c4721cf02efef7048f8513 Author: Rick Farina gentoo org> AuthorDate: Thu Dec 20 04:08:37 2018 +0000 Commit: Rick Farina gentoo org> CommitDate: Thu Dec 20 04:08:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358201d6 app-crypt/johntheripper-jumbo: fix bug #673414 also don't install opencl kernels in a dir john doesn't read them in Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Rick Farina gentoo.org> app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild | 7 +++---- app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild index 6e8d04dc6d4..a70e6a1c4ca 100644 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.8.0.ebuild @@ -96,7 +96,7 @@ src_install() { dosbin run/john newsbin run/mailer john-mailer - pax-mark -mr "${ED}usr/sbin/john" + pax-mark -mr "${ED}/usr/sbin/john" # grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3 for s in \ @@ -111,15 +111,14 @@ src_install() { doins run/*.py if use opencl; then - insinto /usr/share/john/kernels - doins run/kernels/* + insinto /etc/john + doins -r run/kernels fi # config files insinto /etc/john doins run/*.chr run/password.lst doins run/*.conf - doins -r run/kernels # documentation dodoc doc/* diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild index 1e72fa5104c..a05e2f9da35 100644 --- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild +++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild @@ -93,7 +93,7 @@ src_install() { dosbin run/john newsbin run/mailer john-mailer - pax-mark -mr "${ED}usr/sbin/john" + pax-mark -mr "${ED}/usr/sbin/john" # grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3 for s in \ @@ -108,15 +108,15 @@ src_install() { doins run/*.py if use opencl; then - insinto /usr/share/john/kernels - doins run/kernels/* + insinto /etc/john + doins -r run/kernels fi # config files insinto /etc/john doins run/*.chr run/password.lst doins run/*.conf - doins -r run/rules run/kernels run/ztex + doins -r run/rules run/ztex # documentation dodoc doc/*