View | Details | Raw Unified | Return to bug 231879 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +8 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	mailman
4
PORTNAME=	mailman
5
DISTVERSION=	2.1.29
5
DISTVERSION=	2.1.29
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	mail
7
CATEGORIES=	mail
8
MASTER_SITES=	GNU \
8
MASTER_SITES=	GNU \
9
		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
9
		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
Lines 71-78 Link Here
71
71
72
OPTIONS_SINGLE=	MTA
72
OPTIONS_SINGLE=	MTA
73
OPTIONS_SINGLE_MTA=	COURIER EXIM4 OPENSMTPD POSTFIX SENDMAIL
73
OPTIONS_SINGLE_MTA=	COURIER EXIM4 OPENSMTPD POSTFIX SENDMAIL
74
OPTIONS_DEFINE=	HTDIG NAMAZU2 NLS DOCS
74
OPTIONS_DEFINE=	HTDIG NAMAZU2 NOMAILPWD NLS DOCS
75
OPTIONS_DEFAULT=	SENDMAIL
75
OPTIONS_DEFAULT=	SENDMAIL NOMAILPWD
76
COURIER_DESC=	for use with courier
76
COURIER_DESC=	for use with courier
77
EXIM4_DESC=	for use with exim4
77
EXIM4_DESC=	for use with exim4
78
OPENSMTPD_DESC=	for use with opensmtpd - EXPERIMENTAL -
78
OPENSMTPD_DESC=	for use with opensmtpd - EXPERIMENTAL -
Lines 80-85 Link Here
80
SENDMAIL_DESC=	for use with sendmail
80
SENDMAIL_DESC=	for use with sendmail
81
HTDIG_DESC=	- EXPERIMENTAL - htdig integration patches
81
HTDIG_DESC=	- EXPERIMENTAL - htdig integration patches
82
NAMAZU2_DESC=	Make private archives searchable with namazu2
82
NAMAZU2_DESC=	Make private archives searchable with namazu2
83
NOMAILPWD_DESC=	Elide plaintext passwords from monthly reminders
83
MTA_DESC=	Integrate with which MTA?
84
MTA_DESC=	Integrate with which MTA?
84
85
85
.include <bsd.port.options.mk>
86
.include <bsd.port.options.mk>
Lines 142-147 Link Here
142
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Mailman-Cgi-private.py
143
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Mailman-Cgi-private.py
143
.endif
144
.endif
144
145
146
.if ${PORT_OPTIONS:MNOMAILPWD}
147
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mailpasswds
148
.endif
149
145
BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR}
150
BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR}
146
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR}
151
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR}
147
152
(-)files/extra-patch-mailpasswds (+22 lines)
Line 0 Link Here
1
--- cron/mailpasswds.orig	2018-07-25 00:01:28.000000000 +0200
2
+++ cron/mailpasswds	2018-10-03 11:00:40.137699000 +0200
3
@@ -148,17 +148,8 @@
4
                 if mlist.getMemberOption(member,
5
                                          mm_cfg.SuppressPasswordReminder):
6
                     continue
7
-                # Group by the lower-cased address, since Mailman always
8
-                # treates person@dom.ain the same as PERSON@dom.ain.
9
-                try:
10
-                    password = mlist.getMemberPassword(member)
11
-                except Errors.NotAMemberError:
12
-                    # Here's a member with no passwords, which I think was
13
-                    # possible in older versions of Mailman.  Log this and
14
-                    # move on.
15
-                    syslog('error', 'password-less member %s for list %s',
16
-                           member, mlist.internal_name())
17
-                    continue
18
+                # https://mail.python.org/pipermail/mailman-users/2016-April/080746.html
19
+                password = '****'
20
                 optionsurl = mlist.GetOptionsURL(member)
21
                 lang = mlist.getMemberLanguage(member)
22
                 info = (listaddr, password, optionsurl, lang)

Return to bug 231879