[Pkg-mailman-hackers] Pkg-mailman commit - rev 639 - in trunk/debian: . patches
Thijs Kinkhorst
thijs at alioth.debian.org
Tue Dec 29 19:22:03 UTC 2009
Author: thijs
Date: 2009-12-29 19:22:03 +0000 (Tue, 29 Dec 2009)
New Revision: 639
Removed:
trunk/debian/patches/30_pipermail_threads.patch
trunk/debian/patches/65_handle_templates_directories.patch
trunk/debian/patches/77_header_folding_in_attachments.patch
Modified:
trunk/debian/changelog
trunk/debian/patches/16_update_debian.patch
trunk/debian/patches/series
Log:
New upstream release 2.1.13. Incorporates some patches.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-11-09 21:25:56 UTC (rev 638)
+++ trunk/debian/changelog 2009-12-29 19:22:03 UTC (rev 639)
@@ -1,8 +1,12 @@
-mailman (1:2.1.12-4) UNRELEASED; urgency=low
+mailman (1:2.1.13-1) UNRELEASED; urgency=low
+ * New upstream release. Patches incorporated:
+ - 16_update_debian (partially)
+ - 30_pipermail_threads
+ - 65_handle_templates_directories
* Remove msgfmt.py, only used at build-time (closes: #555416).
- -- Thijs Kinkhorst <thijs at debian.org> Mon, 09 Nov 2009 22:08:22 +0100
+ -- Thijs Kinkhorst <thijs at debian.org> Tue, 29 Dec 2009 20:20:41 +0100
mailman (1:2.1.12-3) unstable; urgency=low
Modified: trunk/debian/patches/16_update_debian.patch
===================================================================
--- trunk/debian/patches/16_update_debian.patch 2009-11-09 21:25:56 UTC (rev 638)
+++ trunk/debian/patches/16_update_debian.patch 2009-12-29 19:22:03 UTC (rev 639)
@@ -2,31 +2,11 @@
Author: Tollef Fog Heen <tfheen at debian.org>
update is called from the Debian maintainer scripts and
prints non-appropriate output. Change that.
-Index: mailman-2.1.12/bin/update
+Index: mailman-2.1.13/bin/update
===================================================================
---- mailman-2.1.12.orig/bin/update 2009-03-02 20:41:54.000000000 +0100
-+++ mailman-2.1.12/bin/update 2009-03-02 20:50:02.000000000 +0100
-@@ -299,8 +299,7 @@
- else:
- # directory
- print _("""\
-- looks like you have a really recent CVS installation...
-- you're either one brave soul, or you already ran me""")
-+ Your installation seems up-to-date, great!""")
-
-
- #
-@@ -322,8 +321,7 @@
- %(newname)s""")
- else: # directory
- print _("""\
-- looks like you have a really recent CVS installation...
-- you're either one brave soul, or you already ran me""")
-+ Your installation seems up-to-date, great!""")
-
- #
- # move the html archives there
-@@ -337,37 +335,6 @@
+--- mailman-2.1.13.orig/bin/update 2009-12-22 19:00:43.000000000 +0100
++++ mailman-2.1.13/bin/update 2009-12-29 19:57:40.000000000 +0100
+@@ -334,37 +334,6 @@
# BAW: Is this still necessary?!
mlist.Save()
#
@@ -64,7 +44,7 @@
#
# Move all the templates to the en language subdirectory as required for
# Mailman 2.1
-@@ -666,12 +633,12 @@
+@@ -669,12 +638,12 @@
'Mailman/HyperDatabase.py', 'Mailman/pipermail.py',
'Mailman/smtplib.py', 'Mailman/Cookie.py',
'bin/update_to_10b6', 'scripts/mailcmd',
Deleted: trunk/debian/patches/30_pipermail_threads.patch
===================================================================
--- trunk/debian/patches/30_pipermail_threads.patch 2009-11-09 21:25:56 UTC (rev 638)
+++ trunk/debian/patches/30_pipermail_threads.patch 2009-12-29 19:22:03 UTC (rev 639)
@@ -1,47 +0,0 @@
-
-Patch: 30_pipermail_threads.patch
-Author: Tollef Fog Heen <tfheen at debian.org> and Mark Sapiro <mark at msapiro.net>
-Pipermail non-appropriate output. Change that.
-Will be integrated into next upstream release:
-http://lists.alioth.debian.org/pipermail/pkg-mailman-hackers/2009-July/002754.html
-===================================================================
---- mailman-2.1.12.orig/Mailman/Archiver/pipermail.py.orig 2006-08-15 15:12:18.000000000 +0800
-+++ mailman-2.1.12.orig/Mailman/Archiver/pipermail.py 2006-08-15 15:14:34.000000000 +0800
-@@ -122,9 +122,10 @@
- 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 + '.'
-+ + str(article.sequence) + '-')
- else:
-- myThreadKey = article.date + '-'
-+ myThreadKey = article.date + '.' + str(article.sequence) + '-'
- article.threadKey = myThreadKey
- key = myThreadKey, article.msgid
- self.setThreadKey(archive, key, article.msgid)
-@@ -418,7 +418,8 @@
- else:
- parent = self.database.getArticle(self.archive,
- article.parentID)
-- article.threadKey = parent.threadKey+article.date+'-'
-+ article.threadKey = (parent.threadKey + article.date + '.'
-+ + str(article.sequence) + '-')
- self.database.setThreadKey(self.archive,
- (article.threadKey, article.msgid),
- msgid)
-@@ -632,9 +632,11 @@
- 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 + '.'
-+ + str(article.sequence) + '-')
- else:
-- article.threadKey = article.date + '-'
-+ article.threadKey = (article.date + '.'
-+ + str(article.sequence) + '-')
- key = article.threadKey, article.msgid
-
- self.database.setThreadKey(arch, key, article.msgid)
-
Deleted: trunk/debian/patches/65_handle_templates_directories.patch
===================================================================
--- trunk/debian/patches/65_handle_templates_directories.patch 2009-11-09 21:25:56 UTC (rev 638)
+++ trunk/debian/patches/65_handle_templates_directories.patch 2009-12-29 19:22:03 UTC (rev 639)
@@ -1,16 +0,0 @@
-Patch: 65_handle_templates_directories.patch
-Author: Tollef Fog Heen <tfheen at debian.org>
-Skip directories when updating (Closes: #284771)
-Index: mailman-2.1.12/bin/update
-===================================================================
---- mailman-2.1.12.orig/bin/update 2009-03-02 20:50:13.000000000 +0100
-+++ mailman-2.1.12/bin/update 2009-03-02 20:50:17.000000000 +0100
-@@ -126,7 +126,7 @@
- try:
- fp = open(os.path.join(mm_cfg.TEMPLATE_DIR, gtemplate))
- except IOError, e:
-- if e.errno <> errno.ENOENT: raise
-+ if not (e.errno in [errno.ENOENT, errno.EISDIR, ]): raise
- # No global template
- continue
-
Deleted: trunk/debian/patches/77_header_folding_in_attachments.patch
===================================================================
--- trunk/debian/patches/77_header_folding_in_attachments.patch 2009-11-09 21:25:56 UTC (rev 638)
+++ trunk/debian/patches/77_header_folding_in_attachments.patch 2009-12-29 19:22:03 UTC (rev 639)
@@ -1,142 +0,0 @@
-Patch: 77_header_folding_in_attachments.patch
-Author: Lionel Elie Mamane <lionel at mamane.lu>
-Don't fold headers into message/rfc822 attachments.
-This avoids breaking signatures (Closes: #244673)
-=== added file 'Mailman/Generator.py'
---- mailman-${VERSION}/Mailman/Generator.py 1970-01-01 00:00:00 +0000
-+++ mailman-${VERSION}/Mailman/Generator.py 2009-05-21 20:54:34 +0000
-@@ -0,0 +1,57 @@
-+# Copyright (C) 1998-2003,2009 by the Free Software Foundation, Inc.
-+# 2005 Lionel Elie Mamane <lionel at mamane.lu>
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# as published by the Free Software Foundation; either version 2
-+# of the License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# Author: Bernhard Reiter <bernhard at gnu.org>
-+# Changed by Lionel Elie Mamane December 2005 from version on
-+# http://ftp.intevation.de/users/bernhard/mailman/mailman-2.1.4-avoid-headerfolding-python21.diff
-+# to use clone/children_maxheaderlen trick instead of _write_headers/mangle_from_
-+# Changed by Mark Sapiro May 2009 to fix bug: messages with lines beginning
-+# with "From" are archived split into several messages.
-+
-+"""Standard Mailman generator object.
-+
-+A subclass of email.Generator which only folds long headers
-+in the top object level.
-+This is needed because Mailman should leave the reveiced message parts alone.
-+Otherwise is might change subparts over which a signature was calculated,
-+breaking it while doing so.
-+"""
-+
-+import email
-+import email.Generator
-+
-+try:
-+ True, False
-+except NameError:
-+ True = 1
-+ False = 0
-+
-+
-+class Generator(email.Generator.Generator):
-+ """Generates output from a Message object tree, keeping signatures.
-+
-+ Headers will by default _not_ be folded in attachments.
-+ """
-+ def __init__(self, outfp, mangle_from_=True,
-+ maxheaderlen=78, children_maxheaderlen=0):
-+ email.Generator.Generator.__init__(self, outfp, mangle_from_=mangle_from_, maxheaderlen=maxheaderlen)
-+ self.__children_maxheaderlen = children_maxheaderlen
-+
-+ def clone(self, fp):
-+ """Clone this generator with maxheaderlen set for children"""
-+ return self.__class__(fp, self._mangle_from_, self.__children_maxheaderlen, self.__children_maxheaderlen)
-+
-
-=== modified file 'Mailman/Handlers/SMTPDirect.py'
---- mailman-${VERSION}/Mailman/Handlers/SMTPDirect.py 2005-12-30 18:50:08 +0000
-+++ mailman-${VERSION}/Mailman/Handlers/SMTPDirect.py 2009-05-21 20:55:38 +0000
-@@ -360,7 +360,7 @@
- msg['Sender'] = envsender
- msg['Errors-To'] = envsender
- # Get the plain, flattened text of the message, sans unixfrom
-- msgtext = msg.as_string()
-+ msgtext = msg.as_string(mangle_from_=False)
- refused = {}
- recips = msgdata['recips']
- msgid = msg['message-id']
-
-=== modified file 'Mailman/Mailbox.py'
---- mailman-${VERSION}/Mailman/Mailbox.py 2005-08-27 01:40:17 +0000
-+++ mailman-${VERSION}/Mailman/Mailbox.py 2009-05-21 23:25:58 +0000
-@@ -22,10 +22,10 @@
-
- import email
- from email.Parser import Parser
--from email.Generator import Generator
- from email.Errors import MessageParseError
-
- from Mailman import mm_cfg
-+from Mailman.Generator import Generator
- from Mailman.Message import Message
-
- try:
-@@ -65,7 +65,7 @@
- # Seek to the last char of the mailbox
- self.fp.seek(1, 2)
- # Create a Generator instance to write the message to the file
-- g = Generator(self.fp)
-+ g = Generator(self.fp, mangle_from_=True)
- g.flatten(msg, unixfrom=True)
- # Add one more trailing newline for separation with the next message
- # to be appended to the mbox.
-
-=== modified file 'Mailman/Message.py'
---- mailman-${VERSION}/Mailman/Message.py 2006-03-06 18:21:52 +0000
-+++ mailman-${VERSION}/Mailman/Message.py 2009-05-21 20:54:55 +0000
-@@ -22,6 +22,8 @@
- """
-
- import re
-+from cStringIO import StringIO
-+
- import email
- import email.Message
- import email.Utils
-@@ -32,6 +34,7 @@
-
- from Mailman import mm_cfg
- from Mailman import Utils
-+from Mailman.Generator import Generator
-
- COMMASPACE = ', '
-
-@@ -199,6 +202,16 @@
- except (UnicodeError, LookupError, ValueError):
- return failobj
-
-+ def as_string(self, unixfrom=False, mangle_from_=True):
-+ """Return entire formatted message as a string using Mailman.Generator.
-+
-+ Operates like email.Message.Message.as_string, only
-+ using Mailman's Generator class. Only the top headers will get folded.
-+ """
-+ fp = StringIO()
-+ g = Generator(fp, mangle_from_=mangle_from_)
-+ g.flatten(self, unixfrom=unixfrom)
-+ return fp.getvalue()
-
-
- class UserNotification(Message):
-
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2009-11-09 21:25:56 UTC (rev 638)
+++ trunk/debian/patches/series 2009-12-29 19:22:03 UTC (rev 639)
@@ -6,18 +6,15 @@
16_update_debian.patch
20_qmail_to_mailman.debian.patch
21_newlist_help.patch
-30_pipermail_threads.patch
51_nocompile.pyc.patch
52_check_perms_lstat.patch
53_disable_addons.patch
59_fix_missing_language_crash.patch
63_update_default_server_language.patch
64_correct_html_nesting.patch
-65_handle_templates_directories.patch
66_donot_let_cache_html_pages.patch
70_invalid_utf8_dos.patch
71_date_overflows.patch
74_admin_non-ascii_emails.patch
-77_header_folding_in_attachments.patch
79_archiver_slash.patch
99_js_templates.patch
More information about the Pkg-mailman-hackers
mailing list