From a5be0680588ca95d45c97e98952b0fc04cc80577 Mon Sep 17 00:00:00 2001 From: Dane Smith Date: Wed, 1 Jun 2011 14:46:10 +0000 Subject: app-crypt/truecrypt: Revbump. Add new patch. Fixes bug 369203. Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64 --- app-crypt/truecrypt/ChangeLog | 10 +- app-crypt/truecrypt/Manifest | 30 ++--- app-crypt/truecrypt/files/makefile-archdetect.diff | 11 ++ app-crypt/truecrypt/truecrypt-7.0a-r3.ebuild | 126 +++++++++++++++++++++ 4 files changed, 162 insertions(+), 15 deletions(-) create mode 100644 app-crypt/truecrypt/files/makefile-archdetect.diff create mode 100644 app-crypt/truecrypt/truecrypt-7.0a-r3.ebuild diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog index 27d159b51c2e..a5e2bd96d697 100644 --- a/app-crypt/truecrypt/ChangeLog +++ b/app-crypt/truecrypt/ChangeLog @@ -1,6 +1,14 @@ # 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.61 2011/04/25 14:15:37 c1pher Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.62 2011/06/01 14:46:10 c1pher Exp $ + +*truecrypt-7.0a-r3 (01 Jun 2011) + + 01 Jun 2011; Dane Smith +truecrypt-7.0a-r3.ebuild, + +files/makefile-archdetect.diff: + Add new patch to fix arch detection for the i{3,5,7} processors. + Revbump to r3 and include that patch. Fixes bug 369203. + Paxmark the installed binary. 25 Apr 2011; Dane Smith truecrypt-7.0a-r2.ebuild: Re-added the fetch and mirror restriction after a conversation on -dev. diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest index 445e28310dc1..edcf8ffcdf9c 100644 --- a/app-crypt/truecrypt/Manifest +++ b/app-crypt/truecrypt/Manifest @@ -1,26 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX makefile-archdetect.diff 388 RMD160 d79dabb86a9f5e90eefdd3a0a42e4c64243dccb7 SHA1 bad18f8d1c09f52299993bdc03f9bf99204e2307 SHA256 cccaaa28059718c992a52060d26f37714cdb49818977d0744a21f5b9ef2a8ae7 AUX truecrypt-stop.sh 308 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 SHA1 7139ba403e482a4746e1d545115b74760b1438ea SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c AUX truecrypt.init 729 RMD160 63472dd371afd892e6b00de0e3e516c74ed0075a SHA1 8cb25b2093322e449715abcb3034454fcc6ef77f SHA256 6530577c5f86800a7d92a76b927538006a27f57cf517c6f2bdb793cebaa70b59 DIST truecrypt-7.0a.tar.gz 1996312 RMD160 92b01f87c725feb43aded666ba44fcbd3e3ac740 SHA1 42be0f333e6791e7a122b3e1183e014cd3860198 SHA256 6c845153ee868429e2a531407383e9349754d1579cf66fc838632c44baaba021 EBUILD truecrypt-7.0a-r2.ebuild 3458 RMD160 0f1d3b6d529fa89809ca4944cae0e292c015f1a2 SHA1 e8c8aea3b7800df23498096dc485c9ae8a7a62e2 SHA256 0088a216a26381427e8de29354a7a1ad1b5fe28a80192bb7bc71d64f4d89df69 -MISC ChangeLog 11720 RMD160 4d7a9bd173ac6e3d2bef77ba421358a6d17fac80 SHA1 08d85d76f492f1326646042f2bca7d58b8abfacf SHA256 2cdae18d23b7c852d9b30657d1f5d1e25c327c727db8072520396488a8a77fba +EBUILD truecrypt-7.0a-r3.ebuild 3565 RMD160 75cc7590ae5136b1a745b3a3e5fee5e1bcd2abf1 SHA1 a2861a11e355998b73e623af70fe61da3e411feb SHA256 3aefab93ac26226bd95a44f1fbcf8b82060e473f835ee5ea822d2711e8995d5c +MISC ChangeLog 12020 RMD160 dbdb090d9c9bb5d5ca41015d1a4edaddf8e0549d SHA1 ffe1335bb97e8297720190ec02fec4a76c1e7230 SHA256 35ea83ab9d834838a52860c5e5081d601aa26920667740f53f596a00bfa30cdc MISC metadata.xml 250 RMD160 0ed9b992d346dffc7427a6f36ad6db15f099542f SHA1 906ae1d1afaf4c06a5b54cf7e25843dbac2bb5ba SHA256 c4dab52dbdf0558df59853ea282e0b1deb4cb968914468a648070dcd31a456d8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJNtYExAAoJEEsurZwMLhUxqnEQAIuiczRnaaZOWTzU4AuddjMM -ovN4qXtjWwUt8nyv6/G79pMSvhAlhIDDt1A0CZjOtWEhVVO4HSkOkYhj+xqZK+3E -qARKuIKkpH0enJq2rw59mFFXQz51KLXc1AqGs5tS9+BESzRqb9abBnF7ARgTkSTV -mB4YNaB3FSCJq2HabTj4TdVKTryXi/jlo01GS8nx6Lx5T/YoT78c8sn5F5KG/ToW -lNpMEK4D3hcEQf/0yQoImfluVfuLkglaU74MhLhWcyI1+SrgrkRQcOvjwYUiIiUg -YPY3gUtPyuv+fqrai2fh8Hfw5IOSjIFy422J4r7X5h99N3IV4P0Wmf6+uCTX9H8k -RkBiOACjb44iq2o8RTaGG1xCvNy2VeqdOSpLnTWFpLMpT7kDd8oyFMCpBkCgtNkI -PwMAw4fabPLQxVI3cCLGu4uGyrVkDsdGu8VwQNqiv/CZ3o72BEsaoXHVeRPtgllS -GyS+buSmhbAoX337HnFTV4H7vrYoI66Xb84teu9w21753ITDl4PnH+LCyjir64yc -qX85tgVap7LOEIgg+2FdK4+obOtfZOQc5FkFZamVJp6MOUrrnmf1b2y8n9fuTFNh -FfAqWsL2/6BYvIKzwOWf5+EMcQOYfcNO/8ONaXhhiwTABZaaujj0hszZfVTTJTWM -UnhH1EuZserHwUmxgGld -=9wXQ +iQIcBAEBAgAGBQJN5k+cAAoJEEsurZwMLhUxpTMP/1hSkheuVXGPmDAyacqfxEDw +bkhEb0QdGy/9NlCTWlAFYDCKLemUsXAKbFqdvTLpr5DvD5zBA0mP0KC07KCpuToh +CEzwSY3QsIrxQF4HmuMnowZa8NwT9UYDgddUAgCdHCO6lCm4xcvrIeCFT64EbLmR +qLF/22X/SwehiK0guIFQ7+nsUYIRKmho3lV3GfPnkRP6+7L+6elqaJNVnzqmUQJL +l1vuqBhOtO8gbIhQf1sgQU5AEOMtheHkFGvqV/5+mhBLIWFQZP6tWbwcLSL6PD54 +eJld1MJbDxIg7YKJk2kJULSlzj4f33isNgGsE5lHx+HLOAqKCKE7gYfZ7cXxr5v5 +j6IPP5b4+sIugnIBUpcVJNne2SyDIg+Dc0eP1okIEqHNAF0tgHW86Wz+mBkUX0ws +KYbTO1FVXwfSFo2+8eHxph+Ia9wapvisHCRclSfaebSlVYyBivxhbjXkf5ZbtRkl +SNDNsfQwVCyggQGyj7iay83FIps3wSyBGnJmNiK1Ov4AkWU+y/+I9a8X3cscnmph +ihRAAPA2fCKsNQjVPXaBffiROABVpJY96xE2zedBfC6uliLJ9O7qKk055/5n+p7j +ENQb5gHhCl4pMDfx9N5hG4sXNBFZ9CuZvrLUvMSnTAiKfSxXF79QyC43+HkvxGw8 +AfMD6pxRK6j2DgXhaJhS +=baAU -----END PGP SIGNATURE----- diff --git a/app-crypt/truecrypt/files/makefile-archdetect.diff b/app-crypt/truecrypt/files/makefile-archdetect.diff new file mode 100644 index 000000000000..c01c670bbdaf --- /dev/null +++ b/app-crypt/truecrypt/files/makefile-archdetect.diff @@ -0,0 +1,11 @@ +--- Makefile 2010-09-05 10:32:10.000000000 -0400 ++++ Makefile.new 2011-06-01 10:17:41.575000055 -0400 +@@ -128,7 +128,7 @@ + ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH))) + CPU_ARCH = x86 + ASM_OBJ_FORMAT = elf32 +-else ifneq (,$(filter x86_64 x86-64 amd64 x64,$(ARCH))) ++else ifneq (,$(filter i3 i5 i7 x86_64 x86-64 amd64 x64,$(ARCH))) + CPU_ARCH = x64 + ASM_OBJ_FORMAT = elf64 + endif diff --git a/app-crypt/truecrypt/truecrypt-7.0a-r3.ebuild b/app-crypt/truecrypt/truecrypt-7.0a-r3.ebuild new file mode 100644 index 000000000000..cbb474998993 --- /dev/null +++ b/app-crypt/truecrypt/truecrypt-7.0a-r3.ebuild @@ -0,0 +1,126 @@ +# 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-r3.ebuild,v 1.1 2011/06/01 14:46:10 c1pher Exp $ + +EAPI="2" + +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" + +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?]" +DEPEND="${RDEPEND} + || ( dev-libs/pkcs11-helper dev-libs/opensc )" +RDEPEND="${RDEPEND} + app-admin/sudo" + +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" +} + +src_compile() { + local EXTRA pkcs11_include_directory + + use X || EXTRA+=" NOGUI=1" + + if has_version dev-libs/pkcs11-helper; then + pkcs11_include_directory="/usr/include/pkcs11-helper-1.0" + else + pkcs11_include_directory="/usr/include/opensc" + fi + 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="${pkcs11_include_directory}" \ + || die "emake failed" +} + +src_test() { + "${S}/Main/truecrypt" --text --test || die "tests failed" +} + +src_install() { + dobin Main/truecrypt || die + dodoc Readme.txt "Release/Setup Files/TrueCrypt User Guide.pdf" || die + exeinto "/$(get_libdir)/rcscripts/addons" + newexe "${FILESDIR}/${PN}-stop.sh" "${PN}-stop.sh" || die + + newinitd "${FILESDIR}/${PN}.init" ${PN} || die + + if use X; then + newicon Resources/Icons/TrueCrypt-48x48.xpm truecrypt.xpm || die + make_desktop_entry ${PN} "TrueCrypt" ${PN} "System" || die + fi + + pax-mark -m "${D}/usr/bin/truecrypt" || die +} + +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." +} -- cgit v1.2.3-65-gdbad