From 5b11714303a0e4d3896e6f3f29c1eaed27f22df9 Mon Sep 17 00:00:00 2001
From: Bryce Larson <brycel@vmware.com>
Date: Sat, 27 Feb 2021 00:17:42 +0000
Subject: [PATCH] update to 3002.5 cve release

---
 .gitignore                 |  1 +
 salt-m2_requirements.patch |  6 ------
 salt-zmq.patch             |  9 ---------
 salt.spec                  | 11 +++++------
 sources                    |  2 +-
 5 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 salt-m2_requirements.patch
 delete mode 100644 salt-zmq.patch

diff --git a/.gitignore b/.gitignore
index e3b435e..82a98a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,4 @@
 /salt-3002.tar.gz
 /salt-3002.1.tar.gz
 /salt-3002.2.tar.gz
+/salt-3002.5.tar.gz
diff --git a/salt-m2_requirements.patch b/salt-m2_requirements.patch
deleted file mode 100644
index 1e0b460..0000000
--- a/salt-m2_requirements.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-diff -Naur a/requirements/crypto.txt b/requirements/crypto.txt
---- a/requirements/crypto.txt	2020-02-03 21:33:35.989983615 +0000
-+++ b/requirements/crypto.txt	2020-02-03 21:33:57.651350234 +0000
-@@ -1,2 +1 @@
--pycrypto>=2.6.1; sys.platform not in 'win32,darwin'
- pycryptodomex; sys.platform == 'win32'
diff --git a/salt-zmq.patch b/salt-zmq.patch
deleted file mode 100644
index 527d1b9..0000000
--- a/salt-zmq.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-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 5f9f743..017f2fa 100644
--- a/salt.spec
+++ b/salt.spec
@@ -15,8 +15,8 @@
 %define fish_dir %{_datadir}/fish/vendor_functions.d
 
 Name:    salt
-Version: 3002.2%{?__rc_ver}
-Release: 2%{?dist}
+Version: 3002.5%{?__rc_ver}
+Release: 1%{?dist}
 Summary: A parallel remote execution system
 Group:   System Environment/Daemons
 License: ASL 2.0
@@ -44,8 +44,6 @@ 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
 
@@ -181,8 +179,6 @@ Supports Python 3.
 %setup -q -c
 cd %{name}-%{version}
 
-%patch0 -p1
-
 rm -rf %{py3dir}
 cp -a . %{py3dir}
 
@@ -458,6 +454,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Feb 26 2021 SaltStack Packaging Team <packaging@saltstack.com> - 3002.5-1
+- Update to CVE release 3002.5-1 for Python 3
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3002.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index a4e7856..15da12b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (salt-3002.2.tar.gz) = 0f617a07475347b1bb0d1c6059de541e102103182820dfd6f64f4c281d660e68358eb1ab7171a637e16cef9fea2517c8356df9c449f9bbc92538aa86c316f652
+SHA512 (salt-3002.5.tar.gz) = dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1