From 588fc6c9b9c8e17ddd1b9e8344d4183d1bd2421f338efeab18d4d88ab5837ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
 <pablo.suarezhernandez@suse.com>
Date: Wed, 13 Jan 2021 15:09:21 +0000
Subject: [PATCH] osc copypac from project:systemsmanagement:saltstack:testing
 package:salt revision:379

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=183
---
 _lastrevision                                 |  2 +-
 ...d-warning-that-breaks-miniion-execut.patch | 43 +++++++++++++++++++
 salt.changes                                  |  8 ++++
 salt.spec                                     |  3 ++
 4 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 remove-deprecated-warning-that-breaks-miniion-execut.patch

diff --git a/_lastrevision b/_lastrevision
index c48da37..9eca5e8 100644
--- a/_lastrevision
+++ b/_lastrevision
@@ -1 +1 @@
-9d85a9b3aa831d4d880baab1e8488d3e3dbbc8f3
\ No newline at end of file
+73673e4ab1d13c4393183b8ad6066dfab39c7e63
\ No newline at end of file
diff --git a/remove-deprecated-warning-that-breaks-miniion-execut.patch b/remove-deprecated-warning-that-breaks-miniion-execut.patch
new file mode 100644
index 0000000..d54b685
--- /dev/null
+++ b/remove-deprecated-warning-that-breaks-miniion-execut.patch
@@ -0,0 +1,43 @@
+From 73e357d7eee19a73cade22becb30d9689cae27ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
+ <psuarezhernandez@suse.com>
+Date: Wed, 13 Jan 2021 13:38:32 +0000
+Subject: [PATCH] Remove deprecated warning that breaks miniion
+ execution when "server_id_use_crc" opts are missing
+
+---
+ salt/minion.py | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/salt/minion.py b/salt/minion.py
+index 4d271c6d08..4da665a130 100644
+--- a/salt/minion.py
++++ b/salt/minion.py
+@@ -82,7 +82,6 @@ from salt.utils.event import tagify
+ from salt.utils.network import parse_host_port
+ from salt.utils.odict import OrderedDict
+ from salt.utils.process import ProcessManager, SignalHandlingProcess, default_signals
+-from salt.utils.versions import warn_until
+ from salt.utils.zeromq import ZMQ_VERSION_INFO, ZMQDefaultLoop, install_zmq, zmq
+ 
+ HAS_PSUTIL = False
+@@ -1097,15 +1096,6 @@ class MinionManager(MinionBase):
+         ):
+             masters = [masters]
+ 
+-        if not self.opts.get("server_id_use_crc"):
+-            warn_until(
+-                "Sodium",
+-                "This server_id is computed nor by Adler32 neither by CRC32. "
+-                'Please use "server_id_use_crc" option and define algorithm you'
+-                'prefer (default "Adler32"). The server_id will be computed with'
+-                "Adler32 by default.",
+-            )
+-
+         beacons_leader = True
+         for master in masters:
+             s_opts = copy.deepcopy(self.opts)
+-- 
+2.29.2
+
+
diff --git a/salt.changes b/salt.changes
index 64d4cbc..4e72674 100644
--- a/salt.changes
+++ b/salt.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jan 13 13:49:34 UTC 2021 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
+
+- Remove deprecated warning that breaks minion execution when "server_id_use_crc" opts is missing
+
+- Added:
+  * remove-deprecated-warning-that-breaks-miniion-execut.patch
+
 -------------------------------------------------------------------
 Wed Jan 13 10:13:13 UTC 2021 - Pablo Suárez Hernández <pablo.suarezhernandez@suse.com>
 
diff --git a/salt.spec b/salt.spec
index 27abd04..49be134 100644
--- a/salt.spec
+++ b/salt.spec
@@ -346,6 +346,8 @@ Patch142:     add-patch-support-for-allow-vendor-change-option-wit.patch
 Patch143:     force-zyppnotify-to-prefer-packages.db-than-packages.patch
 # PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/4028fd6e84d882b6dcee695d409c7e1ed6c83bdc
 Patch144:     revert-add-patch-support-for-allow-vendor-change-opt.patch
+# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/commit/73e357d7eee19a73cade22becb30d9689cae27ba
+Patch145:     remove-deprecated-warning-that-breaks-miniion-execut.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  logrotate
@@ -889,6 +891,7 @@ cp %{S:5} ./.travis.yml
 %patch142 -p1
 %patch143 -p1
 %patch144 -p1
+%patch145 -p1
 
 %build
 # Putting /usr/bin at the front of $PATH is needed for RHEL/RES 7. Without this