Skip to content

Commit 5f5d967

Browse files
committed
salt: update to 3006.3.
1 parent d672e82 commit 5f5d967

File tree

2 files changed

+41
-4
lines changed

2 files changed

+41
-4
lines changed
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
This is because:
2+
3+
[4baea1a](https://github.com/saltstack/salt/commit/4baea1a97be0389fabe5307d084579134a1f9b7a)
4+
5+
didn't make it in to 3006.3. As per my comment on the commit,
6+
vendored tornado used an obsolete check for
7+
python version. Upstream tornado no longer does.
8+
9+
Fedora carries this patch to fix salt 3006.3 for py 3.12.
10+
11+
This should be obsolete for 3007
12+
13+
14+
--- a/salt/ext/tornado/netutil.py~ 2023-05-05 12:53:34.000000000 -0500
15+
+++ b/salt/ext/tornado/netutil.py 2023-07-24 11:27:02.376824349 -0500
16+
@@ -54,8 +54,8 @@
17+
elif ssl is None:
18+
ssl_match_hostname = SSLCertificateError = None # type: ignore
19+
else:
20+
- import backports.ssl_match_hostname
21+
- ssl_match_hostname = backports.ssl_match_hostname.match_hostname
22+
+ import urllib3.util.ssl_match_hostname
23+
+ ssl_match_hostname = urllib3.util.ssl_match_hostname
24+
SSLCertificateError = backports.ssl_match_hostname.CertificateError # type: ignore
25+
26+
if hasattr(ssl, 'SSLContext'):
27+
--- a/salt/ext/tornado/netutil.py~ 2023-07-24 11:50:02.836988664 -0500
28+
+++ b/salt/ext/tornado/netutil.py 2023-07-24 11:50:52.217539638 -0500
29+
@@ -56,7 +56,7 @@
30+
else:
31+
import urllib3.util.ssl_match_hostname
32+
ssl_match_hostname = urllib3.util.ssl_match_hostname
33+
- SSLCertificateError = backports.ssl_match_hostname.CertificateError # type: ignore
34+
+ SSLCertificateError = urllib3.util.ssl_match_hostname.CertificateError # type: ignore
35+
36+
if hasattr(ssl, 'SSLContext'):
37+
if hasattr(ssl, 'create_default_context'):

srcpkgs/salt/template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# Template file for 'salt'
22
pkgname=salt
3-
version=3005
4-
revision=3
3+
version=3006.3
4+
revision=1
55
build_style=python3-module
66
hostmakedepends="python3-setuptools"
77
depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
88
python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils
9-
python3-psutil python3-distro python3-pycryptodomex"
9+
python3-psutil python3-distro python3-pycryptodomex python3-looseversion"
1010
short_desc="Remote execution system, and configuration manager"
1111
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
1212
license="Apache-2.0"
1313
homepage="http://saltstack.org/"
1414
changelog="https://docs.saltstack.com/en/latest/topics/releases/${version}.html"
1515
distfiles="${PYPI_SITE}/s/salt/salt-${version}.tar.gz"
16-
checksum=1d200c45b88046178ea56fb5a75726dc620cc5e51411076a04df80ff52f79cd4
16+
checksum=7e53fbcc44c49f8d6e67cb19cada063800ca29ed7f15af972527531aa856e42b
1717
conf_files="
1818
/etc/salt/cloud.providers.d/digitalocean.conf
1919
/etc/salt/cloud.providers.d/vsphere.conf

0 commit comments

Comments
 (0)