gentoo resync : 10.11.2017

3 files changed, 16 insertions, 11 deletions

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index d76a796af884..1360611a1b58 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,10 +3,10 @@ AUX 1.6.7-dmcrypt.rc 8815 SHA256 d04627e1a64e4d86e957b20ff6f478fb376833b7602098a
 AUX setup-1.7.0.py 788 SHA256 ef9fc9cc2b0ab065838adcb65e117e124e59686360fb033dd8c51632a8da1c69 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89 WHIRLPOOL 26d4d90a00a5be81b8cfadd0682d032be955b71c3c2707532a95aada423fdc52edde351af2addf307b602fcd51130dc95372dc1f11bbd80d51208a1b56010add
 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
 EBUILD cryptsetup-1.7.4.ebuild 4025 SHA256 a396ac6b06858d53266a6f16d5797e9446fa6575b002e0c43ce53f27fc622751 SHA512 9b46af09764085af0f6de8e99629839f45b9567110dde94db040e875805ad753f111136da06ffc0a65f3ebd8fa705e0a7509961a24c08032e501967e081f8928 WHIRLPOOL 365cb1aea2098827ee6d17dea3f12a581c3e5cd6f315c86cffc5c98ecd03437500534376d5499691dfb2c1ede319ddc875655325da0feb75a480ec77eb6be2d9
 EBUILD cryptsetup-1.7.5.ebuild 4045 SHA256 931dafa300398093ecd3111750fb685080d217ea0c99af72221dbca5f5925e56 SHA512 838908ef46db7d9710e9071ec21af4c0243a5b1c5220107522b0145cdb38eb1bc0fde392d276c988cf1b3e14880d4db73b1992e849d416113f01ed05dc0581fd WHIRLPOOL 8ad914bedbce8c63063a817454b4359d4727eb39e5bbcc660cd03054034fc63a6ad0741c0f6206f19c87477204c0460a5874c6460a4b74fd329e2c7c3b1ea469
-EBUILD cryptsetup-2.0.0_rc0.ebuild 4228 SHA256 c8e26cc7d65db505e26d46931a0a341dd2741d78720a572674e88e066b3cef29 SHA512 81a092c61a73653e9f53d6ccb45d7999052fd7d79b3b51551c45141de444868bf14a78e7dbd3148ef8b837d1850523c1433755aef6906441bd422c47c730b04a WHIRLPOOL a00b0884044853597a5920447e9757bf2d10f780ccab3e0b9aaea7a164bf40009b456a925da31799c11f95a2c0e0603734a26f85926b00d4115e13afe6743a30
+EBUILD cryptsetup-2.0.0_rc1.ebuild 4335 SHA256 f13dbc5128947c37738e55052b94ba5b045fa74b3637b671b09df3b0d5ce5953 SHA512 af301877acf95dde95c82e2a2de9c980c369c3a9a1ec6bb6f86637a1c64348db5b14ab8d2eee86c0935fb48527e53c6c208c0a135e83c761bf3e0cf51d12d5f0 WHIRLPOOL 869e57661a272af5d372945208d2ffe17fb384868a31d045e207bdd5e7bee9f239dc9ca3ed62b3b3d41712b78a2bb4a3aeb8dbf8562a6661f1ae37ca7328e363
 MISC ChangeLog 8475 SHA256 f9a9f9529c9f1d7307451447cb403805805eb1d4255c9e4fee5c30c46dd5614f SHA512 73b80c6e0ad31d22dda7ea3802be98152bd7ec68d9277081ffd22d073cb3cf9c8bcd7ef083098423bb356c9a5035dccc26db434d5acdcf8f0753fe5d39bc8073 WHIRLPOOL 64aee26e26813436fb035326680aaca1f2d6593d5df9ac6ae3c9fec6329fcef044179d46a9a9648afaed44a420bc067b09e21150fce51b1576b157987a84e2b4
 MISC ChangeLog-2015 32120 SHA256 4f04d04798e6b09ebc80f72f45a4841673e38e05909ccebb5d40c230db0a3272 SHA512 ebf79904c294d29fbeb42d497db5bbac85afdcaaf532ecdae863778ecd9f9c882dd0c3c28994c410611e3eef30492c9bb5696db3c2e4eb49f2e932ee9696185a WHIRLPOOL 8cfe06024e910bfbd0e547fb342ce22c837c79cb29524077272f7478edc6284ed3ef504142b52d6844fa582cd4c4cfb94163c9c40ff074716bd744d2ef039aff
-MISC metadata.xml 879 SHA256 20635e38f0d217140afc4fc93b43abc856049f2c5104cf9dcb2ff2062e56f960 SHA512 1b7f57625f159b0ef144ad968eb20c6785b822e7f254c1cccd75ba8f012357cc818cb9323d64999ba1ff084d7fc89c116db071f51505a62c78f1bfc87596e86a WHIRLPOOL 6b61c3895e6f5fb4250e74e14fdf7658fb4496dbad1cc2ee76aa9d7deba6cd67530ca7d01730c397ea73c4ef398ea53ba90823c18bfab2269d84b78d4dc800c1
+MISC metadata.xml 974 SHA256 5271a1873c19cb065209c67e2c58b5a0ca9f9f00969e1f5ec989f8ddfd04eb43 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41 WHIRLPOOL 4864e3ad8e482bc0ae50f0fb3753cc9e4636ca8afe6705c762aef2edc9d1641eb891f574cfe6c5cb49bdac1eb9adc090665dff3acc4f9a3e78cb022ae7a3a15c
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.0_rc1.ebuild
index ca384992e35e..d5cb3915a115 100644
--- 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 32a868bf8834..33e359aeaf21 100644
--- 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>