Version bump for bug #121138

(Portage version: 2.1_pre4-r1)

5 files changed, 137 insertions, 12 deletions

diff --git a/sys-fs/cryptsetup-luks/ChangeLog b/sys-fs/cryptsetup-luks/ChangeLog
index 647d8290d664..06e07d04af51 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.18 2006/01/03 06:52:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.19 2006/02/02 15:24:57 strerror Exp $
+
+*cryptsetup-luks-1.0.1-r2 (02 Feb 2006)
+
+  02 Feb 2006; Benjamin Smee <strerror@gentoo.org>
+  +cryptsetup-luks-1.0.1-r2.ebuild:
+  Version bump for bug #121138
 
   03 Jan 2006; Mike Frysinger <vapier@gentoo.org>
   +files/cryptsetup-luks-1.0.1-no-nls.patch,
diff --git a/sys-fs/cryptsetup-luks/Manifest b/sys-fs/cryptsetup-luks/Manifest
index 90f05814c2b9..ccfb28f0d0ca 100644
--- a/sys-fs/cryptsetup-luks/Manifest
+++ b/sys-fs/cryptsetup-luks/Manifest
@@ -1,22 +1,45 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 05b588d85d48aa094d9e1b636486ce3e ChangeLog 2702
+MD5 751861c77860e0b772e781607c0ff24a ChangeLog 2862
+RMD160 ff1c6c14d40dbd32c8947bc0579889c6471203ca ChangeLog 2862
+SHA256 f29c3a0cf9a85ff10430710425c6e3f959f5a4a225219975760dd83cbc4464fb ChangeLog 2862
 MD5 66c1f7dfa9c09e11c9e248dd7ec07a5e cryptsetup-luks-1.0-r1.ebuild 2126
+RMD160 aa43f85456963a4c57f8dcf11ceaea3c352d317a cryptsetup-luks-1.0-r1.ebuild 2126
+SHA256 f95db6ef67924e2da007e69dd2559c174c426b45898925b5b0ff3b8dfbfc5474 cryptsetup-luks-1.0-r1.ebuild 2126
 MD5 67d0de76771d3797f20bdc5e3bc1ff47 cryptsetup-luks-1.0.1-r1.ebuild 2029
+RMD160 889f10e56c32f8ecd8dac2290eb05ad5b56f8f75 cryptsetup-luks-1.0.1-r1.ebuild 2029
+SHA256 8ea872716c00b0b916e784af43454ff0d088be5cad14b88525e7802ad21e5527 cryptsetup-luks-1.0.1-r1.ebuild 2029
+MD5 accffda93ebae60c9874bc0909fb3227 cryptsetup-luks-1.0.1-r2.ebuild 2105
+RMD160 1e2678f6fed2c05489e049d67cb3b6b378d2561b cryptsetup-luks-1.0.1-r2.ebuild 2105
+SHA256 c1e44ce7c9133756bb727ae5c3bf8655835965178cce6db2548d53a15ed269b2 cryptsetup-luks-1.0.1-r2.ebuild 2105
 MD5 99b3cfb6a9eb43a772d29da0f88f849d cryptsetup-luks-1.0.1.ebuild 2148
+RMD160 f6998231d11e09fb9d51e38a90284575241d3d77 cryptsetup-luks-1.0.1.ebuild 2148
+SHA256 640bca45ec339c0a4ca3b7dabc9061fdd9d5bdc770c5632f6a38e50a2d198515 cryptsetup-luks-1.0.1.ebuild 2148
 MD5 6d86b15e07cd0cdf96d8a363b1d778cd files/cryptfs.confd 1548
+RMD160 a009482d77e0c467fc9b26bbf7cd0a46ed5eb26e files/cryptfs.confd 1548
+SHA256 7e6d165edb4e3971d949847629e56849c0839c73f43de07822b4c942171dc16a files/cryptfs.confd 1548
+MD5 906131d3cdd20ac94109052236e469b9 files/cryptsetup-luks-1.0.1-libmapper.patch 534
+RMD160 7a7c29c426cb1d884f000654317b51ed9ca5fc7f files/cryptsetup-luks-1.0.1-libmapper.patch 534
+SHA256 f877a45493d0c5a8031b58d56651ac1d784f29160f73130eb18a3b1900fa0b73 files/cryptsetup-luks-1.0.1-libmapper.patch 534
 MD5 c66058fc1ba9f980485e2b9e3b66df52 files/cryptsetup-luks-1.0.1-no-nls.patch 597
+RMD160 fb2604d5de69ddaeeeb9b771c80cc72663bd95a3 files/cryptsetup-luks-1.0.1-no-nls.patch 597
+SHA256 f147f820e5b0bb391b160161e38454db3f719ee94fbd6e497c7454eb410df0c6 files/cryptsetup-luks-1.0.1-no-nls.patch 597
 MD5 f254479b9a12868d43ab10e4658fab51 files/digest-cryptsetup-luks-1.0-r1 72
+RMD160 f16436326ec991428b4e2a840159408c6eba6b53 files/digest-cryptsetup-luks-1.0-r1 72
+SHA256 fc336d3548b4032af8d91ab885aa6e6b5a717af5d6b76ac8cbe0cf5b3d48eeb6 files/digest-cryptsetup-luks-1.0-r1 72
 MD5 6d83c52472ad8d3b12ec5dbc4e056ed7 files/digest-cryptsetup-luks-1.0.1 74
+RMD160 baf87a565a67086afd4d831176f58f495d05d9f6 files/digest-cryptsetup-luks-1.0.1 74
+SHA256 4953350a9bc5349c28fb9afda4f3df9b0a59ed96d8693f34773f59490a998ee6 files/digest-cryptsetup-luks-1.0.1 74
 MD5 6d83c52472ad8d3b12ec5dbc4e056ed7 files/digest-cryptsetup-luks-1.0.1-r1 74
+RMD160 baf87a565a67086afd4d831176f58f495d05d9f6 files/digest-cryptsetup-luks-1.0.1-r1 74
+SHA256 4953350a9bc5349c28fb9afda4f3df9b0a59ed96d8693f34773f59490a998ee6 files/digest-cryptsetup-luks-1.0.1-r1 74
+MD5 1c0c01504919b985fca8352924530b59 files/digest-cryptsetup-luks-1.0.1-r2 268
+RMD160 75bee6ae3c1574f5602a48be8f2791985e4a26b5 files/digest-cryptsetup-luks-1.0.1-r2 268
+SHA256 44f9a55c285900d0fbbdc7268257cde094c0968a33f99e993510147af84a5471 files/digest-cryptsetup-luks-1.0.1-r2 268
 MD5 c653a0b4ace27569ccc659b7cb43b4a9 files/dm-crypt-start.sh 4306
+RMD160 558705676a62acdaacb1362ad5459c1719f5b247 files/dm-crypt-start.sh 4306
+SHA256 48669629db92c204f208406cf5ca78acce9088568e0bc03bba511b38a668b0fc files/dm-crypt-start.sh 4306
 MD5 a3bb6598f67c8922ccb6576ff256ced0 files/dm-crypt-stop.sh 1297
+RMD160 aae23fdb24788b31992f61afd750d0be270a586b files/dm-crypt-stop.sh 1297
+SHA256 c160c65b947af563e5e5ee0b090f3d2a4f4097361b1088be05cba3f3461907b7 files/dm-crypt-stop.sh 1297
 MD5 6c788beeca78bd11e5cd6e759e52fadc metadata.xml 228
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDuyuK2+ySkm8kpY0RAlB+AJ9RP8hOK82n0JlBfEjimoLzBCHxUQCglDOt
-yf3qCKxmhPu93pBM34dsdQA=
-=ryhR
------END PGP SIGNATURE-----
+RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a metadata.xml 228
+SHA256 157fd3642e30749762584d579cbeb8095379a572897d3f60dc30414cfd0f5c34 metadata.xml 228
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r2.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..fd4c22a999fa
--- /dev/null
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2006 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.1-r2.ebuild,v 1.1 2006/02/02 15:24:57 strerror Exp $
+
+inherit linux-info eutils flag-o-matic
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="http://clemens.endorphin.org/LUKS/"
+SRC_URI="http://luks.endorphin.org/source/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="dynamic nls"
+
+DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+	>=dev-libs/libgcrypt-1.1.42
+	>=dev-libs/libgpg-error-1.0-r1
+	!sys-fs/cryptsetup"
+
+dm-crypt_check() {
+	ebegin "Checking for dm-crypt support"
+	linux_chkconfig_present DM_CRYPT
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+		ewarn "cryptsetup requires dm-crypt support!"
+		ewarn "Please enable dm-crypt support in your kernel config, found at:"
+		ewarn "(for 2.6 kernels)"
+		ewarn
+		ewarn "  Device Drivers"
+		ewarn "    Multi-Device Support"
+		ewarn "      Device mapper support"
+		ewarn "        [*] Crypt Target Support"
+		ewarn
+		ewarn "and recompile your kernel if you want this package to work with this kernel"
+		epause 5
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	dm-crypt_check;
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/"${P}"-no-nls.patch
+	epatch "${FILESDIR}"/"${P}"-libmapper.patch || die "patch failed"
+}
+
+src_compile() {
+	if use dynamic ; then
+		ewarn "If you need cryptsetup for an initrd or initramfs then you"
+		ewarn "should NOT use this USE flag"
+		epause 5
+		econf --sbindir=/bin --disable-static $(use_enable nls) || die
+	else
+		append-ldflags -static
+		econf --sbindir=/bin --enable-static $(use_enable nls) || die
+	fi
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	rmdir "${D}/usr/lib/cryptsetup"
+	insinto /lib/rcscripts/addons
+	newconfd ${FILESDIR}/cryptfs.confd cryptfs
+	doins "${FILESDIR}"/dm-crypt-{start,stop}.sh
+}
+
+pkg_postinst() {
+	einfo "Please see the example for configuring a LUKS mountpoint"
+	einfo "in /etc/conf.d/cryptfs"
+}
diff --git a/sys-fs/cryptsetup-luks/files/cryptsetup-luks-1.0.1-libmapper.patch b/sys-fs/cryptsetup-luks/files/cryptsetup-luks-1.0.1-libmapper.patch
new file mode 100644
index 000000000000..158fcc5b8de6
--- /dev/null
+++ b/sys-fs/cryptsetup-luks/files/cryptsetup-luks-1.0.1-libmapper.patch
@@ -0,0 +1,15 @@
+diff -urN cryptsetup-0.1.old/lib/libdevmapper.c cryptsetup-0.1/lib/libdevmapper.c
+--- cryptsetup-0.1.old/lib/libdevmapper.c	2004-06-03 16:33:44.000000000 +0200
++++ cryptsetup-0.1/lib/libdevmapper.c	2005-12-25 10:54:38.000000000 +0100
+@@ -226,6 +226,11 @@
+ 	if (!dm_task_get_info(dmt, &dmi))
+ 		goto out;
+ 
++	if (!dmi.exists) {
++		r = -ENODEV;
++		goto out;
++	}
++
+ 	next = dm_get_next_target(dmt, next, &start, &length,
+ 	                          &target_type, &params);
+ 	if (!target_type || strcmp(target_type, CRYPT_TARGET) != 0 ||
diff --git a/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.1-r2 b/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.1-r2
new file mode 100644
index 000000000000..5351f8582554
--- /dev/null
+++ b/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.1-r2
@@ -0,0 +1,3 @@
+MD5 b2415f67ceed3ad2c7dd2e878cf7787d cryptsetup-luks-1.0.1.tar.bz2 286161
+RMD160 18dd277463607b3b9cc348e0af27af41c5ebcfe1 cryptsetup-luks-1.0.1.tar.bz2 286161
+SHA256 f93f062785f4619735eed4855d3e8b062428a161e498d8b77eca446db940a2a5 cryptsetup-luks-1.0.1.tar.bz2 286161