veracrypt: update to 1.23

1 files changed, 11 insertions, 14 deletions

diff --git a/veracrypt/build/veracrypt.SlackBuild b/veracrypt/build/veracrypt.SlackBuild
index 7e95a0c7..5717015d 100755
--- a/veracrypt/build/veracrypt.SlackBuild
+++ b/veracrypt/build/veracrypt.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2015, 2016, 2017  Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016, 2017, 2018  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -27,7 +27,7 @@
 # By:          Eric Hameleers <alien@slackware.com>
 # For:         veracrypt
 # Descr:       free disk encryption software based on TrueCrypt
-# URL:         https://veracrypt.codeplex.com/
+# URL:         https://veracrypt.fr/
 # Build needs: 
 # Needs:       
 # Changelog:   
@@ -45,6 +45,8 @@
 #              * Update.
 # 1.21-1:      11/jul/2017 by Eric Hameleers <alien@slackware.com>
 #              * Update.
+# 1.23-1:      06/oct/2018 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 .
@@ -54,13 +56,13 @@
 
 PRGNAM=veracrypt
 SRCNAM=VeraCrypt
-SRCVER="1.21"
+SRCVER="1.23"
 VERSION=$(echo $SRCVER |tr - _)
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j4 "}
+NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
 TAG=${TAG:-alien}
 
-WX=${WX:-3.0.2} # for the GUI
+WX=${WX:-3.0.4} # for the GUI
 
 DOCS="License.txt Readme.txt ../doc/html ../doc/EFI-DCS/*.pdf"
 
@@ -76,7 +78,7 @@ 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"
+SRCURL[1]="https://github.com/wxWidgets/wxWidgets/releases/download/v${WX}/wxWidgets-${WX}.tar.bz2"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -92,7 +94,7 @@ else
   MARCH=$( uname -m )
   if [ -z "$ARCH" ]; then
     case "$MARCH" in
-      i?86)    export ARCH=i486 ;;
+      i?86)    export ARCH=i586 ;;
       armv7hl) export ARCH=$MARCH ;;
       armv6hl) export ARCH=$MARCH ;;
       arm*)    export ARCH=arm ;;
@@ -102,7 +104,7 @@ else
   fi
   # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
   case "$ARCH" in
-    i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    i?86)      SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
                SLKLDFLAGS=""; LIBDIRSUFFIX=""
                ;;
     x86_64)    SLKCFLAGS="-O2 -fPIC"
@@ -182,7 +184,7 @@ cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
   # Compensate for doubly compressed source version 1.19:
-  tar -xvf ${SOURCE[$i]} || gunzip -cd ${SOURCE[$i]} | tar -zxvf -
+  tar -xf ${SOURCE[$i]} || gunzip -cd ${SOURCE[$i]} | tar -zxvf -
 done
 
 chown -R root:root .
@@ -201,11 +203,6 @@ touch $OUTPUT/patch-${PRGNAM}.log
 cat $SRCDIR/patches/veracrypt_no_makeself.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"
 export CXXFLAGS="$SLKCFLAGS -maes"