diff --git a/Require-authheaders-0.14.0-and-adjust-tests-accordingly.patch b/Require-authheaders-0.14.0-and-adjust-tests-accordingly.patch new file mode 100644 index 0000000000000000000000000000000000000000..3a11903d25a0d1f3953241c34ef169c4f54df004 --- /dev/null +++ b/Require-authheaders-0.14.0-and-adjust-tests-accordingly.patch @@ -0,0 +1,64 @@ +From 6eada072194037049e5875edc4fda914d9c67f83 Mon Sep 17 00:00:00 2001 +From: starlet-dx <15929766099@163.com> +Date: Thu, 19 Jan 2023 15:08:54 +0800 +Subject: [PATCH 1/1] Require authheaders >=0.14.0 and adjust tests accordingly. + +--- + setup.py | 2 +- + src/mailman/handlers/tests/test_arc_validate.py | 13 ++++++++----- + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/setup.py b/setup.py +index 5eceac2..5171d0e 100644 +--- a/setup.py ++++ b/setup.py +@@ -113,7 +113,7 @@ case second 'm'. Any other spelling is incorrect.""", + 'aiosmtpd>=1.1', + 'alembic', + 'atpublic', +- 'authheaders>=0.9.2', ++ 'authheaders>=0.14.0', + 'authres>=1.0.1', + 'click>=8.0.0', + 'dnspython>=1.14.0', +diff --git a/src/mailman/handlers/tests/test_arc_validate.py b/src/mailman/handlers/tests/test_arc_validate.py +index 6eb2f57..2103b08 100644 +--- a/src/mailman/handlers/tests/test_arc_validate.py ++++ b/src/mailman/handlers/tests/test_arc_validate.py +@@ -190,8 +190,9 @@ This is a test message. + """) + + ValidateAuthenticity().process(lst, msg, msgdata) +- res = ["lists.example.org; spf=pass smtp.mfrom=jqd@d1.example" +- "; dkim=pass header.i=@d1.example; dmarc=pass; arc=fail"] ++ res = ['lists.example.org; spf=pass smtp.mfrom=jqd@d1.example', ++ '; dkim=pass header.i=@d1.example; dmarc=pass; arc=fail ', ++ '(Most recent ARC-Message-Signature did not validate)'] + self.assertEqual(msg["Authentication-Results"], ''.join(res)) + + def test_authentication_whitelist_hit(self): +@@ -233,8 +234,9 @@ This is a test! + + ValidateAuthenticity().process(lst, msg, msgdata) + +- res = ["example.com; spf=pass smtp.mailfrom=gmail.com" +- "; dkim=pass header.d=valimail.com; arc=none"] ++ res = ['example.com; spf=pass smtp.mailfrom=gmail.com', ++ '; dkim=pass header.d=valimail.com; arc=none ', ++ '(Message is not ARC signed)'] + self.assertEqual(msg["Authentication-Results"], ''.join(res)) + + def test_authentication_whitelist_miss(self): +@@ -277,7 +279,8 @@ This is a test! + + ValidateAuthenticity().process(lst, msg, msgdata) + self.assertEqual(msg["Authentication-Results"], +- "test.com; dkim=pass header.d=valimail.com; arc=none") ++ 'test.com; dkim=pass header.d=valimail.com; arc=none ' ++ '(Message is not ARC signed)') + + + class TestTimeout(unittest.TestCase): +-- +2.30.0 + diff --git a/mailman.spec b/mailman.spec index f46de6251279048cd4a0ccc039e4bd1a5ff2ef07..ae0b723aedf7b3fb2bcdeadffc7639c64a88dd55 100644 --- a/mailman.spec +++ b/mailman.spec @@ -7,7 +7,7 @@ Name: mailman Version: 3.3.2 -Release: 7 +Release: 8 Epoch: 3 Summary: The GNU mailing list manager License: GPLv3 @@ -30,6 +30,8 @@ Patch16: mailman3-test_as_string_python_bug_27321.patch Patch17: 0001-fix-tests-assertion-error.patch #Refer: https://gitlab.com/mailman/mailman/-/issues/964#note_1001855903 Patch18: support-sqlalchemy-1-4.patch +#Refer: https://gitlab.com/mailman/mailman/-/merge_requests/929 +Patch19: Require-authheaders-0.14.0-and-adjust-tests-accordingly.patch BuildArch: noarch BuildRequires: glibc-langpack-en BuildRequires: python%{python3_pkgversion}-devel >= 3.5 python%{python3_pkgversion}-setuptools @@ -211,6 +213,9 @@ done %{_datadir}/selinux/*/mailman3.pp %changelog +* Fri Jan 20 2023 yaoxin - 3:3.3.2-8 +- Fix build error due to python-authheaders update to 0.15.1 + * Thu Jul 07 2022 wangkai - 3:3.3.2-7 - Silence sqlalchemy-1.4 warning