Correct hostnamne patch

f38
Gwyn Ciesla 1 year ago
parent 69f93ba67d
commit bbe10ba6b9

@ -11,18 +11,6 @@
SSLCertificateError = backports.ssl_match_hostname.CertificateError # type: ignore SSLCertificateError = backports.ssl_match_hostname.CertificateError # type: ignore
if hasattr(ssl, 'SSLContext'): if hasattr(ssl, 'SSLContext'):
--- a/salt/ext/tornado/iostream.py~ 2023-05-05 12:53:34.000000000 -0500
+++ b/salt/ext/tornado/iostream.py 2023-07-24 11:38:00.657632623 -0500
@@ -38,7 +38,8 @@
from salt.ext.tornado.concurrent import TracebackFuture
from salt.ext.tornado import ioloop
from salt.ext.tornado.log import gen_log, app_log
-from salt.ext.tornado.netutil import ssl_wrap_socket, ssl_match_hostname, SSLCertificateError, _client_ssl_defaults, _server_ssl_defaults
+from salt.ext.tornado.netutil import ssl_wrap_socket, SSLCertificateError, _client_ssl_defaults, _server_ssl_defaults
+import urllib3.util.ssl_match_hostname
from salt.ext.tornado import stack_context
from salt.ext.tornado.util import errno_from_exception
--- a/salt/ext/tornado/netutil.py~ 2023-07-24 11:50:02.836988664 -0500 --- 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 +++ b/salt/ext/tornado/netutil.py 2023-07-24 11:50:52.217539638 -0500
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@

@ -11,7 +11,7 @@
Name: salt Name: salt
Version: 3006.3 Version: 3006.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: A parallel remote execution system Summary: A parallel remote execution system
Group: System Environment/Daemons Group: System Environment/Daemons
License: Apache-2.0 License: Apache-2.0
@ -333,6 +333,9 @@ chown salt:salt %{_sysconfdir}/%{name}/gpgkeys -R
%changelog %changelog
* Wed Sep 20 2023 Gwyn Ciesla <gwync@protonmail.com> - 3006.3-2
- Patch correction.
* Mon Sep 11 2023 Gwyn Ciesla <gwync@protonmail.com> - 3006.3-1 * Mon Sep 11 2023 Gwyn Ciesla <gwync@protonmail.com> - 3006.3-1
- 3006.3 - 3006.3

Loading…
Cancel
Save