veracrypt: updated to 1.19

1 files changed, 27 insertions, 13 deletions

diff --git a/veracrypt/build/veracrypt.SlackBuild b/veracrypt/build/veracrypt.SlackBuild
index 81eb6f15..01e1fc01 100755
--- a/veracrypt/build/veracrypt.SlackBuild
+++ b/veracrypt/build/veracrypt.SlackBuild
@@ -51,7 +51,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=veracrypt
-# Note: download URL is obfuscated, so random SRCVER does not work:
+SRCNAM=VeraCrypt
 SRCVER="1.19"
 VERSION=$(echo $SRCVER |tr - _)
 BUILD=${BUILD:-1}
@@ -71,8 +71,8 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # 1.19: https://veracrypt.codeplex.com/downloads/get/1614088
-SOURCE[0]="$SRCDIR/${PRGNAM}_${SRCVER}_Source.tar.gz"
-SRCURL[0]="https://download-codeplex.sec.s-msft.com/Download/Release?ProjectName=veracrypt&DownloadId=1614088&FileTime=131212015504170000&Build=21031"
+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[1]="$SRCDIR/wxWidgets-${WX}.tar.bz2"
 SRCURL[1]="http://downloads.sourceforge.net/wxwindows/wxWidgets-${WX}.tar.bz2"
@@ -180,27 +180,38 @@ echo "++"
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
-  tar -xvf ${SOURCE[$i]}
+  # Compensate for doubly compressed source version 1.19:
+  tar -xvf ${SOURCE[$i]} || gunzip -cd ${SOURCE[$i]} | tar -zxvf -
 done
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+rX-st .
 
-cd src
+cd src 2>/dev/null || cd ${SRCNAM}*/src
+
+# Prepare patches:
+touch $OUTPUT/patch-${PRGNAM}.log
 
 # We do not need a self-extracting installer:
 cat $SRCDIR/patches/veracrypt_no_makeself.patch | patch -p1 --verbose \
-  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+  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
 
 echo Building ...
 export LDFLAGS="$SLKLDFLAGS"
-export CXXFLAGS="$SLKCFLAGS"
-export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS -maes"
+export CFLAGS="$SLKCFLAGS -maes"
 
-# First build a static wxGTK, then build truecrypt:
-make WXSTATIC=1 WX_ROOT=$(cd ../wxWidgets-$WX; pwd) VERBOSE=1 wxbuild \
+# First build a static wxGTK, then build veracrypt:
+make WXSTATIC=1 WX_ROOT=$(cd ../../wxWidgets-$WX; pwd) VERBOSE=1 wxbuild \
   2>&1 | tee $OUTPUT/make-${PRGNAM}_wx.log
-make WXSTATIC=1 LFLAGS="-ldl" VERBOSE=1 \
+make WXSTATIC=1 VERBOSE=1 \
+  TC_EXTRA_LFLAGS+="-ldl ${LDFLAGS}" \
+  TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
+  TC_EXTRA_CFLAGS="${CFLAGS}" \
   2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 # Install the GUI/console combined binary:
@@ -209,9 +220,12 @@ 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=$(cd ../../wxWidgets-$WX; pwd) VERBOSE=1 wxbuild \
   2>&1 | tee $OUTPUT/make-${PRGNAM}-nox_wx.log
-make NOGUI=1 WXSTATIC=1 LFLAGS="-ldl" VERBOSE=1 \
+make NOGUI=1 WXSTATIC=1 VERBOSE=1 \
+  TC_EXTRA_LFLAGS+="-ldl ${LDFLAGS}" \
+  TC_EXTRA_CXXFLAGS="${CXXFLAGS}" \
+  TC_EXTRA_CFLAGS="${CFLAGS}" \
   2>&1 | tee $OUTPUT/make-${PRGNAM}-nox.log
 
 # Install the console-only binary: