Update to version 1.4.4
- Update to version 1.4.4 - Resolves: CVE-2022-24761 - Convert to pyproject macros Signed-off-by: Renata <rravanel@redhat.com>
This commit is contained in:
Renata
parent
c14c4300c4
commit
7a3cf9bb93
4 changed files with 30 additions and 77 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -15,3 +15,4 @@
|
|||
/v1.2.1.tar.gz
|
||||
/v1.2.1-nodocs.tar.gz
|
||||
/v1.4.3-nodocs.tar.gz
|
||||
/v1.4.4-nodocs.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
From 0278f7a9ca9e65c877a34b5c122dbdda9f78c23d Mon Sep 17 00:00:00 2001
|
||||
From: Carl George <carl@george.computer>
|
||||
Date: Tue, 9 May 2023 23:01:49 -0500
|
||||
Subject: [PATCH] Skip test_in_generator
|
||||
|
||||
This test fails during a mock build.
|
||||
|
||||
Traceback (most recent call last):
|
||||
File "/builddir/build/BUILD/waitress-1.4.3-nodocs/waitress/tests/test_functional.py", line 1207, in test_in_generator
|
||||
self.assertRaises(ConnectionClosed, read_http, fp)
|
||||
AssertionError: ConnectionClosed not raised
|
||||
---
|
||||
waitress/tests/test_functional.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/waitress/tests/test_functional.py b/waitress/tests/test_functional.py
|
||||
index 8f4b262..c748f3a 100644
|
||||
--- a/waitress/tests/test_functional.py
|
||||
+++ b/waitress/tests/test_functional.py
|
||||
@@ -1193,6 +1193,7 @@ class InternalServerErrorTests(object):
|
||||
self.send_check_error(to_send)
|
||||
self.assertRaises(ConnectionClosed, read_http, fp)
|
||||
|
||||
+ @unittest.skip('fails in mock build')
|
||||
def test_in_generator(self):
|
||||
to_send = "GET /in_generator HTTP/1.1\r\n\r\n"
|
||||
to_send = tobytes(to_send)
|
||||
--
|
||||
2.40.1
|
||||
|
||||
|
|
@ -1,18 +1,14 @@
|
|||
%global srcname waitress
|
||||
|
||||
%global _docdir_fmt %{name}
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 1.4.3
|
||||
Name: python-waitress
|
||||
Version: 1.4.4
|
||||
Release: 1%{?dist}
|
||||
Summary: Waitress WSGI server
|
||||
|
||||
License: ZPLv2.1
|
||||
URL: https://github.com/Pylons/%{srcname}
|
||||
License: ZPL-2.1
|
||||
URL: https://github.com/Pylons/waitress
|
||||
Source0: v%{version}-nodocs.tar.gz
|
||||
# Upstream ships non free docs files.
|
||||
# Upstream ships non free docs files.
|
||||
# We do not even want them in our src.rpms
|
||||
# So we remove them before uploading.
|
||||
# So we remove them before uploading.
|
||||
#
|
||||
# Download the upstream tarball and invoke this script while in the
|
||||
# tarball's directory:
|
||||
|
|
@ -20,69 +16,55 @@ Source0: v%{version}-nodocs.tar.gz
|
|||
#
|
||||
Source1: generate-tarball.sh
|
||||
|
||||
# downstream only patch
|
||||
Patch0: 0001-Skip-test_in_generator.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%global _description %{expand:
|
||||
Waitress is meant to be a production-quality pure-Python WSGI server with very
|
||||
acceptable performance. It has no dependencies except ones which live in the
|
||||
Python standard library. It runs on CPython on Unix and Windows under Python
|
||||
2.7+ and Python 3.4+. It is also known to run on PyPy 1.6.0+ on UNIX. It
|
||||
2.7+ and Python 3.5+. It is also known to run on PyPy 1.6.0+ on UNIX. It
|
||||
supports HTTP/1.0 and HTTP/1.1.}
|
||||
|
||||
%description %{_description}
|
||||
|
||||
%package -n python2-%{srcname}
|
||||
Summary: %{summary}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-nose
|
||||
|
||||
%description -n python2-%{srcname} %{_description}
|
||||
|
||||
Python 2 version.
|
||||
|
||||
%package -n python3-%{srcname}
|
||||
%package -n python3-waitress
|
||||
Summary: %{summary}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-nose
|
||||
BuildRequires: pyproject-rpm-macros
|
||||
|
||||
%description -n python3-%{srcname} %{_description}
|
||||
|
||||
Python 3 version.
|
||||
%description -n python3-waitress %{_description}
|
||||
|
||||
%prep
|
||||
%autosetup -n %{srcname}-%{version}-nodocs -p 1
|
||||
%autosetup -n waitress-%{version}-nodocs -p 1
|
||||
sed -e '/pytest-cover/d' \
|
||||
-e '/coverage/d' \
|
||||
-e '/addopts/d' \
|
||||
-i setup.cfg
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires -x testing
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%py3_build
|
||||
%pyproject_wheel
|
||||
|
||||
%install
|
||||
%py2_install
|
||||
%py3_install
|
||||
%pyproject_install
|
||||
%pyproject_save_files waitress
|
||||
|
||||
%check
|
||||
PYTHONPATH=%{buildroot}%{python2_sitelib} nosetests-%{python2_version} %{srcname}
|
||||
PYTHONPATH=%{buildroot}%{python3_sitelib} nosetests-%{python3_version} %{srcname}
|
||||
%pytest
|
||||
|
||||
%files -n python2-%{srcname}
|
||||
%license COPYRIGHT.txt LICENSE.txt
|
||||
%doc README.rst CHANGES.txt
|
||||
%{python2_sitelib}/%{srcname}/
|
||||
%{python2_sitelib}/%{srcname}-*.egg-info/
|
||||
|
||||
%files -n python3-%{srcname}
|
||||
%files -n python3-waitress -f %{pyproject_files}
|
||||
%license COPYRIGHT.txt LICENSE.txt
|
||||
%doc README.rst CHANGES.txt
|
||||
%{_bindir}/waitress-serve
|
||||
%{python3_sitelib}/%{srcname}/
|
||||
%{python3_sitelib}/%{srcname}-*.egg-info/
|
||||
|
||||
%changelog
|
||||
* Mon Nov 06 2023 Renata Ravanelli <renata.ravanelli@gmail.com>
|
||||
- Update to version 1.4.4
|
||||
- Resolves: CVE-2022-24761
|
||||
- Convert to pyproject macros
|
||||
|
||||
* Wed May 10 2023 Carl George <carl@george.computer> - 1.4.3-1
|
||||
- Update to version 1.4.3
|
||||
- Resolves: rhbz#1791421 CVE-2019-16785
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (v1.4.3-nodocs.tar.gz) = c3749376e97d864874b1976b7f9f2688d3b55c56e33a01d968fc59a068a27ea14dd389d8ca4feb211afbfd0bb6848f6b8d483142e0b7a1b403f924fb7cb87f3c
|
||||
SHA512 (v1.4.4-nodocs.tar.gz) = 246e066774f093caf174c2e7a054fedf9d09ce871524f6fdfd86bade89b858ff28ea0fd7347874303e473bf2527919beecc174264d5d8283030ab13c5942ef2d
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue