summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Smee <strerror@gentoo.org>2005-05-24 22:48:32 +0000
committerBenjamin Smee <strerror@gentoo.org>2005-05-24 22:48:32 +0000
commitf19fb38a3e64e39fdda8c062309c8a91aa5309c5 (patch)
tree7e3294f524b42c6149e0d8afd7280307476d58db /sys-fs/cryptsetup
parentVersion bumped. MTA now configured with USE-Flag (diff)
downloadhistorical-f19fb38a3e64e39fdda8c062309c8a91aa5309c5.tar.gz
historical-f19fb38a3e64e39fdda8c062309c8a91aa5309c5.tar.bz2
historical-f19fb38a3e64e39fdda8c062309c8a91aa5309c5.zip
Fixed the dm-crypt check as per bug 89142
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-fs/cryptsetup')
-rw-r--r--sys-fs/cryptsetup/ChangeLog6
-rw-r--r--sys-fs/cryptsetup/Manifest12
-rw-r--r--sys-fs/cryptsetup/cryptsetup-0.1-r1.ebuild29
-rw-r--r--sys-fs/cryptsetup/metadata.xml3
4 files changed, 36 insertions, 14 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index a1ef369792d1..e16ab0ba4d6a 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/cryptsetup
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.11 2005/04/12 01:04:26 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.12 2005/05/24 22:48:32 strerror Exp $
+
+ 24 May 2005; Benjamin Smee <strerror@gentoo.org> metadata.xml,
+ cryptsetup-0.1-r1.ebuild:
+ Fixed the dm-crypt check as per bug 89142
12 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
cryptsetup-0.1-r1.ebuild:
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 07ef0570cfe1..5a018d0d9e7f 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,9 +1,9 @@
-MD5 87cfee63832351980b6bf5e34e573c30 ChangeLog 1562
MD5 a562ab3dfba05c3f52de4afde1a829de cryptsetup-0.1.ebuild 1147
-MD5 5be5a7266a46591bb4db0cacd9ac8af3 metadata.xml 226
-MD5 d41101bdf9cd680f4fe41b7193c0f053 cryptsetup-0.1-r1.ebuild 1287
-MD5 959c303c3bfeab6c12e28ae4e16400b3 files/digest-cryptsetup-0.1 67
-MD5 327d83538ed5305bdc3568cd353410bb files/cryptfs.confd 1337
-MD5 959c303c3bfeab6c12e28ae4e16400b3 files/digest-cryptsetup-0.1-r1 67
+MD5 20ca6263869d71ead33853afa127c4fc cryptsetup-0.1-r1.ebuild 1596
+MD5 b2583c58b8aab06b79950eb6fc414462 ChangeLog 1700
+MD5 cd57823a7232b359b6a8674cde9fadde metadata.xml 290
MD5 3232a190894a35b7d2f3610f2eb652dc files/dm-crypt-start.sh 3937
+MD5 327d83538ed5305bdc3568cd353410bb files/cryptfs.confd 1337
MD5 8619b3f74d4d362bab9f430b63243a74 files/dm-crypt-stop.sh 1290
+MD5 959c303c3bfeab6c12e28ae4e16400b3 files/digest-cryptsetup-0.1 67
+MD5 959c303c3bfeab6c12e28ae4e16400b3 files/digest-cryptsetup-0.1-r1 67
diff --git a/sys-fs/cryptsetup/cryptsetup-0.1-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-0.1-r1.ebuild
index a662b29e1aeb..1f2d3428ae65 100644
--- a/sys-fs/cryptsetup/cryptsetup-0.1-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-0.1-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-0.1-r1.ebuild,v 1.7 2005/04/12 01:04:26 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-0.1-r1.ebuild,v 1.8 2005/05/24 22:48:32 strerror Exp $
-inherit kernel-mod
+inherit linux-info
DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
HOMEPAGE="http://www.saout.de/misc/dm-crypt/"
@@ -18,14 +18,29 @@ DEPEND=">=sys-fs/device-mapper-1.00.07-r1
S=${WORKDIR}/${PN}-${PV}
-pkg_setup() {
- if ! kernel-mod_configoption_present DM_CRYPT ; then
- ewarn "dm-crypt is not enabled in /usr/src/linux/.config"
- ewarn "please see $HOMEPAGE"
- ewarn "for details on how to enable dm-crypt for your kernel"
+dm-crypt_check() {
+ ebegin "Checking for dm-crypt support"
+ linux_chkconfig_present DM_CRYPT
+ eend $?
+
+ if [[ $? -ne 0 ]] ; then
+ eerror "cryptsetup requires dm-crypt support!"
+ eerror "Please enable dm-crypt support in your kernel config, found at:"
+ eerror "(for 2.6 kernels)"
+ eerror
+ eerror " Device Drivers"
+ eerror " Multi-Device Support"
+ eerror " [*] Crypt Target Support"
+ eerror "and recompile your kernel..."
+ die "dm-crypt support not detected!"
fi
}
+pkg_setup() {
+ linux-info_pkg_setup
+ dm-crypt_check;
+}
+
src_compile() {
econf --bindir=/bin --disable-nls || die
diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index 1fe1cc3b9927..7a58e0e75a74 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -5,4 +5,7 @@
<maintainer>
<email>tigger@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>strerror@gentoo.org</email>
+</maintainer>
</pkgmetadata>