Change to fix bug #162851

Package-Manager: portage-2.1.1-r2

4 files changed, 114 insertions, 5 deletions

diff --git a/sys-fs/cryptsetup-luks/ChangeLog b/sys-fs/cryptsetup-luks/ChangeLog
index 3769d2ae43d5..d7e861d19384 100644
--- a/sys-fs/cryptsetup-luks/ChangeLog
+++ b/sys-fs/cryptsetup-luks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cryptsetup-luks
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.46 2007/01/21 12:45:31 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.47 2007/01/26 15:06:12 strerror Exp $
+
+*cryptsetup-luks-1.0.4-r1 (26 Jan 2007)
+
+  26 Jan 2007; Benjamin Smee <strerror@gentoo.org>
+  +cryptsetup-luks-1.0.4-r1.ebuild:
+  Change to fix bug #162851
 
   21 Jan 2007; Benjamin Smee <strerror@gentoo.org>
   cryptsetup-luks-1.0.4.ebuild:
diff --git a/sys-fs/cryptsetup-luks/Manifest b/sys-fs/cryptsetup-luks/Manifest
index 27f4b5b12589..d131d7c2949a 100644
--- a/sys-fs/cryptsetup-luks/Manifest
+++ b/sys-fs/cryptsetup-luks/Manifest
@@ -53,14 +53,18 @@ EBUILD cryptsetup-luks-1.0.3-r3.ebuild 2501 RMD160 26b3819c326be2f8de409218a752b
 MD5 d71bdc0955c4b77ee4061100ae1cdb87 cryptsetup-luks-1.0.3-r3.ebuild 2501
 RMD160 26b3819c326be2f8de409218a752bbf2e9ee0dfe cryptsetup-luks-1.0.3-r3.ebuild 2501
 SHA256 7853beb6728fb4ded96c3ff4439ecb3a5b81f8c77f59acbe2eb10951da655233 cryptsetup-luks-1.0.3-r3.ebuild 2501
+EBUILD cryptsetup-luks-1.0.4-r1.ebuild 2601 RMD160 58443d3a3c621ccdad3b233e848728235ce69ea9 SHA1 0a3b1cfce3a2841444b254a046d4afa42196a897 SHA256 66f84b3a1ee7a19d7e570fd196a8c707d5c30919d89fc9a3c433103acba0b0f9
+MD5 5b1393327889b7dd55d5ed7f24af3576 cryptsetup-luks-1.0.4-r1.ebuild 2601
+RMD160 58443d3a3c621ccdad3b233e848728235ce69ea9 cryptsetup-luks-1.0.4-r1.ebuild 2601
+SHA256 66f84b3a1ee7a19d7e570fd196a8c707d5c30919d89fc9a3c433103acba0b0f9 cryptsetup-luks-1.0.4-r1.ebuild 2601
 EBUILD cryptsetup-luks-1.0.4.ebuild 2557 RMD160 f0852837246003218baa1a691eb0d0fd7ff451f0 SHA1 23e3159c6c156b004f8611a7eb96413c2e2a03f3 SHA256 9d20d95029a8123d9dc20b05d028103205440aa972cebb39742395ba3a169df4
 MD5 8aa10f77a53fabd16359c10bfe57f980 cryptsetup-luks-1.0.4.ebuild 2557
 RMD160 f0852837246003218baa1a691eb0d0fd7ff451f0 cryptsetup-luks-1.0.4.ebuild 2557
 SHA256 9d20d95029a8123d9dc20b05d028103205440aa972cebb39742395ba3a169df4 cryptsetup-luks-1.0.4.ebuild 2557
-MISC ChangeLog 6492 RMD160 49de16a2cd7c80c8767c704a6f7e201b4524b39c SHA1 580d6e880f50714c337dfd10f9334771dadb8765 SHA256 385b2e855e6aaf8b6bd3f6e2256292a3692d2bf930d052f3690e52830cd89067
-MD5 a1dcdd2ba8572b5f9c96c3dba532f8bb ChangeLog 6492
-RMD160 49de16a2cd7c80c8767c704a6f7e201b4524b39c ChangeLog 6492
-SHA256 385b2e855e6aaf8b6bd3f6e2256292a3692d2bf930d052f3690e52830cd89067 ChangeLog 6492
+MISC ChangeLog 6649 RMD160 ba730e82c4df9938bfef14602d605b67812aaa2c SHA1 9fb16675069b842a70ceb1550064a07ed990a2f8 SHA256 978a048d7e4ff7f17a51b0b3cb380b32bc08ce056c2a6230317eb6c04a1c273f
+MD5 9912a7e48fd9a21690c453fd943ef76d ChangeLog 6649
+RMD160 ba730e82c4df9938bfef14602d605b67812aaa2c ChangeLog 6649
+SHA256 978a048d7e4ff7f17a51b0b3cb380b32bc08ce056c2a6230317eb6c04a1c273f ChangeLog 6649
 MISC metadata.xml 228 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a SHA1 0f7be0d47f13ff42c97b3787385fe6e1cd9cbfc0 SHA256 157fd3642e30749762584d579cbeb8095379a572897d3f60dc30414cfd0f5c34
 MD5 6c788beeca78bd11e5cd6e759e52fadc metadata.xml 228
 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a metadata.xml 228
@@ -80,3 +84,6 @@ SHA256 b3e05fc5b08998b29b5c80fdab6eb5f3b9c7558ddd447c785cb4baf998bde190 files/di
 MD5 99aa86b96620381c73335d1bc21ddf77 files/digest-cryptsetup-luks-1.0.4 268
 RMD160 ba93465625d521cc777c1fbc352c3aec11786eff files/digest-cryptsetup-luks-1.0.4 268
 SHA256 9c5d89e73392ea18152a5a4d7b1804ed6a57bb5309abfe23e4605210737f6ec9 files/digest-cryptsetup-luks-1.0.4 268
+MD5 99aa86b96620381c73335d1bc21ddf77 files/digest-cryptsetup-luks-1.0.4-r1 268
+RMD160 ba93465625d521cc777c1fbc352c3aec11786eff files/digest-cryptsetup-luks-1.0.4-r1 268
+SHA256 9c5d89e73392ea18152a5a4d7b1804ed6a57bb5309abfe23e4605210737f6ec9 files/digest-cryptsetup-luks-1.0.4-r1 268
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r1.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..0493f6a5dacb
--- /dev/null
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r1.ebuild,v 1.1 2007/01/26 15:06:12 strerror Exp $
+
+inherit linux-info eutils flag-o-matic multilib
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="http://luks.endorphin.org/"
+SRC_URI="http://luks.endorphin.org/source/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="build dynamic nls selinux"
+RESTRICT="confcache"
+
+DEPEND=">=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
+	selinux? ( sys-libs/libselinux )
+	!sys-fs/cryptsetup"
+
+dm-crypt_check() {
+	local CONFIG_CHECK="~DM_CRYPT"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup-luks)"
+	check_extra_config
+	echo
+}
+
+crypto_check() {
+	local CONFIG_CHECK="~CRYPTO"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup-luks)"
+	check_extra_config
+	echo
+}
+
+cbc_check() {
+	local CONFIG_CHECK="~CRYPTO_CBC"
+	local WARNING_CRYPTO="CONFIG_CRYPTO_CBC:\tis not set (required for Kernel 2.6.19)"
+	check_extra_config
+	echo
+}
+
+pkg_setup() {
+	# Bug 148390
+	if ! use build ; then
+		linux-info_pkg_setup
+		dm-crypt_check
+		crypto_check
+		cbc_check
+	fi
+}
+
+src_compile() {
+	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
+
+	econf \
+		--sbindir=/sbin \
+		$(use_enable !dynamic static) \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable nls) \
+		$(use_enable selinux) \
+		|| die
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	rmdir "${D}"/usr/$(get_libdir)/cryptsetup
+	insinto /lib/rcscripts/addons
+	dosym /sbin/cryptsetup /bin/cryptsetup
+	newins "${FILESDIR}"/1.0.3-dm-crypt-start.sh dm-crypt-start.sh || die
+	newins "${FILESDIR}"/1.0.3-dm-crypt-stop.sh dm-crypt-stop.sh || die
+	newconfd "${FILESDIR}"/1.0.3-cryptfs.confd cryptfs || die
+}
+
+pkg_postinst() {
+	ewarn "This ebuild introduces a new set of scripts and configuration"
+	ewarn "then the previous system. If you are currently using /etc/conf.d/crypfs"
+	ewarn "then you *MUST* read the new /etc/conf.d/cryptfs for instructions"
+	ewarn "on how to convert your previous cryptfs to the new syntax or your"
+	ewarn "encrypted partitions will *NOT* work."
+	einfo
+	einfo "Please see the example for configuring a LUKS mountpoint"
+	einfo "in /etc/conf.d/cryptfs"
+	einfo
+}
diff --git a/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.4-r1 b/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.4-r1
new file mode 100644
index 000000000000..5941fa96ba5e
--- /dev/null
+++ b/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.4-r1
@@ -0,0 +1,3 @@
+MD5 156ae6b618438ee9feeddc6c2bdc4e94 cryptsetup-luks-1.0.4.tar.bz2 306907
+RMD160 47737ab9302152a64f0e13b405c219d0166d8217 cryptsetup-luks-1.0.4.tar.bz2 306907
+SHA256 5ba6066d79443fce157b8b6081be466b4c04759cf5cd020b51a8f6cfc996e2a6 cryptsetup-luks-1.0.4.tar.bz2 306907