Update to 3006.1

This version finally is officially py3.11 compatible. Drop the
backported patch needed for that before.

Fixes QubesOS/qubes-issues#8285

contextvars.patch

@@ -1,18 +1,14 @@
---- salt-3005/requirements/base.txt.fix	2022-08-25 17:13:58.740984435 -0600
-+++ salt-3005/requirements/base.txt	2022-08-25 17:14:14.428036445 -0600
-@@ -4,5 +4,4 @@ PyYAML
- MarkupSafe
- requests>=1.0.0
- distro>=1.0.1
+--- salt-3006.1/requirements/base.txt~	2023-05-05 12:53:34.000000000 -0500
++++ salt-3006.1/requirements/base.txt	2023-05-24 09:59:08.874838801 -0500
+@@ -9,4 +9,3 @@
+ packaging>=21.3
+ looseversion
+ # We need contextvars for salt-ssh
 -contextvars
- psutil>=5.0.0
---- salt-3005/requirements/zeromq.txt.fix	2022-08-25 17:05:45.496349067 -0600
-+++ salt-3005/requirements/zeromq.txt	2022-08-25 17:06:19.011460188 -0600
-@@ -1,6 +1,4 @@
- -r base.txt
+--- salt-3006.1/requirements/zeromq.txt~	2023-05-05 12:53:34.000000000 -0500
++++ salt-3006.1/requirements/zeromq.txt	2023-05-24 10:02:57.943989348 -0500
+@@ -2,4 +2,3 @@
  -r crypto.txt
 
--pyzmq<=20.0.0 ; python_version < "3.6"
--pyzmq>=17.0.0 ; python_version < "3.9"
--pyzmq>19.0.2 ; python_version >= "3.9"
-+pyzmq>=19.0.2
+ pyzmq>=20.0.0
+-pyzmq==25.0.2 ; sys_platform == "win32"

rel

@@ -1 +1 @@
-4
+1

salt-3006.1.tar.gz.sha512

@@ -0,0 +1 @@
+edfb60c93e2c5b03e4945870bd394b70bdc7598abe12056124bbf912dc29f23e08f6ef569352e3bcdd4d96f092bb6b8ab1765d13f582ea2d3512f85a92de5e95

salt.spec.in

@@ -40,7 +40,6 @@ Source20: %{name}-run.fish
 Source21: %{name}-syndic.fish
 
 Patch0: contextvars.patch
-Patch1: pr62677.patch
 BuildArch: noarch
 
 %ifarch %{ix86} x86_64
@@ -63,13 +62,14 @@ BuildRequires: python3-devel
 BuildRequires: python3dist(distro) >= 1.0.1
 BuildRequires: python3dist(jinja2)
 BuildRequires: python3dist(jmespath)
+BuildRequires: python3dist(looseversion)
 BuildRequires: python3dist(markupsafe)
-BuildRequires: python3dist(packaging)
+BuildRequires: python3dist(packaging) >= 21.3
 BuildRequires: python3dist(pip) >= 19
 BuildRequires: python3dist(psutil) >= 5
 BuildRequires: python3dist(pycryptodomex) >= 3.9.8
 BuildRequires: python3dist(pyyaml)
-BuildRequires: python3dist(pyzmq) >= 19.0.2
+BuildRequires: python3dist(pyzmq) >= 20
 BuildRequires: python3dist(requests) >= 1
 BuildRequires: python3dist(setuptools) >= 40.8
 BuildRequires: python3dist(wheel)
@@ -219,7 +219,7 @@ install -p -m 0644  %{SOURCE21} %{buildroot}%{fish_dir}/%{name}-syndic.fish
 
 # ZSH completion
 mkdir -p %{buildroot}%{zsh_dir}
-install -p -m 0644 pkg/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name}
+install -p -m 0644 pkg/common/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name}
 
 
 %check
@@ -240,6 +240,7 @@ install -p -m 0644 pkg/%{name}.zsh %{buildroot}%{zsh_dir}/_%{name}
 %dir %{_sysconfdir}/%{name}/pki/
 %{fish_dir}/%{name}*.fish
 %{zsh_dir}/_%{name}
+%{_bindir}/salt-pip
 
 %files master
 %doc %{_mandir}/man7/%{name}.7*

version

@@ -1 +1 @@
-3005.1
+3006.1