sys-fs/cryptsetup: Bump to version 2.0.0_rc1. Removed old.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 7b315ddb485436d8566ce70db7918716a685cd60..d24e26f3aa267637b6c59fd4d8a943d90a49680f 100644 (file)
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,3 +1,3 @@
 DIST cryptsetup-1.7.4.tar.xz 1232068 SHA256 7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016 SHA512 c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71 WHIRLPOOL f00d0e529a5d34460733e8110584266b42011055d81d94b0ae8d47a1f11f1639c4b658a55415241e72c431c615d896a94ae444a518a0b56f971b888a5ab7cc09
 DIST cryptsetup-1.7.5.tar.xz 1232696 SHA256 2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 WHIRLPOOL cd2fe15a08f3202c89055e334a3c56fcb60a19bda8135c7d833f384e9beb7fcd6f31fbbd4ac29572f46199f05bd6055b89b3d6733828354d9c985b3e55da4e14
-DIST cryptsetup-2.0.0-rc0.tar.xz 16222712 SHA256 e0de7563b957117680b946c2f66ac1fadecb8459ce2db6b84687a1937524bd5c SHA512 82429e5672ed5a430898283b088bd94008bf075b67a312876ec841275ff3584912c8b07c857540a52c0e2f571fcf389ececa45d749fd20204f841b067078e6cd WHIRLPOOL bb87779b9835e56bbbd30f72ca5514db9a9cb2a9c35164020d64c29d4226d10a372d7560c2516886d50c485011478fbb17a55b98e37af9f21a4dc30711983d98
+DIST cryptsetup-2.0.0-rc1.tar.xz 10059840 SHA256 97bb590ff3173715b5485decd8c48a415c3997011ba70bccb7fa3dfdb2b13ca1 SHA512 397c45b11dd275c2e7da6442a80a92da0de8888a1b9547ae16ee69681c5b63d95253fe0e80ea20a09d14d06d0e138ad349486999f94ce065140f49dcd1dd8427 WHIRLPOOL 388c09370ca04f74677f7d75785bc6b0f093b81ec9ddd7ce83af911481e9671543366e2ebcf9183ad623ff5e721c43b371be909d3ffb7eee5f597b5a4080a8d2

diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.0_rc1.ebuild
similarity index 93%
rename from sys-fs/cryptsetup/cryptsetup-2.0.0_rc0.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.0.0_rc1.ebuild
index ca384992e35e9fcf03a9aec14636dde584a326dc..d5cb3915a1153481cc44401d1c8154780eea6b3c 100644 (file)
--- a/sys-fs/cryptsetup/cryptsetup-2.0.0_rc0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.0_rc1.ebuild
@@ -19,14 +19,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 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} libressl nls pwquality python reencrypt static static-libs udev urandom"
+IUSE="${CRYPTO_BACKENDS} argon2 libressl nls pwquality python reencrypt static static-libs udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
        python? ( ${PYTHON_REQUIRED_USE} )
        static? ( !gcrypt )" #496612
 
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
+LIB_DEPEND="
+       dev-libs/libgpg-error[static-libs(+)]
        dev-libs/popt[static-libs(+)]
        sys-apps/util-linux[static-libs(+)]
+       argon2? ( app-crypt/argon2[static-libs(+)] )
        gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
        nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
        openssl? (
@@ -82,17 +84,19 @@ src_configure() {
        # We disable autotool python integration so we can use eclasses
        # for proper integration with multiple python versions.
        local myeconfargs=(
-               --sbindir=/sbin
-               --enable-shared
                --disable-python
-               $(use_enable static static-cryptsetup)
-               $(use_enable static-libs static)
+               --disable-internal-argon2
+               --enable-shared
+               --sbindir=/sbin
+               --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+               $(use_enable argon2 libargon2)
                $(use_enable nls)
                $(use_enable pwquality)
                $(use_enable reencrypt cryptsetup-reencrypt)
+               $(use_enable static static-cryptsetup)
+               $(use_enable static-libs static)
                $(use_enable udev)
                $(use_enable !urandom dev-random)
-               --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
        )
        econf "${myeconfargs[@]}"
 
@@ -131,7 +135,7 @@ src_install() {
        newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
 
        insinto /etc/tmpfiles.d
-       doins scripts/${PN}_tmpfiles.conf
+       doins scripts/${PN}.conf
 
        use python && cd python && distutils-r1_src_install
 }

diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index 32a868bf8834d6916c548dfdcbaa3d13e3b63e18..33e359aeaf2148754a0a92971bbcc695ccff6003 100644 (file)
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -6,6 +6,7 @@
        <name>Gentoo Base System</name>
 </maintainer>
 <use>
+       <flag name="argon2">Enable password hashing algorithm from <pkg>app-crypt/argon2</pkg></flag>
        <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag>
        <flag name="kernel">Use kernel crypto backend (mainly for embedded systems)</flag>
        <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>