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 9361313933E for ; Sun, 4 Jul 2021 19:41:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9330E082B; Sun, 4 Jul 2021 19:41:45 +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 D48E7E082B for ; Sun, 4 Jul 2021 19:41:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 CB056342B01 for ; Sun, 4 Jul 2021 19:41:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A1EE7C2 for ; Sun, 4 Jul 2021 19:41:43 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1625427666.77fd4b1458819795789b6c3d7ea120c5a067c3fd.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild sys-fs/cryptsetup/metadata.xml X-VCS-Directories: sys-fs/cryptsetup/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 77fd4b1458819795789b6c3d7ea120c5a067c3fd X-VCS-Branch: master Date: Sun, 4 Jul 2021 19:41:43 +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: aa5aaee0-6c94-4362-9106-be497e2ad900 X-Archives-Hash: 3290dc7cf6870913efbe9059c88e1a36 commit: 77fd4b1458819795789b6c3d7ea120c5a067c3fd Author: Robin H. Johnson gentoo org> AuthorDate: Sun Jul 4 19:16:25 2021 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jul 4 19:41:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fd4b14 sys-fs/cryptsetup: update 2.4.0_rc2 for integrity & ssh tokens Signed-off-by: Robin H. Johnson gentoo.org> sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild | 8 +++++++- sys-fs/cryptsetup/metadata.xml | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild index 72a0baf8cb9..6a8851cfee4 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" # we don't support nss since it doesn't allow cryptsetup to be built statically # and it's missing ripemd160 support so it can't provide full backward compatibility -IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom" +IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom ssh" REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) static? ( !gcrypt )" #496612 @@ -30,6 +30,7 @@ LIB_DEPEND=" nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) + ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] )" # We have to always depend on ${LIB_DEPEND} rather than put behind @@ -85,6 +86,7 @@ src_configure() { $(use_enable static-libs static) $(use_enable udev) $(use_enable !urandom dev-random) + $(use_enable ssh ssh-token) $(usex argon2 '' '--with-luks2-pbkdf=pbkdf2') ) econf "${myeconfargs[@]}" @@ -110,6 +112,10 @@ src_install() { if use static ; then mv "${ED}"/sbin/cryptsetup{.static,} || die mv "${ED}"/sbin/veritysetup{.static,} || die + mv "${ED}"/sbin/integritysetup{.static,} || die + if use ssh ; then + mv "${ED}"/sbin/cryptsetup-ssh{.static,} || die + fi if use reencrypt ; then mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die fi diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml index 878e56b200b..d2968cbd565 100644 --- a/sys-fs/cryptsetup/metadata.xml +++ b/sys-fs/cryptsetup/metadata.xml @@ -12,8 +12,9 @@ Use dev-libs/nettle crypto backend Use dev-libs/openssl crypto backend Use dev-libs/libpwquality for password quality checking - Use /dev/urandom instead of /dev/random Build cryptsetup-reencrypt + Build cryptsetup-ssh for experimental support of token via SSH-server + Use /dev/urandom instead of /dev/random cryptsetup/cryptsetup