From 886ff1d9649a10026654705fef6ded3ab7453452 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Mon, 2 Sep 2024 13:03:02 +0100
Subject: [PATCH 1/2] fix: correctly support bookworm and noble for veracrypt

---
 01-main/packages/veracrypt         | 11 ++++++-----
 01-main/packages/veracrypt-console | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/01-main/packages/veracrypt b/01-main/packages/veracrypt
index 956381a5..a82de92e 100644
--- a/01-main/packages/veracrypt
+++ b/01-main/packages/veracrypt
@@ -1,9 +1,10 @@
 DEFVER=2
-ARCHS_SUPPORTED="amd64 arm64"
-CODENAMES_SUPPORTED="buster bullseye focal jammy"
-if [ "${ARCH}" == "amd64" ]; then
-    CODENAMES_SUPPORTED="${CODENAMES_SUPPORTED} noble bookworm"
-fi 
+ARCHS_SUPPORTED="amd64 arm64 armhf"
+case ${HOST_ARCH} in
+    amd64) CODENAMES_SUPPORTED="bullseye bookworm focal jammy noble" ;;
+    arm64) CODENAMES_SUPPORTED="bullseye bookworm focal jammy noble" ;;
+    armhf) CODENAMES_SUPPORTED="bullseye bookworm focal" ;;
+esac
 get_website "https://www.veracrypt.fr/en/Downloads.html"
 if [ "${ACTION}" != "prettylist" ]; then
     VERSION_PUBLISHED="$(grep 'Latest Stable Release' $CACHE_FILE  |cut -d\  -f 5)"  
diff --git a/01-main/packages/veracrypt-console b/01-main/packages/veracrypt-console
index 7dab8e62..3a2f6257 100644
--- a/01-main/packages/veracrypt-console
+++ b/01-main/packages/veracrypt-console
@@ -1,9 +1,10 @@
 DEFVER=1
-ARCHS_SUPPORTED="amd64 arm64"
-CODENAMES_SUPPORTED="buster bullseye focal jammy"
-if [ "${ARCH}" == "amd64" ]; then
-    CODENAMES_SUPPORTED="${CODENAMES_SUPPORTED} noble bookworm"
-fi 
+ARCHS_SUPPORTED="amd64 arm64 armhf"
+case ${HOST_ARCH} in
+    amd64) CODENAMES_SUPPORTED="bullseye bookworm focal jammy noble" ;;
+    arm64) CODENAMES_SUPPORTED="bullseye bookworm focal jammy noble" ;;
+    armhf) CODENAMES_SUPPORTED="bullseye bookworm focal" ;;
+esac 
 get_website "https://www.veracrypt.fr/en/Downloads.html"
 if [ "${ACTION}" != "prettylist" ]; then
     VERSION_PUBLISHED="$(grep 'Latest Stable Release' $CACHE_FILE  |cut -d\  -f 5)"  

From 5a093a55dc63287332cd6b6db17b7fbfac6f4b8b Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Tue, 3 Sep 2024 18:56:22 +0100
Subject: [PATCH 2/2] fix: Correctly find version string in updated website
 design

---
 01-main/packages/veracrypt         | 3 ++-
 01-main/packages/veracrypt-console | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/01-main/packages/veracrypt b/01-main/packages/veracrypt
index a82de92e..b91d8f05 100644
--- a/01-main/packages/veracrypt
+++ b/01-main/packages/veracrypt
@@ -7,7 +7,8 @@ case ${HOST_ARCH} in
 esac
 get_website "https://www.veracrypt.fr/en/Downloads.html"
 if [ "${ACTION}" != "prettylist" ]; then
-    VERSION_PUBLISHED="$(grep 'Latest Stable Release' $CACHE_FILE  |cut -d\  -f 5)"  
+    VERSION_PUBLISHED=$(grep -Eo '/Linux: Version [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+ ' /var/cache/deb-get/veracrypt.html | cut -d\  -f3)
+
     URL=$(unroll_url "https://launchpad.net/veracrypt/trunk/${VERSION_PUBLISHED}/+download/veracrypt-${VERSION_PUBLISHED}-${UPSTREAM_ID^}-${UPSTREAM_RELEASE}-${HOST_ARCH}.deb\"")
 fi
 PRETTY_NAME="Veracrypt"
diff --git a/01-main/packages/veracrypt-console b/01-main/packages/veracrypt-console
index 3a2f6257..6faebf81 100644
--- a/01-main/packages/veracrypt-console
+++ b/01-main/packages/veracrypt-console
@@ -7,7 +7,8 @@ case ${HOST_ARCH} in
 esac 
 get_website "https://www.veracrypt.fr/en/Downloads.html"
 if [ "${ACTION}" != "prettylist" ]; then
-    VERSION_PUBLISHED="$(grep 'Latest Stable Release' $CACHE_FILE  |cut -d\  -f 5)"  
+      VERSION_PUBLISHED=$(grep -Eo '/Linux: Version [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+ ' /var/cache/deb-get/veracrypt.html | cut -d\  -f3)
+
     URL=$(unroll_url "https://launchpad.net/veracrypt/trunk/${VERSION_PUBLISHED}/+download/veracrypt-console-${VERSION_PUBLISHED}-${UPSTREAM_ID^}-${UPSTREAM_RELEASE}-${HOST_ARCH}.deb\"")
 fi
 PRETTY_NAME="Veracrypt Console"