diff --git a/paramiko-2.1.1.tar.gz b/paramiko-2.1.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4b22bd58afc741cf660e6be4d2f727cb1dccef6e Binary files /dev/null and b/paramiko-2.1.1.tar.gz differ diff --git a/paramiko-2.7.2-drop-pytest-relaxed.patch b/paramiko-2.7.2-drop-pytest-relaxed.patch deleted file mode 100644 index 2be787f61fe1a1c68a5b7332410aeeb29a565cbf..0000000000000000000000000000000000000000 --- a/paramiko-2.7.2-drop-pytest-relaxed.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 953d9a1f1055de97e35c7060fcebc7283eff9e29 Mon Sep 17 00:00:00 2001 -From: zhaorenhai -Date: Fri, 29 Jan 2021 06:48:10 +0000 -Subject: [PATCH] drop pytest-relaxed - ---- - tests/test_client.py | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/tests/test_client.py b/tests/test_client.py -index 60ad310c..2d665cdd 100644 ---- a/tests/test_client.py -+++ b/tests/test_client.py -@@ -33,7 +33,7 @@ import warnings - import weakref - from tempfile import mkstemp - --from pytest_relaxed import raises -+from pytest import raises - from mock import patch, Mock - - import paramiko -@@ -684,10 +684,10 @@ class PasswordPassphraseTests(ClientTest): - - # TODO: more granular exception pending #387; should be signaling "no auth - # methods available" because no key and no password -- @raises(SSHException) - def test_passphrase_kwarg_not_used_for_password_auth(self): -- # Using the "right" password in the "wrong" field shouldn't work. -- self._test_connection(passphrase="pygmalion") -+ with raises(SSHException): -+ # Using the "right" password in the "wrong" field shouldn't work. -+ self._test_connection(passphrase='pygmalion') - - def test_passphrase_kwarg_used_for_key_passphrase(self): - # Straightforward again, with new passphrase kwarg. -@@ -705,14 +705,14 @@ class PasswordPassphraseTests(ClientTest): - password="television", - ) - -- @raises(AuthenticationException) # TODO: more granular - def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given( # noqa - self - ): -- # Sanity: if we're given both fields, the password field is NOT used as -- # a passphrase. -- self._test_connection( -- key_filename=_support("test_rsa_password.key"), -- password="television", -- passphrase="wat? lol no", -- ) -+ with raises(AuthenticationException): # TODO: more granular -+ # Sanity: if we're given both fields, the password field is NOT used as -+ # a passphrase. -+ self._test_connection( -+ key_filename=_support('test_rsa_password.key'), -+ password='television', -+ passphrase='wat? lol no', -+ ) --- -2.27.0 - diff --git a/paramiko-2.7.2.tar.gz b/paramiko-2.7.2.tar.gz deleted file mode 100644 index 1aea7d6ea3bcef1c8309c4e9ab200df89f885d4f..0000000000000000000000000000000000000000 Binary files a/paramiko-2.7.2.tar.gz and /dev/null differ diff --git a/python-paramiko.spec b/python-paramiko.spec index 95ebaa4a723c3aa9f2a60a30b06df3699c0977cd..d7867032772cceff34033996aca3bf18fc5d08da 100644 --- a/python-paramiko.spec +++ b/python-paramiko.spec @@ -1,76 +1,98 @@ -Name: python-paramiko -Version: 2.7.2 -Release: 1 -Summary: Python SSH module -License: LGPLv2+ -URL: https://github.com/paramiko/paramiko -Source0: https://github.com/paramiko/paramiko/archive/%{version}/paramiko-%{version}.tar.gz - -Patch0: paramiko-2.7.2-drop-pytest-relaxed.patch - -BuildArch: noarch - +%global _empty_manifest_terminate_build 0 +Name: python-paramiko +Version: 2.1.1 +Release: 1 +Summary: SSH2 protocol library +License: LGPL-2.1 +URL: https://github.com/paramiko/paramiko/ +Source0: https://files.pythonhosted.org/packages/d1/5a/ebd00d884f30baf208359a027eb7b38372d81d0c004724bb1aa71ae43b37/paramiko-2.1.1.tar.gz +BuildArch: noarch %description -Paramiko is a combination of the Esperanto words for "paranoid" and "friend". It is a module -for Python 2.7/3.4+ that implements the SSH2 protocol for secure (encrypted and authenticated) -connections to remote machines. - -%package -n python3-paramiko -Summary: Python SSH module -BuildRequires: python3-devel python3-setuptools python3-bcrypt >= 3.1.3 python3-pytest -BuildRequires: python3-cryptography >= 2.5 python3-pyasn1 >= 0.1.7 python3-pynacl >= 1.0.1 -BuildRequires: python3-invoke >= 1.3 python3-mock >= 2.0 -Requires: python3-bcrypt >= 3.1.3 python3-cryptography >= 1.5 -Requires: python3-pyasn1 >= 0.1.7 python3-pynacl >= 1.0.1 python3-invoke >= 1.3 -%{?python_provide:%python_provide python3-paramiko} - -%description -n python3-paramiko -Paramiko is a combination of the Esperanto words for "paranoid" and "friend". python3-paramiko is -a module for Python 3.4+ that implements the SSH2 protocol for secure (encrypted and authenticated) -connections to remote machines. Unlike SSL (aka TLS), SSH2 protocol does not require hierarchical -certificates signed by a powerful central authority. You may know SSH2 as the protocol that replaced -Telnet and rsh for secure access to remote shells, but the protocol also includes the ability to open -arbitrary channels to remote services across the encrypted tunnel (this is how SFTP works, for example). - -%package help -Summary: Docs and demos for SSH2 protocol library for python -BuildRequires: python3-sphinx -Provides: python-paramiko-doc = %{version}-%{release} -Obsoletes: python-paramiko-doc <= %{version}-%{release} - -%description help -This is the documentation and demos for python-paramiko. +This is a library for making SSH2 connections (client or server). +Emphasis is on using SSH2 as an alternative to SSL for making secure +connections between python scripts. All major ciphers and hash methods +are supported. SFTP client and server mode are both supported too. + +Required packages: + Cryptography + +To install the development version, ``pip install -e +git+https://github.com/paramiko/paramiko/#egg=paramiko``. + +%package -n python2-paramiko +Summary: SSH2 protocol library +Provides: python2-paramiko +BuildRequires: python2-devel +BuildRequires: python2-setuptools +Requires: python2-cryptography +Requires: python2-pyasn1 +%description -n python2-paramiko +This is a library for making SSH2 connections (client or server). +Emphasis is on using SSH2 as an alternative to SSL for making secure +connections between python scripts. All major ciphers and hash methods +are supported. SFTP client and server mode are both supported too. + +Required packages: + Cryptography + +To install the development version, ``pip install -e +git+https://github.com/paramiko/paramiko/#egg=paramiko``. + +%package help +Summary: Development documents and examples for paramiko +Provides: python2-paramiko-doc +%description help +This is a library for making SSH2 connections (client or server). +Emphasis is on using SSH2 as an alternative to SSL for making secure +connections between python scripts. All major ciphers and hash methods +are supported. SFTP client and server mode are both supported too. + +Required packages: + Cryptography + +To install the development version, ``pip install -e +git+https://github.com/paramiko/paramiko/#egg=paramiko``. %prep -%autosetup -p1 -n paramiko-%{version} +%autosetup -n paramiko-2.1.1 %build -%py3_build +%py2_build %install -%py3_install - -sphinx-build -b html sites/docs/ html/ -rm -f html/.buildinfo - -%check -rm -f tests/test_sftp*.py -PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} - -%files -n python3-paramiko -%license LICENSE -%{python3_sitelib}/paramiko-*.egg-info/ -%{python3_sitelib}/paramiko/ - -%files help -%doc html/ demos/ NEWS README.rst +%py2_install +install -d -m755 %{buildroot}/%{_pkgdocdir} +if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi +if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi +if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi +if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi +pushd %{buildroot} +if [ -d usr/lib ]; then + find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/lib64 ]; then + find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/bin ]; then + find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/sbin ]; then + find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst +fi +touch doclist.lst +if [ -d usr/share/man ]; then + find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst +fi +popd +mv %{buildroot}/filelist.lst . +mv %{buildroot}/doclist.lst . + +%files -n python2-paramiko -f filelist.lst +%{python2_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog -* Thu Jan 28 2021 zhaorenhai - 2.7.2-1 -- Upgrade to 2.7.2 - -* Mon Aug 10 2020 lingsheng - 2.4.1-8 -- Remove python2-paramiko subpackage - -* Wed Nov 06 2019 Lijin Yang - 2.4.1-7 -- init package +* Sat May 15 2021 openstack-sig +- Package Spec generated