xap/veracrypt: Upgraded to veracrypt-1.24.Hotfix1.
parent
a4168ea849
commit
0d8af452cf
|
@ -1 +0,0 @@
|
|||
44717d24b8deff2db9dd0365572063e38bbe4a59438a8c3c07675b5eed370358 VeraCrypt_1.21_Source.tar.bz2
|
|
@ -0,0 +1 @@
|
|||
8b40ece805b216843d7a71b1a30069c4057931341b030bf65caace59263c5c8c VeraCrypt_1.24-Hotfix1_Source.tar.bz2
|
|
@ -0,0 +1,39 @@
|
|||
diff -Naur orig/src/Crypto/jitterentropy-base-user.h mod/src/Crypto/jitterentropy-base-user.h
|
||||
--- orig/src/Crypto/jitterentropy-base-user.h 2019-10-27 12:10:18.000000000 +0000
|
||||
+++ mod/src/Crypto/jitterentropy-base-user.h 2019-12-15 23:26:23.663508743 +0000
|
||||
@@ -49,8 +49,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
-typedef uint64 __u64;
|
||||
-
|
||||
#ifdef _MSC_VER
|
||||
|
||||
typedef uint64 uint64_t;
|
||||
@@ -70,7 +68,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-static VC_INLINE void jent_get_nstime(__u64 *out)
|
||||
+static VC_INLINE void jent_get_nstime(uint64 *out)
|
||||
{
|
||||
*out = __rdtsc();;
|
||||
}
|
||||
@@ -80,7 +78,7 @@
|
||||
/* taken from Linux kernel */
|
||||
#if CRYPTOPP_BOOL_X64
|
||||
#define DECLARE_ARGS(val, low, high) unsigned low, high
|
||||
-#define EAX_EDX_VAL(val, low, high) ((low) | ((__u64)(high) << 32))
|
||||
+#define EAX_EDX_VAL(val, low, high) ((low) | ((uint64)(high) << 32))
|
||||
#define EAX_EDX_RET(val, low, high) "=a" (low), "=d" (high)
|
||||
#else
|
||||
#define DECLARE_ARGS(val, low, high) unsigned long long val
|
||||
@@ -88,7 +86,7 @@
|
||||
#define EAX_EDX_RET(val, low, high) "=A" (val)
|
||||
#endif
|
||||
|
||||
-VC_INLINE void jent_get_nstime(__u64 *out)
|
||||
+VC_INLINE void jent_get_nstime(uint64 *out)
|
||||
{
|
||||
DECLARE_ARGS(val, low, high);
|
||||
asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
# Build script for Slackware
|
||||
# Copyright (C) 2017 Damien Goutte-Gattat
|
||||
# Copyright (C) 2017,2019 Damien Goutte-Gattat
|
||||
#
|
||||
# Redistribution and use of this script, with or without modifications,
|
||||
# is permitted provided that the following conditions are met:
|
||||
|
@ -28,12 +28,13 @@
|
|||
|
||||
# Source package infos
|
||||
NAMESRC=${NAMESRC:-VeraCrypt}
|
||||
VERSION=${VERSION:-1.21}
|
||||
VERSION=${VERSION:-1.24-Hotfix1}
|
||||
ARCHIVE=${ARCHIVE:-${NAMESRC}_${VERSION}_Source.tar.bz2}
|
||||
WGET=${WGET:-https://launchpad.net/veracrypt/trunk/$VERSION/+download/$ARCHIVE}
|
||||
WGET=${WGET:-https://launchpad.net/veracrypt/trunk/1.24-hotfix1/+download/$ARCHIVE}
|
||||
|
||||
# Build infos
|
||||
NAMEPKG=${NAMEPKG:-veracrypt}
|
||||
VERSIONPKG=${VERSION//-/.}
|
||||
BUILD=${BUILD:-1GGD}
|
||||
ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
|
||||
JOBS=${JOBS:-1}
|
||||
|
@ -85,21 +86,24 @@ NAME=$NAMEPKG-$VERSION
|
|||
mkdir $TMP/$NAME && cd $TMP/$NAME
|
||||
echo "Building $ARCHIVE..."
|
||||
tar xf $CWD/$ARCHIVE
|
||||
patch -p 1 < $CWD/veracrypt-1.24-fix-uint64-decl.patch
|
||||
cd src
|
||||
make -j $JOBS
|
||||
install -D -m 755 Main/veracrypt $PKG/usr/bin/veracrypt
|
||||
cd ..
|
||||
|
||||
# Install the documentation
|
||||
mkdir -p $PKG/usr/doc/$NAME
|
||||
mkdir -p $PKG/usr/doc/$NAMEPKG-$VERSIONPKG
|
||||
install -m 644 License.txt README.md \
|
||||
doc/EFI-DCS/{dcs_tpm_owner_02.pdf,disk_encryption_v1_2.pdf} \
|
||||
$PKG/usr/doc/$NAME
|
||||
cp -r doc/html $PKG/usr/doc/$NAME/html
|
||||
$PKG/usr/doc/$NAMEPKG-$VERSIONPKG
|
||||
cp -r doc/html $PKG/usr/doc/$NAMEPKG-$VERSIONPKG/html
|
||||
|
||||
# Install desktop file
|
||||
# Install desktop file and icon
|
||||
install -D -m 644 src/Setup/Linux/veracrypt.desktop \
|
||||
$PKG/usr/share/applications/veracrypt.desktop
|
||||
install -D -m 644 src/Resources/Icons/VeraCrypt-256x256.xpm \
|
||||
$PKG/usr/share/pixmaps/veracrypt.xpm
|
||||
|
||||
# Copy slack-desc and doinst.sh files
|
||||
install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc
|
||||
|
@ -115,7 +119,7 @@ cd $PKG
|
|||
mkdir -p $OUT
|
||||
PACKAGING="
|
||||
chown root:root . -R
|
||||
/sbin/makepkg -l y -c n $OUT/$NAMEPKG-$VERSION-$ARCH-$BUILD.$EXT
|
||||
/sbin/makepkg -l y -c n $OUT/$NAMEPKG-$VERSIONPKG-$ARCH-$BUILD.$EXT
|
||||
rm -rf $PKG
|
||||
rm -rf $TMP/$NAME
|
||||
"
|
||||
|
|
Loading…
Reference in New Issue