app-crypt/veracrypt: remove old
Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Göktürk Yüksek <gokturk@gentoo.org>
This commit is contained in:
Göktürk Yüksek
parent
aab647bf24
commit
e0c8532e4a
|
|
@ -1,3 +1 @@
|
|||
DIST veracrypt-1.24_p2.tar.gz 25208374 BLAKE2B 2667fb93e6884d97a673fe793b5f83f73961c2362e7704199b5ed0163c03f19313843583f7f2a15e05ee71516e45db97752350d2c27d22f1f278668b7c07aff9 SHA512 f778b8f6288f6f9886a15fa582f6c7126d9eaea319e854ad11bd5d44105ad5a3cb8b750d410ed8fd531ec3b23f9bad83934e6cefedd1352603d4882d2ca0ad84
|
||||
DIST veracrypt-1.24_p4.tar.gz 25212608 BLAKE2B 12d124cc5c869b8112e29624fcc5af3dd96d3c5e0179c643bf16cd361cc01677c09710faa192e7c9fe5f2ca78fbd826bc9df99f34e83ce4534f26dec01185761 SHA512 e077d6fe6a35234737387c4a6997399a251e238ab75524f53efe8ed742a35164fa4d5fcb0f15816dcb29d31fb8a4bb175d45b9aefb912c4747194fb320fa408d
|
||||
DIST veracrypt-1.24_p7.tar.gz 25113248 BLAKE2B 8ead3325ce6fadf4ca8211ea45daaa82a655f29006f224235f44200839289d42fabe84da2e731fc6a169a7d157535c719b2cd9294524e68532c0065e41ed733c SHA512 d149736d4d6740a89bfce892f44757600c6411776b471a208a75b4573bbc6125535ef1b68c2f55903ff82f4d0fff13b8b07d3cf15c7a301c39158aefffc29e17
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
From 482311ef1041918d791e498744f8e0ddeebc91fe Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
|
||||
Date: Fri, 11 Oct 2019 18:16:41 -0400
|
||||
Subject: [PATCH v1] src/Main/Main.make: simplify the WX_CONFIG_LIBS logic
|
||||
|
||||
Irrespective of whether we are linking against widgets statically or
|
||||
dynamically, pull in only 'base' when GUI is disabled, and
|
||||
'adv,core,base' when GUI is enabled. When GUI is disabled, the C/CXX
|
||||
flag must include '-DwxUSE_GUI=0' for this to work.
|
||||
---
|
||||
src/Main/Main.make | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/src/Main/Main.make b/src/Main/Main.make
|
||||
index 0bdd951d..259a1f08 100755
|
||||
--- a/src/Main/Main.make
|
||||
+++ b/src/Main/Main.make
|
||||
@@ -82,14 +82,10 @@ CXXFLAGS += -I$(BASE_DIR)/Main
|
||||
#------ wxWidgets configuration ------
|
||||
|
||||
ifdef TC_NO_GUI
|
||||
-ifdef VC_WX_STATIC
|
||||
WX_CONFIG_LIBS := base
|
||||
else
|
||||
WX_CONFIG_LIBS := adv,core,base
|
||||
endif
|
||||
-else
|
||||
-WX_CONFIG_LIBS := adv,core,base
|
||||
-endif
|
||||
|
||||
ifeq "$(TC_BUILD_CONFIG)" "Release"
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
|
|
@ -1,100 +0,0 @@
|
|||
From 6ab07ac9a30fe48839e31f9c374fd6a6ddeeb382 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
|
||||
Date: Thu, 19 Dec 2019 17:04:37 -0500
|
||||
Subject: [PATCH] Revert "Linux: Fix failure to run VeraCrypt binary built for
|
||||
console mode on headless machines (fix issue
|
||||
https://github.com/veracrypt/VeraCrypt/issues/531)"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The build failure still exists for system wxGTK compiled with '--disable-gui':
|
||||
|
||||
```
|
||||
In file included from TextUserInterface.cpp:27:
|
||||
TextUserInterface.h: In member function ‘virtual bool VeraCrypt::TextUserInterface::Initialize(int&, wxChar**)’:
|
||||
TextUserInterface.h:50:63: error: ‘wxAppBase’ has not been declared
|
||||
50 | virtual bool Initialize (int &argc, wxChar **argv) { return wxAppBase::Initialize(argc, argv); }
|
||||
```
|
||||
|
||||
This reverts commit 737e1f126b8826ed02418266e590e195aebdd7c0.
|
||||
---
|
||||
src/Main/TextUserInterface.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/Main/TextUserInterface.h b/src/Main/TextUserInterface.h
|
||||
index 95db02d7..78874b8c 100644
|
||||
--- a/src/Main/TextUserInterface.h
|
||||
+++ b/src/Main/TextUserInterface.h
|
||||
@@ -47,7 +47,9 @@ namespace VeraCrypt
|
||||
virtual void ExportSecurityTokenKeyfile () const;
|
||||
virtual shared_ptr <GetStringFunctor> GetAdminPasswordRequestHandler ();
|
||||
virtual void ImportSecurityTokenKeyfiles () const;
|
||||
+#ifndef TC_NO_GUI
|
||||
virtual bool Initialize (int &argc, wxChar **argv) { return wxAppBase::Initialize(argc, argv); }
|
||||
+#endif
|
||||
virtual void InitSecurityTokenLibrary () const;
|
||||
virtual void ListSecurityTokenKeyfiles () const;
|
||||
virtual VolumeInfoList MountAllDeviceHostedVolumes (MountOptions &options) const;
|
||||
--
|
||||
2.24.0
|
||||
|
||||
From d168eadc536552fbf76fe86c8ad0fa77130081e1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
|
||||
Date: Thu, 19 Dec 2019 17:15:43 -0500
|
||||
Subject: [PATCH] Revert "Linux: fix compilation error when building
|
||||
console-only version of VeraCrypt that is statically linked to wxWidgets"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The build failure still exists for system wxGTK compiled with '--disable-gui':
|
||||
|
||||
```
|
||||
In file included from TextUserInterface.cpp:27:
|
||||
TextUserInterface.h: In member function ‘virtual bool VeraCrypt::TextUserInterface::Initialize(int&, wxChar**)’:
|
||||
TextUserInterface.h:50:63: error: ‘wxAppBase’ has not been declared
|
||||
50 | virtual bool Initialize (int &argc, wxChar **argv) { return wxAppBase::Initialize(argc, argv); }
|
||||
```
|
||||
|
||||
This reverts commit 14bee5e6a227701e78c5fec04064c0494f6361f0.
|
||||
---
|
||||
src/Main/Main.make | 8 ++++++++
|
||||
src/Makefile | 1 +
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/src/Main/Main.make b/src/Main/Main.make
|
||||
index 0cb4e15d..a154a846 100755
|
||||
--- a/src/Main/Main.make
|
||||
+++ b/src/Main/Main.make
|
||||
@@ -81,7 +81,15 @@ CXXFLAGS += -I$(BASE_DIR)/Main
|
||||
|
||||
#------ wxWidgets configuration ------
|
||||
|
||||
+ifdef TC_NO_GUI
|
||||
+ifdef VC_WX_STATIC
|
||||
+WX_CONFIG_LIBS := base
|
||||
+else
|
||||
+WX_CONFIG_LIBS := adv,core,base
|
||||
+endif
|
||||
+else
|
||||
WX_CONFIG_LIBS := adv,core,base
|
||||
+endif
|
||||
|
||||
ifeq "$(TC_BUILD_CONFIG)" "Release"
|
||||
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 1b084421..f102a28c 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -70,6 +70,7 @@ endif
|
||||
ifeq "$(origin NOGUI)" "command line"
|
||||
export TC_NO_GUI := 1
|
||||
C_CXX_FLAGS += -DTC_NO_GUI
|
||||
+ WX_CONFIGURE_FLAGS += --disable-gui
|
||||
endif
|
||||
|
||||
ifdef PKCS11_INC
|
||||
--
|
||||
2.24.0
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
depend() {
|
||||
after localmount
|
||||
need device-mapper
|
||||
}
|
||||
|
||||
stop() {
|
||||
# Try to remove any dm-crypt mappings
|
||||
if [ -x /usr/bin/veracrypt ]; then
|
||||
ebegin "Removing veracrypt mappings"
|
||||
! /usr/bin/veracrypt -l > /dev/null 2>&1 || /usr/bin/veracrypt -d
|
||||
eend $?
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
inherit desktop 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_1.24-Update2.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
# The modules not linked against in Linux include (but not limited to):
|
||||
# libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
|
||||
# Tested by actually removing the source files and performing a build
|
||||
# For this reason, we don't have to worry about their licenses
|
||||
LICENSE="Apache-2.0 BSD truecrypt-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64"
|
||||
IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
|
||||
RESTRICT="bindist mirror"
|
||||
|
||||
WX_GTK_VER="3.0-gtk3"
|
||||
|
||||
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_1.24-Update2/src"
|
||||
|
||||
pkg_setup() {
|
||||
local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
|
||||
linux-info_pkg_setup
|
||||
|
||||
setup-wxwidgets
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# 1.24_p2 breaks the compilation against wxGTK[-X]
|
||||
# See: https://github.com/veracrypt/VeraCrypt/issues/531
|
||||
eapply -p2 "${FILESDIR}"/${PN}-1.24_p2-revert-wxwidgets-breakage.patch
|
||||
eapply -p2 "${FILESDIR}"/${PN}-1.24-no-gui-fix.patch
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local TC_EXTRA_CFLAGS="${CFLAGS}"
|
||||
local TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
|
||||
local myemakeargs=(
|
||||
NOSTRIP=1
|
||||
NOTEST=1
|
||||
VERBOSE=1
|
||||
CC="$(tc-getCC)"
|
||||
CXX="$(tc-getCXX)"
|
||||
AR="$(tc-getAR)"
|
||||
RANLIB="$(tc-getRANLIB)"
|
||||
TC_EXTRA_LFLAGS="${LDFLAGS}"
|
||||
WX_CONFIG="${WX_CONFIG}"
|
||||
$(usex X "" "NOGUI=1")
|
||||
$(usex asm "" "NOASM=1")
|
||||
$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
|
||||
$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
|
||||
$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
|
||||
)
|
||||
|
||||
# We need to explicitly disable the GUI support when linking against
|
||||
# wxwidgets, in case it was compiled with USE=X
|
||||
if ! use X; then
|
||||
TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS} -DwxUSE_GUI=0"
|
||||
TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS} -DwxUSE_GUI=0"
|
||||
fi
|
||||
|
||||
myemakeargs+=(
|
||||
TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS}"
|
||||
TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS}"
|
||||
)
|
||||
|
||||
emake "${myemakeargs[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
"${S}/Main/veracrypt" --text --test || die "tests failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local DOCS=( Readme.txt )
|
||||
local HTML_DOCS=( )
|
||||
|
||||
dobin Main/veracrypt
|
||||
if use doc; then
|
||||
DOCS+=( "${S}"/../doc/EFI-DCS )
|
||||
docompress -x "/usr/share/doc/${PF}/EFI-DCS"
|
||||
HTML_DOCS+=( "${S}"/../doc/html/. )
|
||||
fi
|
||||
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."
|
||||
}
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
inherit desktop eapi7-ver linux-info pax-utils toolchain-funcs wxwidgets
|
||||
|
||||
MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)"
|
||||
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_${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
# The modules not linked against in Linux include (but not limited to):
|
||||
# libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
|
||||
# Tested by actually removing the source files and performing a build
|
||||
# For this reason, we don't have to worry about their licenses
|
||||
LICENSE="Apache-2.0 BSD truecrypt-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64"
|
||||
IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
|
||||
RESTRICT="bindist mirror"
|
||||
|
||||
WX_GTK_VER="3.0-gtk3"
|
||||
|
||||
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_${MY_PV}/src"
|
||||
|
||||
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_sse2 "" "NOSSE2=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() {
|
||||
local DOCS=( Readme.txt )
|
||||
local HTML_DOCS=( )
|
||||
|
||||
dobin Main/veracrypt
|
||||
if use doc; then
|
||||
DOCS+=( "${S}"/../doc/EFI-DCS )
|
||||
docompress -x "/usr/share/doc/${PF}/EFI-DCS"
|
||||
HTML_DOCS+=( "${S}"/../doc/html/. )
|
||||
fi
|
||||
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."
|
||||
}
|
||||
Loading…
Reference in New Issue