From d73f5b2ce0b9939a67cc5af2139d05e3e7694f80 Mon Sep 17 00:00:00 2001
From: Thomas Szteliga <ts@websafe.pl>
Date: Sat, 29 Jul 2017 04:11:33 +0700
Subject: system/veracrypt: Updated for version 1.21.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/veracrypt/slack-desc           |  2 +-
 system/veracrypt/veracrypt.SlackBuild | 17 ++++++++---------
 system/veracrypt/veracrypt.info       |  8 ++++----
 3 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'system/veracrypt')

diff --git a/system/veracrypt/slack-desc b/system/veracrypt/slack-desc
index 8ec480b483..113fb78c32 100644
--- a/system/veracrypt/slack-desc
+++ b/system/veracrypt/slack-desc
@@ -16,4 +16,4 @@ veracrypt: and partitions encryption making it immune to new developments
 veracrypt: in brute-force attacks. VeraCrypt also solves many vulnerabilities
 veracrypt: and security issues found in TrueCrypt.
 veracrypt:
-veracrypt: Project homepage: https://www.veracrypt.fr/en/Home.html
+veracrypt: Project homepage: https://www.veracrypt.fr/
diff --git a/system/veracrypt/veracrypt.SlackBuild b/system/veracrypt/veracrypt.SlackBuild
index 58ccb41612..118277f74a 100644
--- a/system/veracrypt/veracrypt.SlackBuild
+++ b/system/veracrypt/veracrypt.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for VeraCrypt
 
-# Copyright (c) 2016 Thomas Szteliga <ts@websafe.pl>, Opole, PL
+# Copyright (c) 2016-2017 Thomas Szteliga <ts@websafe.pl>, Opole, PL
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,11 +23,9 @@
 # THE SOFTWARE.
 
 PRGNAM=veracrypt
-VERSION=${VERSION:-git_5103f19e}
-GITVER=5103f19eab5b51e3ef2d21bb4f6035925b6698d4
+VERSION=${VERSION:-1.21}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-SRCNAM=$PRGNAM-$GITVER.zip
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -63,8 +61,9 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir $PRGNAM-$VERSION
+tar xvf $CWD/VeraCrypt_${VERSION}_Source.tar.bz2 -C $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-unzip $CWD/${SRCNAM}
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -73,18 +72,18 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 cd src
-# Fixing the Makefile, check: https://veracrypt.codeplex.com/workitem/567
-sed  -i Makefile -e 's/export CFLAGS := -Wall/export CFLAGS := -Wall -maes/g'
 make
+make package
 cp -av Setup/Linux/usr $PKG
 rm -f $PKG/usr/bin/veracrypt-uninstall.sh
-chmod -x $PKG/usr/share/pixmaps/veracrypt.xpm
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/usr/share/veracrypt/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  $PKG/usr/share/veracrypt/doc/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/veracrypt
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/veracrypt/veracrypt.info b/system/veracrypt/veracrypt.info
index cedd417b92..93a2ba4e60 100644
--- a/system/veracrypt/veracrypt.info
+++ b/system/veracrypt/veracrypt.info
@@ -1,8 +1,8 @@
 PRGNAM="veracrypt"
-VERSION="git_5103f19e"
-HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
-DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/veracrypt/veracrypt-5103f19eab5b51e3ef2d21bb4f6035925b6698d4.zip"
-MD5SUM="aa2fec73cb4dbd54be2101a0c7edf4df"
+VERSION="1.21"
+HOMEPAGE="https://www.veracrypt.fr/"
+DOWNLOAD="https://launchpad.net/veracrypt/trunk/1.21/+download/VeraCrypt_1.21_Source.tar.bz2"
+MD5SUM="00c0f7101c2956e99c54cb8966e7fc92"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxGTK3 makeself"
-- 
cgit v1.2.3