.gitignore

@@ -1 +1,4 @@
-SOURCES/salt-3005.4.tar.gz
+salt-*.tar.gz
+SaltTesting-*.tar.gz
+*.src.rpm
+results_salt/

.salt.metadata

@@ -1 +0,0 @@
-44052c1fca6076a85221816f38a85e14605ea0af  SOURCES/salt-3005.4.tar.gz

SOURCES/0001-Added-MSVSphere-support.patch

@@ -1,32 +0,0 @@
-From 38329cd2bc666ffa82b419a882a92f56ed6b44f0 Mon Sep 17 00:00:00 2001
-From: Sergey Cherevko <sergey.cherevko@softline.com>
-Date: Mon, 24 Apr 2023 11:15:44 +0300
-Subject: [PATCH] Added MSVSphere support
-
----
- salt/grains/core.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/salt/grains/core.py b/salt/grains/core.py
-index debbeb2..37bd9c6 100644
---- a/salt/grains/core.py
-+++ b/salt/grains/core.py
-@@ -1565,6 +1565,7 @@ _OS_NAME_MAP = {
-     "cloudserve": "CloudLinux",
-     "cloudlinux": "CloudLinux",
-     "almalinux": "AlmaLinux",
-+    "msvsphere": "MSVSphere",
-     "pidora": "Fedora",
-     "scientific": "ScientificLinux",
-     "synology": "Synology",
-@@ -1602,6 +1603,7 @@ _OS_FAMILY_MAP = {
-     "Amazon": "RedHat",
-     "CloudLinux": "RedHat",
-     "AlmaLinux": "RedHat",
-+    "MSVSphere": "RedHat",
-     "OVS": "RedHat",
-     "OEL": "RedHat",
-     "XCP": "RedHat",
--- 
-2.39.2
-

salt.spec

@@ -11,7 +11,7 @@
 
 Name:    salt
 Version: 3005.4
-Release: 1%{?dist}.inferit
+Release: 1%{?dist}
 Summary: A parallel remote execution system
 Group:   System Environment/Daemons
 License: ASL 2.0
@@ -26,7 +26,7 @@ Source6: %{name}-master.service
 Source7: %{name}-syndic.service
 Source8: %{name}-minion.service
 Source9: %{name}-api.service
-Source10: README
+Source10: README.fedora
 Source11: %{name}-common.logrotate
 Source12: %{name}.bash
 Source13: %{name}.fish
@@ -40,10 +40,6 @@ Source20: %{name}-run.fish
 Source21: %{name}-syndic.fish
 
 Patch0: contextvars.patch
-
-# Added MSVSphere support
-Patch100: 0001-Added-MSVSphere-support.patch
-
 BuildArch: noarch
 
 %ifarch %{ix86} x86_64
@@ -215,7 +211,7 @@ install -p -m 0644 pkg/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name}
 
 %files -f %{pyproject_files}
 %license LICENSE
-%doc README
+%doc README.fedora
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}.bash
 %{_var}/cache/%{name}
@@ -285,6 +281,7 @@ install -p -m 0644 pkg/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/roster
 
 
+# assumes systemd for RHEL 7 & 8
 %preun master
 %systemd_preun %{name}-syndic.service
 
@@ -320,47 +317,133 @@ install -p -m 0644 pkg/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name}
 
 
 %changelog
-* Mon Dec 11 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 3005.4-1.inferit
-- Updated version to 3005.4
-- Rebuilt for MSVSphere 9.3
-
 * Mon Oct 30 2023 Gwyn Ciesla <gwync@protonmail.com> - 3005.4-1
 - 3005.4
 
 * Tue Sep 05 2023 Gwyn Ciesla <gwync@protonmail.com> - 3005.2-1
 - 3005.2
 
-* Tue Apr 25 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 3005.1-4.inferit
+* Mon Oct 10 2022 Robby Callicotte <rcallicotte@fedoraproject.org> - 3005.1-2
-- Added MSVSphere support
+- Removed macros from changelog
-- Rebuild for MSVSphere
 
-* Tue Nov 01 2022 SaltStack Packaging Team <packaging@saltstack.com> - 3005-2
+* Tue Oct 04 2022 Salt Project Packaging <saltproject-packaging@vmware.com> - 3005.1-1
-- Generate HMAC files post-install in case FIPS mode used only if libraries exist
+- Update to feature release 3005.1-1 for Python 3
 
-* Tue Sep 27 2022 SaltStack Packaging Team <packaging@saltstack.com> - 3005-1
+* Thu Aug 25 2022 Salt Project Packaging <saltproject-packaging@vmware.com> - 3005-1
-- Generate HMAC files post-install in case FIPS mode used
+- Update to feature release 3005-1 for Python 3
-- Added MAN pages
 
-* Fri Apr 10 2020 SaltStack Packaging Team <packaging@frogunder.com> - 3001
+* Thu Jul 28 2022 Robby Callicotte <rcallicotte@fedoraproject.org> - 3004.2-3
-- Update to use pop-build
+- Cleaned up specfile
 
-* Mon Feb 03 2020 SaltStack Packaging Team <packaging@frogunder.com> - 3000-1
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3004.2-2
-- Update to feature release 3000-1  for Python 3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun 21 2022 Salt Project Packaging <saltproject-packaging@vmware.com> - 3004.2-1
+- Update to CVE release 3004.2-1 for Python 3
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3004.1-2
+- Rebuilt for Python 3.11
+
+* Mon Mar 28 2022 Salt Project Packaging <saltproject-packaging@vmware.com> - 3004.1-1
+- Update to CVE release 3004.1-1 for Python 3
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3004-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Oct 19 2021 Salt Project Packaging <saltproject-packaging@vmware.com> - 3004-1
+- Update to feature release 3004-1 for Python 3
+
+* Wed Sep 08 2021 SaltStack Packaging Team <saltproject-packaging@vmware.com> - 3003.3-1
+- Update to CVE release 3003.3-1 https://saltproject.io/security_announcements/salt-security-advisory-2021-sep-02/
+
+* Thu Aug 12 2021 SaltStack Packaging Team <packaging@saltstack.com> - 3003.2-1
+- Update to bugfix release 3003.2-1 for Python 3
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3003.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jul 01 2021 SaltStack Packaging Team <packaging@saltstack.com> - 3003.1-1
+- Update to bugfix release 3003.1-1 for Python 3
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3003-2
+- Rebuilt for Python 3.10
+
+* Mon Apr 26 2021 SaltStack Packaging Team <packaging@saltstack.com> - 3003-1
+- Update to feature release 3003-1 for Python 3
+
+* Fri Mar 26 2021 SaltStack Packaging Team <packaging@saltstack.com> - 3002.6-1
+- Update to bugfix release 3002.6-1 for Python 3
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3002.5-2
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* 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
+
+* 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
+
+* Sun Oct 25 2020 Gwyn Ciesla <gwync@protonmail.com> - 3002-1
+- 3002
+- Patch for _scope_id 3.9 error.
+
+* Mon Jul 27 2020 SaltStack Packaging Team <packaging@saltstack.com> - 3001.1-1
+- Update to feature release 3001.1-1  for Python 3
+
+* Thu Jun 18 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 30001-1
+- Update to feature release 30001-1 for Python 3
+
+* Wed Jun 03 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3001rc1-2
+- Altered msgpack and python-zmq versions limitation
 
-## - Removed Torando since salt.ext.tornado, add dependencies for Tornado
+* Tue Jun 02 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3001rc1-1
+- Update to Release Candidate rc1 for point release 3001
 
-* Wed Jan 22 2020 SaltStack Packaging Team <packaging@garethgreenaway.com> - 3000.0.0rc2-1
+* Fri May 15 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3000.3-1
+- Update to feature release 3000.3-1  for Python 3
+
+* Wed Apr 29 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3000.2-1
+- Update to feature release 3000.2-1  for Python 3
+
+* Wed Apr 01 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3000.1-1
+- Update to feature release 3000.1-1  for Python 3
+
+* Tue Feb 25 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3000-5
+- Fix lint clean up issues
+
+* Tue Feb 25 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3000-4
+- Removed cherrypy < 18.0.0 check since python 3.5 no longer used on Fedora
+
+* Mon Feb 24 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3000-3
+- Added distro as a build and requires dependency for Fedora >= 31
+
+* Mon Feb 24 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3000-2
+- Changed dependency for crypto to pycryptodomex
+
+* Mon Feb 03 2020 SaltStack Packaging Team <packaging@saltstack.com.com> - 3000-1
+- Update to feature release 3000-1  for Python 3
+- Removed Torando since salt.ext.tornado, add dependencies for Tornado
+
+* Wed Jan 22 2020 SaltStack Packaging Team <packaging@saltstack.com> - 3000.0.0rc2-1
 - Update to Neon Release Candidate 2 for Python 3
 - Updated spec file to not use py3_build  due to '-s' preventing pip installs
 - Updated patch file to support Tornado4
 
-* Wed Jan 08 2020 SaltStack Packaging Team <packaging@frogunder.com> - 2019.2.3-1
+* Wed Jan 08 2020 SaltStack Packaging Team <packaging@saltstack.com> - 2019.2.3-1
 - Update to feature release 2019.2.3-1  for Python 3
 
-* Tue Oct 15 2019 SaltStack Packaging Team <packaging@frogunder.com> - 2019.2.2-1
+* Tue Oct 15 2019 SaltStack Packaging Team <packaging@saltstack.com> - 2019.2.2-1
 - Update to feature release 2019.2.2-1  for Python 3
 
-* Thu Sep 12 2019 SaltStack Packaging Team <packaging@frogunder.com> - 2019.2.1-1
+* Thu Sep 12 2019 SaltStack Packaging Team <packaging@saltstack.com> - 2019.2.1-1
 - Update to feature release 2019.2.1-1  for Python 3
 
 * Tue Sep 10 2019 SaltStack Packaging Team <packaging@saltstack.com> - 2019.2.0-10
@@ -393,27 +476,70 @@ install -p -m 0644 pkg/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name}
 * Mon Apr 08 2019 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.4-2
 - Update to allow for Python 3.6
 
+* Mon Mar 04 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2019.2.0-1
+- Update to feature release 2019.2.0-1 for Python 2
+
 * Sat Feb 16 2019 SaltStack Packaging Team <packaging@saltstack.com> - 2019.2.0-1
 - Update to feature release 2019.2.0-1  for Python 3
 
 * Sat Feb 16 2019 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.4-1
 - Update to feature release 2018.3.4-1  for Python 3
 
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2018.3.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Wed Jan 09 2019 SaltStack Packaging Team <packaging@saltstack.com> - 2019.2.0-0
 - Update to feature release branch 2019.2.0-0 for Python 2
 - Revised acceptable versions of cherrypy, futures
 
+* Thu Nov 29 2018 SaltStack Packaging Team <packaging@Ch3LL.com> - 2018.3.3-2
+- Revised BuildRequires and Requires to use python2 versions of packages
+- Cleaned up spec file to apply to Fedora 28 and above
+
+* Mon Oct 15 2018 SaltStack Packaging Team <packaging@Ch3LL.com> - 2018.3.3-1
+- Update to feature release 2018.3.3-1 for Python 2
+- Revised versions of cherrypy acceptable
+
 * Tue Oct 09 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.3-1
 - Update to feature release 2018.3.3-1  for Python 3
 - Revised versions of cherrypy acceptable
 
+* Tue Jul 24 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.2-5
+- Fix version of python used, multiple addition of 2.7 
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jul 09 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.2-3
+- Allow for removal of /usr/bin/python
+
+* Mon Jul 09 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.2-2
+- Correct tornado version check
+
+* Thu Jun 21 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.2-1
+- Update to feature release 2018.3.2-1  for Python 2
+
 * Mon Jun 11 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.1-1
 - Update to feature release 2018.3.1-1  for Python 3
 - Revised minimum msgpack version >= 0.4
 
+* Fri Jun 08 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.1-1
+- Update to feature release 2018.3.1-1  for Python 2
+- Revised minimum msgpack version >= 0.4
+
 * Mon Apr 02 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.0-1
 - Development build for Python 3 support
 
+* Fri Mar 30 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2018.3.0-1
+- Update to feature release 2018.3.0-1
+
+* Tue Mar 27 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2017.7.5-1
+- Update to feature release 2017.7.5-1
+
+* Fri Feb 16 2018 SaltStack Packaging Team <packaging@saltstack.com> - 2017.7.4-1
+- Update to feature release 2017.7.4-1
+- Limit to Tornado use to between versions 4.2.1 and less than 5.0
+
 * Tue Jan 30 2018 SaltStack Packaging Team <packaging@Ch3LL.com> - 2017.7.3-1
 - Update to feature release 2017.7.3-1
 

sources

@@ -0,0 +1 @@
+SHA512 (salt-3005.4.tar.gz) = 31c699fc369c1f3c47f4f3a9a572381dd8c54323771194bdcc73128b55d983da7338b03061a6cdec6631aca62048e5829ea38687c3b0fdb1cdcbd5df9d000f05