From 36ab7a0a7eff40d9e61686a885341677f6dd511a Mon Sep 17 00:00:00 2001
From: Laurens Vanderhoven <lvdh@noxy.be>
Date: Sat, 2 Nov 2024 17:14:26 +0100
Subject: [PATCH] salt: update to 3007.1.

---
 srcpkgs/salt/patches/fix-3006.3-on-py12.patch | 37 -------------------
 srcpkgs/salt/patches/requirements.patch       | 13 ++++---
 srcpkgs/salt/template                         |  4 +-
 3 files changed, 9 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/salt/patches/fix-3006.3-on-py12.patch

diff --git a/srcpkgs/salt/patches/fix-3006.3-on-py12.patch b/srcpkgs/salt/patches/fix-3006.3-on-py12.patch
deleted file mode 100644
index 5cb3312a737045..00000000000000
--- a/srcpkgs/salt/patches/fix-3006.3-on-py12.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-This is because:
-
-[4baea1a](https://github.com/saltstack/salt/commit/4baea1a97be0389fabe5307d084579134a1f9b7a)
-
-didn't make it in to 3006.3. As per my comment on the commit,
-vendored tornado used an obsolete check for
-python version. Upstream tornado no longer does.
-
-Fedora carries this patch to fix salt 3006.3 for py 3.12.
-
-This should be obsolete for 3007
-
-
---- a/salt/ext/tornado/netutil.py~	2023-05-05 12:53:34.000000000 -0500
-+++ b/salt/ext/tornado/netutil.py	2023-07-24 11:27:02.376824349 -0500
-@@ -54,8 +54,8 @@
- elif ssl is None:
-     ssl_match_hostname = SSLCertificateError = None  # type: ignore
- else:
--    import backports.ssl_match_hostname
--    ssl_match_hostname = backports.ssl_match_hostname.match_hostname
-+    import urllib3.util.ssl_match_hostname
-+    ssl_match_hostname = urllib3.util.ssl_match_hostname
-     SSLCertificateError = backports.ssl_match_hostname.CertificateError  # type: ignore
- 
- if hasattr(ssl, 'SSLContext'):
---- a/salt/ext/tornado/netutil.py~	2023-07-24 11:50:02.836988664 -0500
-+++ b/salt/ext/tornado/netutil.py	2023-07-24 11:50:52.217539638 -0500
-@@ -56,7 +56,7 @@
- else:
-     import urllib3.util.ssl_match_hostname
-     ssl_match_hostname = urllib3.util.ssl_match_hostname
--    SSLCertificateError = backports.ssl_match_hostname.CertificateError  # type: ignore
-+    SSLCertificateError = urllib3.util.ssl_match_hostname.CertificateError  # type: ignore
- 
- if hasattr(ssl, 'SSLContext'):
-     if hasattr(ssl, 'create_default_context'):
diff --git a/srcpkgs/salt/patches/requirements.patch b/srcpkgs/salt/patches/requirements.patch
index abf56d4a542996..61a5856482707f 100644
--- a/srcpkgs/salt/patches/requirements.patch
+++ b/srcpkgs/salt/patches/requirements.patch
@@ -1,10 +1,11 @@
-diff --git a/requirements/base.txt b/requirements/base.txt
-index c19d8804a2b..62244c35152 100644
 --- a/requirements/base.txt
 +++ b/requirements/base.txt
-@@ -9,4 +9,4 @@ psutil>=5.0.0
- packaging>=21.3
- looseversion
- # We need contextvars for salt-ssh
+@@ -15,7 +15,7 @@
+
+ # We need contextvars for salt-ssh.
+ # Even on python versions which ships with contextvars in the standard library!
 -contextvars
 +contextvars; python_version < "3.7"
+
+ setproctitle>=1.2.3
+ timelib>=0.2.5
diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template
index 1061a338803e4e..954d6a2b6224a3 100644
--- a/srcpkgs/salt/template
+++ b/srcpkgs/salt/template
@@ -1,6 +1,6 @@
 # Template file for 'salt'
 pkgname=salt
-version=3006.8
+version=3007.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="http://saltstack.org/"
 changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html"
 distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz"
-checksum=31629905c8d784bdb9786b6a3f77f9a87330bc56d7b68bebc9a19472d9efd866
+checksum=b933ac4cb3e4b1118b46dada55c9cc6bdc6f0f94b4c92877aec44b25c6a28c9a
 conf_files="
  /etc/salt/cloud.providers.d/digitalocean.conf
  /etc/salt/cloud.providers.d/vsphere.conf