svn commit: r410774 - in head/mail/mailman: . files
Matthias Andree
mandree at FreeBSD.org
Thu Mar 10 19:50:14 UTC 2016
Author: mandree
Date: Thu Mar 10 19:50:12 2016
New Revision: 410774
URL: https://svnweb.freebsd.org/changeset/ports/410774
Log:
Avoid patch-LP1551075 when HTDIG is enabled. [1]
This patch is part of the HTDIG integration patch already. [1]
Also correct namazurc file path in pkg-message, bumping PORTREVISION.
PR: 207876 [1]
Submitted by: David Siebörger [1]
Added:
head/mail/mailman/files/extra-patch-LP1551075
- copied unchanged from r410773, head/mail/mailman/files/patch-LP1551075
Deleted:
head/mail/mailman/files/patch-LP1551075
Modified:
head/mail/mailman/Makefile
head/mail/mailman/files/pkg-message.in
Modified: head/mail/mailman/Makefile
==============================================================================
--- head/mail/mailman/Makefile Thu Mar 10 19:41:06 2016 (r410773)
+++ head/mail/mailman/Makefile Thu Mar 10 19:50:12 2016 (r410774)
@@ -3,7 +3,7 @@
PORTNAME= mailman
DISTVERSION= 2.1.21
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= GNU \
SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
@@ -121,6 +121,7 @@ RUN_DEPENDS+= htdig:${PORTSDIR}/textproc
PLIST_SUB+= SUB_HTDIG=""
.else
PLIST_SUB+= SUB_HTDIG="@comment "
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-LP1551075
.endif
.if ${PORT_OPTIONS:MNAMAZU2}
Copied: head/mail/mailman/files/extra-patch-LP1551075 (from r410773, head/mail/mailman/files/patch-LP1551075)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/mailman/files/extra-patch-LP1551075 Thu Mar 10 19:50:12 2016 (r410774, copy of r410773, head/mail/mailman/files/patch-LP1551075)
@@ -0,0 +1,40 @@
+=== modified file 'Mailman/Handlers/MimeDel.py'
+--- Mailman/Handlers/MimeDel.py 2011-04-13 04:13:10 +0000
++++ Mailman/Handlers/MimeDel.py 2016-02-29 06:28:44 +0000
+@@ -1,4 +1,4 @@
+-# Copyright (C) 2002-2011 by the Free Software Foundation, Inc.
++# Copyright (C) 2002-2016 by the Free Software Foundation, Inc.
+ #
+ # This program is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+@@ -210,6 +210,11 @@
+ # If we're left with a multipart message with only one sub-part, recast
+ # the message to just the sub-part, but not if the part is message/rfc822
+ # because we don't want to lose the headers.
++ # Also, if this is a multipart/signed part, stop now as the original part
++ # may have had a multipart sub-part with only one sub-sub-part, the sig
++ # may still be valid and going further may break it. (LP: #1551075)
++ if msg.get_content_type() == 'multipart/signed':
++ return
+ if msg.is_multipart():
+ if (len(msg.get_payload()) == 1 and
+ msg.get_content_type() <> 'message/rfc822'):
+
+=== modified file 'NEWS'
+--- NEWS 2016-02-28 20:43:02 +0000
++++ NEWS 2016-02-29 06:28:44 +0000
+@@ -5,6 +5,13 @@
+
+ Here is a history of user visible changes to Mailman.
+
++2.1.22 (xx-xxx-xxxx)
++
++ Bug fixes and other patches
++
++ - Don't collapse multipart with a single sub-part inside multipart/signed
++ parts. (LP: #1551075)
++
+ 2.1.21 (28-Feb-2016)
+
+ New Features
+
Modified: head/mail/mailman/files/pkg-message.in
==============================================================================
--- head/mail/mailman/files/pkg-message.in Thu Mar 10 19:41:06 2016 (r410773)
+++ head/mail/mailman/files/pkg-message.in Thu Mar 10 19:50:12 2016 (r410774)
@@ -50,7 +50,7 @@ is started by a script in %%LOCALBASE%%/
In order to make private archives searchable with namazu2, you need
to copy or link %%LOCALBASE%%/libexec/namazu.cgi to
%%MAILMANDIR%%/archives/private/<ML_name>/ and configure .namazurc.
-Refer to %%LOCALBASE%%/etc/namazu/namazu-sample.
+Refer to %%LOCALBASE%%/etc/namazu/namazurc.sample.
You can also see the document in Japanese language in
<http://www.python.jp/pipermail/mailman-users-jp/2004-August/001008.html>
----------------------------------------------------------------------------
More information about the svn-ports-head
mailing list