Version bump per bug #277990.

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

3 files changed, 108 insertions, 2 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index bbadadd4d1c6..c348c0e10f71 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.76 2009/08/31 15:05:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.77 2009/11/28 00:32:54 robbat2 Exp $
+
+*cryptsetup-1.0.7 (28 Nov 2009)
+
+  28 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +cryptsetup-1.0.7.ebuild:
+  Version bump per bug #277990.
 
   31 Aug 2009; Raúl Porcel <armin76@gentoo.org> cryptsetup-1.0.6-r2.ebuild:
   arm/ia64/s390/sh/sparc stable wrt #259253
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 23385e1e5d57..c7a9abc500c6 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -12,8 +12,10 @@ AUX dm-crypt-stop.sh 1290 RMD160 ccd5c5f25b01a6c80228609c97d4e25136098ff6 SHA1 0
 DIST cryptsetup-0.1.tar.bz2 249013 RMD160 0657a5750e32e059e3a2ad10b3de0027d616442b SHA1 b371113b266e4cdffe36fd9e3be753e4adc9f766 SHA256 421c9eb1771f8e3f61eb1b21843032b4f30f6b2cfac66a800980a2b65bdad5b7
 DIST cryptsetup-1.0.5.tar.bz2 322394 RMD160 99d9b0090b297b1bc2c72c064f091c8b2f322f70 SHA1 3e275fa67e761f6ed229ecfe831dd8a7da4be4b4 SHA256 4bab529afa00cafde3bc5df2769578c88438f80c5152d4257cd0e86986f95bc4
 DIST cryptsetup-1.0.6.tar.bz2 405713 RMD160 7ec056cf80fd25a782d3f6cc345858cf4ea988ec SHA1 dd45ad6a29c2e9af83c2c1525b02d7af88ab7212 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd
+DIST cryptsetup-1.0.7.tar.bz2 417339 RMD160 0b903f14b672dfb74116864886370852c66ec425 SHA1 d955a8149d19bc9f09f20bf89f4a39771e6f5de7 SHA256 829af59ab5bb47e4ff384a927458b4ffbb86380825de5f9ac751a89df599ed99
 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
-MISC ChangeLog 10711 RMD160 e01b8a68351eff034e2c75c3db4577dca200a60d SHA1 76ea013fa3a9d70003cdebbfeb244f2af955bab7 SHA256 22e7f39659fc7c4ca2ebdf1359bde9312208015ac95b2dd120d476642fcc7b58
+EBUILD cryptsetup-1.0.7.ebuild 3056 RMD160 69eb9e5572e3e0a4492dc4f470c067dc660e0a80 SHA1 777fc921347d9d4cc3f295b6021ea7aa822bed80 SHA256 bb6659123697cd5911e0535bcc913a2ad7c649f6458e29ded30304af5dd6eb01
+MISC ChangeLog 10858 RMD160 c4a684525d0eea0b33c6674ba8a103c0a018a017 SHA1 2e0851efe5b3499568f4909389e6e3333021475e SHA256 b654195c14551a363354c7d3a89b6a25c8d0c1c10bd2ea1c3937b4eec9b658ae
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.7.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.7.ebuild
new file mode 100644
index 000000000000..fa83dbc9429e
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.7.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.7.ebuild,v 1.1 2009/11/28 00:32:54 robbat2 Exp $
+
+EAPI=2
+
+inherit linux-info eutils flag-o-matic multilib
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="http://luks.endorphin.org/ 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"
+IUSE="dynamic nls selinux"
+
+DEPEND="|| (
+		>=sys-fs/lvm2-2.02.45
+		>=sys-fs/device-mapper-1.00.07-r1
+	)
+	>=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"
+
+dm-crypt_check() {
+	local CONFIG_CHECK="~DM_CRYPT"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+crypto_check() {
+	local CONFIG_CHECK="~CRYPTO"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+cbc_check() {
+	local CONFIG_CHECK="~CRYPTO_CBC"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	check_extra_config
+}
+
+pkg_setup() {
+	dm-crypt_check
+	crypto_check
+	cbc_check
+
+	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_configure() {
+	use selinux || export ac_cv_lib_selinux_is_selinux_enabled=no
+	econf \
+		--sbindir=/sbin \
+		$(use_enable !dynamic static) \
+		--enable-libgcrypt \
+		--enable-libdevmapper \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable nls) \
+		|| 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
+}
+
+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."
+}