commit: 77fd4b1458819795789b6c3d7ea120c5a067c3fd
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 4 19:16:25 2021 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> 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 <robbat2 <AT> 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 @@
<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> crypto
backend</flag>
<flag name="pwquality">Use <pkg>dev-libs/libpwquality</pkg> for
password quality checking</flag>
- <flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
<flag name="reencrypt">Build cryptsetup-reencrypt</flag>
+ <flag name="ssh">Build cryptsetup-ssh for experimental support of token
via SSH-server</flag>
+ <flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
</use>
<upstream>
<remote-id type="gitlab">cryptsetup/cryptsetup</remote-id>
