Version bump #349962 by ScytheMan.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

3 files changed, 110 insertions, 10 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index b836f8954c78..1b75098cb8f0 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.97 2010/10/29 06:19:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.98 2010/12/29 15:54:25 vapier Exp $
+
+*cryptsetup-1.2.0 (29 Dec 2010)
+
+  29 Dec 2010; Mike Frysinger <vapier@gentoo.org> +cryptsetup-1.2.0.ebuild:
+  Version bump #349962 by ScytheMan.
 
   29 Oct 2010; Jeroen Roovers <jer@gentoo.org> cryptsetup-1.1.2.ebuild:
   Stable for HPPA (bug #327689).
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 830d20654861..a2b29defa8df 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,6 +1,7 @@
-AUX 1.0.5-dm-crypt-start.sh 8298 RMD160 858f607fe1a2036430f972dbbc643c178baf96f7 SHA1 00c7380894d30842c01ef18ed3e14114cf1da36b SHA256 8c9f4a502dfb20e1a6c656a9563da539dbe8d1aeeb3517bc34bf14a7d301f201
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.0.5-dm-crypt-stop.sh 1022 RMD160 c74d4fffec325378bb008b28c4225b67577c1d1b SHA1 d7b18d4d4845540baecdde373942cc8966c3d5e3 SHA256 42015047c708aa73eae615559ff76c9c8948a5d01fba68f64c5432e30ec799a4
-AUX 1.0.5-dmcrypt.confd 3029 RMD160 c84d92a58923ce88a60ab1e8fcc88910b0689df6 SHA1 b006d7f31773842e7247b2df0fe1735aac87ec59 SHA256 b5ea27a1034dda22b287422097e30e99a0673bd6a3148e38b1c2310bdcc28280
 AUX 1.0.5-dmcrypt.rc 660 RMD160 f1af3b07db2eaf938fd21b8ef4b23068f2fac78a SHA1 c297587c68d84611a8fec444d3a98443105efee7 SHA256 11518d0d26572b07f43e7ad69f638e93546656b9f14b647d9825ab8b4619906d
 AUX 1.0.6-dmcrypt.confd 3309 RMD160 23a1a91ae2b2fd4d743bf8e0427cf40e4b24ecd8 SHA1 a4bd74df103227c0aaa1cfcd75908f16c67f843a SHA256 0c30e081c0b8f879964ae49735f10b05a1d92f4f481042851958860945e13271
 AUX 1.0.6-r2-dm-crypt-start.sh 8092 RMD160 d61f1cf13e75c105065f8ca6c6a9afe12eedbcaa SHA1 fc4b6580063cd3758ada2d1ddfced3e005c8fabf SHA256 56004bef91b8fad57fe67fec19427dd7c48e01c8e1ba7ff60f8c370295775fdc
@@ -8,19 +9,22 @@ AUX 1.1.0-libudev.patch 964 RMD160 362e8bf35a2f6c022404f515811befa80121e779 SHA1
 AUX 1.1.0_rc3-static-no-selinux.patch 813 RMD160 a9e476edd9bfe12e4663962198e3ed28f43877a3 SHA1 f26e3e356848d098c70f0857a04945fb264ae844 SHA256 7ec5067c5b05b478f45cdd35953827e4696011104f533b3339d18c4becc1985a
 AUX 1.1.3-dm-crypt-start.sh 8131 RMD160 f81286cbd07155c743fd679c19e531ff3a228461 SHA1 e67d2bd2df95ad098cc67a5bbeba7da4426d4014 SHA256 f671be89b8d0d005dfc4aadc6d9a9a3bf80e720d54574515632d63ac8dd27ab7
 AUX 1.1.3-dm-crypt-stop.sh 1107 RMD160 6920a2f701f7c80adafa6a10918e51d896867faa SHA1 81ece35ca41bae4d1737c706de1b07cc8a530773 SHA256 497c381871d38de1d47052c08c89e42b9489784c5f878472303a4bdaf402e450
-AUX cryptfs.confd 1337 RMD160 f98acce860d95d69e8e95d9bab32ba5bb5bef421 SHA1 5e7b239e549b6def07af968d02b300ec36d8aac1 SHA256 8c8e815297eb20140ae7d4d555d3bfdd373ad368adf179841516430da370505c
 AUX cryptsetup-1.0.6-udevsettle.patch 561 RMD160 613da67876c1c20c3ea3687ec425b31551ae57d1 SHA1 cd0177fa53f4d6f605522f53a98c57286162859f SHA256 80c4914071769dedc20198425b4ea528ec22264ff4c54516a9e5722a8e671f60
-AUX cryptsetup-libmapper.patch 297 RMD160 1f5a19f125147797db69f4fb75d6abe36743d52b SHA1 e198368263d1635d30d27c87ed45deb23fac2f06 SHA256 c66c178fe949ceccd82d64f5acc8288e0486014dcfbc4fc6f4a0bf6c62bf4cc8
-AUX dm-crypt-start.sh 3939 RMD160 b8e77d42b9f5df01cb04f320d7b983855626b39b SHA1 1af1421b687626dae63781f4d78736522d641984 SHA256 2a6114349008ce7d438dae7adcdcd35fdfafa7d54f73d811812c29938865f651
-AUX dm-crypt-stop.sh 1290 RMD160 ccd5c5f25b01a6c80228609c97d4e25136098ff6 SHA1 0f9c13e12b4310a190d5db48d4fd32267b795094 SHA256 944e2227b1125902acfa322373dda67d13998ac2d0af075810986471fcbca5a9
-DIST cryptsetup-0.1.tar.bz2 249013 RMD160 0657a5750e32e059e3a2ad10b3de0027d616442b SHA1 b371113b266e4cdffe36fd9e3be753e4adc9f766 SHA256 421c9eb1771f8e3f61eb1b21843032b4f30f6b2cfac66a800980a2b65bdad5b7
 DIST cryptsetup-1.0.6.tar.bz2 405713 RMD160 7ec056cf80fd25a782d3f6cc345858cf4ea988ec SHA1 dd45ad6a29c2e9af83c2c1525b02d7af88ab7212 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd
 DIST cryptsetup-1.1.2.tar.bz2 478501 RMD160 2488fb603edb73cfc99726c59d44530ac006b4d9 SHA1 270580572c413facee359b29e5886ff2b4e6de1c SHA256 45972839fbb169b3ad5649454c217b7f5b0b3c8bf07e32f51a334a88217c7293
 DIST cryptsetup-1.1.3.tar.bz2 499276 RMD160 bf2e724779174a3cd6ce9d592e17c70979f26e85 SHA1 6f8a4c9a80a0d25f8492dfce6db6abed221598f6 SHA256 9c8e68a272f6d9cfb6cd65cc0743f4c44a2096c61f74e0602bf40208b5e69c0a
-EBUILD cryptsetup-0.1-r3.ebuild 1882 RMD160 cba167af414ab6349b172c5c8d6449ba7228458a SHA1 f9a70a151fdd2cb7e3591514f583c066e4899c0b SHA256 ffee91a66e88d879e3f6bfee3ab97e97b6735315e0d9c81d8b2ec005dcf8d473
+DIST cryptsetup-1.2.0.tar.bz2 523859 RMD160 8f1ce6d72a056e9c98996be85041569e96abff24 SHA1 fa9383eda40655311f2dfe751e061b0111c73908 SHA256 411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea
 EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2a53197 SHA1 8cbe4f6a69a72faf4916f1992a4ee3febd04114e SHA256 cad92c053518bb11a2acd9e806e471117c462187c8a02f5258e933e093ab2a66
 EBUILD cryptsetup-1.1.2.ebuild 3382 RMD160 c737fb8fb63a11c15c1af86db25fafc8a32e152a SHA1 4cc2311e92c429d519d99c126434b4e2ca6375cf SHA256 6445f68c8a2f1497a771cc07466f0ee6a0b23cdeb257c7db2899a1f7b247d452
 EBUILD cryptsetup-1.1.3-r1.ebuild 3153 RMD160 85b5644a340943d6a3c35698ea16c4852ab1220b SHA1 995b80ae8fca61d0fac9cba0fe78afba405505b4 SHA256 041645e8c23e7f0f5defbcb38f3de8da8467561c63b0adb269cbddfabc8aa936
 EBUILD cryptsetup-1.1.3.ebuild 3397 RMD160 40eab87e9d566cf807d7d7c1d274cb82a3f19812 SHA1 0bcbb75cf10c9221432b8aae34d67993bbe74ea3 SHA256 1270c0f6df14ffb46cb97760863743160ae1520e18c133a2969661e9a3b1d1e4
-MISC ChangeLog 14038 RMD160 8d85f51beeb2cd381918acf4826c98bf03633ea9 SHA1 1ca48f880600f3965c54380c4f5bc83eb677f4fa SHA256 90417eb92ecb4fedfc22f5c8b31b55dd70a0ec8032382b87432a672d3f0dfccf
+EBUILD cryptsetup-1.2.0.ebuild 3150 RMD160 9d9295684bda792db462582bf1122fa4eead29de SHA1 877f651473b65d29612baf22d313510a5b32f96b SHA256 660f1a06af2e89f3b8fce5cb41a22772030c9a3bd0c785f0549c9da8580914fd
+MISC ChangeLog 14188 RMD160 90c5e5bbae4c28e6cbe9df809c0a16ca3dd162a7 SHA1 e4ee113f3e501ec0a11badbbfe7cc56322ea2ef2 SHA256 20ba0ae17821c7c699c4da4010c2a88d1fa4c91db4ca9a1c7316fbd835c01b3c
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAk0bWZ0ACgkQaC/OocHi7JYjFAD+N+/4xT6O7Sy9lpwXpsgfaO3a
+tvR3oF4VHbk2KioACe8A+gIz9wxiEeqk9rav3Jqi6hhlXGH58fWjGay4GFdbrLjl
+=yW5g
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.2.0.ebuild b/sys-fs/cryptsetup/cryptsetup-1.2.0.ebuild
new file mode 100644
index 000000000000..6d4c1ee023ec
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.2.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0.ebuild,v 1.1 2010/12/29 15:54:25 vapier Exp $
+
+EAPI="2"
+
+inherit linux-info eutils multilib libtool
+
+MY_P=${P/_rc/-rc}
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="http://code.google.com/p/cryptsetup/"
+SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="dynamic nls selinux"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND=">=sys-fs/lvm2-2.02.64
+	>=dev-libs/libgcrypt-1.1.42
+	>=dev-libs/libgpg-error-1.0-r1
+	>=dev-libs/popt-1.7
+	>=sys-fs/udev-124
+	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
+	selinux? ( sys-libs/libselinux )
+	!sys-fs/cryptsetup-luks"
+
+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
+
+	if use dynamic ; then
+		ewarn "If you need cryptsetup for an initrd or initramfs then you"
+		ewarn "should NOT use the dynamic USE flag"
+		epause 5
+	fi
+}
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--sbindir=/sbin \
+		--enable-shared \
+		$(use_enable !dynamic static) \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable nls) \
+		$(use_enable selinux)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc TODO ChangeLog # README NEWS # last ones are empty
+
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/1.1.3-dm-crypt-start.sh dm-crypt-start.sh || die
+	newins "${FILESDIR}"/1.1.3-dm-crypt-stop.sh dm-crypt-stop.sh || die
+	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
+	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
+}
+
+pkg_postinst() {
+	ewarn "This ebuild introduces a new set of scripts and configuration"
+	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
+	ewarn "then you *MUST* copy your old file to:"
+	ewarn "/etc/conf.d/dmcrypt"
+	ewarn "Or your encrypted partitions will *NOT* work."
+	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"
+
+}