Bug #323655: version bump

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 104 insertions, 12 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 233b2df8d285..80d0d8a01f01 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,12 @@
 # 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.84 2010/05/24 18:34:15 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.85 2010/06/17 19:09:41 robbat2 Exp $
+
+*cryptsetup-1.1.2 (17 Jun 2010)
+
+  17 Jun 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +cryptsetup-1.1.2.ebuild:
+  Bug #323655: version bump
 
 *cryptsetup-1.1.1 (24 May 2010)
 
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 7a50ed10460a..6a9392b81d96 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 1.0.5-dm-crypt-start.sh 8298 RMD160 858f607fe1a2036430f972dbbc643c178baf96f7 SHA1 00c7380894d30842c01ef18ed3e14114cf1da36b SHA256 8c9f4a502dfb20e1a6c656a9563da539dbe8d1aeeb3517bc34bf14a7d301f201
 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
@@ -22,6 +19,7 @@ DIST cryptsetup-1.1.0.tar.bz2 465778 RMD160 c4e649bd8749507ee43e639f62cf2d28cc6a
 DIST cryptsetup-1.1.1-rc1.tar.bz2 476097 RMD160 c4ec17a7495f138098b76f52115238298740b263 SHA1 0d52bd4a152b066b37224773e642e36c1d52d79d SHA256 98720aa760741652e5280edfd5e03208a7e407c505d3ee3e9056dbb7712f0dc2
 DIST cryptsetup-1.1.1-rc2.tar.bz2 477360 RMD160 16783ebc67b629b77959c80d7bcac9a2ca700cab SHA1 2d45cb255d4601d7f921ba0e30d0d0564b509042 SHA256 02875d87ab1957a0f53f421eac0154a72c45564d88c10f59a013e6c449f68f55
 DIST cryptsetup-1.1.1.tar.bz2 477800 RMD160 b402d9927280f5bc4018aab95f5063874aeb6bbc SHA1 cd2684ebc8fc7b23019d9102ed742699b037afe1 SHA256 a0d07cfc03d3a12d54e68eebb509e6ce45bbd5169ae277256ea7bd165cc246bd
+DIST cryptsetup-1.1.2.tar.bz2 478501 RMD160 2488fb603edb73cfc99726c59d44530ac006b4d9 SHA1 270580572c413facee359b29e5886ff2b4e6de1c SHA256 45972839fbb169b3ad5649454c217b7f5b0b3c8bf07e32f51a334a88217c7293
 EBUILD cryptsetup-0.1-r3.ebuild 1882 RMD160 cba167af414ab6349b172c5c8d6449ba7228458a SHA1 f9a70a151fdd2cb7e3591514f583c066e4899c0b SHA256 ffee91a66e88d879e3f6bfee3ab97e97b6735315e0d9c81d8b2ec005dcf8d473
 EBUILD cryptsetup-1.0.5-r1.ebuild 2967 RMD160 e3d53062c60387d7ed59c864a842de457f031d3f SHA1 4a603cb45fe4cf249cc6a75413d3e14481098b6e SHA256 4f305ccb9c8432becb2e4a42859305aa642d3df8c8ed04b78c5dca4f839bead7
 EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2a53197 SHA1 8cbe4f6a69a72faf4916f1992a4ee3febd04114e SHA256 cad92c053518bb11a2acd9e806e471117c462187c8a02f5258e933e093ab2a66
@@ -31,12 +29,6 @@ EBUILD cryptsetup-1.1.0.ebuild 2952 RMD160 4f790c0b7388319bc4935237a301868f443b0
 EBUILD cryptsetup-1.1.1.ebuild 3036 RMD160 5eedec40850803a392daa6c0aac49a63a71b6d16 SHA1 a235c590162ae92d0d66ae0b235cb830d6982d00 SHA256 eff000a0955f4833ee49651ba74b6727c735fb1aa4dd15a4cb34defaee198444
 EBUILD cryptsetup-1.1.1_rc1.ebuild 2982 RMD160 744e8fcac011ecfd11def3149c5bcdd47087dba6 SHA1 89bb9d0376786cf70c5c9a7d5ab2e9174bb935a7 SHA256 eb5b16906624d610acd7daf251b6280f733dfe4e9e2d74e691afbf85520e8d92
 EBUILD cryptsetup-1.1.1_rc2.ebuild 3040 RMD160 e512e3d3980727f682c63db686a59123a937deb1 SHA1 11d24b1493be4087f2b8b1577154106a40072616 SHA256 8400b3ac19c3178b6c55218c51b8e11962a4d97dba070c80da8940a25a696ea9
-MISC ChangeLog 12045 RMD160 317aedde421d0456b0ba061d6ba2d8bece86dfe2 SHA1 229ebe80c5f1145d07a598e64a0a1b6c6fdecfa1 SHA256 1fa264777c006f22b46be959ae4c2b62f611c0b480b116f7b86f80d9b1a421d8
+EBUILD cryptsetup-1.1.2.ebuild 3036 RMD160 e76396064d05b8406010bb85e78339a41243a218 SHA1 58ad1720c069840048dd7b882e2e2ac0f7232ab8 SHA256 39128f24aad85f0a74faa8c9982b22382e444116c1b866abc6ee459285b89d64
+MISC ChangeLog 12188 RMD160 1f051a330728b87ef548efddf02dae61d9a44c57 SHA1 56ad22254266a21ac437a32d57814d87cb3cf907 SHA256 0abd3a22c4c6da10a0b20ad8bea6d99a4fa855847a077a427c2df567decf5f93
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkwHA2kACgkQTwhj9JtAlp5HfwD/diMEwGhb1MbGrhuWDKjiP9VJ
-m9ZNdrsSmAAqkVfDYjwA/1qt4jRs8ilUHqQpXjUSHpBlh12D4YAken6M20kdSkIX
-=2NOV
------END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.2.ebuild
new file mode 100644
index 000000000000..f0fd0efcb442
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.1.2.ebuild
@@ -0,0 +1,94 @@
+# 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.1.2.ebuild,v 1.1 2010/06/17 19:09:41 robbat2 Exp $
+
+EAPI=2
+
+inherit linux-info eutils flag-o-matic multilib autotools
+
+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() {
+	# Both merged upstream
+	#epatch "${FILESDIR}"/1.1.0_rc3-static-no-selinux.patch
+	#epatch "${FILESDIR}"/1.1.0-libudev.patch
+	eautoreconf
+	:
+}
+
+src_configure() {
+	econf \
+		--sbindir=/sbin \
+		--enable-shared \
+		$(use_enable !dynamic static) \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable nls) \
+		$(use_enable selinux) \
+		|| die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	rmdir "${D}"/usr/$(get_libdir)/cryptsetup
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/1.0.6-r2-dm-crypt-start.sh dm-crypt-start.sh || die
+	newins "${FILESDIR}"/1.0.5-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
+	dodoc TODO ChangeLog # README NEWS # last ones are empty
+}
+
+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."
+}