Changes as per reasons in bug #112597. Added dynamic flag

Package-Manager: portage-2.0.51.22-r3

4 files changed, 76 insertions, 12 deletions

diff --git a/sys-fs/cryptsetup-luks/Manifest b/sys-fs/cryptsetup-luks/Manifest
index d51cb280c674..d60a2e1c247a 100644
--- a/sys-fs/cryptsetup-luks/Manifest
+++ b/sys-fs/cryptsetup-luks/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e61211b214547ee5d6078460df84463a cryptsetup-luks-1.0.1.ebuild 2151
+MD5 80fefee20968a47c4c7a68c11e5e6690 cryptsetup-luks-1.0.1-r1.ebuild 1927
 MD5 66c1f7dfa9c09e11c9e248dd7ec07a5e cryptsetup-luks-1.0-r1.ebuild 2126
 MD5 6e3e82be44b3332d6cda7a23c9b210e9 ChangeLog 2017
 MD5 3caa86ef66126cc858551801beb4b6d0 cryptsetup-luks-1.0.ebuild 2004
 MD5 6c788beeca78bd11e5cd6e759e52fadc metadata.xml 228
 MD5 c653a0b4ace27569ccc659b7cb43b4a9 files/dm-crypt-start.sh 4306
 MD5 6d86b15e07cd0cdf96d8a363b1d778cd files/cryptfs.confd 1548
-MD5 f254479b9a12868d43ab10e4658fab51 files/digest-cryptsetup-luks-1.0 72
 MD5 a3bb6598f67c8922ccb6576ff256ced0 files/dm-crypt-stop.sh 1297
 MD5 6d83c52472ad8d3b12ec5dbc4e056ed7 files/digest-cryptsetup-luks-1.0.1 74
 MD5 f254479b9a12868d43ab10e4658fab51 files/digest-cryptsetup-luks-1.0-r1 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDc4/bKRy60XGEcJIRAiJbAJ4h/5dyP67122ZfWMrI4wpbEsKshACeLQCM
-ofMmixYLSXa83O3o9vx3d/c=
-=77FS
------END PGP SIGNATURE-----
+MD5 6d83c52472ad8d3b12ec5dbc4e056ed7 files/digest-cryptsetup-luks-1.0.1-r1 74
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..a0b71cb4b418
--- /dev/null
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2005 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-r1.ebuild,v 1.1 2005/11/25 16:00:53 strerror Exp $
+
+inherit linux-info eutils multilib 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 ~mips ppc ~ppc64 sparc x86"
+
+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"
+
+IUSE="dynamic nls"
+
+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_compile() {
+	cd ${S}
+
+	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"
+	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/digest-cryptsetup-luks-1.0 b/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0
deleted file mode 100644
index 0f344f4e1954..000000000000
--- a/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62c4bff081e470fb2c9a0f2cb890e613 cryptsetup-luks-1.0.tar.bz2 282675
diff --git a/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.1-r1 b/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.1-r1
new file mode 100644
index 000000000000..61c102c0130b
--- /dev/null
+++ b/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.1-r1
@@ -0,0 +1 @@
+MD5 b2415f67ceed3ad2c7dd2e878cf7787d cryptsetup-luks-1.0.1.tar.bz2 286161