|
|
@@ -1,6 +1,6 @@
|
|
|
Index: Mailman/Archiver/pipermail.py
|
|
|
---- Mailman/Archiver/pipermail.py.orig 2006-01-29 06:12:26 +0100
|
|
|
-+++ Mailman/Archiver/pipermail.py 2006-05-22 19:53:14 +0200
|
|
|
+--- Mailman/Archiver/pipermail.py.orig 2008-04-21 20:28:22 +0200
|
|
|
++++ Mailman/Archiver/pipermail.py 2008-04-22 07:51:36 +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 2005-08-27 03:40:15 +0200
|
|
|
-+++ Mailman/Commands/cmd_subscribe.py 2006-05-22 19:53:14 +0200
|
|
|
-@@ -76,6 +76,7 @@
|
|
|
+--- 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 @@
|
|
|
if password is None:
|
|
|
password = Utils.MakeRandomPassword()
|
|
|
if address is None:
|
|
|
@@ -46,9 +46,9 @@ Index: Mailman/Commands/cmd_subscribe.py
|
|
|
if not address:
|
|
|
# Fall back to the sender address
|
|
|
Index: Mailman/HTMLFormatter.py
|
|
|
---- 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 @@
|
|
|
+--- Mailman/HTMLFormatter.py.orig 2008-04-21 20:28:22 +0200
|
|
|
++++ Mailman/HTMLFormatter.py 2008-04-22 07:51:36 +0200
|
|
|
+@@ -44,7 +44,7 @@
|
|
|
realname = self.real_name
|
|
|
hostname = self.host_name
|
|
|
listinfo_link = Link(self.GetScriptURL('listinfo'), realname).Format()
|
|
|
@@ -58,9 +58,9 @@ Index: Mailman/HTMLFormatter.py
|
|
|
return Container(
|
|
|
'<hr>',
|
|
|
Index: Mailman/Handlers/Decorate.py
|
|
|
---- 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 @@
|
|
|
+--- 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 @@
|
|
|
del msg['content-transfer-encoding']
|
|
|
del msg['content-disposition']
|
|
|
msg['Content-Type'] = 'multipart/mixed'
|
|
|
@@ -69,21 +69,21 @@ Index: Mailman/Handlers/Decorate.py
|
|
|
|
|
|
|
|
|
Index: Mailman/Handlers/Scrubber.py
|
|
|
---- 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')
|
|
|
+--- Mailman/Handlers/Scrubber.py.orig 2008-04-21 20:28:22 +0200
|
|
|
++++ Mailman/Handlers/Scrubber.py 2008-04-22 07:51:36 +0200
|
|
|
+@@ -385,6 +385,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):
|
|
|
- t = t.encode(lcset, 'replace')
|
|
|
+ except (UnicodeError, LookupError, ValueError,
|
|
|
+ AssertionError):
|
|
|
Index: Mailman/Queue/OutgoingRunner.py
|
|
|
---- 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 @@
|
|
|
+--- Mailman/Queue/OutgoingRunner.py.orig 2008-04-21 20:28:22 +0200
|
|
|
++++ Mailman/Queue/OutgoingRunner.py 2008-04-22 07:51:36 +0200
|
|
|
+@@ -89,6 +89,7 @@
|
|
|
syslog('error', 'Cannot connect to SMTP server %s on port %s',
|
|
|
mm_cfg.SMTPHOST, port)
|
|
|
self.__logged = True
|
|
|
@@ -92,9 +92,9 @@ Index: Mailman/Queue/OutgoingRunner.py
|
|
|
except Errors.SomeRecipientsFailed, e:
|
|
|
# Handle local rejects of probe messages differently.
|
|
|
Index: Mailman/htmlformat.py
|
|
|
---- 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 @@
|
|
|
+--- Mailman/htmlformat.py.orig 2008-04-21 20:28:22 +0200
|
|
|
++++ Mailman/htmlformat.py 2008-04-22 07:51:36 +0200
|
|
|
+@@ -300,7 +300,8 @@
|
|
|
charset = 'us-ascii'
|
|
|
if self.language:
|
|
|
charset = Utils.GetCharSet(self.language)
|
|
|
@@ -105,9 +105,9 @@ Index: Mailman/htmlformat.py
|
|
|
kws.setdefault('bgcolor', self.bgcolor)
|
|
|
tab = ' ' * indent
|
|
|
Index: bin/check_perms
|
|
|
---- 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 @@
|
|
|
+--- bin/check_perms.orig 2008-04-21 20:28:22 +0200
|
|
|
++++ bin/check_perms 2008-04-22 07:51:36 +0200
|
|
|
+@@ -82,7 +82,7 @@
|
|
|
return os.stat(path)[ST_MODE]
|
|
|
|
|
|
def statgidmode(path):
|
|
|
@@ -117,8 +117,8 @@ Index: bin/check_perms
|
|
|
|
|
|
seen = {}
|
|
|
Index: bin/config_list
|
|
|
---- bin/config_list.orig 2005-12-30 19:50:08 +0100
|
|
|
-+++ bin/config_list 2006-05-22 19:53:14 +0200
|
|
|
+--- bin/config_list.orig 2008-04-21 20:28:22 +0200
|
|
|
++++ bin/config_list 2008-04-22 07:51:36 +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 2006-02-05 05:45:09 +0100
|
|
|
-+++ bin/mailmanctl 2006-05-22 19:53:14 +0200
|
|
|
+--- bin/mailmanctl.orig 2008-04-21 20:28:22 +0200
|
|
|
++++ bin/mailmanctl 2008-04-22 07:51:36 +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 2005-08-27 03:40:16 +0200
|
|
|
-+++ bin/newlist 2006-05-22 19:53:14 +0200
|
|
|
+--- bin/newlist.orig 2008-04-21 20:28:22 +0200
|
|
|
++++ bin/newlist 2008-04-22 07:51:36 +0200
|
|
|
@@ -87,6 +87,9 @@
|
|
|
defined in your Defaults.py file or overridden by settings in mm_cfg.py).
|
|
|
|
|
|
@@ -179,7 +179,7 @@ Index: bin/newlist
|
|
|
try:
|
|
|
opts, args = getopt.getopt(sys.argv[1:], 'hql:u:e:',
|
|
|
['help', 'quiet', 'language=',
|
|
|
-@@ -199,7 +206,7 @@
|
|
|
+@@ -203,7 +210,7 @@
|
|
|
except Errors.BadListNameError, s:
|
|
|
usage(1, _('Illegal list name: %(s)s'))
|
|
|
except Errors.EmailAddressError, s:
|
|
|
@@ -189,8 +189,8 @@ Index: bin/newlist
|
|
|
usage(1, _('List already exists: %(listname)s'))
|
|
|
|
|
|
Index: bin/update
|
|
|
---- bin/update.orig 2005-08-27 03:40:16 +0200
|
|
|
-+++ bin/update 2006-05-22 19:53:14 +0200
|
|
|
+--- bin/update.orig 2008-04-21 20:28:22 +0200
|
|
|
++++ bin/update 2008-04-22 07:51:36 +0200
|
|
|
@@ -541,9 +541,11 @@
|
|
|
file20 = os.path.join(mm_cfg.DATA_DIR, 'pending_subscriptions.db')
|
|
|
file214 = os.path.join(mm_cfg.DATA_DIR, 'pending.pck')
|
|
|
@@ -227,41 +227,41 @@ Index: bin/update
|
|
|
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 2006-03-23 11:51:30 +0100
|
|
|
-+++ messages/de/LC_MESSAGES/mailman.po 2006-05-22 19:53:14 +0200
|
|
|
-@@ -7201,7 +7201,7 @@
|
|
|
+--- 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 href="
|
|
|
-+"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 mit "
|
|
|
-@@ -7214,7 +7214,7 @@
|
|
|
+-"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 Optionhref=\"?VARHELP=topics/topics_bodylines_limit"
|
|
|
+-"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 2006-03-23 11:51:32 +0100
|
|
|
-+++ messages/es/LC_MESSAGES/mailman.po 2006-05-22 19:53:14 +0200
|
|
|
-@@ -1984,7 +1984,7 @@
|
|
|
+--- 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:203 bin/newlist:200
|
|
|
+ #: 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:208
|
|
|
+ #: Mailman/Cgi/create.py:217
|
|
|
msgid ""
|
|
|
Index: scripts/driver
|
|
|
---- scripts/driver.orig 2005-08-27 03:40:17 +0200
|
|
|
-+++ scripts/driver 2006-05-22 19:53:14 +0200
|
|
|
+--- scripts/driver.orig 2008-04-21 20:28:22 +0200
|
|
|
++++ scripts/driver 2008-04-22 07:51:36 +0200
|
|
|
@@ -95,6 +95,15 @@
|
|
|
module = getattr(pkg, scriptname)
|
|
|
main = getattr(module, 'main')
|