# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1621855469 0
# Node ID 324b3fa82b76e3b2347e820167c43a4930249093
# Parent  8685d0e1ac512825a3c8719c810caf26f2bcc4e5
Add veracrypt

diff -r 8685d0e1ac51 -r 324b3fa82b76 cookutils/stuff/check-wok
--- a/cookutils/stuff/check-wok	Thu May 13 14:58:33 2021 +0100
+++ b/cookutils/stuff/check-wok	Mon May 24 11:24:29 2021 +0000
@@ -2,6 +2,7 @@
 
 renice -n 1 -p $$
 WOK=${1:-/home/slitaz/wok}
+. /etc/slitaz/cook.conf
 
 for i in $WOK/*/receipt ; do
 	if [ ! -e $i ]; then
diff -r 8685d0e1ac51 -r 324b3fa82b76 glib-networking/receipt
--- a/glib-networking/receipt	Thu May 13 14:58:33 2021 +0100
+++ b/glib-networking/receipt	Mon May 24 11:24:29 2021 +0000
@@ -16,6 +16,11 @@
 
 HOST_ARCH="i486 arm"
 
+current_version()
+{
+	wget -O - $(dirname $WGET_URL) 2>/dev/null | sed '/LATEST/!d;s|.*IS-||;s|<.*||'
+}
+
 # Handle cross compilation.
 case "$ARCH" in
 	i?86) BUILD_DEPENDS="$BUILD_DEPENDS intltool automake autoconf" ;;
diff -r 8685d0e1ac51 -r 324b3fa82b76 glib/receipt
--- a/glib/receipt	Thu May 13 14:58:33 2021 +0100
+++ b/glib/receipt	Mon May 24 11:24:29 2021 +0000
@@ -15,6 +15,11 @@
 BUILD_DEPENDS="pcre-dev libffi-dev gettext zlib-dev perl python-dev \
 elfutils-dev libxml2-dev libxml2-tools automake"
 
+current_version()
+{
+	wget -O - $(dirname $WGET_URL) 2>/dev/null | sed '/LATEST/!d;s|.*IS-||;s|<.*||'
+}
+
 # Handle cross comilation. Use host Perl, Python, etc
 case "$ARCH" in
 	arm*)
diff -r 8685d0e1ac51 -r 324b3fa82b76 glibc/receipt
--- a/glibc/receipt	Thu May 13 14:58:33 2021 +0100
+++ b/glibc/receipt	Mon May 24 11:24:29 2021 +0000
@@ -16,6 +16,13 @@
 # Genpkg order for tazwok.
 COOK_OPT="genpkg=glibc-base:glib-locale:glibc-dev"
 
+current_version()
+{
+	wget -O - $(dirname $WGET_URL) 2>/dev/null | \
+	sed '/href="glibc-[0-9]/!d;/tar/!d;s|.*>glibc-||;s|.tar.*||' | \
+	sort -Vr | sed q
+}
+
 # Rules to compile & install the temporary toolchain.
 cook_tmp_toolchain()
 {
diff -r 8685d0e1ac51 -r 324b3fa82b76 glibmm/receipt
--- a/glibmm/receipt	Thu May 13 14:58:33 2021 +0100
+++ b/glibmm/receipt	Mon May 24 11:24:29 2021 +0000
@@ -13,6 +13,11 @@
 DEPENDS="glib libsigc++ gcc-lib-base glibc-base libffi pcre"
 BUILD_DEPENDS="glib-dev libsigc++-dev"
 
+current_version()
+{
+	wget -O - $(dirname $WGET_URL) 2>/dev/null | sed '/LATEST/!d;s|.*IS-||;s|<.*||'
+}
+
 # Rules to configure and make the package.
 compile_rules()
 {
diff -r 8685d0e1ac51 -r 324b3fa82b76 linld/stuff/src/LINLD.CPP
--- a/linld/stuff/src/LINLD.CPP	Thu May 13 14:58:33 2021 +0100
+++ b/linld/stuff/src/LINLD.CPP	Mon May 24 11:24:29 2021 +0000
@@ -22,6 +22,9 @@
 #endif
 	"..." NL
         "vga mode: ask,extended,normal or dec/oct/hex number" NL
+#ifdef CPU32
+        "-32 for 386+" NL
+#endif
 #ifdef CPU64
         "-64 for cpu64 only" NL
 #endif
@@ -55,10 +58,15 @@
     if (!*++argv) syntax();
     const char **clp = &cmdline;
     do {
+#ifdef CPU32
+        if ((*(u16 *)*argv|2) == 0x332F) {	// -32 /32
+	    extrn char cpu386;
+	    if (cpu386 == 0) exit();
+	}
+#endif
 #ifdef CPU64
         if ((*(u16 *)*argv|2) == 0x362F) {	// -64 /64
-	    if (cpuhaslm() != 0) continue;
-	    exit();
+	    if (cpuhaslm() == 0) exit();
 	}
 #endif
 #ifdef ISO9660
diff -r 8685d0e1ac51 -r 324b3fa82b76 linld/stuff/src/_BEG.ASM
--- a/linld/stuff/src/_BEG.ASM	Thu May 13 14:58:33 2021 +0100
+++ b/linld/stuff/src/_BEG.ASM	Mon May 24 11:24:29 2021 +0000
@@ -219,19 +219,18 @@
 		pushfd
 		pop	dx
 		pop	ax
-		mov	bl,al
 		xor	al,20h		; toggle CPUID feature bit 21 (=> pentium+)
 		push	ax		;  (toggle AC: bit 18 => 486+)
 		push	dx
 		popfd
 		pushfd
-		pop	dx		; dx.1=flags.1=1
-		pop	ax
-		xor	al,bl		; clear C
-		je	@@no_cpuid	; CPUID feature bit changed ?
+		pop	dx
+		pop	dx
+		xor	al,dl		; clear C
+		jne	@@no_cpuid	; CPUID feature bit changed ?
 		mov	eax,80000001h	; Extended Processor Info and Feature Bits
 		cpuid
-		mov	dl,-1		; set 386 flag (assume cpuid => fpu:bit0=1 ?)
+		mov	dl,-1		; set 386 flag
 		ifdef	NO386
 		db	66h		; mov [_cpu_features],edx
 @@no_cpuid:
diff -r 8685d0e1ac51 -r 324b3fa82b76 linux-libre/receipt
--- a/linux-libre/receipt	Thu May 13 14:58:33 2021 +0100
+++ b/linux-libre/receipt	Mon May 24 11:24:29 2021 +0000
@@ -8,13 +8,19 @@
 LICENSE="GPL2"
 PROVIDE="linux"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"
+WEB_SITE="http://www.fsfla.org/ikiwiki/selibre/linux-libre/"
 WGET_URL="http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/$VERSION/$TARBALL"
 
 DEPENDS="kmod"
 BUILD_DEPENDS="slitaz-toolchain perl git xz lzma patch kmod bc \
 sysfsutils-dev libtool glib-dev libwrap libwrap-dev udev-dev"
 
+current_version()
+{
+	wget -O - http://linux-libre.fsfla.org/pub/linux-libre/releases/ 2> /dev/null | \
+	sed '/-gnu/!d;s|.*ref="||;s|/".*||' | sed '$!d'
+}
+
 # Rules to configure and make the package.
 compile_rules()
 {
diff -r 8685d0e1ac51 -r 324b3fa82b76 linux/receipt
--- a/linux/receipt	Thu May 13 14:58:33 2021 +0100
+++ b/linux/receipt	Mon May 24 11:24:29 2021 +0000
@@ -29,6 +29,12 @@
 # Aufs enable chroot
 AUFS_NOT_RAMFS="uclibc-cross-compiler-x86_64 is not compatible with aufs+tmpfs 8("
 
+current_version()
+{
+	wget -O - $WEB_SITE 2> /dev/null | grep -A 1 longterm | \
+	sed '/strong/!d;s|.*<strong>||;s|</s.*||;q'
+}
+
 # Handle multiarch compilation. Less bdeps when cross-compiling for ARM
 case "$ARCH" in
 	arm) BUILD_DEPENDS="xz" ;;
diff -r 8685d0e1ac51 -r 324b3fa82b76 openvpn-doc/receipt
--- a/openvpn-doc/receipt	Thu May 13 14:58:33 2021 +0100
+++ b/openvpn-doc/receipt	Mon May 24 11:24:29 2021 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openvpn-doc"
-VERSION="2.5.0"
+VERSION="2.5.2"
 CATEGORY="network"
 TAGS="vpn tunnel"
 SHORT_DESC="Documentation for OpenVPN."
diff -r 8685d0e1ac51 -r 324b3fa82b76 openvpn-down-root/receipt
--- a/openvpn-down-root/receipt	Thu May 13 14:58:33 2021 +0100
+++ b/openvpn-down-root/receipt	Mon May 24 11:24:29 2021 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openvpn-down-root"
-VERSION="2.5.0"
+VERSION="2.5.2"
 CATEGORY="network"
 TAGS="vpn tunnel"
 SHORT_DESC="The down-root plugin for OpenVPN."
diff -r 8685d0e1ac51 -r 324b3fa82b76 openvpn-pam/receipt
--- a/openvpn-pam/receipt	Thu May 13 14:58:33 2021 +0100
+++ b/openvpn-pam/receipt	Mon May 24 11:24:29 2021 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openvpn-pam"
-VERSION="2.5.0"
+VERSION="2.5.2"
 CATEGORY="network"
 TAGS="vpn tunnel"
 SHORT_DESC="PAM plugin for OpenVPN."
diff -r 8685d0e1ac51 -r 324b3fa82b76 veracrypt/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/veracrypt/receipt	Mon May 24 11:24:29 2021 +0000
@@ -0,0 +1,37 @@
+# SliTaz package receipt.
+
+PACKAGE="veracrypt"
+VERSION="1.24-Update7"
+CATEGORY="security"
+SHORT_DESC="disk encryption software based on TrueCrypt 7.1a"
+MAINTAINER="pascal.bellard@slitaz.org"
+LICENSE="Apache"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WEB_SITE="https://www.veracrypt.fr/en/"
+WGET_URL="https://github.com/veracrypt/VeraCrypt/archive/refs/tags/VeraCrypt_$VERSION.tar.gz"
+
+DEPENDS="wxWidgets fuse"
+BUILD_DEPENDS="yasm pkg-config wxWidgets-dev fuse-dev"
+
+current_version()
+{
+	wget -O - ${WGET_URL%archive*}releases 2>/dev/null | \
+	sed '/href=/!d;/tar.gz/!d;s|.*VeraCrypt_\(.*\).tar.gz".*|\1|;q'
+}
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	cd src &&
+	make ARCH=i686 &&
+	make DESTDIR=$DESTDIR install
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/bin $fs/usr/share
+	cp -a $install/usr/bin/veracrypt $fs/usr/bin
+	cp -a $install/usr/share/applications $fs/usr/share
+	cp -a $install/usr/share/pixmaps $fs/usr/share
+}