|
|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
Index: Mailman/Archiver/pipermail.py
|
|
|
|
|
--- Mailman/Archiver/pipermail.py.orig 2008-04-21 20:28:22 +0200
|
|
|
|
|
+++ Mailman/Archiver/pipermail.py 2008-04-22 07:51:36 +0200
|
|
|
|
|
--- Mailman/Archiver/pipermail.py.orig 2008-06-30 18:29:46 +0200
|
|
|
|
|
+++ Mailman/Archiver/pipermail.py 2008-07-01 20:48:10 +0200
|
|
|
|
|
@@ -122,9 +122,9 @@
|
|
|
|
|
parentID = article.parentID
|
|
|
|
|
if parentID is not None and self.articleIndex.has_key(parentID):
|
|
|
|
|
@ -35,9 +35,9 @@ Index: Mailman/Archiver/pipermail.py
|
|
|
|
|
|
|
|
|
|
self.database.setThreadKey(arch, key, article.msgid)
|
|
|
|
|
Index: Mailman/Commands/cmd_subscribe.py
|
|
|
|
|
--- 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 @@
|
|
|
|
|
--- 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
|
|
|
|
|
@@ -84,6 +84,7 @@
|
|
|
|
|
if password is None:
|
|
|
|
|
password = Utils.MakeRandomPassword()
|
|
|
|
|
if address is None:
|
|
|
|
|
@ -46,8 +46,8 @@ Index: Mailman/Commands/cmd_subscribe.py
|
|
|
|
|
if not address:
|
|
|
|
|
# Fall back to the sender address
|
|
|
|
|
Index: Mailman/HTMLFormatter.py
|
|
|
|
|
--- Mailman/HTMLFormatter.py.orig 2008-04-21 20:28:22 +0200
|
|
|
|
|
+++ Mailman/HTMLFormatter.py 2008-04-22 07:51:36 +0200
|
|
|
|
|
--- Mailman/HTMLFormatter.py.orig 2008-06-30 18:29:46 +0200
|
|
|
|
|
+++ Mailman/HTMLFormatter.py 2008-07-01 20:48:10 +0200
|
|
|
|
|
@@ -44,7 +44,7 @@
|
|
|
|
|
realname = self.real_name
|
|
|
|
|
hostname = self.host_name
|
|
|
|
|
@ -58,9 +58,9 @@ Index: Mailman/HTMLFormatter.py
|
|
|
|
|
return Container(
|
|
|
|
|
'<hr>',
|
|
|
|
|
Index: Mailman/Handlers/Decorate.py
|
|
|
|
|
--- 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 @@
|
|
|
|
|
--- 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 @@
|
|
|
|
|
del msg['content-transfer-encoding']
|
|
|
|
|
del msg['content-disposition']
|
|
|
|
|
msg['Content-Type'] = 'multipart/mixed'
|
|
|
|
|
@ -69,8 +69,8 @@ Index: Mailman/Handlers/Decorate.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Index: Mailman/Handlers/Scrubber.py
|
|
|
|
|
--- Mailman/Handlers/Scrubber.py.orig 2008-04-21 20:28:22 +0200
|
|
|
|
|
+++ Mailman/Handlers/Scrubber.py 2008-04-22 07:51:36 +0200
|
|
|
|
|
--- 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 @@
|
|
|
|
|
t = unicode(t, 'ascii', 'replace')
|
|
|
|
|
try:
|
|
|
|
|
@ -81,8 +81,8 @@ Index: Mailman/Handlers/Scrubber.py
|
|
|
|
|
except (UnicodeError, LookupError, ValueError,
|
|
|
|
|
AssertionError):
|
|
|
|
|
Index: Mailman/Queue/OutgoingRunner.py
|
|
|
|
|
--- Mailman/Queue/OutgoingRunner.py.orig 2008-04-21 20:28:22 +0200
|
|
|
|
|
+++ Mailman/Queue/OutgoingRunner.py 2008-04-22 07:51:36 +0200
|
|
|
|
|
--- Mailman/Queue/OutgoingRunner.py.orig 2008-06-30 18:29:46 +0200
|
|
|
|
|
+++ Mailman/Queue/OutgoingRunner.py 2008-07-01 20:48:10 +0200
|
|
|
|
|
@@ -89,6 +89,7 @@
|
|
|
|
|
syslog('error', 'Cannot connect to SMTP server %s on port %s',
|
|
|
|
|
mm_cfg.SMTPHOST, port)
|
|
|
|
|
@ -92,8 +92,8 @@ Index: Mailman/Queue/OutgoingRunner.py
|
|
|
|
|
except Errors.SomeRecipientsFailed, e:
|
|
|
|
|
# Handle local rejects of probe messages differently.
|
|
|
|
|
Index: Mailman/htmlformat.py
|
|
|
|
|
--- Mailman/htmlformat.py.orig 2008-04-21 20:28:22 +0200
|
|
|
|
|
+++ Mailman/htmlformat.py 2008-04-22 07:51:36 +0200
|
|
|
|
|
--- Mailman/htmlformat.py.orig 2008-06-30 18:29:46 +0200
|
|
|
|
|
+++ Mailman/htmlformat.py 2008-07-01 20:48:10 +0200
|
|
|
|
|
@@ -300,7 +300,8 @@
|
|
|
|
|
charset = 'us-ascii'
|
|
|
|
|
if self.language:
|
|
|
|
|
@ -105,8 +105,8 @@ Index: Mailman/htmlformat.py
|
|
|
|
|
kws.setdefault('bgcolor', self.bgcolor)
|
|
|
|
|
tab = ' ' * indent
|
|
|
|
|
Index: bin/check_perms
|
|
|
|
|
--- bin/check_perms.orig 2008-04-21 20:28:22 +0200
|
|
|
|
|
+++ bin/check_perms 2008-04-22 07:51:36 +0200
|
|
|
|
|
--- bin/check_perms.orig 2008-06-30 18:29:46 +0200
|
|
|
|
|
+++ bin/check_perms 2008-07-01 20:48:10 +0200
|
|
|
|
|
@@ -82,7 +82,7 @@
|
|
|
|
|
return os.stat(path)[ST_MODE]
|
|
|
|
|
|
|
|
|
|
@ -117,8 +117,8 @@ Index: bin/check_perms
|
|
|
|
|
|
|
|
|
|
seen = {}
|
|
|
|
|
Index: bin/config_list
|
|
|
|
|
--- bin/config_list.orig 2008-04-21 20:28:22 +0200
|
|
|
|
|
+++ bin/config_list 2008-04-22 07:51:36 +0200
|
|
|
|
|
--- bin/config_list.orig 2008-06-30 18:29:46 +0200
|
|
|
|
|
+++ bin/config_list 2008-07-01 20:48:10 +0200
|
|
|
|
|
@@ -307,6 +307,11 @@
|
|
|
|
|
in mm_cfg.OPTINFO.items()
|
|
|
|
|
if validval & bitval]
|
|
|
|
|
@ -132,8 +132,8 @@ Index: bin/config_list
|
|
|
|
|
finally:
|
|
|
|
|
if savelist and not checkonly:
|
|
|
|
|
Index: bin/mailmanctl
|
|
|
|
|
--- bin/mailmanctl.orig 2008-04-21 20:28:22 +0200
|
|
|
|
|
+++ bin/mailmanctl 2008-04-22 07:51:36 +0200
|
|
|
|
|
--- bin/mailmanctl.orig 2008-06-30 18:29:46 +0200
|
|
|
|
|
+++ bin/mailmanctl 2008-07-01 20:48:10 +0200
|
|
|
|
|
@@ -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.
|
|
|
|
|
@ -149,8 +149,8 @@ Index: bin/mailmanctl
|
|
|
|
|
os.chdir(mm_cfg.PREFIX)
|
|
|
|
|
# Set our file mode creation umask
|
|
|
|
|
Index: bin/newlist
|
|
|
|
|
--- bin/newlist.orig 2008-04-21 20:28:22 +0200
|
|
|
|
|
+++ bin/newlist 2008-04-22 07:51:36 +0200
|
|
|
|
|
--- bin/newlist.orig 2008-06-30 18:29:46 +0200
|
|
|
|
|
+++ bin/newlist 2008-07-01 20:48:10 +0200
|
|
|
|
|
@@ -87,6 +87,9 @@
|
|
|
|
|
defined in your Defaults.py file or overridden by settings in mm_cfg.py).
|
|
|
|
|
|
|
|
|
|
@ -189,9 +189,9 @@ Index: bin/newlist
|
|
|
|
|
usage(1, _('List already exists: %(listname)s'))
|
|
|
|
|
|
|
|
|
|
Index: bin/update
|
|
|
|
|
--- bin/update.orig 2008-04-21 20:28:22 +0200
|
|
|
|
|
+++ bin/update 2008-04-22 07:51:36 +0200
|
|
|
|
|
@@ -541,9 +541,11 @@
|
|
|
|
|
--- bin/update.orig 2008-06-30 18:29:46 +0200
|
|
|
|
|
+++ bin/update 2008-07-01 20:48:10 +0200
|
|
|
|
|
@@ -552,9 +552,11 @@
|
|
|
|
|
file20 = os.path.join(mm_cfg.DATA_DIR, 'pending_subscriptions.db')
|
|
|
|
|
file214 = os.path.join(mm_cfg.DATA_DIR, 'pending.pck')
|
|
|
|
|
db = None
|
|
|
|
|
@ -203,7 +203,7 @@ Index: bin/update
|
|
|
|
|
except IOError, e:
|
|
|
|
|
if e.errno <> errno.ENOENT: raise
|
|
|
|
|
else:
|
|
|
|
|
@@ -555,6 +557,7 @@
|
|
|
|
|
@@ -566,6 +568,7 @@
|
|
|
|
|
# Try to load the Mailman 2.1.x where x < 5, file
|
|
|
|
|
try:
|
|
|
|
|
fp = open(file214)
|
|
|
|
|
@ -211,7 +211,7 @@ Index: bin/update
|
|
|
|
|
except IOError, e:
|
|
|
|
|
if e.errno <> errno.ENOENT: raise
|
|
|
|
|
else:
|
|
|
|
|
@@ -588,8 +591,12 @@
|
|
|
|
|
@@ -599,8 +602,12 @@
|
|
|
|
|
# data[0] is the address being unsubscribed
|
|
|
|
|
addrops_by_address.setdefault(data[0], []).append((key, val))
|
|
|
|
|
elif op == Pending.SUBSCRIPTION:
|
|
|
|
|
@ -226,42 +226,9 @@ Index: bin/update
|
|
|
|
|
subs_by_address.setdefault(addr, []).append((key, val))
|
|
|
|
|
elif op == Pending.RE_ENABLE:
|
|
|
|
|
# data[0] is the mailing list's internal name
|
|
|
|
|
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</a>\n"
|
|
|
|
|
" configuration variable."
|
|
|
|
|
msgstr ""
|
|
|
|
|
-"Der Themenfilter kategorisiert jede eingehende e-Mailnachricht gemäss < a "
|
|
|
|
|
+"Der Themenfilter kategorisiert jede eingehende e-Mailnachricht gemäss <a "
|
|
|
|
|
"href=\"http://www.python.org/doc/current/lib/module-re.html\">Filterregeln "
|
|
|
|
|
"mit regulären Ausdrücken</a>, die Sie weiter unten festlegen können. Wenn "
|
|
|
|
|
"die <code>Subject:</code> oder <code>Keywords:</code> Header der Nachricht "
|
|
|
|
|
@@ -7363,7 +7363,7 @@
|
|
|
|
|
"nicht mit Sammelnachrichten.\n"
|
|
|
|
|
" <p>Optional kann auch der Nachrichtentext auf Vorkommen von <code>Subject:</"
|
|
|
|
|
"code> und <code>Keyword:</code> Header durchsucht werden. Spezifizieren Sie "
|
|
|
|
|
-"hierzu die Option<a href=\"?VARHELP=topics/topics_bodylines_limit"
|
|
|
|
|
+"hierzu die Option <a href=\"?VARHELP=topics/topics_bodylines_limit"
|
|
|
|
|
"\">topics_bodylines_limit</a>."
|
|
|
|
|
|
|
|
|
|
# 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 ""
|
|
|
|
|
Index: scripts/driver
|
|
|
|
|
--- scripts/driver.orig 2008-04-21 20:28:22 +0200
|
|
|
|
|
+++ scripts/driver 2008-04-22 07:51:36 +0200
|
|
|
|
|
--- scripts/driver.orig 2008-06-30 18:29:46 +0200
|
|
|
|
|
+++ scripts/driver 2008-07-01 20:48:10 +0200
|
|
|
|
|
@@ -95,6 +95,15 @@
|
|
|
|
|
module = getattr(pkg, scriptname)
|
|
|
|
|
main = getattr(module, 'main')
|
|
|
|
|
|