diff --git a/pyftpdlib-1.5.1.tar.gz b/pyftpdlib-1.5.1.tar.gz deleted file mode 100644 index 6f6cfc1..0000000 --- a/pyftpdlib-1.5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bcd7fc825123414a157718c6dcdcb0978208d3c865d4650564acef4acce3354 -size 127582 diff --git a/pyftpdlib-1.5.2.tar.gz b/pyftpdlib-1.5.2.tar.gz new file mode 100644 index 0000000..7141930 --- /dev/null +++ b/pyftpdlib-1.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcb1a949848302b4a10623e57966d2bdbcf898bf220b587ea287d14de4b1471e +size 179047 diff --git a/pyftpdlib-disable-error-0-ssl-unwrap.diff b/pyftpdlib-disable-error-0-ssl-unwrap.diff deleted file mode 100644 index 2eca23b..0000000 --- a/pyftpdlib-disable-error-0-ssl-unwrap.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/pyftpdlib/test/test_functional_ssl.py -=================================================================== ---- a/pyftpdlib/test/test_functional_ssl.py -+++ b/pyftpdlib/test/test_functional_ssl.py -@@ -134,7 +134,7 @@ class TestFtpListingCmdsTLSMixin(TLSTest - # File "/opt/python/2.7.9/lib/python2.7/ssl.py", line 771, in unwrap - # s = self._sslobj.shutdown() - # error: [Errno 0] Error -- @unittest.skipIf(TRAVIS, "fails on travis") -+ @unittest.skipIf(1, "fails with SSL") - def test_nlst(self): - super(TestFtpListingCmdsTLSMixin, self).test_nlst() - diff --git a/pyftpdlib-disable-incomplete-file-received.diff b/pyftpdlib-disable-incomplete-file-received.diff deleted file mode 100644 index 9b709a7..0000000 --- a/pyftpdlib-disable-incomplete-file-received.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/pyftpdlib/test/test_functional.py -=================================================================== ---- a/pyftpdlib/test/test_functional.py -+++ b/pyftpdlib/test/test_functional.py -@@ -1956,7 +1956,7 @@ class TestCallbacks(unittest.TestCase): - self.tearDown() - self.assertEqual(_file, [os.path.abspath(TESTFN)]) - -- @unittest.skipIf(TRAVIS, "failing on Travis") -+ @unittest.skipIf(1, "failing on openSUSE Build Service") - @retry_before_failing() - def test_on_incomplete_file_received(self): - _file = [] diff --git a/pyftpdlib-handle-missing-SSLv3.diff b/pyftpdlib-handle-missing-SSLv3.diff deleted file mode 100644 index c07ded0..0000000 --- a/pyftpdlib-handle-missing-SSLv3.diff +++ /dev/null @@ -1,23 +0,0 @@ -Index: b/pyftpdlib/test/test_functional_ssl.py -=================================================================== ---- a/pyftpdlib/test/test_functional_ssl.py -+++ b/pyftpdlib/test/test_functional_ssl.py -@@ -344,13 +344,15 @@ class TestFTPS(unittest.TestCase): - self.client.quit() - - def test_ssl_version(self): -- protos = [ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1] -+ protos = [ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1] - if hasattr(ssl, "PROTOCOL_SSLv2"): - protos.append(ssl.PROTOCOL_SSLv2) - for proto in protos: - self.try_protocol_combo(ssl.PROTOCOL_SSLv2, proto) -- for proto in protos: -- self.try_protocol_combo(ssl.PROTOCOL_SSLv3, proto) -+ if hasattr(ssl, "PROTOCOL_SSLv3"): -+ protos.append(ssl.PROTOCOL_SSLv3) -+ for proto in protos: -+ self.try_protocol_combo(ssl.PROTOCOL_SSLv3, proto) - for proto in protos: - self.try_protocol_combo(ssl.PROTOCOL_SSLv23, proto) - for proto in protos: diff --git a/python-pyftpdlib.changes b/python-pyftpdlib.changes index 3aeb01c..4cae0c3 100644 --- a/python-pyftpdlib.changes +++ b/python-pyftpdlib.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jun 22 14:14:51 UTC 2017 - jmatejek@suse.com + +- update to 1.5.2 + * disables old SSL methods + * fixed some hangs/crashes +- fixes test failures in OBS +- drop patches that are no longer needed: + * pyftpdlib-disable-error-0-ssl-unwrap.diff + * pyftpdlib-disable-incomplete-file-received.diff + * pyftpdlib-handle-missing-SSLv3.diff +- convert to singlespec + ------------------------------------------------------------------- Mon May 9 14:58:36 UTC 2016 - hpj@urpla.net diff --git a/python-pyftpdlib.spec b/python-pyftpdlib.spec index d0c58b8..94da2bf 100644 --- a/python-pyftpdlib.spec +++ b/python-pyftpdlib.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyftpdlib # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -14,31 +14,28 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pyftpdlib -Version: 1.5.1 +Version: 1.5.2 Release: 0 -License: MIT Summary: Very fast asynchronous FTP server library -Url: https://github.com/giampaolo/pyftpdlib/ +License: MIT Group: Development/Languages/Python -Source: https://pypi.python.org/packages/a8/f8/0f6db156898616dbcbd7bf865660295c81479071ab0fcd1898fe1b3a4fc4/pyftpdlib-%{version}.tar.gz -Patch1: pyftpdlib-disable-error-0-ssl-unwrap.diff -Patch2: pyftpdlib-handle-missing-SSLv3.diff -Patch3: pyftpdlib-disable-incomplete-file-received.diff -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: python-mock -BuildRequires: python-nose -BuildRequires: python-pyOpenSSL -Requires: python-pyOpenSSL +Url: https://github.com/giampaolo/pyftpdlib/ +Source: https://files.pythonhosted.org/packages/source/p/pyftpdlib/pyftpdlib-%{version}.tar.gz +BuildRequires: %{python_module devel} +BuildRequires: %{python_module mock} +BuildRequires: %{python_module nose} +BuildRequires: %{python_module pyOpenSSL} +BuildRequires: %{python_module setuptools} +BuildRequires: python-rpm-macros +Requires: python-pyOpenSSL BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif +%python_subpackages %description Python FTP server library provides a high-level portable interface to easily @@ -54,23 +51,22 @@ language and it's used in projects like %prep %setup -q -n pyftpdlib-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install %check -make test +#%%python_exec -m nose #pyftpdlib/test +export PYTHONPATH=$PWD +%python_exec pyftpdlib/test/runner.py -%files +%files %{python_files} %defattr(-,root,root,-) %doc README.rst LICENSE -%{_bindir}/ftpbench +%python3_only %{_bindir}/ftpbench %{python_sitelib}/* %changelog