forked from void-linux/void-packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
41 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
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'): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,19 @@ | ||
# Template file for 'salt' | ||
pkgname=salt | ||
version=3005 | ||
revision=3 | ||
version=3006.3 | ||
revision=1 | ||
build_style=python3-module | ||
hostmakedepends="python3-setuptools" | ||
depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq | ||
python3-M2Crypto python3-tornado python3-msgpack dmidecode pciutils | ||
python3-psutil python3-distro python3-pycryptodomex" | ||
python3-psutil python3-distro python3-pycryptodomex python3-looseversion" | ||
short_desc="Remote execution system, and configuration manager" | ||
maintainer="Toyam Cox <[email protected]>" | ||
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=1d200c45b88046178ea56fb5a75726dc620cc5e51411076a04df80ff52f79cd4 | ||
checksum=7e53fbcc44c49f8d6e67cb19cada063800ca29ed7f15af972527531aa856e42b | ||
conf_files=" | ||
/etc/salt/cloud.providers.d/digitalocean.conf | ||
/etc/salt/cloud.providers.d/vsphere.conf | ||
|