head 1.6;
access;
symbols
OPENPKG_E1_MP_HEAD:1.3
OPENPKG_E1_MP:1.3;
locks; strict;
comment @# @;
1.6
date 2009.03.27.11.03.17; author rse; state Exp;
branches;
next 1.5;
commitid WzcJBqMxHBsh3FHt;
1.5
date 2008.07.01.18.59.53; author rse; state Exp;
branches;
next 1.4;
commitid iYVbwgDWcxLSk89t;
1.4
date 2008.04.22.05.58.27; author rse; state Exp;
branches;
next 1.3;
commitid iThJCarEmP1jg40t;
1.3
date 2006.05.22.18.19.09; author rse; state Exp;
branches;
next 1.2;
commitid Y7X4cafJntLqT2yr;
1.2
date 2005.05.21.19.32.54; author rse; state Exp;
branches;
next 1.1;
1.1
date 2005.04.30.17.18.54; author rse; state Exp;
branches;
next ;
desc
@@
1.6
log
@upgrading package: mailman 2.1.11 -> 2.1.12
@
text
@Index: Mailman/Archiver/pipermail.py
--- Mailman/Archiver/pipermail.py.orig 2009-02-23 22:23:35 +0100
+++ Mailman/Archiver/pipermail.py 2009-03-27 11:55:18 +0100
@@@@ -122,9 +122,9 @@@@
parentID = article.parentID
if parentID is not None and self.articleIndex.has_key(parentID):
parent = self.getArticle(archive, parentID)
- myThreadKey = parent.threadKey + article.date + '-'
+ myThreadKey = parent.threadKey + article.date + '/' + article.msgid + '-'
else:
- myThreadKey = article.date + '-'
+ myThreadKey = article.date + '/' + article.msgid + '-'
article.threadKey = myThreadKey
key = myThreadKey, article.msgid
self.setThreadKey(archive, key, article.msgid)
@@@@ -418,7 +418,7 @@@@
else:
parent = self.database.getArticle(self.archive,
article.parentID)
- article.threadKey = parent.threadKey+article.date+'-'
+ article.threadKey = parent.threadKey + article.date + '/' + article.msgid + '-'
self.database.setThreadKey(self.archive,
(article.threadKey, article.msgid),
msgid)
@@@@ -632,9 +632,9 @@@@
article.parentID = parentID = self.get_parent_info(arch, article)
if parentID:
parent = self.database.getArticle(arch, parentID)
- article.threadKey = parent.threadKey + article.date + '-'
+ article.threadKey = parent.threadKey + article.date + '/' + article.msgid + '-'
else:
- article.threadKey = article.date + '-'
+ article.threadKey = article.date + '/' + article.msgid + '-'
key = article.threadKey, article.msgid
self.database.setThreadKey(arch, key, article.msgid)
Index: Mailman/Commands/cmd_subscribe.py
--- Mailman/Commands/cmd_subscribe.py.orig 2009-02-23 22:23:35 +0100
+++ Mailman/Commands/cmd_subscribe.py 2009-03-27 11:55:18 +0100
@@@@ -84,6 +84,7 @@@@
if password is None:
password = Utils.MakeRandomPassword()
if address is None:
+ h = None
realname, address = parseaddr(res.msg['from'])
if not address:
# Fall back to the sender address
Index: Mailman/HTMLFormatter.py
--- Mailman/HTMLFormatter.py.orig 2009-02-23 22:23:35 +0100
+++ Mailman/HTMLFormatter.py 2009-03-27 11:55:18 +0100
@@@@ -44,7 +44,7 @@@@
realname = self.real_name
hostname = self.host_name
listinfo_link = Link(self.GetScriptURL('listinfo'), realname).Format()
- owner_link = Link('mailto:' + self.GetOwnerEmail(), ownertext).Format()
+ owner_link = Link('mailto:' + self.GetOwnerEmail(), realname + '-owner').Format()
innertext = _('%(listinfo_link)s list run by %(owner_link)s')
return Container(
'
',
Index: Mailman/Handlers/Decorate.py
--- Mailman/Handlers/Decorate.py.orig 2009-02-23 22:23:35 +0100
+++ Mailman/Handlers/Decorate.py 2009-03-27 11:55:18 +0100
@@@@ -205,6 +205,7 @@@@
del msg['content-transfer-encoding']
del msg['content-disposition']
msg['Content-Type'] = 'multipart/mixed'
+ msg['Mime-version'] = '1.0'
Index: Mailman/Handlers/Scrubber.py
--- Mailman/Handlers/Scrubber.py.orig 2009-02-23 22:23:35 +0100
+++ Mailman/Handlers/Scrubber.py 2009-03-27 11:55:18 +0100
@@@@ -388,6 +388,8 @@@@
t = unicode(t, 'ascii', 'replace')
try:
# Should use HTML-Escape, or try generalizing to UTF-8
+ if len(charset) == 0:
+ charset = 'us-ascii'
t = t.encode(charset, 'replace')
except (UnicodeError, LookupError, ValueError,
AssertionError):
Index: Mailman/Queue/OutgoingRunner.py
--- Mailman/Queue/OutgoingRunner.py.orig 2009-02-23 22:23:35 +0100
+++ Mailman/Queue/OutgoingRunner.py 2009-03-27 11:55:18 +0100
@@@@ -89,6 +89,7 @@@@
syslog('error', 'Cannot connect to SMTP server %s on port %s',
mm_cfg.SMTPHOST, port)
self.__logged = True
+ self._snooze(0)
return True
except Errors.SomeRecipientsFailed, e:
# Handle local rejects of probe messages differently.
Index: Mailman/htmlformat.py
--- Mailman/htmlformat.py.orig 2009-02-23 22:23:35 +0100
+++ Mailman/htmlformat.py 2009-03-27 11:55:18 +0100
@@@@ -300,7 +300,8 @@@@
charset = 'us-ascii'
if self.language:
charset = Utils.GetCharSet(self.language)
- output = ['Content-Type: text/html; charset=%s\n' % charset]
+ output = ['Content-Type: text/html; charset=%s' % charset]
+ output.append('Cache-control: no-cache\n')
if not self.suppress_head:
kws.setdefault('bgcolor', self.bgcolor)
tab = ' ' * indent
Index: bin/check_perms
--- bin/check_perms.orig 2009-02-23 22:23:35 +0100
+++ bin/check_perms 2009-03-27 11:55:18 +0100
@@@@ -82,7 +82,7 @@@@
return os.stat(path)[ST_MODE]
def statgidmode(path):
- stat = os.stat(path)
+ stat = os.lstat(path)
return stat[ST_MODE], stat[ST_GID]
seen = {}
Index: bin/config_list
--- bin/config_list.orig 2009-02-23 22:23:35 +0100
+++ bin/config_list 2009-03-27 11:55:18 +0100
@@@@ -307,6 +307,11 @@@@
in mm_cfg.OPTINFO.items()
if validval & bitval]
gui._setValue(mlist, k, validval, fakedoc)
+ # Ugly hack, but seems to be needed since
+ # new_member_options isn't really a number in gui.
+ # -- tfheen, 2003-12-06
+ if k == "new_member_options":
+ mlist.new_member_options = validval
# BAW: when to do gui._postValidate()???
finally:
if savelist and not checkonly:
Index: bin/mailmanctl
--- bin/mailmanctl.orig 2009-02-23 22:23:35 +0100
+++ bin/mailmanctl 2009-03-27 11:55:18 +0100
@@@@ -417,6 +417,13 @@@@
# won't be opening any terminal devices, don't do the ultra-paranoid
# suggestion of doing a second fork after the setsid() call.
os.setsid()
+
+ # Be sure to close any open std{in,out,err}
+ devnull = os.open('/dev/null', 0)
+ os.dup2(devnull, 0)
+ os.dup2(devnull, 1)
+ os.dup2(devnull, 2)
+
# Instead of cd'ing to root, cd to the Mailman installation home
os.chdir(mm_cfg.PREFIX)
# Set our file mode creation umask
Index: bin/newlist
--- bin/newlist.orig 2009-02-23 22:23:35 +0100
+++ bin/newlist 2009-03-27 11:58:07 +0100
@@@@ -88,12 +88,16 @@@@
defined in your Defaults.py file or overridden by settings in mm_cfg.py).
Note that listnames are forced to lowercase.
+
+The list admin address need to be a fully-qualified address, like
+owner@@example.com, not just owner.
"""
import sys
import os
import getpass
import getopt
+import grp
import paths
from Mailman import mm_cfg
@@@@ -122,6 +126,9 @@@@
def main():
+ gid = grp.getgrnam(mm_cfg.MAILMAN_GROUP)[2]
+ if os.getgid() != mm_cfg.MAILMAN_GROUP:
+ os.setgid(gid)
try:
opts, args = getopt.getopt(sys.argv[1:], 'hql:u:e:',
['help', 'quiet', 'language=',
@@@@ -203,7 +210,7 @@@@
except Errors.BadListNameError, s:
usage(1, _('Illegal list name: %(s)s'))
except Errors.EmailAddressError, s:
- usage(1, _('Bad owner email address: %(s)s'))
+ usage(1, _('Bad owner email address: %(s)s. Owner addresses need to be fully-qualified names, like "owner@@example.com", not just "owner".'))
except Errors.MMListAlreadyExistsError:
usage(1, _('List already exists: %(listname)s'))
Index: bin/update
--- bin/update.orig 2009-02-23 22:23:35 +0100
+++ bin/update 2009-03-27 11:55:18 +0100
@@@@ -551,9 +551,11 @@@@
file20 = os.path.join(mm_cfg.DATA_DIR, 'pending_subscriptions.db')
file214 = os.path.join(mm_cfg.DATA_DIR, 'pending.pck')
db = None
+ ver = None
# Try to load the Mailman 2.0 file
try:
fp = open(file20)
+ ver = "20"
except IOError, e:
if e.errno <> errno.ENOENT: raise
else:
@@@@ -565,6 +567,7 @@@@
# Try to load the Mailman 2.1.x where x < 5, file
try:
fp = open(file214)
+ ver = "214"
except IOError, e:
if e.errno <> errno.ENOENT: raise
else:
@@@@ -598,8 +601,12 @@@@
# data[0] is the address being unsubscribed
addrops_by_address.setdefault(data[0], []).append((key, val))
elif op == Pending.SUBSCRIPTION:
- # data[0] is a UserDesc object
- addr = data[0].address
+ if ver == "20":
+ # data is tuple (emailaddr, password, digest)
+ addr = data[0]
+ else:
+ # data[0] is a UserDesc object
+ addr = data[0].address
subs_by_address.setdefault(addr, []).append((key, val))
elif op == Pending.RE_ENABLE:
# data[0] is the mailing list's internal name
Index: scripts/driver
--- scripts/driver.orig 2009-02-23 22:23:35 +0100
+++ scripts/driver 2009-03-27 11:55:18 +0100
@@@@ -98,6 +98,15 @@@@
module = getattr(pkg, scriptname)
main = getattr(module, 'main')
try:
+ import os
+ request_method = os.environ.get('REQUEST_METHOD')
+ if not request_method in ['GET', 'POST', 'HEAD']:
+ print "Status: 405 Method not allowed"
+ print "Content-type: text/plain"
+ print
+ print "The method is not allowed"
+ sys.exit()
+
try:
sys.stderr = logger
sys.stdout = tempstdout
@
1.5
log
@upgrading package: mailman 2.1.10 -> 2.1.11
@
text
@d2 2
a3 2
--- Mailman/Archiver/pipermail.py.orig 2008-06-30 18:29:46 +0200
+++ Mailman/Archiver/pipermail.py 2008-07-01 20:48:10 +0200
d38 2
a39 2
--- Mailman/Commands/cmd_subscribe.py.orig 2008-06-30 18:29:46 +0200
+++ Mailman/Commands/cmd_subscribe.py 2008-07-01 20:48:10 +0200
d49 2
a50 2
--- Mailman/HTMLFormatter.py.orig 2008-06-30 18:29:46 +0200
+++ Mailman/HTMLFormatter.py 2008-07-01 20:48:10 +0200
d61 3
a63 3
--- Mailman/Handlers/Decorate.py.orig 2008-06-30 18:29:46 +0200
+++ Mailman/Handlers/Decorate.py 2008-07-01 20:48:10 +0200
@@@@ -197,6 +197,7 @@@@
d72 3
a74 3
--- Mailman/Handlers/Scrubber.py.orig 2008-06-30 18:29:46 +0200
+++ Mailman/Handlers/Scrubber.py 2008-07-01 20:48:10 +0200
@@@@ -385,6 +385,8 @@@@
d84 2
a85 2
--- Mailman/Queue/OutgoingRunner.py.orig 2008-06-30 18:29:46 +0200
+++ Mailman/Queue/OutgoingRunner.py 2008-07-01 20:48:10 +0200
d95 2
a96 2
--- Mailman/htmlformat.py.orig 2008-06-30 18:29:46 +0200
+++ Mailman/htmlformat.py 2008-07-01 20:48:10 +0200
d108 2
a109 2
--- bin/check_perms.orig 2008-06-30 18:29:46 +0200
+++ bin/check_perms 2008-07-01 20:48:10 +0200
d120 2
a121 2
--- bin/config_list.orig 2008-06-30 18:29:46 +0200
+++ bin/config_list 2008-07-01 20:48:10 +0200
d135 2
a136 2
--- bin/mailmanctl.orig 2008-06-30 18:29:46 +0200
+++ bin/mailmanctl 2008-07-01 20:48:10 +0200
d152 3
a154 3
--- bin/newlist.orig 2008-06-30 18:29:46 +0200
+++ bin/newlist 2008-07-01 20:48:10 +0200
@@@@ -87,6 +87,9 @@@@
d164 1
a164 1
@@@@ -94,6 +97,7 @@@@
a166 1
import sha
d191 3
a193 3
--- bin/update.orig 2008-06-30 18:29:46 +0200
+++ bin/update 2008-07-01 20:48:10 +0200
@@@@ -552,9 +552,11 @@@@
d205 1
a205 1
@@@@ -566,6 +568,7 @@@@
d213 1
a213 1
@@@@ -599,8 +602,12 @@@@
d229 3
a231 3
--- scripts/driver.orig 2008-06-30 18:29:46 +0200
+++ scripts/driver 2008-07-01 20:48:10 +0200
@@@@ -95,6 +95,15 @@@@
@
1.4
log
@upgrading package: mailman 2.1.9 -> 2.1.10
@
text
@d2 2
a3 2
--- Mailman/Archiver/pipermail.py.orig 2008-04-21 20:28:22 +0200
+++ Mailman/Archiver/pipermail.py 2008-04-22 07:51:36 +0200
d38 3
a40 3
--- Mailman/Commands/cmd_subscribe.py.orig 2008-04-21 20:28:22 +0200
+++ Mailman/Commands/cmd_subscribe.py 2008-04-22 07:51:36 +0200
@@@@ -83,6 +83,7 @@@@
d49 2
a50 2
--- Mailman/HTMLFormatter.py.orig 2008-04-21 20:28:22 +0200
+++ Mailman/HTMLFormatter.py 2008-04-22 07:51:36 +0200
d61 3
a63 3
--- Mailman/Handlers/Decorate.py.orig 2008-04-21 20:28:22 +0200
+++ Mailman/Handlers/Decorate.py 2008-04-22 07:51:36 +0200
@@@@ -191,6 +191,7 @@@@
d72 2
a73 2
--- Mailman/Handlers/Scrubber.py.orig 2008-04-21 20:28:22 +0200
+++ Mailman/Handlers/Scrubber.py 2008-04-22 07:51:36 +0200
d84 2
a85 2
--- Mailman/Queue/OutgoingRunner.py.orig 2008-04-21 20:28:22 +0200
+++ Mailman/Queue/OutgoingRunner.py 2008-04-22 07:51:36 +0200
d95 2
a96 2
--- Mailman/htmlformat.py.orig 2008-04-21 20:28:22 +0200
+++ Mailman/htmlformat.py 2008-04-22 07:51:36 +0200
d108 2
a109 2
--- bin/check_perms.orig 2008-04-21 20:28:22 +0200
+++ bin/check_perms 2008-04-22 07:51:36 +0200
d120 2
a121 2
--- bin/config_list.orig 2008-04-21 20:28:22 +0200
+++ bin/config_list 2008-04-22 07:51:36 +0200
d135 2
a136 2
--- bin/mailmanctl.orig 2008-04-21 20:28:22 +0200
+++ bin/mailmanctl 2008-04-22 07:51:36 +0200
d152 2
a153 2
--- bin/newlist.orig 2008-04-21 20:28:22 +0200
+++ bin/newlist 2008-04-22 07:51:36 +0200
d192 3
a194 3
--- bin/update.orig 2008-04-21 20:28:22 +0200
+++ bin/update 2008-04-22 07:51:36 +0200
@@@@ -541,9 +541,11 @@@@
d206 1
a206 1
@@@@ -555,6 +557,7 @@@@
d214 1
a214 1
@@@@ -588,8 +591,12 @@@@
a228 33
Index: messages/de/LC_MESSAGES/mailman.po
--- messages/de/LC_MESSAGES/mailman.po.orig 2008-04-21 20:28:22 +0200
+++ messages/de/LC_MESSAGES/mailman.po 2008-04-22 07:53:15 +0200
@@@@ -7350,7 +7350,7 @@@@
"\">topics_bodylines_limit\n"
" configuration variable."
msgstr ""
-"Der Themenfilter kategorisiert jede eingehende e-Mailnachricht gem酲s < a "
+"Der Themenfilter kategorisiert jede eingehende e-Mailnachricht gem酲s Filterregeln "
"mit regul酺en Ausdrcken, die Sie weiter unten festlegen k霵nen. Wenn "
"die Subject: oder Keywords: Header der Nachricht "
@@@@ -7363,7 +7363,7 @@@@
"nicht mit Sammelnachrichten.\n"
" Optional kann auch der Nachrichtentext auf Vorkommen von Subject: und Keyword: Header durchsucht werden. Spezifizieren Sie "
-"hierzu die Optiontopics_bodylines_limit."
# Mailman/Gui/Topics.py:57
Index: messages/es/LC_MESSAGES/mailman.po
--- messages/es/LC_MESSAGES/mailman.po.orig 2008-04-21 20:28:22 +0200
+++ messages/es/LC_MESSAGES/mailman.po 2008-04-22 07:51:36 +0200
@@@@ -2002,7 +2002,7 @@@@
#: Mailman/Cgi/create.py:212 bin/newlist:204
msgid "Illegal list name: %(s)s"
-msgstr "Nombre de lista ilegal: %(opt)s"
+msgstr "Nombre de lista ilegal: %(s)s"
#: Mailman/Cgi/create.py:217
msgid ""
d230 2
a231 2
--- scripts/driver.orig 2008-04-21 20:28:22 +0200
+++ scripts/driver 2008-04-22 07:51:36 +0200
@
1.3
log
@upgrading package: mailman 2.1.5 -> 2.1.8
@
text
@d2 2
a3 2
--- Mailman/Archiver/pipermail.py.orig 2006-01-29 06:12:26 +0100
+++ Mailman/Archiver/pipermail.py 2006-05-22 19:53:14 +0200
d38 3
a40 3
--- Mailman/Commands/cmd_subscribe.py.orig 2005-08-27 03:40:15 +0200
+++ Mailman/Commands/cmd_subscribe.py 2006-05-22 19:53:14 +0200
@@@@ -76,6 +76,7 @@@@
d49 3
a51 3
--- Mailman/HTMLFormatter.py.orig 2005-08-27 03:40:15 +0200
+++ Mailman/HTMLFormatter.py 2006-05-22 19:53:14 +0200
@@@@ -43,7 +43,7 @@@@
d61 3
a63 3
--- Mailman/Handlers/Decorate.py.orig 2006-01-29 06:12:26 +0100
+++ Mailman/Handlers/Decorate.py 2006-05-22 19:53:14 +0200
@@@@ -182,6 +182,7 @@@@
d72 4
a75 4
--- Mailman/Handlers/Scrubber.py.orig 2006-02-19 22:03:38 +0100
+++ Mailman/Handlers/Scrubber.py 2006-05-22 19:53:14 +0200
@@@@ -370,6 +370,8 @@@@
t = u.encode('ascii', 'replace')
d81 2
a82 2
except (UnicodeError, LookupError, ValueError):
t = t.encode(lcset, 'replace')
d84 3
a86 3
--- Mailman/Queue/OutgoingRunner.py.orig 2005-08-27 03:40:16 +0200
+++ Mailman/Queue/OutgoingRunner.py 2006-05-22 19:53:14 +0200
@@@@ -88,6 +88,7 @@@@
d95 3
a97 3
--- Mailman/htmlformat.py.orig 2005-08-27 03:40:15 +0200
+++ Mailman/htmlformat.py 2006-05-22 19:53:14 +0200
@@@@ -299,7 +299,8 @@@@
d108 3
a110 3
--- bin/check_perms.orig 2005-08-27 03:40:16 +0200
+++ bin/check_perms 2006-05-22 19:53:14 +0200
@@@@ -80,7 +80,7 @@@@
d120 2
a121 2
--- bin/config_list.orig 2005-12-30 19:50:08 +0100
+++ bin/config_list 2006-05-22 19:53:14 +0200
d135 2
a136 2
--- bin/mailmanctl.orig 2006-02-05 05:45:09 +0100
+++ bin/mailmanctl 2006-05-22 19:53:14 +0200
d152 2
a153 2
--- bin/newlist.orig 2005-08-27 03:40:16 +0200
+++ bin/newlist 2006-05-22 19:53:14 +0200
d182 1
a182 1
@@@@ -199,7 +206,7 @@@@
d192 2
a193 2
--- bin/update.orig 2005-08-27 03:40:16 +0200
+++ bin/update 2006-05-22 19:53:14 +0200
d230 3
a232 3
--- messages/de/LC_MESSAGES/mailman.po.orig 2006-03-23 11:51:30 +0100
+++ messages/de/LC_MESSAGES/mailman.po 2006-05-22 19:53:14 +0200
@@@@ -7201,7 +7201,7 @@@@
d236 6
a241 6
-"Der Themenfilter kategorisiert jede eingehende e-Mailnachricht gem酲s href="
+"Der Themenfilter kategorisiert jede eingehende e-Mailnachricht gem酲s Filterregeln mit "
"regul酺en Ausdrcken, die Sie weiter unten festlegen k霵nen. Wenn die "
"Subject: oder Keywords: Header der Nachricht mit "
@@@@ -7214,7 +7214,7 @@@@
d245 1
a245 1
-"hierzu die Optionhref=\"?VARHELP=topics/topics_bodylines_limit"
d251 3
a253 3
--- messages/es/LC_MESSAGES/mailman.po.orig 2006-03-23 11:51:32 +0100
+++ messages/es/LC_MESSAGES/mailman.po 2006-05-22 19:53:14 +0200
@@@@ -1984,7 +1984,7 @@@@
d255 1
a255 1
#: Mailman/Cgi/create.py:203 bin/newlist:200
d260 1
a260 1
#: Mailman/Cgi/create.py:208
d263 2
a264 2
--- scripts/driver.orig 2005-08-27 03:40:17 +0200
+++ scripts/driver 2006-05-22 19:53:14 +0200
@
1.2
log
@modifying package: mailman-2.1.5 20050501 -> 20050521
@
text
@d2 3
a4 3
--- Mailman/Archiver/pipermail.py.orig 2003-12-24 18:09:30 +0100
+++ Mailman/Archiver/pipermail.py 2005-04-30 09:07:16 +0200
@@@@ -115,9 +115,9 @@@@
d16 1
a16 1
@@@@ -407,7 +407,7 @@@@
d25 1
a25 1
@@@@ -615,9 +615,9 @@@@
d38 2
a39 2
--- Mailman/Commands/cmd_subscribe.py.orig 2002-11-21 06:37:25 +0100
+++ Mailman/Commands/cmd_subscribe.py 2005-04-30 09:07:16 +0200
d48 12
a59 52
@@@@ -84,9 +85,13 @@@@
res.results.append(_('No valid address found to subscribe'))
return STOP
# Watch for encoded names
- h = make_header(decode_header(realname))
+ try:
+ h = make_header(decode_header(realname))
+ except UnicodeDecodeError:
+ # Just fall back to an empty real, it's not critical
+ h = ""
# BAW: in Python 2.2, use just unicode(h)
- realname = h.__unicode__()
+ realname = unicode(h)
# Coerce to byte string if uh contains only ascii
try:
realname = realname.encode('us-ascii')
Index: Mailman/Defaults.py.in
--- Mailman/Defaults.py.in.orig 2004-04-25 04:30:03 +0200
+++ Mailman/Defaults.py.in 2005-04-30 09:07:16 +0200
@@@@ -770,6 +770,21 @@@@
# list's config variable default_member_moderation.
DEFAULT_NEW_MEMBER_OPTIONS = 256
+# Specify the type of passwords to use, when Mailman generates the passwords
+# itself, as would be the case for membership requests where the user did not
+# fill in a password, or during list creation, when auto-generation of admin
+# passwords was selected.
+#
+# Set this value to Yes for classic Mailman user-friendly(er) passwords.
+# These generate semi-pronounceable passwords which are easier to remember.
+# Set this value to No to use more cryptographically secure, but harder to
+# remember, passwords -- if your operating system and Python version support
+# the necessary feature (specifically that /dev/urandom be available).
+USER_FRIENDLY_PASSWORDS = Yes
+# This value specifies the default lengths of member and list admin passwords
+MEMBER_PASSWORD_LENGTH = 8
+ADMIN_PASSWORD_LENGTH = 10
+
#####
Index: Mailman/Handlers/AvoidDuplicates.py
--- Mailman/Handlers/AvoidDuplicates.py.orig 2003-04-19 06:57:14 +0200
+++ Mailman/Handlers/AvoidDuplicates.py 2005-04-30 09:07:16 +0200
@@@@ -92,4 +92,6 @@@@
msgdata['recips'] = newrecips
# RFC 2822 specifies zero or one CC header
del msg['cc']
- msg['Cc'] = COMMASPACE.join([formataddr(i) for i in ccaddrs.values()])
+ newcc = COMMASPACE.join([formataddr(i) for i in ccaddrs.values()])
+ if newcc:
+ msg['Cc'] = newcc
d61 3
a63 3
--- Mailman/Handlers/Decorate.py.orig 2003-12-01 15:21:08 +0100
+++ Mailman/Handlers/Decorate.py 2005-04-30 09:07:16 +0200
@@@@ -156,6 +156,7 @@@@
d72 3
a74 3
--- Mailman/Handlers/Scrubber.py.orig 2003-12-01 02:43:18 +0100
+++ Mailman/Handlers/Scrubber.py 2005-04-30 09:07:16 +0200
@@@@ -316,6 +316,8 @@@@
a82 28
Index: Mailman/ListAdmin.py
--- Mailman/ListAdmin.py.orig 2005-04-30 09:07:16 +0200
+++ Mailman/ListAdmin.py 2005-04-30 09:07:16 +0200
@@@@ -83,6 +83,8 @@@@
except IOError, e:
if e.errno <> errno.ENOENT: raise
self.__db = {}
+ # put version number in new database
+ self.__db['version'] = IGN, mm_cfg.REQUESTS_FILE_SCHEMA_VERSION
def __closedb(self):
if self.__db is not None:
Index: Mailman/Queue/#Switchboard.py.rej#
--- /dev/null 2005-04-30 09:07:56 +0200
+++ Mailman/Queue/#Switchboard.py.rej# 2005-04-30 09:07:16 +0200
@@@@ -0,0 +1,12 @@@@
+@@@@ -259,7 +259,10 @@@@
+
+ def _ext_read(self, filename):
+ fp = open(filename)
+- dict = marshal.load(fp)
++ try:
++ dict = marshal.load(fp)
++ except EOFError:
++ return {}
+ # Update from version 2 files
+ if dict.get('version', 0) == 2:
+ del dict['filebase']
d84 2
a85 2
--- Mailman/Queue/OutgoingRunner.py.orig 2004-02-22 23:37:45 +0100
+++ Mailman/Queue/OutgoingRunner.py 2005-04-30 09:07:16 +0200
a93 36
Index: Mailman/Queue/Switchboard.py.rej
--- /dev/null 2005-04-30 09:07:56 +0200
+++ Mailman/Queue/Switchboard.py.rej 2005-04-30 09:07:16 +0200
@@@@ -0,0 +1,20 @@@@
+***************
+*** 259,265 ****
+
+ def _ext_read(self, filename):
+ fp = open(filename)
+- dict = marshal.load(fp)
+ # Update from version 2 files
+ if dict.get('version', 0) == 2:
+ del dict['filebase']
+--- 259,268 ----
+
+ def _ext_read(self, filename):
+ fp = open(filename)
++ try:
++ dict = marshal.load(fp)
++ except EOFError:
++ return {}
+ # Update from version 2 files
+ if dict.get('version', 0) == 2:
+ del dict['filebase']
Index: Mailman/Utils.py
--- Mailman/Utils.py.orig 2005-04-30 09:07:16 +0200
+++ Mailman/Utils.py 2005-04-30 09:07:16 +0200
@@@@ -680,7 +680,7 @@@@
else:
# See the note in Defaults.py concerning DEFAULT_HOST_NAME
# vs. DEFAULT_EMAIL_HOST.
- hostname = mm_cfg.DEFAULT_HOST_NAME or mm_cfg.DEFAULT_EMAIL_HOST
+ hostname = mm_cfg.DEFAULT_HOST_NAME or mm_cfg.DEFAULT_URL_HOST
return hostname.lower()
d95 2
a96 2
--- Mailman/htmlformat.py.orig 2005-04-30 09:07:16 +0200
+++ Mailman/htmlformat.py 2005-04-30 09:07:16 +0200
d99 1
a99 1
if self.language and Utils.IsLanguage(self.language):
d108 3
a110 3
--- bin/check_perms.orig 2003-03-31 22:07:55 +0200
+++ bin/check_perms 2005-04-30 09:07:16 +0200
@@@@ -81,7 +81,7 @@@@
d120 3
a122 3
--- bin/config_list.orig 2003-11-25 00:08:19 +0100
+++ bin/config_list 2005-04-30 09:07:16 +0200
@@@@ -293,6 +293,11 @@@@
d135 3
a137 3
--- bin/mailmanctl.orig 2004-02-03 23:26:08 +0100
+++ bin/mailmanctl 2005-04-30 09:07:16 +0200
@@@@ -416,6 +416,13 @@@@
d150 1
a150 1
# Clear our file mode creation umask
d152 3
a154 3
--- bin/newlist.orig 2004-02-29 18:09:44 +0100
+++ bin/newlist 2005-04-30 09:07:16 +0200
@@@@ -62,6 +62,9 @@@@
d164 1
a164 1
@@@@ -69,6 +72,7 @@@@
d172 1
a172 1
@@@@ -97,6 +101,9 @@@@
d180 3
a182 3
opts, args = getopt.getopt(sys.argv[1:], 'hql:',
['help', 'quiet', 'language='])
@@@@ -163,7 +170,7 @@@@
d192 3
a194 3
--- bin/update.orig 2005-04-30 09:07:16 +0200
+++ bin/update 2005-04-30 09:07:16 +0200
@@@@ -532,9 +532,11 @@@@
d206 1
a206 1
@@@@ -546,6 +548,7 @@@@
d214 1
a214 1
@@@@ -579,8 +582,12 @@@@
d230 3
a232 3
--- messages/de/LC_MESSAGES/mailman.po.orig 2004-04-04 19:03:05 +0200
+++ messages/de/LC_MESSAGES/mailman.po 2005-04-30 09:07:16 +0200
@@@@ -7006,7 +7006,7 @@@@
d241 1
a241 1
@@@@ -7019,7 +7019,7 @@@@
d251 3
a253 3
--- messages/es/LC_MESSAGES/mailman.po.orig 2004-03-16 07:04:06 +0100
+++ messages/es/LC_MESSAGES/mailman.po 2005-04-30 09:07:16 +0200
@@@@ -1944,7 +1944,7 @@@@
d255 1
a255 1
#: Mailman/Cgi/create.py:200 bin/newlist:164
d260 1
a260 1
#: Mailman/Cgi/create.py:205
d263 2
a264 2
--- scripts/driver.orig 2005-04-30 09:07:16 +0200
+++ scripts/driver 2005-04-30 09:07:16 +0200
a280 1212
Index: templates/#Makefile.in.rej#
--- /dev/null 2005-04-30 09:07:56 +0200
+++ templates/#Makefile.in.rej# 2005-04-30 09:07:16 +0200
@@@@ -0,0 +1,9 @@@@
+@@@@ -42,7 +42,7 @@@@
+
+ SHELL= /bin/sh
+
+-LANGUAGES= big5 ca cs de en es et eu fi fr gb hr hu it ja ko lt nl \
++LANGUAGES= big5 ca cs da de en es et eu fi fr gb hr hu it ja ko lt nl \
+ no pl pt pt_BR ro ru sl sr sv uk
+
+ # Modes for directories and executables created by the install
Index: templates/Makefile.in
--- templates/Makefile.in.orig 2004-04-25 04:30:04 +0200
+++ templates/Makefile.in 2005-04-30 09:07:16 +0200
@@@@ -42,7 +42,7 @@@@
SHELL= /bin/sh
-LANGUAGES= big5 ca cs de en es et eu fi fr gb hr hu it ja ko lt nl \
+LANGUAGES= big5 ca cs da de en es et eu fi fr gb hr hu it ja ko lt nl \
no pl pt pt_BR ro ru sl sr sv tr uk
# Modes for directories and executables created by the install
Index: templates/big5/admlogin.html
--- templates/big5/admlogin.html.orig 2001-06-08 16:14:36 +0200
+++ templates/big5/admlogin.html 2005-04-30 09:07:16 +0200
@@@@ -1,9 +1,11 @@@@
%(listname)s 論壇 壇主驗證
+
+
-
-