diff --git a/10001-fix-character-decoding-errors.patch b/10001-fix-character-decoding-errors.patch new file mode 100644 index 0000000000000000000000000000000000000000..2a7ddac609847a799a40a260f5caa8593d6d787f --- /dev/null +++ b/10001-fix-character-decoding-errors.patch @@ -0,0 +1,29 @@ +From b57d35f53f9fdd865157385c9dfcea5c56b849fc Mon Sep 17 00:00:00 2001 +From: layne yang +Date: Tue, 16 Jul 2024 17:15:51 +0800 +Subject: [PATCH] fix character decoding errors + +--- + Lib/test/test_minidom.py | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py +index eff4f52..8a7c879 100644 +--- a/Lib/test/test_minidom.py ++++ b/Lib/test/test_minidom.py +@@ -1064,10 +1064,8 @@ class MinidomTest(unittest.TestCase): + + # Verify that character decoding errors raise exceptions instead + # of crashing +- self.assertRaises(ExpatError, parseString, +- '') +- self.assertRaises(ExpatError, parseString, +- 'Comment \xe7a va ? Tr\xe8s bien ?') ++ self.assertRaises(UnicodeDecodeError, parseString, ++ 'Comment \xe7a va ? Tr\xe8s bien ?') + + doc.unlink() + +-- +2.31.1 + diff --git a/python.spec b/python.spec index 8fa034a39668327886775fea358cdee27a2f4889..dbffbb3c3312086537158ea23e7189c1bdb0914d 100644 --- a/python.spec +++ b/python.spec @@ -1438,8 +1438,9 @@ Patch404: 00404-cve-2023-40217.patch # above: Patch5000: 05000-autotool-intermediates.patch - +#Add by anolis Patch10000: 10000-python-anolis-rebrand.patch +Patch10001: 10001-fix-character-decoding-errors.patch # ====================================================== # Additional metadata, and subpackages @@ -1885,6 +1886,7 @@ find -name "*~" |xargs rm -f %endif %patch10000 -p1 +%patch10001 -p1 # ====================================================== @@ -2750,7 +2752,7 @@ rm -fr %{buildroot} %changelog * Tue Nov 28 2023 yangxianzhao - 2.7.5-94.0.1 - rebrand to anolis - +- build: fix build error * Wed Sep 27 2023 Charalampos Stratakis - 2.7.5-94 - Security fix for CVE-2023-40217 Resolves: RHEL-9615