From 6af2bef6ddbe9c20b5b9da44b1159cee88e4b0aa Mon Sep 17 00:00:00 2001 From: programmer12 <964969108@qq.com> Date: Thu, 13 Jan 2022 19:24:02 +0800 Subject: [PATCH] fix buid error (cherry picked from commit 20a42938b1eaf793c4ca588aee016146ee0b1a75) --- fixbuilderror-1.patch | 24 ++++++++++++++++++++++++ fixbuilderror-2.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ mailman.spec | 7 ++++++- 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 fixbuilderror-1.patch create mode 100644 fixbuilderror-2.patch diff --git a/fixbuilderror-1.patch b/fixbuilderror-1.patch new file mode 100644 index 0000000..b2d2eee --- /dev/null +++ b/fixbuilderror-1.patch @@ -0,0 +1,24 @@ +From 4a52c1a77bbd72615d246b232da0652b883e6a3d Mon Sep 17 00:00:00 2001 +From: programmer12 <964969108@qq.com> +Date: Thu, 13 Jan 2022 16:42:25 +0800 +Subject: [PATCH] 2 + +--- + src/mailman/email/tests/test_message.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mailman/email/tests/test_message.py b/src/mailman/email/tests/test_message.py +index 6631851..6584225 100644 +--- a/src/mailman/email/tests/test_message.py ++++ b/src/mailman/email/tests/test_message.py +@@ -17,6 +17,7 @@ + + """Test the message API.""" + ++import sys + import unittest + + from email import message_from_binary_file +-- +2.27.0 + diff --git a/fixbuilderror-2.patch b/fixbuilderror-2.patch new file mode 100644 index 0000000..642d6d5 --- /dev/null +++ b/fixbuilderror-2.patch @@ -0,0 +1,43 @@ +From f1a8bcc29c3bf50e6c031695b4fd8535ebe8e396 Mon Sep 17 00:00:00 2001 +From: programmer12 <964969108@qq.com> +Date: Thu, 13 Jan 2022 15:31:26 +0800 +Subject: [PATCH] 2 + +--- + src/mailman/email/tests/test_message.py | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/src/mailman/email/tests/test_message.py b/src/mailman/email/tests/test_message.py +index dd75fbc..6631851 100644 +--- a/src/mailman/email/tests/test_message.py ++++ b/src/mailman/email/tests/test_message.py +@@ -107,11 +107,26 @@ Test content + self.assertEqual(msg.get_payload(), 'Non-ascii text ?.') + + def test_as_string_python_bug_27321(self): ++ # Bug 27321 is fixed in Python 3.8.7rc1, 3.9.1rc1 and later. + with path('mailman.email.tests.data', 'bad_email.eml') as email_path: + with open(str(email_path), 'rb') as fp: + msg = message_from_binary_file(fp, Message) + fp.seek(0) + text = fp.read().decode('ascii', 'replace') ++ if (sys.version_info.minor == 8 and sys.hexversion >= 0x030807C1 or ++ sys.hexversion >= 0x030901C1): ++ self.assertEqual(msg.as_string(), """\ ++To: ++Subject: =?koi8-r?B?UF9AX/NfQ1/5X+xfS1/p?= ++From: =?koi8-r?B?8sXL0sXB1MnXzs/FIMHHxc7U09TXzw==?= ++Content-Type: text/plain; charset="koi8-r" ++Message-Id: <20160614102505.9OFQ19L1C> ++Content-Transfer-Encoding: base64 ++ ++/vTvIPTh6+/lIPLl6+zh7e7h8SDy4fPz+ezr4T8K68HLz8ogz9TLzMnLINbEwdTYIM/UINzUz8fP ++IM3F1M/EwSDQz8nTy8Egy8zJxc7Uz9c/Cg== ++""") ++ else: + self.assertEqual(msg.as_string(), text) + + def test_as_string_python_bug_32330(self): +-- +2.27.0 + diff --git a/mailman.spec b/mailman.spec index ede434b..b8b69da 100644 --- a/mailman.spec +++ b/mailman.spec @@ -7,7 +7,7 @@ Name: mailman Version: 3.3.2 -Release: 3 +Release: 4 Epoch: 3 Summary: The GNU mailing list manager License: GPLv3 @@ -21,6 +21,8 @@ Source5: mailman3-digests.service Source6: mailman3-digests.timer Patch11: mailman-subject-prefix.patch Patch14: mailman-use-either-importlib_resources-or-directly-importlib.patch +Patch15: fixbuilderror-1.patch +Patch16: fixbuilderror-2.patch BuildArch: noarch BuildRequires: glibc-langpack-en BuildRequires: python%{python3_pkgversion}-devel >= 3.5 python%{python3_pkgversion}-setuptools @@ -202,6 +204,9 @@ done %{_datadir}/selinux/*/mailman3.pp %changelog +* Thu Jan 13 2022 liwu - 3.3.2-4 +- fix build error + * Thu Aug 12 2021 wangyue - 3.3.2-3 - fix build error -- Gitee