- Update CVE-2023-52425-libexpat-2.6.0-backport.patch so that it

uses features sniffing, not just comparing version
  number. Include also support-expat-CVE-2022-25236-patched.patch.
- Refresh patches:
  - CVE-2023-27043-email-parsing-errors.patch
  - fix_configure_rst.patch
  - skip_if_buildbot-extend.patch
- Remove included patch:
  - support-expat-CVE-2022-25236-patched.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python311?expand=0&rev=123
This commit is contained in:
2024-05-01 09:01:36 +00:00
committed by Git OBS Bridge
parent 37ecd27cc8
commit e54275a76b
7 changed files with 135 additions and 175 deletions

View File

@@ -5,10 +5,8 @@
Misc/NEWS.d/next/Library/2023-10-20-15-28-08.gh-issue-102988.dStNO7.rst | 8
4 files changed, 344 insertions(+), 21 deletions(-)
Index: Python-3.11.8/Doc/library/email.utils.rst
===================================================================
--- Python-3.11.8.orig/Doc/library/email.utils.rst
+++ Python-3.11.8/Doc/library/email.utils.rst
--- a/Doc/library/email.utils.rst
+++ b/Doc/library/email.utils.rst
@@ -60,13 +60,18 @@ of the new API.
begins with angle brackets, they are stripped off.
@@ -58,10 +56,8 @@ Index: Python-3.11.8/Doc/library/email.utils.rst
.. function:: parsedate(date)
Index: Python-3.11.8/Lib/email/utils.py
===================================================================
--- Python-3.11.8.orig/Lib/email/utils.py
+++ Python-3.11.8/Lib/email/utils.py
--- a/Lib/email/utils.py
+++ b/Lib/email/utils.py
@@ -48,6 +48,7 @@ TICK = "'"
specialsre = re.compile(r'[][\\()<>@,:;".]')
escapesre = re.compile(r'[\\"]')
@@ -241,10 +237,8 @@ Index: Python-3.11.8/Lib/email/utils.py
return addrs[0]
Index: Python-3.11.8/Lib/test/test_email/test_email.py
===================================================================
--- Python-3.11.8.orig/Lib/test/test_email/test_email.py
+++ Python-3.11.8/Lib/test/test_email/test_email.py
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -17,6 +17,7 @@ from unittest.mock import patch
import email
@@ -253,7 +247,7 @@ Index: Python-3.11.8/Lib/test/test_email/test_email.py
from email.charset import Charset
from email.generator import Generator, DecodedGenerator, BytesGenerator
@@ -3321,15 +3322,137 @@ Foo
@@ -3336,15 +3337,137 @@ Foo
[('Al Person', 'aperson@dom.ain'),
('Bud Person', 'bperson@dom.ain')])
@@ -399,7 +393,7 @@ Index: Python-3.11.8/Lib/test/test_email/test_email.py
def test_getaddresses_embedded_comment(self):
"""Test proper handling of a nested comment"""
@@ -3520,6 +3643,54 @@ multipart/report
@@ -3535,6 +3658,54 @@ multipart/report
m = cls(*constructor, policy=email.policy.default)
self.assertIs(m.policy, email.policy.default)
@@ -454,10 +448,8 @@ Index: Python-3.11.8/Lib/test/test_email/test_email.py
# Test the iterator/generators
class TestIterators(TestEmailBase):
Index: Python-3.11.8/Misc/NEWS.d/next/Library/2023-10-20-15-28-08.gh-issue-102988.dStNO7.rst
===================================================================
--- /dev/null
+++ Python-3.11.8/Misc/NEWS.d/next/Library/2023-10-20-15-28-08.gh-issue-102988.dStNO7.rst
+++ b/Misc/NEWS.d/next/Library/2023-10-20-15-28-08.gh-issue-102988.dStNO7.rst
@@ -0,0 +1,8 @@
+:func:`email.utils.getaddresses` and :func:`email.utils.parseaddr` now
+return ``('', '')`` 2-tuples in more situations where invalid email