Version bump.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 138 insertions, 9 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 5fd89dbd0720..f5e6e82fd1ff 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.154 2013/08/14 04:41:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.155 2013/08/14 04:50:22 radhermit Exp $
+
+*cryptsetup-1.6.2 (14 Aug 2013)
+
+  14 Aug 2013; Tim Harder <radhermit@gentoo.org> +cryptsetup-1.6.2.ebuild:
+  Version bump.
 
   14 Aug 2013; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Simplify USE flag descriptions.
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 8f284ec04e0a..fe6a71fd4423 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -24,6 +24,7 @@ DIST cryptsetup-1.4.3.tar.bz2 798101 SHA256 d5ff2c00f6f791d77fa5636a02ae43ddbb46
 DIST cryptsetup-1.5.1.tar.bz2 958979 SHA256 16d23f78cab35937281a0ae7a8febce0c3a1a0f291cc94e169a7b968b81d2b36 SHA512 f1847d1833f0aba59af334a5b3919ca44b1a6dce152a44ccb76747fed5996ce83bddac9b6550ab8c63d7ca66dd9e0e79ccc2399b7b3860e8090bf776a72a77b0 WHIRLPOOL 2f24c43ba689039ab3548225cda91bea0c65cf2014e7cd57157def111493c3c2037a283cb778c3301c9d7b138f4fc8da21ce5752b9d1379d66fa01ef2481823e
 DIST cryptsetup-1.6.0.tar.bz2 1180090 SHA256 dd9686fce5d3276b2eb2ac40d513a9b64850af8fff881442f2cfe87257ba2406 SHA512 2d1b5289d79fa70af1958f77a04cf2d5e426e22b429f05f76c47eb93d50ab3a18ce75e85c6f86304f8fe4b2c06d909eba9ccf84422d6b7d033437489bad9f79f WHIRLPOOL 52be2dc1ae5b620007655138ff372ba80398c5cb5545805e48b6b54d68241bf57c6e67f3986982a70c6cf156c7297127f03f9dc4d8226cc0f56120e32ab5997a
 DIST cryptsetup-1.6.1.tar.bz2 1175052 SHA256 baf36e663c03eb6440482d91c486d61ed47ce5c9268ad04c18ca09082755149c SHA512 6d85720a33e05f2687f0ac9dd6730d025a14389091c06c047983b4875edc55db1b5c4878f7dee1720be192fa1ab06df2c7d0a0edfea0fb5bd787ee73a33302ca WHIRLPOOL 7951ac7623cca575899ff8741f0867bfa50f69433a124224cb60f73ed63437fa8b5a7da27dd455ae6f768d4764f6672b1cb90a4312dd2c2f91f0310bec8b2796
+DIST cryptsetup-1.6.2.tar.bz2 1189584 SHA256 15723f0198303d4bcb99d480b7a773918e2d319f0348457988c063bdd03e109a SHA512 59fb835ef8bcd6d0c704a021055032639840ef4bb7be6ade8ff91d347ae74d8e6cba4583d8ced7a4a8c6f09ebc16c4eff3549c13c4327d92fd9234db58e18c10 WHIRLPOOL 3ab24572ea42dfdd0d5176dfa4621520cd0bccda53c3a01676d400a7a841ab9643c979c4942daa774658602bd8cdf659376cbc94c553e2097c5eb3c51a7edb31
 EBUILD cryptsetup-1.0.6-r2.ebuild 3122 SHA256 e0428878fb5416942255112eb70d7a6fdb13583504fdbcdac641a0457f7b97e9 SHA512 178ba72e4687ca0b388b423626eb3ad12ae694567c2f18faf09830cda1a633c29268df13f9b074a421a31715b6e46853a942e8833381500ca7becf688571ac0d WHIRLPOOL 773a0858a6c479f1020c328ca1bd202f0e316db22f9ee075cf21a40032a4543a2337631352ab6804f05041a4bde7925aee98576fcf5ab064b603357d7be4b3d7
 EBUILD cryptsetup-1.1.2.ebuild 3405 SHA256 218301930c96355b1c5df5daa917df2ef7adb41015be702ba6f64f43b79d06b6 SHA512 34f1500c1c25b5c842d82073b5465bb018299ed701757a3aebeabc2e8db82727895917e464159fecbb6770080f77fa7cd6cafb16d726609f0578afb1860d985c WHIRLPOOL 91287f2abc0e2e82842be4fcf075124823bdadc0cb579a772433c37ca81c51e9940285c968caa5f945c7f603109485002a80bf9b87b7d200ad349d0b03eb054f
 EBUILD cryptsetup-1.1.3-r3.ebuild 3464 SHA256 a654e3098507aa1df7a317e8c3ca1daf347ea672b40fecf62d1adf4ba89ea2f3 SHA512 6dbb0e3e2b0aef7e3e5746301fd63b2e963cf6ab6094cdc2449794c14f0e9f9851b7a559863a165b71db000249a38cb42b618053e76eb5b93a4d2b5672a6f8b4 WHIRLPOOL 467e3b9d9714e2d5de08a2465ef604e158ef08a6dff53a6f29dd34df7df627793a691c45ebc7b64b24b4736b4051b1929bd3a8c10a5169a1586b3f86fb21688b
@@ -35,16 +36,17 @@ EBUILD cryptsetup-1.4.3.ebuild 3554 SHA256 22710eb458bbcb1b23e2f48c1103c70907163
 EBUILD cryptsetup-1.5.1.ebuild 3839 SHA256 753d1a404b86f2c593833d2d45428ba49330879b9599655a46c1e3d5652867e9 SHA512 714fb7d65197d8f13a9de6277e36c26a9023bfa902630140a3c6a73c752806e8e06c94910bfc5cc314941706f12a273b572d637f08ede35033e3c27e413c316e WHIRLPOOL ad13a0303fa4d946818d03b92ad9e66156e66f3a2afb2c53f30abfc30957002c29f5375f911374ce584f8f454ceb9dd88f84288efa4c6b2a5fb250d9d5bc9304
 EBUILD cryptsetup-1.6.0.ebuild 3840 SHA256 872125ba1c7c9145feef61af5ae110d075be711f99f09248b43ac78fc97794d4 SHA512 1db903425743a8dfaf4da7e11f9040c7c9d9eb7e0482115eda10f591cb6c0383524a27e77eecd6f34bacc92c1fdc4bbe4003a9f5e3c64bfccccf6bf375baf515 WHIRLPOOL 2273a0d746ca129bc97ec2c7adb73571cce6f0a93500644410af653d1aa7bd8a3a8e765adb69673138521e92cffdbb413cc10d47b6a836000d417f8317165a9a
 EBUILD cryptsetup-1.6.1.ebuild 4336 SHA256 434ba062d587e0c107357940f63adcba3223d65f8bc99eedd1133aceceae6b71 SHA512 b846159fc8cc48a74d0548cdb131dd987ad913785cc6f0da58fac2dab9c1a42aa03efb71792973f9b63533cc0538edde5b4f2753fdfa4a3a7e2ac55a9d0e89f9 WHIRLPOOL a3c6251951859a2789fb1cc642e1ccc98feee91407a28c2969699f9f59ed19847af4968c388bcbeab351081526ce9bc1dc8ba5bed106d1e12c62f89bc21fa0f9
-MISC ChangeLog 23830 SHA256 95d49bf52ff182115fab412c3cd3f02d4f3dd2db746dbcff433b491a8db63840 SHA512 50a0cc161a753bfbee2a586af6d96c42b56978d681284f8b9ac3ca9e26fc26040823dd153b56458ede71fc5895a2d207b1e182ef8e428ea0e478455f05edeab0 WHIRLPOOL 8dadde496bf8dfb76d6d646c272bd7063f4c128f57b5b8459fa8a76633cab73e047f9bbb6b8b012476e1b341972cac8b899cd27337edc64270f468a022f6b237
+EBUILD cryptsetup-1.6.2.ebuild 4345 SHA256 33ef1c643c06a3785e5827b13e6322a9cc23868df50393785e9e2b2a340ce896 SHA512 ae6dc8b752177398f1ad82cf9b61fbd5dbec98dbc637340e6947dd94dace7b0a856a17fe8b4a03c65314e2a41ef24e2ba467af6f141bf5ae3fe3198e47d86c3e WHIRLPOOL 7e0900b28515e4ecb8d65df4827aa0d5bbde084de7564a74b731b04aecfe69543b2c755a1f7cb4752cd1ff303bfda86d10dea1cd1e2bbeb0a76c1ebae64f43a6
+MISC ChangeLog 23955 SHA256 04ab180eab27907b57a0ff31e78d25696ccce1dadf47664ddb09134c39d2c2d0 SHA512 aa6d7aea28fda95105ffe92525e9268769be54b1b03d5f979de86e323c31e508e95c6925e51e58013c65619e8fe6c2a4814de9badbc1b9918e39b79c3d92e48f WHIRLPOOL 0d065c6969968f402794c88420a465e56ddd6fc32829d49287ef5fba0ab945db4e43dab95f62d3fd6d25778ce1b430ce243024c58eb6fd55663170c0b85eb13c
 MISC metadata.xml 763 SHA256 494337a4a156da7feba29856957ffe6babede998bbbe2aa76ad68463f7a3ba4d SHA512 4124c6744a491b4b59115fe561408bde963d7527b835e5c554b3b99b460c6b2a9e98abb294f0e3de5af8625e27efecc7b139b8887b5e8b51af93772bd3574b1a WHIRLPOOL 1b76543228dffe7115e547dc068b6db84b06ff0a5f244c5964eb21cba55c9b6ee9637d4a19c38b4b9ebeba55ac7fe4437e97c4be32f26380fec6773b76ef8fce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSCwqPAAoJEEqz6FtPBkyj+lEIAJbtbUripVRWRx8jIC17GVSb
-iLSkrHtYjQuxfsr0tye58wIU6HQ/2L4PdHZQAKlilZJjT+rxxg6F/CEh1ic+YmAi
-DUTW3zurmc39vZfuoyQuTbRmi/ZDwCuHZmRjx0wBtREHafo0ECoKoQaw6wwoWK8k
-us/Vf49BZMEl7/3YJvAhlplXUsRg33+4ig/VOCZnAqS5VDBa/KEZAo7Cy0/s7LVH
-SUGK4JeCw0CbktGTSgETC2EZs49W2qRITzB5FSs4LqTdMsOThwNj6ROeQL+qiDXE
-1cM9GW+3L3hmoU9InzvkUerK/JsS78yuKpYGEDNQ09naCNIt7VCa5DvlshlSE70=
-=7976
+iQEcBAEBCAAGBQJSCwyQAAoJEEqz6FtPBkyjV5UH/RQcrH27PmAwzao19NNBYgwE
+rsBPyrs1hVBhSYsGjdj+hDzBRshWEQqi40Dp3YJzB3k2fEnjUvYrxThPIAhdzSn/
+Ha9FTIg2IFwp0JW6QJiCAqgsFSN0eEROS4rYAqow6VsvZ0+MYvBqBrGbiN3h2rb4
+8zxK33Ab4fzVo+on0qSYsSlGLLYD5dUZwL6jrxQNh2EeNvfMKkx0wYkE4wn7vWLu
+n57iixr8t5gLsuu7wsG7myPkGB8JHN6caDQ0T6ZZskPfeiZQDAZDWXtQ1PICfn+u
+UUTcr4F5ekThmCDsw+Twa/XIcWOKnMYntZw+lZen5qoeYVyTGpLFbw4cId95Y+w=
+=0gEH
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.2.ebuild
new file mode 100644
index 000000000000..6816e7bc116d
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.6.2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.2.ebuild,v 1.1 2013/08/14 04:50:22 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools python-single-r1 linux-info libtool eutils
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="http://code.google.com/p/cryptsetup/"
+SRC_URI="http://cryptsetup.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+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} nls python reencrypt static static-libs udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	sys-apps/util-linux[static-libs(+)]
+	gcrypt? ( dev-libs/libgcrypt[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? ( dev-libs/openssl[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	sys-libs/e2fsprogs-libs[static-libs(+)]
+	udev? ( virtual/udev[static-libs(+)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\(+\)\]}
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )"
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	epatch "${FILESDIR}"/${PN}-1.6.1-openssl-static.patch
+	eautoreconf
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	econf \
+		--sbindir=/sbin \
+		--enable-shared \
+		$(use_enable static static-cryptsetup) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable python) \
+		$(use_enable reencrypt cryptsetup-reencrypt) \
+		$(use_enable udev) \
+		$(use_enable !urandom dev-random) \
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/}; do use ${x} && echo ${x} ; done)
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+	default
+}
+
+src_install() {
+	default
+	if use static ; then
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
+	fi
+	prune_libtool_files --modules
+
+	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.5.1-dmcrypt.rc dmcrypt
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Please see the example for configuring a LUKS mountpoint"
+		elog "in /etc/conf.d/dmcrypt"
+		elog
+		elog "If you are using baselayout-2 then please do:"
+		elog "rc-update add dmcrypt boot"
+		elog "This version introduces a command line arguement 'key_timeout'."
+		elog "If you want the search for the removable key device to timeout"
+		elog "after 10 seconds add the following to your bootloader config:"
+		elog "key_timeout=10"
+		elog "A timeout of 0 will mean it will wait indefinitely."
+		elog
+		elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
+		elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
+		elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
+		elog "For more info, see http://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
+	fi
+}