Backport upstream fix for CVE-2022-24761 rhbz#2065791

This commit is contained in:
Carl George 2024-06-26 12:45:37 -05:00
commit da68c77707
10 changed files with 713 additions and 8 deletions

View file

@ -4,7 +4,7 @@
Name: python-%{srcname}
Version: 1.4.3
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Waitress WSGI server
License: ZPLv2.1
@ -20,6 +20,22 @@ Source0: v%{version}-nodocs.tar.gz
#
Source1: generate-tarball.sh
# https://github.com/Pylons/waitress/commit/e75b0d9afbea8a933f8f5f11d279e661cbfd676b
Patch1: 0001-Add-new-regular-expressions-for-Chunked-Encoding.patch
# https://github.com/Pylons/waitress/commit/1f6059f4c4a3a0b256b4027eda64fb9fc311b0a6
Patch2: 0002-Be-more-strict-in-parsing-Content-Length.patch
# https://github.com/Pylons/waitress/commit/884bed167d09c3d5fdf0730e2ca2564eefdd4534
Patch3: 0003-Update-tests-to-remove-invalid-chunked-encoding-chunk-size.patch
# https://github.com/Pylons/waitress/commit/d032a669682838b26d6a1a1b513b9da83b0e0f90
Patch4: 0004-Error-when-receiving-back-Chunk-Extension.patch
# https://github.com/Pylons/waitress/commit/d9bdfa0cf210f6daf017d7c5a3cc149bdec8a9a7
Patch5: 0005-Validate-chunk-size-in-Chunked-Encoding-are-HEXDIG.patch
# https://github.com/Pylons/waitress/commit/bd22869c143a3f1284f271399524676efbafa655
Patch6: 0006-Remove-extraneous-calls-to-.strip-in-Chunked-Encoding.patch
# downstream only patches
Patch7: 0007-Backport-security-fix-note.patch
Patch8: 0008-Skip-tests-that-fail-inconsistently-during-mock-build.patch
BuildArch: noarch
# No docs as we don't have packaged pylons theme for sphinx
@ -38,14 +54,13 @@ Summary: Waitress WSGI server
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-nose
BuildRequires: python-coverage
%description -n python2-%{srcname} %{_description}
Python 3 version.
Python 2 version.
%prep
%autosetup -n %{srcname}-%{version}-nodocs
%autosetup -n %{srcname}-%{version}-nodocs -p 1
%build
%py2_build
@ -53,9 +68,8 @@ Python 3 version.
%install
%py2_install
#check
# disable checks for now as they fail trying to lookup localhost in koji.
#
%check
PYTHONPATH=%{buildroot}%{python2_sitelib} nosetests-%{python2_version} %{srcname}
%files -n python2-%{srcname}
%license COPYRIGHT.txt LICENSE.txt
@ -65,6 +79,10 @@ Python 3 version.
%{python2_sitelib}/%{srcname}-*.egg-info/
%changelog
* Wed Jun 26 2024 Carl George <carlwgeorge@fedoraproject.org> - 1.4.3-2
- Backport upstream fix for CVE-2022-24761 rhbz#2065791
- Run test suite
* Fri Feb 07 2020 Lorenzo Gil Sanchez <lorenzo.gil.sanchez@gmail.com> - 1.4.3-1
- Update to 1.4.3 Fixes bug #1785591