- Add gh120226-fix-sendfile-test-kernel-610.patch to avoid
failing test_sendfile_close_peer_in_the_middle_of_receiving tests on Linux >= 6.10 (GH-120227). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python310?expand=0&rev=145
This commit is contained in:
35
gh120226-fix-sendfile-test-kernel-610.patch
Normal file
35
gh120226-fix-sendfile-test-kernel-610.patch
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
From 1b3f6523a5c83323cdc44031b33a1c062e5dc698 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Xi Ruoyao <xry111@xry111.site>
|
||||||
|
Date: Fri, 7 Jun 2024 23:51:32 +0800
|
||||||
|
Subject: [PATCH] gh-120226: Fix
|
||||||
|
test_sendfile_close_peer_in_the_middle_of_receiving on Linux >= 6.10
|
||||||
|
(GH-120227)
|
||||||
|
|
||||||
|
The worst case is that the kernel buffers 17 pages with a page size of 64k.
|
||||||
|
(cherry picked from commit a7584245661102a5768c643fbd7db8395fd3c90e)
|
||||||
|
|
||||||
|
Co-authored-by: Xi Ruoyao <xry111@xry111.site>
|
||||||
|
---
|
||||||
|
Lib/test/test_asyncio/test_sendfile.py | 11 ++++-------
|
||||||
|
1 file changed, 4 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
--- a/Lib/test/test_asyncio/test_sendfile.py
|
||||||
|
+++ b/Lib/test/test_asyncio/test_sendfile.py
|
||||||
|
@@ -93,13 +93,10 @@ class MyProto(asyncio.Protocol):
|
||||||
|
|
||||||
|
class SendfileBase:
|
||||||
|
|
||||||
|
- # 256 KiB plus small unaligned to buffer chunk
|
||||||
|
- # Newer versions of Windows seems to have increased its internal
|
||||||
|
- # buffer and tries to send as much of the data as it can as it
|
||||||
|
- # has some form of buffering for this which is less than 256KiB
|
||||||
|
- # on newer server versions and Windows 11.
|
||||||
|
- # So DATA should be larger than 256 KiB to make this test reliable.
|
||||||
|
- DATA = b"x" * (1024 * 256 + 1)
|
||||||
|
+ # Linux >= 6.10 seems buffering up to 17 pages of data.
|
||||||
|
+ # So DATA should be large enough to make this test reliable even with a
|
||||||
|
+ # 64 KiB page configuration.
|
||||||
|
+ DATA = b"x" * (1024 * 17 * 64 + 1)
|
||||||
|
# Reduce socket buffer size to test on relative small data sets.
|
||||||
|
BUF_SIZE = 4 * 1024 # 4 KiB
|
||||||
|
|
||||||
@@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 2 09:44:26 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||||
|
|
||||||
|
- Add gh120226-fix-sendfile-test-kernel-610.patch to avoid
|
||||||
|
failing test_sendfile_close_peer_in_the_middle_of_receiving
|
||||||
|
tests on Linux >= 6.10 (GH-120227).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Aug 28 16:54:34 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
Wed Aug 28 16:54:34 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
|
||||||
|
|
||||||
|
|||||||
@@ -212,6 +212,9 @@ Patch25: CVE-2024-6923-email-hdr-inject.patch
|
|||||||
# PATCH-FIX-UPSTREAM CVE-2024-8088-inf-loop-zipfile_Path.patch bsc#1229704 mcepl@suse.com
|
# PATCH-FIX-UPSTREAM CVE-2024-8088-inf-loop-zipfile_Path.patch bsc#1229704 mcepl@suse.com
|
||||||
# avoid denial of service in zipfile
|
# avoid denial of service in zipfile
|
||||||
Patch26: CVE-2024-8088-inf-loop-zipfile_Path.patch
|
Patch26: CVE-2024-8088-inf-loop-zipfile_Path.patch
|
||||||
|
# PATCH-FIX-UPSTREAM gh120226-fix-sendfile-test-kernel-610.patch gh#python/cpython#120226 mcepl@suse.com
|
||||||
|
# Fix test_sendfile_close_peer_in_the_middle_of_receiving on Linux >= 6.10 (GH-120227)
|
||||||
|
Patch27: gh120226-fix-sendfile-test-kernel-610.patch
|
||||||
BuildRequires: autoconf-archive
|
BuildRequires: autoconf-archive
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@@ -493,6 +496,7 @@ other applications.
|
|||||||
%patch -p1 -P 24
|
%patch -p1 -P 24
|
||||||
%patch -p1 -P 25
|
%patch -p1 -P 25
|
||||||
%patch -p1 -P 26
|
%patch -p1 -P 26
|
||||||
|
%patch -p1 -P 27
|
||||||
|
|
||||||
# drop Autoconf version requirement
|
# drop Autoconf version requirement
|
||||||
sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
|
sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac
|
||||||
|
|||||||
Reference in New Issue
Block a user