diff --git a/match_hostname.patch b/match_hostname.patch index 706818e..3bda7ec 100644 --- a/match_hostname.patch +++ b/match_hostname.patch @@ -11,18 +11,6 @@ SSLCertificateError = backports.ssl_match_hostname.CertificateError # type: ignore 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 +++ b/salt/ext/tornado/netutil.py 2023-07-24 11:50:52.217539638 -0500 @@ -56,7 +56,7 @@ diff --git a/salt.spec b/salt.spec index 3c4aae9..5fb396e 100644 --- a/salt.spec +++ b/salt.spec @@ -11,7 +11,7 @@ Name: salt Version: 3006.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A parallel remote execution system Group: System Environment/Daemons License: Apache-2.0 @@ -333,6 +333,9 @@ chown salt:salt %{_sysconfdir}/%{name}/gpgkeys -R %changelog +* Wed Sep 20 2023 Gwyn Ciesla - 3006.3-2 +- Patch correction. + * Mon Sep 11 2023 Gwyn Ciesla - 3006.3-1 - 3006.3