Avoid explicit reading of /etc/salt/minion (bsc#1220357)

Author: vzhestkov

salt/avoid-explicit-reading-of-etc-salt-minion-bsc-122035.patch

@@ -0,0 +1,27 @@
+From bbdb56932845dceb47332a4c967c13a9a78b88bc Mon Sep 17 00:00:00 2001
+From: Victor Zhestkov <[email protected]>
+Date: Wed, 25 Sep 2024 14:08:20 +0300
+Subject: [PATCH] Avoid explicit reading of /etc/salt/minion
+ (bsc#1220357)
+
+Co-authored-by: Daniel A. Wozniak <[email protected]>
+---
+ salt/utils/azurearm.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/salt/utils/azurearm.py b/salt/utils/azurearm.py
+index 276cbb66b3..9ae128273c 100644
+--- a/salt/utils/azurearm.py
++++ b/salt/utils/azurearm.py
+@@ -47,8 +47,6 @@ try:
+ except ImportError:
+     HAS_AZURE = False
+ 
+-__opts__ = salt.config.minion_config("/etc/salt/minion")
+-__salt__ = salt.loader.minion_mods(__opts__)
+ 
+ log = logging.getLogger(__name__)
+ 
+-- 
+2.46.1
+

salt/salt.spec

@@ -444,6 +444,8 @@ Patch139:       use-cachedir-for-extension_modules-in-salt-call-bsc-.patch
 Patch140:       revert-the-change-making-reactor-less-blocking-bsc-1.patch
 # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/66649
 Patch141:       allow-namedloadercontexts-to-be-returned-from-loader.patch
+# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/commit/d54407ba6dc664e5e5f3f613e27ae24f828c9648
+Patch142:       avoid-explicit-reading-of-etc-salt-minion-bsc-122035.patch
 
 ### IMPORTANT: The line below is used as a snippet marker. Do not touch it.
 ### SALT PATCHES LIST END