From 4964a4e4df04e8871507980b860ec8095c2f3b96d0ac6a106e152a34496f1689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 13 Nov 2018 11:50:48 +0000 Subject: [PATCH] Accepting request 648722 from home:mimi_vx:branches:devel:languages:python - add disable-gssapi.patch - workaround for boo#1115769 OBS-URL: https://build.opensuse.org/request/show/648722 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-paramiko?expand=0&rev=75 --- disable-gssapi.patch | 13 +++++++++++++ python-paramiko.changes | 5 +++++ python-paramiko.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 disable-gssapi.patch diff --git a/disable-gssapi.patch b/disable-gssapi.patch new file mode 100644 index 0000000..839c816 --- /dev/null +++ b/disable-gssapi.patch @@ -0,0 +1,13 @@ +Index: paramiko-2.4.2/paramiko/ssh_gss.py +=================================================================== +--- paramiko-2.4.2.orig/paramiko/ssh_gss.py ++++ paramiko-2.4.2/paramiko/ssh_gss.py +@@ -53,7 +53,7 @@ try: + import gssapi + + GSS_EXCEPTIONS = (gssapi.GSSException,) +-except (ImportError, OSError): ++except (ImportError, OSError, AttributeError): + try: + import pywintypes + import sspicon diff --git a/python-paramiko.changes b/python-paramiko.changes index 85e0741..18e87f5 100644 --- a/python-paramiko.changes +++ b/python-paramiko.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 13 11:47:43 UTC 2018 - Ondřej Súkup + +- add disable-gssapi.patch - workaround for boo#1115769 + ------------------------------------------------------------------- Fri Oct 5 08:26:46 UTC 2018 - Ondřej Súkup diff --git a/python-paramiko.spec b/python-paramiko.spec index dc46652..7f54ff5 100644 --- a/python-paramiko.spec +++ b/python-paramiko.spec @@ -29,6 +29,7 @@ Source: https://files.pythonhosted.org/packages/source/p/paramiko/parami # certificates needed by testsuite Source1: cert_support.tar.gz Patch0: paramiko-test_extend_timeout.patch +Patch1: disable-gssapi.patch BuildRequires: %{python_module PyNaCl >= 1.0.1} BuildRequires: %{python_module bcrypt >= 3.1.3} BuildRequires: %{python_module cryptography >= 1.1} @@ -71,6 +72,7 @@ This package contains the documentation. %prep %setup -q -n paramiko-%{version} %patch0 -p1 +%patch1 -p1 # Fix non-executable script rpmlint issue: find demos -name "*.py" -exec sed -i "/#\!\/usr\/bin\/.*/d" {} \; tar xvzf %{SOURCE1} -C tests/