app-crypt/truecrypt: Revbump. Remove dependency on a pkcs11 implementation. Provide our own headers wrt bug 369781.

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

3 files changed, 145 insertions, 15 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 7fce8191d3a5..a222cfec6e60 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/truecrypt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.65 2011/07/15 13:10:37 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.66 2011/07/15 17:53:07 c1pher Exp $
+
+*truecrypt-7.0a-r6 (15 Jul 2011)
+
+  15 Jul 2011; Dane Smith <c1pher@gentoo.org> +truecrypt-7.0a-r6.ebuild:
+  Rev bump. Include our own headers by default. Removed dependency on a
+  pkcs11 implementation. Should work with any of them now. Thanks Alon
+  Bar-Lev for the help. Bump to EAPI 4. Bug 369781
 
   15 Jul 2011; Dane Smith <c1pher@gentoo.org> truecrypt-7.0a-r5.ebuild:
   Allow for the inclusion of our own pkcs11.h if using >=opensc-0.12 wrt
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index 497f725c383b..1d01113ff9fb 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -9,22 +9,23 @@ DIST truecrypt-7.0a.tar.gz 1996312 RMD160 92b01f87c725feb43aded666ba44fcbd3e3ac7
 DIST truecrypt-pkcs11.h.bz2 8286 RMD160 15c22390f81a1cb0bfd6699b08acd84cffad9bae SHA1 59d02f97c565f006f2265ff0f4c9a23c3323bff8 SHA256 9e7782dd93f7e37fc0eaa118f9fbce7c643555e134fd39f2076e0fc541ac3494
 EBUILD truecrypt-7.0a-r2.ebuild 3458 RMD160 0f1d3b6d529fa89809ca4944cae0e292c015f1a2 SHA1 e8c8aea3b7800df23498096dc485c9ae8a7a62e2 SHA256 0088a216a26381427e8de29354a7a1ad1b5fe28a80192bb7bc71d64f4d89df69
 EBUILD truecrypt-7.0a-r5.ebuild 3956 RMD160 fa4f8cad6b926b46b42523ede3dca3d808964b50 SHA1 ece0bfb7df34d6298fd717e82a1eb52e2c5f4ed3 SHA256 6ddff384a1adc857d428271da21623dd9808905872a3742709928b2a94b1a237
-MISC ChangeLog 12884 RMD160 c12c46c280e7e478ab3b571fa695d44d9e560678 SHA1 3b565385e85fcb7aaf2a3bd1c4205d38997ab481 SHA256 cbaaa0ce1f5d07cb68e12f569c63b8d5afc0d460238575937e028f0cd5002840
+EBUILD truecrypt-7.0a-r6.ebuild 3420 RMD160 1cbb84a4e028ea12d1bcf1676160c3909ba6f5ad SHA1 099f4f2322c5567c0614691f4a8da9743f7df8a3 SHA256 e00e6cd23a93066d08212e41fe95f48a907b2956434c2e2a7af0b722552f0b13
+MISC ChangeLog 13186 RMD160 83d7695b02300b8b69f46e8ced0fd3efc584ce74 SHA1 e6af15a2f8f3f3a29fcd80918c986a0b76abb1c7 SHA256 04ee1cc8932d06f33b7970ca32ab4f096e24292935214b91168aaee3a2c1de48
 MISC metadata.xml 250 RMD160 0ed9b992d346dffc7427a6f36ad6db15f099542f SHA1 906ae1d1afaf4c06a5b54cf7e25843dbac2bb5ba SHA256 c4dab52dbdf0558df59853ea282e0b1deb4cb968914468a648070dcd31a456d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOIDw+AAoJEEsurZwMLhUxmXsP/Ak6PCmgQ8Xmo5nfqJxLb2Yr
-cDfG5QBNtAaYxS9PLf0C0DBtpNjkXk0f92/obqS6X4l6/sZVvvdEHU3bVJ95TN6n
-MeXIebmVN/D97VDHv8JxzhBEeXn6KSOclA+uCai7iKbGveO9oao79PzEZqMPsIW/
-5v0lTW1qc7aFL20/XCbqQexJ90BEXB/Wu+VGJwRVN/+Cj40JCqyHpA+TH0rU3ZLo
-bFl+CDluWowDHILW7Ill8kNLv6l/R7EpjfwGZGlNIcMNbFuWz5lKu/1I34nYRqgW
-wXa6pK6pA1pdUAKYFDVozS3ZfF/Md0IUh6z5uIKPsEU74X7xY1V/+hf21R3wE0Y6
-aPB/kqShbh2QAlgIpTKAdNkbQ1o4q0qMWRTLoOI4Y8i3mPsUYLFmKy1JqlkCOG7s
-3zJSQpiDL5h732I+GByGeh7K/Bpqa/je2Oar1x0n86CAOkoHVpxpnPxtUkn1ZDib
-erYKFo3fIxLf6DG72Z3W/oOteiO9wevqEX4MLedU1VnhBHytpKYg96OZ12oYX945
-y4aYBAUpAaaxmdrON0jCCcr/vdVOkzqLDTHMGxiaH0ip06FN/2uI3jZAQdD63019
-5jaAbeCvN4QHqppnXCyljOJuidnel+RP/zeGTbIRgcf0QaL42oJEjTlsAP0vKI4R
-nvtU3vVmdFkhc27saU7j
-=9RIy
+iQIcBAEBCAAGBQJOIH52AAoJEEsurZwMLhUx48YQAL+fhyC1zlZabQgjZRB0KpKb
+g9reeFklANzidOwfHtO15lONzPn/2RD8kXAj9ZzJL2ewYGsi9lwfYSlRJrkAagPV
+uJMfMS/lT6r1w4As5MXZbKg1TpjYic7411VHVc7m1jBQe9RgWgbdryd08nwoeU8N
+zXQWBc83jqSNwxaeudX45PU3GnaxGgu8yyOwmm3EDzfmbF3IaJrfI9Ee0VhL0bXP
+FqMtfRT7l0L/bUr50gwpA+Xl1vwXKKk81WOK2yGlXz4y5AL5OPb9Qeu89eUdA+6X
+oImlHefXNBtoMrM3E71YAHjsVuuo+GDHOh60GYfCSv5xSWdyrZfvKusMAeJ6xwDm
++OBEleGyMUEkgfCqtaPxiRYGmJZppsfnHjBUluWJ0MX92xoG+h44fffh666YDISs
+VlKTKD/Ac1U8OmbuqUdQJOZKFHFa3zNkMDAAqsKaQ79YmzF6Q14xbmgHp+fL18Yc
+7S2kbWD11Y8dryiSe3UNn37ygpdtNEpm2ubPjOzeIhOXBAc8KtOo9sEt7dqHh3zu
+MP2kzJDJtthVbnq7n4C+CNf9mB4Ja0zsc5YvAHPrO0vybrktOtsMtG3k1q+5Al+1
+E32HQHpB1MGDlSGLK/iReYwZWoTEvjeiG/h3GYk5IWdR3SR8AmpKq93RTvMacvmr
++mPtWmF6K/UnVTZmOqZ3
+=l7Pi
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/truecrypt/truecrypt-7.0a-r6.ebuild b/app-crypt/truecrypt/truecrypt-7.0a-r6.ebuild
new file mode 100644
index 000000000000..f991dbd8e7d2
--- /dev/null
+++ b/app-crypt/truecrypt/truecrypt-7.0a-r6.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.0a-r6.ebuild,v 1.1 2011/07/15 17:53:07 c1pher Exp $
+
+EAPI="4"
+
+inherit flag-o-matic linux-info multilib toolchain-funcs wxwidgets eutils \
+	pax-utils
+
+DESCRIPTION="Free open-source disk encryption software"
+HOMEPAGE="http://www.truecrypt.org/"
+SRC_URI="${P}.tar.gz\
+	mirror://gentoo/${PN}-pkcs11.h.bz2"
+
+LICENSE="truecrypt-3.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~ppc ~x86"
+IUSE="X"
+RESTRICT="mirror fetch bindist"
+
+RDEPEND="|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper )
+	sys-fs/fuse
+	x11-libs/wxGTK:2.8[X?]
+	app-admin/sudo"
+DEPEND="${RDEPEND}
+	!ppc? ( dev-lang/nasm )"
+
+S="${WORKDIR}/${P}-source"
+
+#See bug 241650.
+pkg_nofetch() {
+	elog "Please download ${P}-linux-{86,64}.tar.gz source from:"
+	elog "http://www.truecrypt.org/downloads2"
+	elog "Then put the file in ${DISTDIR}/${P}.tar.gz"
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~DM_CRYPT ~FUSE_FS ~CRYPTO ~CRYPTO_XTS"
+	linux-info_pkg_setup
+
+	local WX_GTK_VER="2.8"
+	if use X; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets base-unicode
+	fi
+}
+
+src_prepare() {
+	if has_version x11-libs/wxGTK[X]; then
+		# Fix linking when NOGUI=1
+		sed -e "s/WX_CONFIG_LIBS := base/&,core/" -i Main/Main.make || die "sed Main/Main.make failed"
+	fi
+
+	epatch "${FILESDIR}/makefile-archdetect.diff"
+	epatch "${FILESDIR}/execstack-fix.diff"
+	mkdir "${T}"/pkcs11 || die
+	ln -s "${WORKDIR}"/truecrypt-pkcs11.h "${T}"/pkcs11/pkcs11.h || die
+}
+
+src_compile() {
+	local EXTRA
+
+	use X || EXTRA+=" NOGUI=1"
+	append-flags -DCKR_NEW_PIN_MODE=0x000001B0 -DCKR_NEXT_OTP=0x000001B1
+
+	emake \
+		${EXTRA} \
+		NOSTRIP=1 \
+		NOTEST=1 \
+		VERBOSE=1 \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		TC_EXTRA_CFLAGS="${CFLAGS}" \
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
+		TC_EXTRA_LFLAGS="${LDFLAGS}" \
+		WX_CONFIG="${WX_CONFIG}" \
+		PKCS11_INC="${T}/pkcs11/"
+}
+
+src_test() {
+	"${S}/Main/truecrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	dobin Main/truecrypt
+	dodoc Readme.txt "Release/Setup Files/TrueCrypt User Guide.pdf"
+	exeinto "/$(get_libdir)/rcscripts/addons"
+	newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh"
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		newicon Resources/Icons/TrueCrypt-48x48.xpm truecrypt.xpm
+		make_desktop_entry ${PN} "TrueCrypt" ${PN} "System"
+	fi
+
+	pax-mark -m "${D}/usr/bin/truecrypt"
+}
+
+pkg_postinst() {
+	elog "There is now an init script for TrueCrypt for Baselayout-2."
+	elog "If you are a baselayout-2 user and you would like the TrueCrypt"
+	elog "mappings removed on shutdown in order to prevent other file systems"
+	elog "from unmounting then run:"
+	elog "rc-update add truecrypt boot"
+	elog ""
+
+	ewarn "If you're getting errors about DISPLAY while using the terminal"
+	ewarn "it's a known upstream bug. To use TrueCrypt from the terminal"
+	ewarn "all that's necessary is to run: unset DISPLAY"
+	ewarn "This will make the display unaccessable from that terminal "
+	ewarn "but at least you will be able to access your volumes."
+	ewarn ""
+
+	ewarn "TrueCrypt has very restrictive license."
+	ewarn "Please read the ${LICENSE} license in ${PORTDIR}/licenses"
+	ewarn "directory before using TrueCrypt. Please be explicitly aware of"
+	ewarn "the limitations on redistribution of binaries or modified source."
+}