From 583fe4ca6387585a7a5b6e762304f91ca6e71d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 15 Oct 2019 17:04:09 +0300 Subject: [PATCH 1/2] =?UTF-8?q?dev-python/sudsds:=20=D0=BF=D0=B0=D1=82?= =?UTF-8?q?=D1=87=20=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D1=8B=20=D1=81=20openssl-1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev-python/sudsds/.calculate_directory | 1 + .../dev-python/sudsds/openssl-1.1.patch | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/.calculate_directory create mode 100644 profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/openssl-1.1.patch diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/.calculate_directory b/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/.calculate_directory new file mode 100644 index 000000000..5c965ea54 --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/.calculate_directory @@ -0,0 +1 @@ +# Calculate merge()!= append=skip diff --git a/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/openssl-1.1.patch b/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/openssl-1.1.patch new file mode 100644 index 000000000..541e4d8e6 --- /dev/null +++ b/profiles/templates/3.6/6_ac_install_patch/dev-python/sudsds/openssl-1.1.patch @@ -0,0 +1,37 @@ +# Calculate format=diff +diff --git a/transport/http.py b/transport/http.py +index e2a2717..ee539c9 100644 +--- a/transport/http.py ++++ b/transport/http.py +@@ -304,7 +304,7 @@ class HttpTransport(Transport): + # the workaround breaks things on other systems, so it is applied + # on an on-demand basis + log.warning("Activating SSL workaround") +- CheckingHTTPSConnection.FORCE_SSL_VERSION = ssl.PROTOCOL_SSLv3 ++ CheckingHTTPSConnection.FORCE_SSL_VERSION = ssl.PROTOCOL_SSLv23 + elif "ASN1_item_verify:unknown message digest algorithm" in str(e): + # this bug was reported but is present for now + # see: http://bugs.python.org/issue8484 +diff --git a/transport/pyopenssl_wrapper.py b/transport/pyopenssl_wrapper.py +index 790b6d9..35fd8bd 100644 +--- a/transport/pyopenssl_wrapper.py ++++ b/transport/pyopenssl_wrapper.py +@@ -11,8 +11,8 @@ import _ssl # if we can't import it, let the error propagate + + from _ssl import SSLError + from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED +-from _ssl import PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1 +-from _ssl import RAND_status, RAND_egd, RAND_add ++from _ssl import PROTOCOL_SSLv23, PROTOCOL_TLSv1 ++from _ssl import RAND_status, RAND_add + from _ssl import \ + SSL_ERROR_ZERO_RETURN, \ + SSL_ERROR_WANT_READ, \ +@@ -39,7 +39,6 @@ _ssl_to_openssl_cert_op_remap = { + } + + _ssl_to_openssl_version_remap = { +- PROTOCOL_SSLv3: OpenSSL.SSL.SSLv3_METHOD, + PROTOCOL_SSLv23: OpenSSL.SSL.SSLv23_METHOD, + PROTOCOL_TLSv1: OpenSSL.SSL.TLSv1_METHOD, + } From 1f6e1ea3da2cc5691e41e68723e5308b1e767f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 30 Mar 2020 14:46:40 +0300 Subject: [PATCH 2/2] Rebuild sudsds --- .../6_ac_update_sync/revision/2020/20200330-rebuild_sudsds | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 profiles/templates/3.6/6_ac_update_sync/revision/2020/20200330-rebuild_sudsds diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2020/20200330-rebuild_sudsds b/profiles/templates/3.6/6_ac_update_sync/revision/2020/20200330-rebuild_sudsds new file mode 100644 index 000000000..6fc7de5ac --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/revision/2020/20200330-rebuild_sudsds @@ -0,0 +1,4 @@ +# Calculate name=ini.env format=samba ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-# rebuild=dev-python/sudsds + +[overlay-calculate] +revision = #-cut(0,-,#-cl_pass_file-#)-#