Bump for bug #120802

(Portage version: 2.1_pre4-r1)

5 files changed, 126 insertions, 12 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 59ab035894c1..d8c34896eda6 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.24 2006/01/13 21:51:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.25 2006/02/02 14:58:26 strerror Exp $
+
+*cryptsetup-0.1-r3 (02 Feb 2006)
+
+  02 Feb 2006; Benjamin Smee <strerror@gentoo.org>
+  +files/cryptsetup-libmapper.patch, +cryptsetup-0.1-r3.ebuild:
+  Bump for bug #120802
 
   13 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   cryptsetup-0.1-r2.ebuild:
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index e3379ab3e233..7c68380a38c0 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,21 +1,42 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7d1c47c627680d6cc5f164aed6f4598a ChangeLog 3042
+MD5 6cccac4b6ca71100b014057286ef1d34 ChangeLog 3215
+RMD160 553951bd2474f3e67ebb993657d9f457f4a70b0d ChangeLog 3215
+SHA256 4870fb1ec1bf580fb5756a8fa9ec7baf039f128ad40739ea35b813b3e0fade42 ChangeLog 3215
 MD5 e99dbe919e2a9ca39164133ba74ede78 cryptsetup-0.1-r1.ebuild 1738
+RMD160 def712fe515b4415cb7166e90ffb49a5c4d8e865 cryptsetup-0.1-r1.ebuild 1738
+SHA256 7c89c07d82b3f2d83248268a0d4c966340a1ba12cfeb8941667a523c5ff90936 cryptsetup-0.1-r1.ebuild 1738
 MD5 be51dd831294179d2bcc3965750c9ead cryptsetup-0.1-r2.ebuild 1760
+RMD160 f6f23dd3dc2d837e0331ba6584a663077a2842d4 cryptsetup-0.1-r2.ebuild 1760
+SHA256 13d3b37a6c22774dc5dfaab068d88450a20127373b8eebeb307dddd41af4311b cryptsetup-0.1-r2.ebuild 1760
+MD5 ac95a6710abc9a7b28e1ccbf97e9c7d6 cryptsetup-0.1-r3.ebuild 1861
+RMD160 0359e2982bc5516d65046d16aaf435d425c618de cryptsetup-0.1-r3.ebuild 1861
+SHA256 4849c6c229a82dedfc45caf5fb195496b18d5b37abf4b384085311b4c64eb7cc cryptsetup-0.1-r3.ebuild 1861
 MD5 c98ef83e41e7833603d5fd0d3c073fdc cryptsetup-0.1.ebuild 1119
+RMD160 c518b48127dfb48dd22a865df68438aec186e344 cryptsetup-0.1.ebuild 1119
+SHA256 879aa89def5f3074145e5db5234c7008d0ae436d391e4b8d3b6e71e7dd5bd745 cryptsetup-0.1.ebuild 1119
 MD5 327d83538ed5305bdc3568cd353410bb files/cryptfs.confd 1337
+RMD160 f98acce860d95d69e8e95d9bab32ba5bb5bef421 files/cryptfs.confd 1337
+SHA256 8c8e815297eb20140ae7d4d555d3bfdd373ad368adf179841516430da370505c files/cryptfs.confd 1337
+MD5 344f5d9cc2f186abc2eef8f396a8fcd5 files/cryptsetup-libmapper.patch 297
+RMD160 1f5a19f125147797db69f4fb75d6abe36743d52b files/cryptsetup-libmapper.patch 297
+SHA256 c66c178fe949ceccd82d64f5acc8288e0486014dcfbc4fc6f4a0bf6c62bf4cc8 files/cryptsetup-libmapper.patch 297
 MD5 959c303c3bfeab6c12e28ae4e16400b3 files/digest-cryptsetup-0.1 67
+RMD160 3b10f1b9ce6847e0cae5fa2b7d214c7ccea1b759 files/digest-cryptsetup-0.1 67
+SHA256 64076b67ddf9588bb8d57065f074eaa0928aa93a2a8b059d2bf3169f6d1638c0 files/digest-cryptsetup-0.1 67
 MD5 959c303c3bfeab6c12e28ae4e16400b3 files/digest-cryptsetup-0.1-r1 67
+RMD160 3b10f1b9ce6847e0cae5fa2b7d214c7ccea1b759 files/digest-cryptsetup-0.1-r1 67
+SHA256 64076b67ddf9588bb8d57065f074eaa0928aa93a2a8b059d2bf3169f6d1638c0 files/digest-cryptsetup-0.1-r1 67
 MD5 959c303c3bfeab6c12e28ae4e16400b3 files/digest-cryptsetup-0.1-r2 67
+RMD160 3b10f1b9ce6847e0cae5fa2b7d214c7ccea1b759 files/digest-cryptsetup-0.1-r2 67
+SHA256 64076b67ddf9588bb8d57065f074eaa0928aa93a2a8b059d2bf3169f6d1638c0 files/digest-cryptsetup-0.1-r2 67
+MD5 1a1214cefd0e0d7b0e5b3552e68f4874 files/digest-cryptsetup-0.1-r3 247
+RMD160 f97d4fb11ce03423ad4a69e6f5e566248e344f23 files/digest-cryptsetup-0.1-r3 247
+SHA256 e446eacb5c054e5a84f6f97b575988ea04488bc563b079eb7f2c216e562ee038 files/digest-cryptsetup-0.1-r3 247
 MD5 3232a190894a35b7d2f3610f2eb652dc files/dm-crypt-start.sh 3937
+RMD160 61add125c740ce83710142a77ee10ba3f88c92f8 files/dm-crypt-start.sh 3937
+SHA256 a47397bdfdfe20804fd684b42d806e349b2e86cfcbc3d69093d17294e9cc32c4 files/dm-crypt-start.sh 3937
 MD5 8619b3f74d4d362bab9f430b63243a74 files/dm-crypt-stop.sh 1290
+RMD160 ccd5c5f25b01a6c80228609c97d4e25136098ff6 files/dm-crypt-stop.sh 1290
+SHA256 944e2227b1125902acfa322373dda67d13998ac2d0af075810986471fcbca5a9 files/dm-crypt-stop.sh 1290
 MD5 cd57823a7232b359b6a8674cde9fadde metadata.xml 290
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDyalD2+ySkm8kpY0RAqcuAJ99Jh1gbVBY60mwnI8DnlowmFfW2gCfdi7T
-auIti+eKzi+gRi5Q6kskWeM=
-=EeTx
------END PGP SIGNATURE-----
+RMD160 ae946fba0cede1d9ed84ab44513289d771848779 metadata.xml 290
+SHA256 f91bc6f8ed02a4423cd94cf59ab800e44b6bbdd05407e1ef54601b6dd46f6476 metadata.xml 290
diff --git a/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild b/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild
new file mode 100644
index 000000000000..e890960cada9
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-0.1-r3.ebuild,v 1.1 2006/02/02 14:58:26 strerror Exp $
+
+inherit linux-info multilib eutils
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="http://www.saout.de/misc/dm-crypt/"
+SRC_URI="http://www.saout.de/misc/dm-crypt/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=sys-fs/device-mapper-1.00.07-r1
+	!sys-fs/cryptsetup-luks"
+DEPEND="dev-libs/popt
+	>=dev-libs/libgcrypt-1.1.42
+	dev-libs/libgpg-error"
+
+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}/cryptsetup-libmapper.patch"
+}
+
+src_compile() {
+	econf --bindir=/bin --disable-nls || die
+
+	sed -i \
+		-e "s|-lgcrypt|/usr/$(get_libdir)/libgcrypt.a|" \
+		-e "s|-lgpg-error|/usr/$(get_libdir)/libgpg-error.a|" \
+		Makefile src/Makefile
+	sed -i -e "s|-lpopt|/usr/$(get_libdir)/libpopt.a|" src/Makefile
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+
+	newconfd ${FILESDIR}/cryptfs.confd cryptfs
+	insinto /lib/rcscripts/addons
+	doins "${FILESDIR}"/dm-crypt-{start,stop}.sh
+}
diff --git a/sys-fs/cryptsetup/files/cryptsetup-libmapper.patch b/sys-fs/cryptsetup/files/cryptsetup-libmapper.patch
new file mode 100644
index 000000000000..6f3dd180f83b
--- /dev/null
+++ b/sys-fs/cryptsetup/files/cryptsetup-libmapper.patch
@@ -0,0 +1,13 @@
+--- src/libdevmapper.c
++++ src/libdevmapper.c
+@@ -216,6 +216,10 @@
+ 	r = -EINVAL;
+ 	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);
diff --git a/sys-fs/cryptsetup/files/digest-cryptsetup-0.1-r3 b/sys-fs/cryptsetup/files/digest-cryptsetup-0.1-r3
new file mode 100644
index 000000000000..c08b511b4b33
--- /dev/null
+++ b/sys-fs/cryptsetup/files/digest-cryptsetup-0.1-r3
@@ -0,0 +1,3 @@
+MD5 c813ca6b5e8ecd9a48ec126c3b8ce857 cryptsetup-0.1.tar.bz2 249013
+RMD160 0657a5750e32e059e3a2ad10b3de0027d616442b cryptsetup-0.1.tar.bz2 249013
+SHA256 421c9eb1771f8e3f61eb1b21843032b4f30f6b2cfac66a800980a2b65bdad5b7 cryptsetup-0.1.tar.bz2 249013