Adjusted hot fixes to cleanly apply on Windows.

chevah · Jul 31, 2024 · deaf977 · deaf977
1 parent 077d6ec
commit deaf977
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 147 deletions.
diff --git a/src/python/CVE-2021-4189.diff b/src/python/CVE-2021-4189.diff
@@ -1,23 +1,3 @@
-diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
-index bc297ef4ee89fb..71d410bcd1fbf0 100644
---- a/Doc/whatsnew/2.7.rst
-+++ b/Doc/whatsnew/2.7.rst
-@@ -2777,6 +2777,15 @@ It has been replaced by the new ``make regen-all`` target.
-
- .. _acks27:
-
-+Security fix for FTP
-+================================
-+
-+A security fix alters the :class:`ftplib.FTP` behavior to not trust the
-+IPv4 address sent from the remote server when setting up a passive data
-+channel.  We reuse the ftp server IP address instead.  For unusual code
-+requiring the old behavior, set a ``trust_server_pasv_ipv4_address``
-+attribute on your FTP instance to ``True``.  (See :issue:`43285`)
-+
- Acknowledgements
- ================
-
 diff --git a/Lib/ftplib.py b/Lib/ftplib.py
 index 6644554792791b..7c772e6ee5ee16 100644
 --- a/Lib/ftplib.py

diff --git a/src/python/CVE-2022-48560.diff b/src/python/CVE-2022-48560.diff