From bda775f261cee38bab2298f8bac505a2f9efcc1b23138c7e1ad005ddf8e7962a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Dec 2024 12:04:57 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main python-pyftpdlib revision 2463691bb39a835b9f142c08978d1bff --- pyftpdlib-1.5.10.tar.gz | 3 ++ pyftpdlib-1.5.7.tar.gz | 3 -- python-pyftpdlib.changes | 86 +++++++++++++++++++++++++++++++++++++++- python-pyftpdlib.spec | 76 ++++++++++++++--------------------- 4 files changed, 117 insertions(+), 51 deletions(-) create mode 100644 pyftpdlib-1.5.10.tar.gz delete mode 100644 pyftpdlib-1.5.7.tar.gz diff --git a/pyftpdlib-1.5.10.tar.gz b/pyftpdlib-1.5.10.tar.gz new file mode 100644 index 0000000..febea88 --- /dev/null +++ b/pyftpdlib-1.5.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8dbdeb1215bcba2fb748dae31ffdb1ab008540c28d13b3704e178f368a087128 +size 204487 diff --git a/pyftpdlib-1.5.7.tar.gz b/pyftpdlib-1.5.7.tar.gz deleted file mode 100644 index a42f826..0000000 --- a/pyftpdlib-1.5.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ea3ce4137db8209af1f6b9ea020590f462c63ed7c7a1240bd596e4d3a7b656e -size 196076 diff --git a/python-pyftpdlib.changes b/python-pyftpdlib.changes index 40f4e70..9f414d5 100644 --- a/python-pyftpdlib.changes +++ b/python-pyftpdlib.changes @@ -1,3 +1,85 @@ +------------------------------------------------------------------- +Sat Aug 31 12:04:37 UTC 2024 - Dirk Müller + +- update to 1.5.10: + * use black formatter. + * use argparse instead of deprecated optparse. + * use pytest instead of unittest. + * add ability to run tests in parallel with make test- + parallel. + * PermissionError may occur on Windows when binding ports + from a pre-configured PASV range. + +------------------------------------------------------------------- +Mon Mar 25 14:21:26 UTC 2024 - Dirk Müller + +- update to 1.5.9: + * Enhancements + * #611: use ruff code style checker instead of flake8 + isort + (much faster + makes many more code quality checks). + * Bug fixes + * #604: client connection may be reset in PASV/EPSV mode during + TLS handshake. (patch by Benedikt McMullin) + * #607: possible infinite wait in Epoll (patch by + @stat1c-void) + * #607: possible infinite traceback printing in DTPHandler + (patch by @stat1c-void) + * #613: (CRITICAL) bugfix for TLS disconnect causing 100% CPU + usage. (patch by @hakai) + * #614: close connection on SSL EOF error, instead of + erroneously replying with "226 Transfer completed." + * Enhancements + * #586: removed Python 2.6 support. + * #591: speedup logging by 28% by using logging._srcfile = None + trick. This avoids calling calling sys._getframe() for each + log record. + * #605: added support for Python 3.12. + * Enhancements + * #544: replace Travis with Github Actions for CI testing. + * Bug fixes + * #481: fix [WinError 10038] an operation was attempted on + something that is not a socket. (patch by Tailing Yuan) + * #578, [critical]: FTPS broke with PyOpenSSL version 22.1.0. + * Enhancements + * #467: added pre-fork concurrency model, spawn()ing worker + processes to split load. + * #520: directory LISTing is now 3.7x times faster. + * Enhancements + * #495: colored test output. + * Bug fixes + * #492: CRLF line endings are replaced with CRCRLF in ASCII + mode downloads. + * #496: import error due to multiprocessing.Lock() bug. + * Enhancements + * #463: FTPServer class can now be used as a context manager. + * Bug fixes + * #431: Ctrl-C doesn't exit python -m pyftpdlib on Windows. + * #436: ThreadedFTPServer.max_cons is evaluated + threading.activeCount(). If the user uses threads of its own + it will consume the number of max_cons. + * #447: ThreadedFTPServer and MultiprocessFTPServer do not + join() tasks which are no longer consuming resources. + * Enhancements + * #201: implemented SITE MFMT command which changes file + modification time. (patch by Tahir Ijaz) + * #327: add username and password command line options + * #433: documentation moved to readthedocs: + http://pyftpdlib.readthedocs.io + * Bug fixes + * #403: fix duplicated output log. (path by PonyPC) + * #414: Respond successfully to STOR only after closing file + handle. +- drop support-python-312.patch (upstream) + +------------------------------------------------------------------- +Tue Sep 19 05:14:22 UTC 2023 - Steve Kowalik + +- Add patch support-python-312.patch, support Python 3.12+ +- Stop using greedy globs in %files +- Switch to autosetup and pyproject macros +- Remove Python 2 leftovers +- Enable running the tests again + ------------------------------------------------------------------- Fri Apr 21 12:30:41 UTC 2023 - Dirk Müller @@ -21,7 +103,7 @@ Fri Oct 28 20:09:29 UTC 2022 - Yogalakshmi Arunachalam - Update to Version: 1.5.6 - 2020-02-16 Enhancements * #467: added pre-fork concurrency model, spawn()ing worker processes to split load. - * #520: directory LISTing is now 3.7x times faster. + * #520: directory LISTing is now 3.7x times faster. ------------------------------------------------------------------- Wed Jan 19 08:00:32 UTC 2022 - Matej Cepl @@ -33,7 +115,7 @@ Wed Jan 19 08:00:32 UTC 2022 - Matej Cepl Tue Oct 26 04:12:28 UTC 2021 - Steve Kowalik - Regenerate new private key/x509 certificate for the test suite. - (thanks, Jason!) + (thanks, Jason!) ------------------------------------------------------------------- Fri May 7 23:13:10 UTC 2021 - Ben Greiner diff --git a/python-pyftpdlib.spec b/python-pyftpdlib.spec index e022b1b..9396aba 100644 --- a/python-pyftpdlib.spec +++ b/python-pyftpdlib.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyftpdlib # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2016 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties @@ -17,37 +17,29 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without python2 %{?sle15_python_module_pythons} Name: python-pyftpdlib -Version: 1.5.7 +Version: 1.5.10 Release: 0 Summary: Asynchronous FTP server library for Python License: MIT -Group: Development/Languages/Python URL: https://github.com/giampaolo/pyftpdlib/ Source: https://files.pythonhosted.org/packages/source/p/pyftpdlib/pyftpdlib-%{version}.tar.gz Source1: keycert.pem +BuildRequires: %{python_module pip} BuildRequires: %{python_module psutil} BuildRequires: %{python_module pyOpenSSL} BuildRequires: %{python_module pysendfile} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-pyOpenSSL Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Recommends: python-pysendfile BuildArch: noarch -%if %{with python2} -BuildRequires: python-ipaddress -BuildRequires: python-mock -%endif -%ifpython2 -Requires: python-ipaddress -%endif %python_subpackages %description @@ -55,49 +47,40 @@ The Python FTP server library provides a high-level interface to write very asynchronous FTP servers with Python. %prep -%setup -q -n pyftpdlib-%{version} +%autosetup -p1 -n pyftpdlib-%{version} sed -i '1 {/env python/ d}' pyftpdlib/test/*.py pyftpdlib/_compat.py cp %{SOURCE1} pyftpdlib/test %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/ftpbench %python_expand %fdupes %{buildroot}%{$python_sitelib} # Note: Do not remove tests. Other packages import them %check -## # Tests reported as randomly failing in 2016 against v1.5.0: -## # https://github.com/giampaolo/pyftpdlib/issues/386 -## # If they re-occur, please update the issue with backtraces, -## # and disable only related tests. -## donttest="(TestFtpStoreDataTLSMixin and test_rest_on_stor)" -## donttest+=" or (TestFtpStoreDataTLSMixin and test_stor_ascii)" -## # https://github.com/giampaolo/pyftpdlib/issues/550 -## donttest+=" or test_masquerade_address" -## ignorebuild="--ignore build" -## %%{python_expand # expand to python flavor, not to the binary name, then strip the trailing _ -## builddir=_build.$python_ -## ignorebuild+=" --ignore ${builddir%%_}" -## } -## cat > pytest.ini < pytest.ini <