veracrypt: updated to 1.21

1 files changed, 17 insertions, 11 deletions

diff --git a/veracrypt/build/veracrypt.SlackBuild b/veracrypt/build/veracrypt.SlackBuild
index 01e1fc01..7e95a0c7 100755
--- a/veracrypt/build/veracrypt.SlackBuild
+++ b/veracrypt/build/veracrypt.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2015, 2016  Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016, 2017  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -43,6 +43,8 @@
 #              * Update.
 # 1.19-1:      18/oct/2016 by Eric Hameleers <alien@slackware.com>
 #              * Update.
+# 1.21-1:      11/jul/2017 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh veracrypt.SlackBuild' to build a Slackware package.
 # The package (.t?z) and .txt file as well as build logs are created in /tmp .
@@ -52,7 +54,7 @@
 
 PRGNAM=veracrypt
 SRCNAM=VeraCrypt
-SRCVER="1.19"
+SRCVER="1.21"
 VERSION=$(echo $SRCVER |tr - _)
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j4 "}
@@ -60,7 +62,7 @@ TAG=${TAG:-alien}
 
 WX=${WX:-3.0.2} # for the GUI
 
-DOCS="License.txt Readme.txt Release/Setup*/VeraCrypt*Guide.pdf"
+DOCS="License.txt Readme.txt ../doc/html ../doc/EFI-DCS/*.pdf"
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -70,9 +72,8 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# 1.19: https://veracrypt.codeplex.com/downloads/get/1614088
-SOURCE[0]="$SRCDIR/${SRCNAM}_${SRCVER}_Source.tar.gz"
-SRCURL[0]="https://sourceforge.net/projects/${PRGNAM}/files/${SRCNAM}%20${SRCVER}/${SRCNAM}_${SRCVER}_Source.tar.gz/download"
+SOURCE[0]="$SRCDIR/${SRCNAM}_${SRCVER}_Source.tar.bz2"
+SRCURL[0]="https://launchpad.net/${PRGNAM}/trunk/${SRCVER}/+download/${SRCNAM}_${SRCVER}_Source.tar.bz2"
 
 SOURCE[1]="$SRCDIR/wxWidgets-${WX}.tar.bz2"
 SRCURL[1]="http://downloads.sourceforge.net/wxwindows/wxWidgets-${WX}.tar.bz2"
@@ -187,6 +188,10 @@ done
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
+# Need that later:
+WXDIR=$(pwd)/wxWidgets-$WX
+
+# Compensate for sometimes absent root directory in source tarball:
 cd src 2>/dev/null || cd ${SRCNAM}*/src
 
 # Prepare patches:
@@ -196,9 +201,10 @@ touch $OUTPUT/patch-${PRGNAM}.log
 cat $SRCDIR/patches/veracrypt_no_makeself.patch | patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
-# Taken from Arch Linux:
-cat $SRCDIR/patches/veracrypt_no_execstack.patch | patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# Implemented in VeraVCrypt 1.21:
+## Taken from Arch Linux:
+#cat $SRCDIR/patches/veracrypt_no_execstack.patch | patch -p1 --verbose \
+#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 echo Building ...
 export LDFLAGS="$SLKLDFLAGS"
@@ -206,7 +212,7 @@ export CXXFLAGS="$SLKCFLAGS -maes"
 export CFLAGS="$SLKCFLAGS -maes"
 
 # First build a static wxGTK, then build veracrypt:
-make WXSTATIC=1 WX_ROOT=$(cd ../../wxWidgets-$WX; pwd) VERBOSE=1 wxbuild \
+make WXSTATIC=1 WX_ROOT=${WXDIR} VERBOSE=1 wxbuild \
   2>&1 | tee $OUTPUT/make-${PRGNAM}_wx.log
 make WXSTATIC=1 VERBOSE=1 \
   TC_EXTRA_LFLAGS+="-ldl ${LDFLAGS}" \
@@ -220,7 +226,7 @@ install -m0755 Main/${PRGNAM} $PKG/usr/bin/${PRGNAM}
 
 # Also build a console-only version that does not depend on any GUI libs:
 make clean
-make NOGUI=1 WXSTATIC=1 WX_ROOT=$(cd ../../wxWidgets-$WX; pwd) VERBOSE=1 wxbuild \
+make NOGUI=1 WXSTATIC=1 WX_ROOT=${WXDIR} VERBOSE=1 wxbuild \
   2>&1 | tee $OUTPUT/make-${PRGNAM}-nox_wx.log
 make NOGUI=1 WXSTATIC=1 VERBOSE=1 \
   TC_EXTRA_LFLAGS+="-ldl ${LDFLAGS}" \