|
| 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'): |
0 commit comments