Fixes for bugs #180068 #181503 #164795 and other improvements. Thanks to Thomas Bettler for a patch

Package-Manager: portage-2.1.3.11

7 files changed, 193 insertions, 30 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 67b3cbe38f95..3fe748d0fe53 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.42 2007/09/14 21:33:34 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.43 2007/10/02 15:47:27 strerror Exp $
+
+*cryptsetup-1.0.5-r1 (02 Oct 2007)
+
+  02 Oct 2007; Benjamin Smee <strerror@gentoo.org>
+  files/1.0.5-dm-crypt-start.sh, files/1.0.5-dm-crypt-stop.sh,
+  files/1.0.5-dmcrypt.rc, +cryptsetup-1.0.5-r1.ebuild:
+  Fixes for bugs #180068 #181503 #164795 and other improvements. Thanks to
+  Thomas Bettler for a patch
 
   14 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   cryptsetup-1.0.5.ebuild:
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index d4f77c5b82fe..a3185875d868 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,19 +1,19 @@
-AUX 1.0.5-dm-crypt-start.sh 7424 RMD160 9c43f5bfe6990b61cfb147c243e86304087fbb41 SHA1 3a91007a5e63ea4df05f65f28484f82fdb349a2b SHA256 bb651bffc928972512e14858a674221d1a5482daa482ec39e787596c55044b90
-MD5 b4b8e76f8dfc6b4f64bd83e0782ef9d5 files/1.0.5-dm-crypt-start.sh 7424
-RMD160 9c43f5bfe6990b61cfb147c243e86304087fbb41 files/1.0.5-dm-crypt-start.sh 7424
-SHA256 bb651bffc928972512e14858a674221d1a5482daa482ec39e787596c55044b90 files/1.0.5-dm-crypt-start.sh 7424
-AUX 1.0.5-dm-crypt-stop.sh 1021 RMD160 4b4537e0cadf447c1efed6ca8a4478b058e99aad SHA1 ed7c563b2ee9ef7c67e48fb9e63af025d4c2a29f SHA256 fd8856130104aa37d6941168b299389a47e6760077a9e6d3f86f3301385a4973
-MD5 341064815588da90206d883ed5dc42df files/1.0.5-dm-crypt-stop.sh 1021
-RMD160 4b4537e0cadf447c1efed6ca8a4478b058e99aad files/1.0.5-dm-crypt-stop.sh 1021
-SHA256 fd8856130104aa37d6941168b299389a47e6760077a9e6d3f86f3301385a4973 files/1.0.5-dm-crypt-stop.sh 1021
+AUX 1.0.5-dm-crypt-start.sh 8298 RMD160 858f607fe1a2036430f972dbbc643c178baf96f7 SHA1 00c7380894d30842c01ef18ed3e14114cf1da36b SHA256 8c9f4a502dfb20e1a6c656a9563da539dbe8d1aeeb3517bc34bf14a7d301f201
+MD5 f8c8080b1b7e8cc7decfeffe31a46947 files/1.0.5-dm-crypt-start.sh 8298
+RMD160 858f607fe1a2036430f972dbbc643c178baf96f7 files/1.0.5-dm-crypt-start.sh 8298
+SHA256 8c9f4a502dfb20e1a6c656a9563da539dbe8d1aeeb3517bc34bf14a7d301f201 files/1.0.5-dm-crypt-start.sh 8298
+AUX 1.0.5-dm-crypt-stop.sh 1022 RMD160 c74d4fffec325378bb008b28c4225b67577c1d1b SHA1 d7b18d4d4845540baecdde373942cc8966c3d5e3 SHA256 42015047c708aa73eae615559ff76c9c8948a5d01fba68f64c5432e30ec799a4
+MD5 d07195450120fadea8a643596856c546 files/1.0.5-dm-crypt-stop.sh 1022
+RMD160 c74d4fffec325378bb008b28c4225b67577c1d1b files/1.0.5-dm-crypt-stop.sh 1022
+SHA256 42015047c708aa73eae615559ff76c9c8948a5d01fba68f64c5432e30ec799a4 files/1.0.5-dm-crypt-stop.sh 1022
 AUX 1.0.5-dmcrypt.confd 3029 RMD160 c84d92a58923ce88a60ab1e8fcc88910b0689df6 SHA1 b006d7f31773842e7247b2df0fe1735aac87ec59 SHA256 b5ea27a1034dda22b287422097e30e99a0673bd6a3148e38b1c2310bdcc28280
 MD5 63d91d8391aedaf1830d56922f9b5bf8 files/1.0.5-dmcrypt.confd 3029
 RMD160 c84d92a58923ce88a60ab1e8fcc88910b0689df6 files/1.0.5-dmcrypt.confd 3029
 SHA256 b5ea27a1034dda22b287422097e30e99a0673bd6a3148e38b1c2310bdcc28280 files/1.0.5-dmcrypt.confd 3029
-AUX 1.0.5-dmcrypt.rc 599 RMD160 ab1526be212e21793b84afb6ec68ea5813dd6b7f SHA1 8fb7d8fbb375e6e871f7880709d78752d19a615f SHA256 c3c62e4ff198bd20e41e79cc10c1780a9739dd18aa1046519c263491a4b36585
-MD5 87013e9347250aed73ca3ee675e064eb files/1.0.5-dmcrypt.rc 599
-RMD160 ab1526be212e21793b84afb6ec68ea5813dd6b7f files/1.0.5-dmcrypt.rc 599
-SHA256 c3c62e4ff198bd20e41e79cc10c1780a9739dd18aa1046519c263491a4b36585 files/1.0.5-dmcrypt.rc 599
+AUX 1.0.5-dmcrypt.rc 654 RMD160 226db3109b754f43078b52c9b95be9645c2159de SHA1 5822febef7190818020a7f9eff13c06c509a7a38 SHA256 06a4489eb3ddc64ea05269259ecf9816f186d559a1310f9b5daa1cca44ff12b0
+MD5 2647d575f24aa7c735febc189a69f3c9 files/1.0.5-dmcrypt.rc 654
+RMD160 226db3109b754f43078b52c9b95be9645c2159de files/1.0.5-dmcrypt.rc 654
+SHA256 06a4489eb3ddc64ea05269259ecf9816f186d559a1310f9b5daa1cca44ff12b0 files/1.0.5-dmcrypt.rc 654
 AUX cryptfs.confd 1337 RMD160 f98acce860d95d69e8e95d9bab32ba5bb5bef421 SHA1 5e7b239e549b6def07af968d02b300ec36d8aac1 SHA256 8c8e815297eb20140ae7d4d555d3bfdd373ad368adf179841516430da370505c
 MD5 327d83538ed5305bdc3568cd353410bb files/cryptfs.confd 1337
 RMD160 f98acce860d95d69e8e95d9bab32ba5bb5bef421 files/cryptfs.confd 1337
@@ -40,14 +40,18 @@ EBUILD cryptsetup-0.1-r3.ebuild 1848 RMD160 f8e4c64e6c5833bd294d8406071b3e6ff8c1
 MD5 8c1b291fae1b435160c910a1ea2ae02f cryptsetup-0.1-r3.ebuild 1848
 RMD160 f8e4c64e6c5833bd294d8406071b3e6ff8c1f8da cryptsetup-0.1-r3.ebuild 1848
 SHA256 613614dd78ed3b5bc352c58549cddc5d7297f9a33a7b2a16c006e39455e1f0f0 cryptsetup-0.1-r3.ebuild 1848
+EBUILD cryptsetup-1.0.5-r1.ebuild 2873 RMD160 37447281e3ef5e22b969d3f4594f6221ee7c6b00 SHA1 afe42e3c62c8acec4239cda72f3f33284565678c SHA256 f9fe4e34e69574bcf547247b93f4076daeda0691f6b428d5053f7b5cb8e33cf1
+MD5 710b23480608977213c32ed906994061 cryptsetup-1.0.5-r1.ebuild 2873
+RMD160 37447281e3ef5e22b969d3f4594f6221ee7c6b00 cryptsetup-1.0.5-r1.ebuild 2873
+SHA256 f9fe4e34e69574bcf547247b93f4076daeda0691f6b428d5053f7b5cb8e33cf1 cryptsetup-1.0.5-r1.ebuild 2873
 EBUILD cryptsetup-1.0.5.ebuild 2627 RMD160 fbbdd6e40a4ee3be801f2e2f7702bf59e27d2b91 SHA1 ae77b0efb0311766dca5d62846826a27ef7c8fb1 SHA256 b5ad9a6a3471c80a48003ca2a8d3b877b75c48777568d36991bbc1185437ecfa
 MD5 5576500ca5477d7036e6859b67fd7980 cryptsetup-1.0.5.ebuild 2627
 RMD160 fbbdd6e40a4ee3be801f2e2f7702bf59e27d2b91 cryptsetup-1.0.5.ebuild 2627
 SHA256 b5ad9a6a3471c80a48003ca2a8d3b877b75c48777568d36991bbc1185437ecfa cryptsetup-1.0.5.ebuild 2627
-MISC ChangeLog 5284 RMD160 4d7ad803edbf59a4717568ed4605a4045e0ea0aa SHA1 782d6f59f5cfb282cac9e166cd617ff6b235e275 SHA256 f3ff0c5d8fbd29beb7e2e32e9a2e9dbc27de0a87f42f9b2b78835b67a85c1b61
-MD5 3925e0e59a8c97711869a4c9a4a4ce33 ChangeLog 5284
-RMD160 4d7ad803edbf59a4717568ed4605a4045e0ea0aa ChangeLog 5284
-SHA256 f3ff0c5d8fbd29beb7e2e32e9a2e9dbc27de0a87f42f9b2b78835b67a85c1b61 ChangeLog 5284
+MISC ChangeLog 5594 RMD160 c2e6a4629b1194a4a2238d7c362e9e636b7f9069 SHA1 b5cc993ea3451282127a19b2919ee8f19b84f3c9 SHA256 0fff21f65c673d49ddac6c098101f14dd4aa69667891af27e0ac4a3ae73da07d
+MD5 acf82777e40424e39a296493263da2f2 ChangeLog 5594
+RMD160 c2e6a4629b1194a4a2238d7c362e9e636b7f9069 ChangeLog 5594
+SHA256 0fff21f65c673d49ddac6c098101f14dd4aa69667891af27e0ac4a3ae73da07d ChangeLog 5594
 MISC metadata.xml 228 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a SHA1 0f7be0d47f13ff42c97b3787385fe6e1cd9cbfc0 SHA256 157fd3642e30749762584d579cbeb8095379a572897d3f60dc30414cfd0f5c34
 MD5 6c788beeca78bd11e5cd6e759e52fadc metadata.xml 228
 RMD160 4ecb17bc29c5805c7d009098d379f85807f0ff9a metadata.xml 228
@@ -61,3 +65,6 @@ SHA256 d2eed93b9c00f9956739459613dff3d777e7cfa0d3280144e6d8c7cbb304e461 files/di
 MD5 a23dba1cb5ff2bc4b72ed817bf07e204 files/digest-cryptsetup-1.0.5 253
 RMD160 8f49aab39175397b6566e0f044c832a11135d82a files/digest-cryptsetup-1.0.5 253
 SHA256 065a3ee4291314826dfece58d6334db93b15fb8f85ba73afad614a917031817c files/digest-cryptsetup-1.0.5 253
+MD5 a23dba1cb5ff2bc4b72ed817bf07e204 files/digest-cryptsetup-1.0.5-r1 253
+RMD160 8f49aab39175397b6566e0f044c832a11135d82a files/digest-cryptsetup-1.0.5-r1 253
+SHA256 065a3ee4291314826dfece58d6334db93b15fb8f85ba73afad614a917031817c files/digest-cryptsetup-1.0.5-r1 253
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..1989717ce245
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.0.5-r1.ebuild,v 1.1 2007/10/02 15:47:27 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"
+
+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_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for Kernel 2.6.19)"
+	check_extra_config
+	echo
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+}
+
+pkg_setup() {
+	dm-crypt_check
+	crypto_check
+	cbc_check
+}
+
+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
+	newins "${FILESDIR}"/1.0.5-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.5-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 "then 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."
+}
diff --git a/sys-fs/cryptsetup/files/1.0.5-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.0.5-dm-crypt-start.sh
index 4c09fb19a7cf..055bfe9aabc5 100644
--- a/sys-fs/cryptsetup/files/1.0.5-dm-crypt-start.sh
+++ b/sys-fs/cryptsetup/files/1.0.5-dm-crypt-start.sh
@@ -20,6 +20,14 @@ dm_crypt_execute_dmcrypt() {
 		# let user set options, otherwise leave empty
 		: ${options:=' '}
 	elif [ -n "$swap" ]; then
+		local foo
+		einfo "Checking swap is not LUKS"
+		cryptsetup isLuks ${source} 2>/dev/null >/dev/console </dev/console
+		foo="$?"
+		if [ "${foo}" -eq 0 ]; then
+		ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
+		return
+		fi
 		target=${swap}
 		# swap contents do not need to be preserved between boots, luks not required.
 		# suspend2 users should have initramfs's init handling their swap partition either way.
@@ -50,6 +58,7 @@ dm_crypt_execute_dmcrypt() {
 		einfo "dm-crypt mapping ${target} is already configured"
 		return
 	fi
+	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
 	# Handle keys
 	if [ -n "$key" ]; then
 		# Notes: sed not used to avoid case where /usr partition is encrypted.
@@ -72,10 +81,10 @@ dm_crypt_execute_dmcrypt() {
 							umount -n ${mntrem} 2>/dev/null >/dev/null
 							rmdir ${mntrem} 2>/dev/null >/dev/null
 							einfo "Cannot find ${key} on removable media."
-							echo -n -e " ${green}*${off}  Abort?(${red}yes${off}/${green}no${off})" >/dev/console	
-							read ans </dev/console
+							echo -n -e " ${green}*${off}  Abort?(${red}yes${off}/${green}no${off})" >/dev/console
+							read ${read_timeout} ans </dev/console
 							echo	>/dev/console
-							[ "$ans" != "yes" ] && { i=0; c=0; } || return 
+							[ "$ans" = "no" ] && { i=0; c=0; } || return
 						else
 							key="${mntrem}${key}"
 							break
@@ -89,9 +98,9 @@ dm_crypt_execute_dmcrypt() {
 							rmdir ${mntrem} 2>/dev/null >/dev/null
 							einfo "Removable device for ${target} not present."
 							echo -n -e " ${green}*${off}  Abort?(${red}yes${off}/${green}no${off})" >/dev/console
-							read ans </dev/console
+							read ${read_timeout} ans </dev/console
 							echo  >/dev/console
-							[ "$ans" != "yes" ] && { i=0; c=0; } || return
+							[ "$ans" = "no" ] && { i=0; c=0; } || return
 						fi
 					fi
 				done
@@ -112,7 +121,6 @@ dm_crypt_execute_dmcrypt() {
 	else
 		mode=none
 	fi
-	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
 	ebegin "dm-crypt map ${target}"
 	einfo "cryptsetup will be called with : ${options} ${arg1} ${arg2} ${arg3}"
 	if [ "$mode" == "gpg" ]; then
@@ -195,9 +203,44 @@ dm_crypt_execute_localmount() {
 	fi
 }
 
+# Determine string lengths
+strlen() {
+	if [ -z "$1" ]
+		then
+			echo "usage: strlen <variable_name>"
+			die
+		fi
+	eval echo "\${#${1}}"
+}
+
+# Lookup optional bootparams
+parse_opt() {
+	case "$1" in
+		*\=*)
+			local key_name="`echo "$1" | cut -f1 -d=`"
+			local key_len=`strlen key_name`
+			local value_start=$((key_len+2))
+			echo "$1" | cut -c ${value_start}-
+		;;
+	esac
+}
+
 local cryptfs_status=0
 local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
 
+CMDLINE="`cat /proc/cmdline`"
+for x in ${CMDLINE}
+do
+	case "${x}" in
+		key_timeout\=*)
+			KEY_TIMEOUT=`parse_opt "${x}"`
+			if [ ${KEY_TIMEOUT} -gt 0 ]; then
+				read_timeout="-t ${KEY_TIMEOUT}"
+			fi
+		;;
+	esac
+done
+
 if [[ -f /etc/conf.d/dmcrypt ]] && [[ -x /sbin/cryptsetup ]] ; then
 	ebegin "Setting up dm-crypt mappings"
 
diff --git a/sys-fs/cryptsetup/files/1.0.5-dm-crypt-stop.sh b/sys-fs/cryptsetup/files/1.0.5-dm-crypt-stop.sh
index 9aea8217cb8f..299e43bb9b2f 100644
--- a/sys-fs/cryptsetup/files/1.0.5-dm-crypt-stop.sh
+++ b/sys-fs/cryptsetup/files/1.0.5-dm-crypt-stop.sh
@@ -1,12 +1,12 @@
 # /lib/rcscripts/addons/dm-crypt-stop.sh
 
 # Try to remove any dm-crypt mappings
-csetup=/bin/cryptsetup
-if [ -f /etc/conf.d/cryptfs ] && [ -x "$csetup" ]
+csetup=/sbin/cryptsetup
+if [ -f /etc/conf.d/dmcrypt ] && [ -x "$csetup" ]
 then
 	einfo "Removing dm-crypt mappings"
 
-	/bin/egrep "^(target|swap)" /etc/conf.d/cryptfs | \
+	/bin/egrep "^(target|swap)" /etc/conf.d/dmcrypt | \
 	while read targetline
 	do
 		target=
@@ -15,16 +15,16 @@ then
 		eval ${targetline}
 
 		[ -n "${swap}" ] && target=${swap}
-		[ -z "${target}" ] && ewarn "Invalid line in /etc/conf.d/cryptfs: ${targetline}"
+		[ -z "${target}" ] && ewarn "Invalid line in /etc/conf.d/dmcrypt: ${targetline}"
 
 		ebegin "Removing dm-crypt mapping for: ${target}"
 		${csetup} remove ${target}
 		eend $? "Failed to remove dm-crypt mapping for: ${target}"
 	done
 
-	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" /etc/conf.d/cryptfs) ]] ; then
+	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" /etc/conf.d/dmcrypt) ]] ; then
 		einfo "Taking down any dm-crypt loop devices"
-		/bin/egrep -e "^(source)" /etc/conf.d/cryptfs | while read sourceline
+		/bin/egrep -e "^(source)" /etc/conf.d/dmcrypt | while read sourceline
 		do
 			source=
 			eval ${sourceline}
diff --git a/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc b/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc
index a861a4f80d2d..399cc5bf65d1 100644
--- a/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc
+++ b/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc
@@ -1,10 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc,v 1.1 2007/08/14 16:05:16 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc,v 1.2 2007/10/02 15:47:27 strerror Exp $
 
 depend() {
 	before checkfs
+	if [ -e /lib/librc.so ]; then
+	need device-mapper
+	fi
 }
 
 start() {
diff --git a/sys-fs/cryptsetup/files/digest-cryptsetup-1.0.5-r1 b/sys-fs/cryptsetup/files/digest-cryptsetup-1.0.5-r1
new file mode 100644
index 000000000000..6f628fcf5e9f
--- /dev/null
+++ b/sys-fs/cryptsetup/files/digest-cryptsetup-1.0.5-r1
@@ -0,0 +1,3 @@
+MD5 0aa2f94c39123f1a0352983e5366179c cryptsetup-1.0.5.tar.bz2 322394
+RMD160 99d9b0090b297b1bc2c72c064f091c8b2f322f70 cryptsetup-1.0.5.tar.bz2 322394
+SHA256 4bab529afa00cafde3bc5df2769578c88438f80c5152d4257cd0e86986f95bc4 cryptsetup-1.0.5.tar.bz2 322394