From f04c3c3febfddbcea6b1e82ac867c21ef14adf08 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Mon, 16 Nov 2020 22:41:12 +0000
Subject: [PATCH] update to 3002.2 bugfix release

---
 .gitignore                  |  1 +
 salt-3001-msgpack-zmq.patch | 22 ----------------------
 salt-zmq.patch              |  9 +++++++++
 salt.spec                   | 12 ++++++++++--
 sources                     |  2 +-
 5 files changed, 21 insertions(+), 25 deletions(-)
 delete mode 100644 salt-3001-msgpack-zmq.patch
 create mode 100644 salt-zmq.patch

diff --git a/.gitignore b/.gitignore
index 03f92df..e3b435e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,4 @@
 /salt-3001.1.tar.gz
 /salt-3002.tar.gz
 /salt-3002.1.tar.gz
+/salt-3002.2.tar.gz
diff --git a/salt-3001-msgpack-zmq.patch b/salt-3001-msgpack-zmq.patch
deleted file mode 100644
index ecdd34d..0000000
--- a/salt-3001-msgpack-zmq.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur a/requirements/base.txt b/requirements/base.txt
---- a/requirements/base.txt	2020-06-02 15:42:02.000000000 -0600
-+++ b/requirements/base.txt	2020-06-03 12:09:35.534741001 -0600
-@@ -1,5 +1,6 @@
- Jinja2
--msgpack>=0.5,!=0.5.5,<1.0.0
-+## msgpack>=0.5,!=0.5.5,<1.0.0
-+msgpack>=0.5.6
- PyYAML
- MarkupSafe
- requests>=1.0.0
-diff -Naur a/requirements/zeromq.txt b/requirements/zeromq.txt
---- a/requirements/zeromq.txt	2020-06-02 15:42:02.000000000 -0600
-+++ b/requirements/zeromq.txt	2020-06-03 12:10:00.205931146 -0600
-@@ -1,5 +1,5 @@
- -r base.txt
- -r crypto.txt
- 
--pyzmq>=2.2.0; python_version < '3.8'
--pyzmq>=19.0.0; python_version >= '3.8'
-+pyzmq>=17.0.0; python_version < '3.8'
-+pyzmq>=17.0.0; python_version >= '3.8'
diff --git a/salt-zmq.patch b/salt-zmq.patch
new file mode 100644
index 0000000..527d1b9
--- /dev/null
+++ b/salt-zmq.patch
@@ -0,0 +1,9 @@
+diff -Naur a/requirements/zeromq.txt b/requirements/zeromq.txt
+--- a/requirements/zeromq.txt	2020-11-19 23:40:32.054767574 +0000
++++ b/requirements/zeromq.txt	2020-11-19 23:40:58.851359366 +0000
+@@ -2,4 +2,4 @@
+ -r crypto.txt
+ 
+ pyzmq>=17.0.0 ; python_version < "3.9"
+-pyzmq>=19.0.2 ; python_version >= "3.9"
++pyzmq>=19.0.0 ; python_version >= "3.9"
diff --git a/salt.spec b/salt.spec
index 594d1e9..526f8ee 100644
--- a/salt.spec
+++ b/salt.spec
@@ -15,7 +15,7 @@
 %define fish_dir %{_datadir}/fish/vendor_functions.d
 
 Name:    salt
-Version: 3002.1%{?__rc_ver}
+Version: 3002.2%{?__rc_ver}
 Release: 1%{?dist}
 Summary: A parallel remote execution system
 Group:   System Environment/Daemons
@@ -44,6 +44,8 @@ Source19: salt-minion.fish
 Source20: salt-run.fish
 Source21: salt-syndic.fish
 
+Patch0: salt-zmq.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -179,6 +181,8 @@ Supports Python 3.
 %setup -q -c
 cd %{name}-%{version}
 
+%patch0 -p1
+
 rm -rf %{py3dir}
 cp -a . %{py3dir}
 
@@ -265,7 +269,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %{python3_sitelib}/%{name}/*
-%{python3_sitelib}/%{name}-*-py?.?.egg-info
+%{python3_sitelib}/%{name}-*-py%{python3_version}.egg-info
 %{_sysconfdir}/logrotate.d/salt
 %{_sysconfdir}/bash_completion.d/salt.bash
 %{_var}/cache/salt
@@ -454,6 +458,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Nov 18 2020 SaltStack Packaging Team <packaging@saltstack.com> - 3002.2-1
+- Update to bugfix release 3002.2-1 for Python3
+- Revert _scope_id patch since it's been fixed upstream
+
 * Wed Nov 04 2020 SaltStack Packaging Team <packaging@saltstack.com> - 3002.1-1
 - Update to CVE release 3002.1-1 for Python3
 
diff --git a/sources b/sources
index cb4c0bb..a4e7856 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (salt-3002.1.tar.gz) = 8fc02d0b47dad60f96eb4442b0e8a31f04d796f12b845c8142135593af4c7ea9c2d9335a3f520f8858951f87b0e8cc6be70d383fde2d93a6d529e077bcc87114
+SHA512 (salt-3002.2.tar.gz) = 0f617a07475347b1bb0d1c6059de541e102103182820dfd6f64f4c281d660e68358eb1ab7171a637e16cef9fea2517c8356df9c449f9bbc92538aa86c316f652