diff --git a/ARC-message-fail-tests.patch b/ARC-message-fail-tests.patch deleted file mode 100644 index b705a62..0000000 --- a/ARC-message-fail-tests.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- - src/mailman/handlers/tests/test_arc_validate.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - ---- a/src/mailman/handlers/tests/test_arc_validate.py -+++ b/src/mailman/handlers/tests/test_arc_validate.py -@@ -192,7 +192,7 @@ 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"] -- self.assertEqual(msg["Authentication-Results"], ''.join(res)) -+ self.assertIn(''.join(res), msg["Authentication-Results"]) - - def test_authentication_whitelist_hit(self): - config.push('just_dkim', """ -@@ -235,7 +235,7 @@ This is a test! - - res = ["example.com; spf=pass smtp.mailfrom=gmail.com" - "; dkim=pass header.d=valimail.com; arc=none"] -- self.assertEqual(msg["Authentication-Results"], ''.join(res)) -+ self.assertIn(''.join(res), msg["Authentication-Results"]) - - def test_authentication_whitelist_miss(self): - config.push('just_dkim', """ -@@ -276,8 +276,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") -+ self.assertIn("test.com; dkim=pass header.d=valimail.com; arc=none", -+ msg["Authentication-Results"]) - - def test_authentication_bad_outlook_header(self): - config.push('just_dkim', """ -@@ -320,8 +320,8 @@ This is a test! - """) - - ValidateAuthenticity().process(lst, msg, msgdata) -- self.assertEqual(msg["Authentication-Results"], -- "test.com; dkim=fail header.d=valimail.com; arc=none") -+ self.assertIn("test.com; dkim=fail header.d=valimail.com; arc=none", -+ msg["Authentication-Results"]) - - - class TestTimeout(unittest.TestCase): diff --git a/mailman-3.3.5.tar.gz b/mailman-3.3.5.tar.gz deleted file mode 100644 index 1c8ab14..0000000 --- a/mailman-3.3.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fb38d9b516d9fdeb9c9f961a7630330cda46c490b91defc94b2c16683eeaf8a -size 1771305 diff --git a/mailman-3.3.6.tar.gz b/mailman-3.3.6.tar.gz new file mode 100644 index 0000000..2ba0f3a --- /dev/null +++ b/mailman-3.3.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d2ece475c020ad9d063d70f3637c86a31df0d48a0148f8ed6c8b9481e8e5d63 +size 1628026 diff --git a/python-mailman.changes b/python-mailman.changes index a78c660..357a507 100644 --- a/python-mailman.changes +++ b/python-mailman.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Oct 27 09:03:39 UTC 2022 - Andreas Schneider + +- Update to version 3.3.6 + * https://gitlab.com/mailman/mailman/-/blob/3.3.6/src/mailman/docs/NEWS.rst +- Added support-attrs-22.patch +- Removed ARC-message-fail-tests.patch + ------------------------------------------------------------------- Tue Sep 27 12:31:25 UTC 2022 - Markéta Machová diff --git a/python-mailman.spec b/python-mailman.spec index f98f350..d9c5171 100644 --- a/python-mailman.spec +++ b/python-mailman.spec @@ -46,7 +46,7 @@ %define mypython_sitelib %{python3_sitelib} %endif Name: python-mailman%{psuffix} -Version: 3.3.5 +Version: 3.3.6 Release: 0 Summary: A Mailing List Manager Group: Productivity/Networking/Email/Mailinglists @@ -75,12 +75,10 @@ Patch0: python-mailman-test_interact_default_banner.patch Patch1: support-sqlalchemy-1-4.patch # Suppprt Alembic 1.8.x Patch2: support-alembic-1-8.patch -# -# PATCH-FIX-UPSTREAM ARC-message-fail-tests.patch bsc#[0-9]+ mcepl@suse.com -# this patch makes things totally awesome -Patch3: ARC-message-fail-tests.patch # Disable cache_ok warnings on console messages: disable caching completely at the moment -Patch4: mailman-support-sqlalchemy-1-4.patch +Patch3: mailman-support-sqlalchemy-1-4.patch +# Support attrs 22.1 +Patch4: support-attrs-22.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros diff --git a/support-alembic-1-8.patch b/support-alembic-1-8.patch index 228af76..5b6c411 100644 --- a/support-alembic-1-8.patch +++ b/support-alembic-1-8.patch @@ -1,24 +1,24 @@ -Index: mailman-3.3.5/setup.py +Index: mailman-3.3.6/setup.py =================================================================== ---- mailman-3.3.5.orig/setup.py 2021-11-17 14:13:41.906620492 +0100 -+++ mailman-3.3.5/setup.py 2021-11-17 14:14:51.339103855 +0100 +--- mailman-3.3.6.orig/setup.py 2022-10-27 11:00:31.427260047 +0200 ++++ mailman-3.3.6/setup.py 2022-10-27 11:01:57.051868729 +0200 @@ -111,7 +111,7 @@ case second 'm'. Any other spelling is }, install_requires = [ 'aiosmtpd>=1.4.1', -- 'alembic>=1.6.2,<1.7', -+ 'alembic>=1.6.2,<1.9', +- 'alembic>=1.6.2,!=1.7.0', ++ 'alembic>=1.6.2,<1.9.0', 'atpublic', - 'authheaders>=0.9.2', - 'authres>=1.0.1', -Index: mailman-3.3.5/src/mailman.egg-info/requires.txt + 'attrs<21.3.0', + 'authheaders>=0.14.0', +Index: mailman-3.3.6/src/mailman.egg-info/requires.txt =================================================================== ---- mailman-3.3.5.orig/src/mailman.egg-info/requires.txt 2021-09-29 05:25:10.000000000 +0200 -+++ mailman-3.3.5/src/mailman.egg-info/requires.txt 2021-11-17 14:15:21.459313543 +0100 +--- mailman-3.3.6.orig/src/mailman.egg-info/requires.txt 2022-10-26 06:26:52.000000000 +0200 ++++ mailman-3.3.6/src/mailman.egg-info/requires.txt 2022-10-27 11:02:22.972052996 +0200 @@ -1,5 +1,5 @@ aiosmtpd>=1.4.1 --alembic<1.7,>=1.6.2 -+alembic<1.9,>=1.6.2 +-alembic!=1.7.0,>=1.6.2 ++alembic<1.9.0,>=1.6.2 atpublic - authheaders>=0.9.2 - authres>=1.0.1 + attrs<21.3.0 + authheaders>=0.14.0 diff --git a/support-attrs-22.patch b/support-attrs-22.patch new file mode 100644 index 0000000..c0f690a --- /dev/null +++ b/support-attrs-22.patch @@ -0,0 +1,26 @@ +Index: mailman-3.3.6/setup.py +=================================================================== +--- mailman-3.3.6.orig/setup.py 2022-10-27 11:14:04.065047157 +0200 ++++ mailman-3.3.6/setup.py 2022-10-27 11:15:25.901631179 +0200 +@@ -113,7 +113,7 @@ case second 'm'. Any other spelling is + 'aiosmtpd>=1.4.1', + 'alembic>=1.6.2,<1.9.0', + 'atpublic', +- 'attrs<21.3.0', ++ 'attrs<22.2', + 'authheaders>=0.14.0', + 'authres>=1.0.1', + 'click>=8.0.0', +Index: mailman-3.3.6/src/mailman.egg-info/requires.txt +=================================================================== +--- mailman-3.3.6.orig/src/mailman.egg-info/requires.txt 2022-10-27 11:02:22.972052996 +0200 ++++ mailman-3.3.6/src/mailman.egg-info/requires.txt 2022-10-27 11:15:33.805687581 +0200 +@@ -1,7 +1,7 @@ + aiosmtpd>=1.4.1 + alembic<1.9.0,>=1.6.2 + atpublic +-attrs<21.3.0 ++attrs<22.2.0 + authheaders>=0.14.0 + authres>=1.0.1 + click>=8.0.0 diff --git a/support-sqlalchemy-1-4.patch b/support-sqlalchemy-1-4.patch index fc58318..5739254 100644 --- a/support-sqlalchemy-1-4.patch +++ b/support-sqlalchemy-1-4.patch @@ -1,8 +1,8 @@ -Index: mailman-3.3.5/setup.py +Index: mailman-3.3.6/setup.py =================================================================== ---- mailman-3.3.5.orig/setup.py -+++ mailman-3.3.5/setup.py -@@ -127,7 +127,7 @@ case second 'm'. Any other spelling is +--- mailman-3.3.6.orig/setup.py 2022-09-02 05:49:42.000000000 +0200 ++++ mailman-3.3.6/setup.py 2022-10-27 11:00:31.427260047 +0200 +@@ -128,7 +128,7 @@ case second 'm'. Any other spelling is 'python-dateutil>=2.0', 'passlib', 'requests', @@ -11,10 +11,10 @@ Index: mailman-3.3.5/setup.py 'zope.component', 'zope.configuration', 'zope.event', -Index: mailman-3.3.5/src/mailman/database/tests/test_factory.py +Index: mailman-3.3.6/src/mailman/database/tests/test_factory.py =================================================================== ---- mailman-3.3.5.orig/src/mailman/database/tests/test_factory.py -+++ mailman-3.3.5/src/mailman/database/tests/test_factory.py +--- mailman-3.3.6.orig/src/mailman/database/tests/test_factory.py 2022-09-02 05:49:42.000000000 +0200 ++++ mailman-3.3.6/src/mailman/database/tests/test_factory.py 2022-10-27 11:00:31.427260047 +0200 @@ -76,10 +76,11 @@ class TestSchemaManager(unittest.TestCas # In case of MySQL, you cannot create/drop indexes on primary keys # manually as it is handled automatically by MySQL. @@ -41,11 +41,11 @@ Index: mailman-3.3.5/src/mailman/database/tests/test_factory.py config.db.commit() def test_current_database(self): -Index: mailman-3.3.5/src/mailman/model/listmanager.py +Index: mailman-3.3.6/src/mailman/model/listmanager.py =================================================================== ---- mailman-3.3.5.orig/src/mailman/model/listmanager.py -+++ mailman-3.3.5/src/mailman/model/listmanager.py -@@ -31,6 +31,11 @@ from mailman.model.mime import ContentFi +--- mailman-3.3.6.orig/src/mailman/model/listmanager.py 2022-09-02 05:49:42.000000000 +0200 ++++ mailman-3.3.6/src/mailman/model/listmanager.py 2022-10-27 11:00:31.427260047 +0200 +@@ -39,6 +39,11 @@ from mailman.model.mime import ContentFi from mailman.utilities.datetime import now from mailman.utilities.queries import QuerySequence from public import public @@ -57,7 +57,7 @@ Index: mailman-3.3.5/src/mailman/model/listmanager.py from zope.event import notify from zope.interface import implementer -@@ -120,7 +125,7 @@ class ListManager: +@@ -128,7 +133,7 @@ class ListManager: """See `IListManager`.""" result_set = store.query(MailingList) for list_id in result_set.values(MailingList._list_id):