From 4891ce69e78205b0d22fc487e5e8b710747f3cf0 Mon Sep 17 00:00:00 2001
From: gqgunhed <110590071+gqgunhed@users.noreply.github.com>
Date: Mon, 10 Jul 2023 11:57:29 +0200
Subject: [PATCH 1/7] Update bootstrap.sh

Changes to include more recent Linux/Debian releases
---
 usr/local/share/bastille/bootstrap.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh
index 79bc3cfb..c45fcf60 100644
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.sh
@@ -399,7 +399,7 @@ debootstrap_release() {
     fi
 
     case "${LINUX_FLAVOR}" in
-        bionic|stretch|buster|bullseye)
+        bionic|buster|bullseye|bookworm)
         info "Increasing APT::Cache-Start"
         echo "APT::Cache-Start 251658240;" > "${bastille_releasesdir}"/${DIR_BOOTSTRAP}/etc/apt/apt.conf.d/00aptitude
         ;;
@@ -567,13 +567,6 @@ ubuntu_focal|focal|ubuntu-focal)
     ARCH_BOOTSTRAP=${HW_MACHINE_ARCH_LINUX}
     debootstrap_release
     ;;
-debian_stretch|stretch|debian-stretch)
-    PLATFORM_OS="Debian/Linux"
-    LINUX_FLAVOR="stretch"
-    DIR_BOOTSTRAP="Debian9"
-    ARCH_BOOTSTRAP=${HW_MACHINE_ARCH_LINUX}
-    debootstrap_release
-    ;;
 debian_buster|buster|debian-buster)
     PLATFORM_OS="Debian/Linux"
     LINUX_FLAVOR="buster"
@@ -588,6 +581,13 @@ debian_bullseye|bullseye|debian-bullseye)
     ARCH_BOOTSTRAP=${HW_MACHINE_ARCH_LINUX}
     debootstrap_release
     ;;
+debian_bookworm|bookworm|debian-bookworm)
+    PLATFORM_OS="Debian/Linux"
+    LINUX_FLAVOR="bookworm"
+    DIR_BOOTSTRAP="Debian12"
+    ARCH_BOOTSTRAP=${HW_MACHINE_ARCH_LINUX}
+    debootstrap_release
+    ;;
 *)
     usage
     ;;

From 16fae7251841eb50a30a33ee1e040b3d3dfecdc0 Mon Sep 17 00:00:00 2001
From: gqgunhed <110590071+gqgunhed@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:01:01 +0200
Subject: [PATCH 2/7] Added Ubuntu Jammy 22.04 LTS

---
 usr/local/share/bastille/bootstrap.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh
index c45fcf60..7c02e5f4 100644
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.sh
@@ -567,6 +567,13 @@ ubuntu_focal|focal|ubuntu-focal)
     ARCH_BOOTSTRAP=${HW_MACHINE_ARCH_LINUX}
     debootstrap_release
     ;;
+ubuntu_jammy|jammy|ubuntu-jammy)
+    PLATFORM_OS="Ubuntu/Linux"
+    LINUX_FLAVOR="jammy"
+    DIR_BOOTSTRAP="Ubuntu_2204"
+    ARCH_BOOTSTRAP=${HW_MACHINE_ARCH_LINUX}
+    debootstrap_release
+    ;;
 debian_buster|buster|debian-buster)
     PLATFORM_OS="Debian/Linux"
     LINUX_FLAVOR="buster"

From a89f42242c860899c92815725e70f35b3de39dac Mon Sep 17 00:00:00 2001
From: gqgunhed <110590071+gqgunhed@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:04:40 +0200
Subject: [PATCH 3/7] Added ubuntu-jammy and bookworm releases

 removed "stretch" release
---
 usr/local/share/bastille/create.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh
index 437086bf..32bf6c9b 100644
--- a/usr/local/share/bastille/create.sh
+++ b/usr/local/share/bastille/create.sh
@@ -683,9 +683,9 @@ if [ -n "${LINUX_JAIL}" ]; then
         ## check for FreeBSD releases name
         NAME_VERIFY=ubuntu_focal
         ;;
-    debian_stretch|stretch|debian-stretch)
+    jammy|ubuntu_jammy|ubuntu-jammy)
         ## check for FreeBSD releases name
-        NAME_VERIFY=stretch
+        NAME_VERIFY=ubuntu_jammy
         ;;
     debian_buster|buster|debian-buster)
         ## check for FreeBSD releases name
@@ -695,6 +695,10 @@ if [ -n "${LINUX_JAIL}" ]; then
         ## check for FreeBSD releases name
         NAME_VERIFY=bullseye
         ;;
+    debian_bookworm|bookworm|debian-bookworm)
+        ## check for FreeBSD releases name
+        NAME_VERIFY=bookworm
+        ;;
     *)
         error_notify "Unknown Linux."
         usage

From bea80db8983584ffa56ac59b405fa5e9ff151f8a Mon Sep 17 00:00:00 2001
From: gqgunhed <110590071+gqgunhed@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:08:47 +0200
Subject: [PATCH 4/7] Exchanged entry for Debian9 with Debian12

---
 usr/local/share/bastille/create.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh
index 32bf6c9b..8c7d2455 100644
--- a/usr/local/share/bastille/create.sh
+++ b/usr/local/share/bastille/create.sh
@@ -759,10 +759,6 @@ if [ -z "${EMPTY_JAIL}" ]; then
         NAME_VERIFY=Ubuntu_2004
         validate_release
         ;;
-    debian_stretch|stretch|debian-stretch)
-        NAME_VERIFY=Debian9
-        validate_release
-        ;;
     debian_buster|buster|debian-buster)
         NAME_VERIFY=Debian10
         validate_release
@@ -771,6 +767,10 @@ if [ -z "${EMPTY_JAIL}" ]; then
         NAME_VERIFY=Debian11
         validate_release
         ;;
+    debian_bookworm|bookworm|debian-bookworm)
+        NAME_VERIFY=Debian12
+        validate_release
+        ;;
     *)
         error_notify "Unknown Release."
         usage

From 8d16399e50774b4d5811a06054f7c4a11a61350c Mon Sep 17 00:00:00 2001
From: gqgunhed <110590071+gqgunhed@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:13:22 +0200
Subject: [PATCH 5/7] Added NAME_VERIFY=Ubuntu_2204 section

---
 usr/local/share/bastille/create.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh
index 8c7d2455..acb49b8b 100644
--- a/usr/local/share/bastille/create.sh
+++ b/usr/local/share/bastille/create.sh
@@ -759,6 +759,11 @@ if [ -z "${EMPTY_JAIL}" ]; then
         NAME_VERIFY=Ubuntu_2004
         validate_release
         ;;
+    ubuntu_jammy|jammy|ubuntu-jammy)
+        UBUNTU="1"
+        NAME_VERIFY=Ubuntu_2204
+        validate_release
+        ;;
     debian_buster|buster|debian-buster)
         NAME_VERIFY=Debian10
         validate_release

From cf569eaeeba32eb07b6408a49d5330c57cd33c76 Mon Sep 17 00:00:00 2001
From: gqgunhed <110590071+gqgunhed@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:19:30 +0200
Subject: [PATCH 6/7] Updated supported Linux releases

Added
- Ubuntu2204
- Debian12
Removed
- Debian9
---
 usr/local/share/bastille/destroy.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/local/share/bastille/destroy.sh b/usr/local/share/bastille/destroy.sh
index 7126edb2..587698ce 100644
--- a/usr/local/share/bastille/destroy.sh
+++ b/usr/local/share/bastille/destroy.sh
@@ -249,14 +249,14 @@ current-build-latest|current-BUILD-LATEST|CURRENT-BUILD-LATEST)
     NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(current-build-latest)$' | sed 's/CURRENT/current/;s/build/BUILD/g;s/latest/LATEST/g')
     destroy_rel
     ;;
-Ubuntu_1804|Ubuntu_2004|UBUNTU_1804|UBUNTU_2004)
+Ubuntu_1804|Ubuntu_2004|Ubuntu_2204|UBUNTU_1804|UBUNTU_2004|UBUNTU_2204)
     ## check for Linux releases
-    NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(Ubuntu_1804)$|(Ubuntu_2004)$' | sed 's/UBUNTU/Ubuntu/g;s/ubuntu/Ubuntu/g')
+    NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(Ubuntu_1804)$|(Ubuntu_2004)$|(Ubuntu_2204)$' | sed 's/UBUNTU/Ubuntu/g;s/ubuntu/Ubuntu/g')
     destroy_rel
     ;;
-Debian9|Debian10|Debian11|DEBIAN9|DEBIAN10|DEBIAN11)
+Debian10|Debian11|Debian12|DEBIAN10|DEBIAN11|DEBIAN12)
     ## check for Linux releases
-    NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(Debian9)$|(Debian10)$|(Debian11)$' | sed 's/DEBIAN/Debian/g')
+    NAME_VERIFY=$(echo "${TARGET}" | grep -iwE '(Debian10)$|(Debian11)$|(Debian12)$' | sed 's/DEBIAN/Debian/g')
     destroy_rel
     ;;
 *)

From 6e78be22f019fc718139a87c718fd92c9cb71a0a Mon Sep 17 00:00:00 2001
From: gqgunhed <110590071+gqgunhed@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:04:25 +0200
Subject: [PATCH 7/7] added focal+jammy to Apt::Cache-Start

Ran into an error without the change when using the "universe" repos, so I included these.
---
 usr/local/share/bastille/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh
index 7c02e5f4..b48d87fb 100644
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.sh
@@ -399,7 +399,7 @@ debootstrap_release() {
     fi
 
     case "${LINUX_FLAVOR}" in
-        bionic|buster|bullseye|bookworm)
+        bionic|focal|jammy|buster|bullseye|bookworm)
         info "Increasing APT::Cache-Start"
         echo "APT::Cache-Start 251658240;" > "${bastille_releasesdir}"/${DIR_BOOTSTRAP}/etc/apt/apt.conf.d/00aptitude
         ;;