Fix for bug #132126 and added pic USE flag

(Portage version: 2.0.54-r2)

5 files changed, 109 insertions, 2 deletions

diff --git a/sys-fs/cryptsetup-luks/ChangeLog b/sys-fs/cryptsetup-luks/ChangeLog
index c2bd82490cfa..2208b94debe4 100644
--- a/sys-fs/cryptsetup-luks/ChangeLog
+++ b/sys-fs/cryptsetup-luks/ChangeLog
@@ -1,6 +1,13 @@
 # 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.27 2006/05/03 14:40:00 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.28 2006/05/31 09:10:07 strerror Exp $
+
+*cryptsetup-luks-1.0.3-r1 (31 May 2006)
+
+  31 May 2006; Benjamin Smee <strerror@gentoo.org>
+  +files/cryptsetup-luks-1.0.3-selinux.patch,
+  +cryptsetup-luks-1.0.3-r1.ebuild:
+  Fix for bug #132126 and added pic USE flag
 
   03 May 2006; Benjamin Smee <strerror@gentoo.org>
   cryptsetup-luks-1.0.3.ebuild:
diff --git a/sys-fs/cryptsetup-luks/Manifest b/sys-fs/cryptsetup-luks/Manifest
index 0161e9fe0dd7..46ecddc3bb68 100644
--- a/sys-fs/cryptsetup-luks/Manifest
+++ b/sys-fs/cryptsetup-luks/Manifest
@@ -1,13 +1,16 @@
-MD5 67144b920eb99de1a25e386be6a849b4 ChangeLog 3737
+MD5 c879637603e8212dda20d10e43f50e61 ChangeLog 3957
 MD5 e9db29331962729c373695ee3d7e8fed cryptsetup-luks-1.0.1-r1.ebuild 2043
 MD5 06345bb64c18f0ab5857556a8bd52de0 cryptsetup-luks-1.0.1-r2.ebuild 2113
+MD5 51174d2fd98792f1f31709118b0bcd43 cryptsetup-luks-1.0.3-r1.ebuild 2203
 MD5 ae53dfd047c0b226edb1bd3b03b4d4a7 cryptsetup-luks-1.0.3.ebuild 1934
 MD5 6d86b15e07cd0cdf96d8a363b1d778cd files/cryptfs.confd 1548
 MD5 906131d3cdd20ac94109052236e469b9 files/cryptsetup-luks-1.0.1-libmapper.patch 534
 MD5 c66058fc1ba9f980485e2b9e3b66df52 files/cryptsetup-luks-1.0.1-no-nls.patch 597
+MD5 8e76b60d4e94130170c49c7f32bb2ee6 files/cryptsetup-luks-1.0.3-selinux.patch 418
 MD5 1c0c01504919b985fca8352924530b59 files/digest-cryptsetup-luks-1.0.1-r1 268
 MD5 1c0c01504919b985fca8352924530b59 files/digest-cryptsetup-luks-1.0.1-r2 268
 MD5 27723e8b4ff24b9ba390777aaa73fbf0 files/digest-cryptsetup-luks-1.0.3 268
+MD5 1af32c51e65cb0cc90ccf7cb90192283 files/digest-cryptsetup-luks-1.0.3-r1 74
 MD5 c653a0b4ace27569ccc659b7cb43b4a9 files/dm-crypt-start.sh 4306
 MD5 a3bb6598f67c8922ccb6576ff256ced0 files/dm-crypt-stop.sh 1297
 MD5 6c788beeca78bd11e5cd6e759e52fadc metadata.xml 228
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r1.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..080353372e40
--- /dev/null
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r1.ebuild
@@ -0,0 +1,86 @@
+# 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.3-r1.ebuild,v 1.1 2006/05/31 09:10:07 strerror Exp $
+
+inherit autotools linux-info eutils flag-o-matic
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="dynamic nls pic selinux"
+
+DEPEND=">=sys-fs/device-mapper-1.00.07-r1
+	>=dev-libs/libgcrypt-1.1.42
+	>=dev-libs/libgpg-error-1.0-r1
+	selinux? ( sys-libs/libselinux )
+	!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}"/"${PN}-${PV}-selinux.patch"
+	eautoreconf
+}
+
+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
+		econf --sbindir=/bin --disable-static \
+		$(use_enable nls) \
+		$(use_enable selinux) \
+		$(use_with pic) \
+		|| die
+	else
+		econf --sbindir=/bin --enable-static \
+		$(use_enable nls) \
+		$(use_enable selinux) \
+		$(use_with pic) \
+		|| 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.3-selinux.patch b/sys-fs/cryptsetup-luks/files/cryptsetup-luks-1.0.3-selinux.patch
new file mode 100644
index 000000000000..d5d890b7c8fa
--- /dev/null
+++ b/sys-fs/cryptsetup-luks/files/cryptsetup-luks-1.0.3-selinux.patch
@@ -0,0 +1,10 @@
+--- configure.in	2006-04-05 17:21:29.000000000 +0000
++++ configure.in.new	2006-05-30 10:48:25.000000000 +0000
+@@ -96,6 +96,7 @@
+                           [[default=auto]]],auto,[
+ 	have_module=yes
+ 	saved_LIBS="$LIBS"
++	AC_CHECK_LIB(sepol, sepol_bool_set)
+ 	AC_CHECK_LIB(selinux, is_selinux_enabled)
+ 	AC_CHECK_LIB(devmapper, dm_task_set_name,,unset have_module)
+ 	AC_CHECK_HEADER(libdevmapper.h,,unset have_module=)
diff --git a/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.3-r1 b/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.3-r1
new file mode 100644
index 000000000000..d1c01d5563c8
--- /dev/null
+++ b/sys-fs/cryptsetup-luks/files/digest-cryptsetup-luks-1.0.3-r1
@@ -0,0 +1 @@
+MD5 e134b82b4706a28ba1d73b9176d5ad0c cryptsetup-luks-1.0.3.tar.bz2 304836