commit: 84c3c30ebb39b2b7fdef328d4e11793dd3eb6d45 Author: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> AuthorDate: Wed Apr 4 03:49:10 2018 +0000 Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> CommitDate: Wed Apr 4 03:49:10 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c3c30e
app-crypt/veracrypt: bump to 1.22 - Add support for SSSE3 and SSE4_1 through cpu_flags_x86_*. - Rework some of the USE logic using usex. - Fix the desktop file category. "Encryption;Encryption Tools;Utility;" is unregistered according to the desktop menu specification. Replace it with "Utility;Security". Bug: https://bugs.gentoo.org/611362 Closes: https://bugs.gentoo.org/652052 Package-Manager: Portage-2.3.27, Repoman-2.3.9 app-crypt/veracrypt/Manifest | 1 + .../files/veracrypt-1.22-sysmacros-fix.patch | 36 +++++++++ app-crypt/veracrypt/veracrypt-1.22.ebuild | 90 ++++++++++++++++++++++ 3 files changed, 127 insertions(+) diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest index 0ae36bd7ab8..59a6f010b51 100644 --- a/app-crypt/veracrypt/Manifest +++ b/app-crypt/veracrypt/Manifest @@ -1,2 +1,3 @@ DIST VeraCrypt_1.19.tar.gz 23235780 BLAKE2B 0d02b3c6783d233f7cc64956eef58077e8a125fd5db28c1374921d8f2ca6dc9e1cde5402917c1ed4e4a626901e24c566ee834a12e41b6bcd150b8d64851f1ebc SHA512 ebce681099e04d938ff0dc10a1af848c82dafd80b165b2431ec355d64e29be4e60d1d63f0d5c9fd1182394080d00f0f573e3ae90f3e2167533dea2b895bd0164 DIST VeraCrypt_1.21.tar.gz 24106162 BLAKE2B 5afe48830bde81d91d16f0bdf16010bdbdb885df84b9cd3e48191e468be51a485dfb3fc4f95da71d6d973a2f22dfbb92ee2b912dcf019921b37e1d4479c8c8d8 SHA512 5186d339f8fb0d88acfc35b1e7a916f797e30be93e8f252cca542b6d5c1cd916110111ef7b859d66b1790ce05d7d02bc72def26857eb003ea114a911fcec6c41 +DIST VeraCrypt_1.22.tar.gz 24820384 BLAKE2B 52fb822d07af96a9f47c17f8aacf13a949fb5a7c5d064a720e003e6d1bfbb5f221a5823720527e1f2c82f08547d77349cc90bc839336a622efcf1836dd97bb88 SHA512 83cdaf673bc9cdeadeb70b2beeabf87a2a9a65d3b0b0cc7fdf9c87671714af1e207ddd1db716302919e2d14414f5d4dd9d8f5203847d72834f53544a04c1a62a diff --git a/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch b/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch new file mode 100644 index 00000000000..702e8f702ec --- /dev/null +++ b/app-crypt/veracrypt/files/veracrypt-1.22-sysmacros-fix.patch @@ -0,0 +1,36 @@ +From 0a50becec3a3cca71e575dfec35d69ab295c85cc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <[email protected]> +Date: Tue, 3 Apr 2018 23:06:20 -0400 +Subject: [PATCH] Platform/Unix: include <sys/sysmacros.h> for major/minor + macros +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Starting with glibc 2.26, macros "major" and "minor" are only +available from <sys/sysmacros.h> [0]. The build fails with the +following without including this header: + +Unix/FilesystemPath.cpp:84:49: error: ‘major’ was not declared in this scope +Unix/FilesystemPath.cpp:84:113: error: ‘minor’ was not declared in this scope + +[0] https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html +--- + src/Platform/Unix/FilesystemPath.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Platform/Unix/FilesystemPath.cpp b/src/Platform/Unix/FilesystemPath.cpp +index d6c9cd2..7c28af4 100644 +--- a/Platform/Unix/FilesystemPath.cpp ++++ b/Platform/Unix/FilesystemPath.cpp +@@ -15,6 +15,7 @@ + #include "Platform/StringConverter.h" + #include <stdio.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + + namespace VeraCrypt + { +-- +2.16.3 + diff --git a/app-crypt/veracrypt/veracrypt-1.22.ebuild b/app-crypt/veracrypt/veracrypt-1.22.ebuild new file mode 100644 index 00000000000..98de71aa670 --- /dev/null +++ b/app-crypt/veracrypt/veracrypt-1.22.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils linux-info pax-utils toolchain-funcs wxwidgets + +DESCRIPTION="Disk encryption with strong security based on TrueCrypt" +HOMEPAGE="https://www.veracrypt.fr/en/Home.html"; +SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz"; + +LICENSE="Apache-2.0 truecrypt-3.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+asm cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 +doc X" +RESTRICT="bindist mirror" + +WX_GTK_VER="3.0" + +RDEPEND=" + sys-fs/lvm2 + sys-fs/fuse:0 + x11-libs/wxGTK:${WX_GTK_VER}[X?] + app-admin/sudo + dev-libs/pkcs11-helper +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig + asm? ( dev-lang/yasm ) +" + +S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src" +HTML_DOCS=( "${S}"/../doc/html/. ) +DOCS=( Readme.txt ) +PATCHES=( "${FILESDIR}"/${PN}-1.22-sysmacros-fix.patch ) + +pkg_setup() { + local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS" + linux-info_pkg_setup + + setup-wxwidgets +} + +src_compile() { + local myemakeargs=( + 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}" + $(usex X "" "NOGUI=1") + $(usex asm "" "NOASM=1") + $(usex cpu_flags_x86_sse4_1 "SSE41=1" "") + $(usex cpu_flags_x86_ssse3 "SSSE3=1" "") + ) + + emake "${myemakeargs[@]}" +} + +src_test() { + "${S}/Main/veracrypt" --text --test || die "tests failed" +} + +src_install() { + dobin Main/veracrypt + use doc && einstalldocs + + newinitd "${FILESDIR}/${PN}.init" ${PN} + + if use X; then + local s + for s in 16 48 128 256; do + newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm + done + make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security" + fi + + pax-mark -m "${D%/}/usr/bin/veracrypt" +} + +pkg_postinst() { + ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware" + ewarn "of the limitations on redistribution of binaries or modified source." +}
