CVS commit: pkgsrc/www/mailman3-web

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Jun  4 11:17:44 UTC 2025

Modified Files:
        pkgsrc/www/mailman3-web: Makefile distinfo
        pkgsrc/www/mailman3-web/patches: patch-mailman__web_settings_mailman.py

Log Message:
mailman3-web: fixes for py-django-allauth >= 65.5


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/mailman3-web/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/mailman3-web/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/mailman3-web/patches/patch-mailman__web_settings_mailman.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/mailman3-web/Makefile
diff -u pkgsrc/www/mailman3-web/Makefile:1.9 pkgsrc/www/mailman3-web/Makefile:1.10
--- pkgsrc/www/mailman3-web/Makefile:1.9        Mon Oct 14 06:46:05 2024
+++ pkgsrc/www/mailman3-web/Makefile    Wed Jun  4 11:17:44 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2024/10/14 06:46:05 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2025/06/04 11:17:44 markd Exp $
 
 DISTNAME=      mailman_web-0.0.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
+PKGREVISION=   1
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/mailman-web/}
 

Index: pkgsrc/www/mailman3-web/distinfo
diff -u pkgsrc/www/mailman3-web/distinfo:1.4 pkgsrc/www/mailman3-web/distinfo:1.5
--- pkgsrc/www/mailman3-web/distinfo:1.4        Mon Apr 29 07:50:16 2024
+++ pkgsrc/www/mailman3-web/distinfo    Wed Jun  4 11:17:44 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2024/04/29 07:50:16 markd Exp $
+$NetBSD: distinfo,v 1.5 2025/06/04 11:17:44 markd Exp $
 
 BLAKE2s (mailman_web-0.0.9.tar.gz) = ee522261bd0c8fdb991cb0bddcaca7645f5f4df8bcd0783c9e50d77f92a9eb7f
 SHA512 (mailman_web-0.0.9.tar.gz) = 19b969a6ea864d246dfe738698bbaad353c049927223886f60eac8dabc07219a2dd39aab3ab382f3a5ede8f18fc32af8e9e48099eb06505b229c6d5b487a55bc
 Size (mailman_web-0.0.9.tar.gz) = 22300 bytes
 SHA1 (patch-mailman__web_manage.py) = dc7ba1e520869d93bedb4dedb8ac8c92ca362cd8
 SHA1 (patch-mailman__web_settings_base.py) = 3f9aa8af506f1d3b988a3a0da7193efa2e993668
-SHA1 (patch-mailman__web_settings_mailman.py) = cc6a776d6a53b959ec34637d801fa7cdf329b0bd
+SHA1 (patch-mailman__web_settings_mailman.py) = 026a8ea5e40286e495233bf4146a45813bac8073

Index: pkgsrc/www/mailman3-web/patches/patch-mailman__web_settings_mailman.py
diff -u pkgsrc/www/mailman3-web/patches/patch-mailman__web_settings_mailman.py:1.1 pkgsrc/www/mailman3-web/patches/patch-mailman__web_settings_mailman.py:1.2
--- pkgsrc/www/mailman3-web/patches/patch-mailman__web_settings_mailman.py:1.1  Sat Jun 10 06:00:53 2023
+++ pkgsrc/www/mailman3-web/patches/patch-mailman__web_settings_mailman.py      Wed Jun  4 11:17:44 2025
@@ -1,9 +1,24 @@
-$NetBSD: patch-mailman__web_settings_mailman.py,v 1.1 2023/06/10 06:00:53 markd Exp $
+$NetBSD: patch-mailman__web_settings_mailman.py,v 1.2 2025/06/04 11:17:44 markd Exp $
+
+https://gitlab.com/mailman/mailman-web/-/commit/3713b55989fbf0e5e79a6df64fd41cfdd3353262
+https://gitlab.com/mailman/mailman-web/-/commit/1af9f7c900c310b60ac17ae71e0cbb68ee97c0b9
+  for django-allauth >= 65.5
 
 configure paths
 
---- mailman_web/settings/mailman.py.orig       2022-09-10 14:41:36.000000000 +0000
+--- mailman_web/settings/mailman.py.orig       2024-03-07 08:49:37.048697200 +0000
 +++ mailman_web/settings/mailman.py
+@@ -28,8 +28,8 @@ DEFAULT_FROM_EMAIL = 'postorius@localhos
+ 
+ 
+ #: Django Allauth
+-ACCOUNT_AUTHENTICATION_METHOD = "username_email"
+-ACCOUNT_EMAIL_REQUIRED = True
++ACCOUNT_LOGIN_METHODS = {'email', 'username'}
++ACCOUNT_SIGNUP_FIELDS = ['username*', 'email*', 'password1*', 'password2*']
+ ACCOUNT_EMAIL_VERIFICATION = "mandatory"
+ ACCOUNT_UNIQUE_EMAIL = True
+ 
 @@ -93,7 +93,7 @@ AUTHENTICATION_BACKENDS = (
  HAYSTACK_CONNECTIONS = {
      'default': {