From a82b174826adfacc38968e7f1a06833851ca2d84 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Wed, 9 Jun 2021 11:53:10 -0400
Subject: [PATCH 1/4] perform the repo changes for any upgrade

---
 salt/common/tools/sbin/soup | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index a3c8e5105..5c2c011f8 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -249,9 +249,8 @@ masterunlock() {
 
 preupgrade_changes_2.3.50_repo() {
     # We made repo changes in 2.3.50 and this prepares for that on upgrade
-    echo "Checking to see if 2.3.50 repo changes are needed."
-
-    [[ "$INSTALLEDVERSION" == 2.3.30 || "$INSTALLEDVERSION" == 2.3.40 ]] && up_2.3.3X_to_2.3.50_repo
+    echo "Making repo changes."
+    up_2.3.3X_to_2.3.50_repo
 }
 
 preupgrade_changes() {
@@ -438,7 +437,7 @@ up_2.3.2X_to_2.3.30() {
 }
 
 up_2.3.3X_to_2.3.50_repo() {
-  echo "Performing 2.3.50 repo actions."
+  echo "Performing repo changes."
   if [[ "$OS" == "centos" ]]; then
     # Import GPG Keys
     gpg_rpm_import

From 7c92054f13cebc6949c4fa826dcbac98131fca12 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 10 Jun 2021 09:13:15 -0400
Subject: [PATCH 2/4] soup hotfix to updating repos for earlier versions of SO
 so salt will isntall

---
 HOTFIX | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HOTFIX b/HOTFIX
index d3f5a12fa..12595f2e1 100644
--- a/HOTFIX
+++ b/HOTFIX
@@ -1 +1 @@
-
+SALTYSOUP

From 46b1de97f50b6f5d3f34ef8ed62dd17811f24169 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 10 Jun 2021 09:30:03 -0400
Subject: [PATCH 3/4] change function name

---
 salt/common/tools/sbin/soup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 5c2c011f8..f31d09fb1 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -250,7 +250,7 @@ masterunlock() {
 preupgrade_changes_2.3.50_repo() {
     # We made repo changes in 2.3.50 and this prepares for that on upgrade
     echo "Making repo changes."
-    up_2.3.3X_to_2.3.50_repo
+    upgrade_to_2.3.50_repo
 }
 
 preupgrade_changes() {
@@ -436,7 +436,7 @@ up_2.3.2X_to_2.3.30() {
   INSTALLEDVERSION=2.3.30
 }
 
-up_2.3.3X_to_2.3.50_repo() {
+upgrade_to_2.3.50_repo() {
   echo "Performing repo changes."
   if [[ "$OS" == "centos" ]]; then
     # Import GPG Keys

From e64059bd7b39c9f695cf3c58bdecb4481d711857 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 10 Jun 2021 09:31:10 -0400
Subject: [PATCH 4/4] remove unneeded function

---
 salt/common/tools/sbin/soup | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index f31d09fb1..f508e8aa8 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -247,12 +247,6 @@ masterunlock() {
   fi
 }
 
-preupgrade_changes_2.3.50_repo() {
-    # We made repo changes in 2.3.50 and this prepares for that on upgrade
-    echo "Making repo changes."
-    upgrade_to_2.3.50_repo
-}
-
 preupgrade_changes() {
     # This function is to add any new pillar items if needed.
     echo "Checking to see if changes are needed."
@@ -743,7 +737,7 @@ else
   systemctl stop salt-master
   echo ""
 
-  preupgrade_changes_2.3.50_repo
+  upgrade_to_2.3.50_repo
 
   # Does salt need upgraded. If so update it.
   if [ "$UPGRADESALT" == "1" ]; then