From 8dc163f0748b22a2cf521208f006712e872797c7 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 12 Oct 2023 13:09:07 -0400
Subject: [PATCH] use script from develop branch

---
 salt/salt/scripts/bootstrap-salt.sh | 25 ++++++++++++++++++-------
 salt/salt/scripts/bs_dev            |  0
 salt/salt/scripts/bs_stable         |  0
 3 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 salt/salt/scripts/bs_dev
 create mode 100644 salt/salt/scripts/bs_stable

diff --git a/salt/salt/scripts/bootstrap-salt.sh b/salt/salt/scripts/bootstrap-salt.sh
index ace3bce26..422e9395f 100644
--- a/salt/salt/scripts/bootstrap-salt.sh
+++ b/salt/salt/scripts/bootstrap-salt.sh
@@ -596,6 +596,7 @@ fi
 echoinfo "Running version: ${__ScriptVersion}"
 echoinfo "Executed by: ${CALLER}"
 echoinfo "Command line: '${__ScriptFullName} ${__ScriptArgs}'"
+echowarn "Running the unstable version of ${__ScriptName}"
 
 # Define installation type
 if [ "$#" -gt 0 ];then
@@ -1523,7 +1524,7 @@ __check_dpkg_architecture() {
             else
                 # Saltstack official repository has arm64 metadata beginning with Debian 11,
                 # use amd64 repositories on arm64 for anything older, since all pkgs are arch-independent
-                if [ "$DISTRO_NAME_L" = "debian" ] || [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then
+                if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then
                   __REPO_ARCH="amd64"
                 else
                   __REPO_ARCH="arm64"
@@ -1709,6 +1710,14 @@ __debian_codename_translation() {
         "11")
             DISTRO_CODENAME="bullseye"
             ;;
+        "12")
+            DISTRO_CODENAME="bookworm"
+            # FIXME - TEMPORARY
+            # use bullseye packages until bookworm packages are available
+            DISTRO_CODENAME="bullseye"
+            DISTRO_MAJOR_VERSION=11
+            rv=11
+            ;;
         *)
             DISTRO_CODENAME="stretch"
             ;;
@@ -2196,7 +2205,7 @@ __dnf_install_noinput() {
 
 #---  FUNCTION  -------------------------------------------------------------------------------------------------------
 #          NAME:  __tdnf_install_noinput
-#   DESCRIPTION:  (DRY) dnf install with noinput options
+#   DESCRIPTION:  (DRY) tdnf install with noinput options
 #----------------------------------------------------------------------------------------------------------------------
 __tdnf_install_noinput() {
 
@@ -7033,15 +7042,17 @@ install_photon_git_deps() {
                 "${__python}" -m pip install "${dep}" || return 1
             done
     else
-        __PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc"
+        __PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc glibc-devel linux-devel.x86_64"
         # shellcheck disable=SC2086
         __tdnf_install_noinput ${__PACKAGES} || return 1
     fi
 
-    # Need newer version of setuptools on Photon
-    _setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}"
-    echodebug "Running '${_PY_EXE} -m pip --upgrade install ${_setuptools_dep}'"
-    ${_PY_EXE} -m pip install --upgrade "${_setuptools_dep}"
+    if [ "${DISTRO_MAJOR_VERSION}" -gt 3 ]; then
+      # Need newer version of setuptools on Photon
+      _setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}"
+      echodebug "Running '${_PY_EXE} -m pip --upgrade install ${_setuptools_dep}'"
+      ${_PY_EXE} -m pip install --upgrade "${_setuptools_dep}"
+    fi
 
     # Let's trigger config_salt()
     if [ "$_TEMP_CONFIG_DIR" = "null" ]; then
diff --git a/salt/salt/scripts/bs_dev b/salt/salt/scripts/bs_dev
new file mode 100644
index 000000000..e69de29bb
diff --git a/salt/salt/scripts/bs_stable b/salt/salt/scripts/bs_stable
new file mode 100644
index 000000000..e69de29bb