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 DD04A138334 for ; Mon, 13 May 2019 15:15:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE9B4E087E; Mon, 13 May 2019 15:15:23 +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 C0B25E087E for ; Mon, 13 May 2019 15:15:23 +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 97B5C34406C for ; Mon, 13 May 2019 15:15:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D8742A5 for ; Mon, 13 May 2019 15:15:20 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1557760513.22d3fbf7721ec935ea503c9eb10c775a22f96e84.polynomial-c@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.1.0.ebuild sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild X-VCS-Directories: sys-fs/cryptsetup/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 22d3fbf7721ec935ea503c9eb10c775a22f96e84 X-VCS-Branch: master Date: Mon, 13 May 2019 15:15:20 +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: 87fd8152-f77f-41c6-854c-d7d0a56be333 X-Archives-Hash: 420cee63afbeb1c2598832b6802017ce commit: 22d3fbf7721ec935ea503c9eb10c775a22f96e84 Author: Lars Wendler gentoo org> AuthorDate: Mon May 13 15:14:43 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon May 13 15:15:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d3fbf7 sys-fs/cryptsetup: Respect libressl USE flag Closes: https://bugs.gentoo.org/678200 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild | 11 +++++++++-- sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild index a4271834ba8..095fb0b3fc6 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild @@ -13,7 +13,9 @@ LICENSE="GPL-2+" SLOT="0/12" # libcryptsetup.so version [[ ${PV} != *_rc* ]] && \ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" -CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" +# cryptsetup does _not_ have a libressl backend. We only have this for REQUIRED_USE +# and change "libressl" to "openssl" in our econf call. +CRYPTO_BACKENDS="gcrypt kernel libressl 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 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom" @@ -79,6 +81,11 @@ src_configure() { ewarn "userspace crypto libraries." fi + local x cryptobackend + for x in ${CRYPTO_BACKENDS//+/} ; do + use ${x} && cryptobackend="${x/libressl/openssl}" + done + local myeconfargs=( --disable-internal-argon2 --enable-shared @@ -86,7 +93,7 @@ src_configure() { # for later use --with-default-luks-format=LUKS$(usex luks1_default 1 2) --with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d" - --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) + --with-crypto_backend=${cryptobackend} $(use_enable argon2 libargon2) $(use_enable nls) $(use_enable pwquality) diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild index 457a33aa1fb..e0142bdc521 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.2.0_rc0.ebuild @@ -13,7 +13,9 @@ LICENSE="GPL-2+" SLOT="0/12" # libcryptsetup.so version [[ ${PV} != *_rc* ]] && \ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" +# cryptsetup does _not_ have a libressl backend. We only have this for REQUIRED_USE +# and change "libressl" to "openssl" in our econf call. +CRYPTO_BACKENDS="gcrypt kernel libressl 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 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom" @@ -79,6 +81,11 @@ src_configure() { ewarn "userspace crypto libraries." fi + local x cryptobackend + for x in ${CRYPTO_BACKENDS//+/} ; do + use ${x} && cryptobackend="${x/libressl/openssl}" + done + local myeconfargs=( --disable-internal-argon2 --enable-shared @@ -86,7 +93,7 @@ src_configure() { # for later use --with-default-luks-format=LUKS$(usex luks1_default 1 2) --with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d" - --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done) + --with-crypto_backend=${cryptobackend} $(use_enable argon2 libargon2) $(use_enable nls) $(use_enable pwquality)