Update to new upstream release 2.1.22.

Changelog: http://bazaar.launchpad.net/~mailman-coders/mailman/2.1/view/1643/NEWS#L8

3 files changed, 10 insertions, 51 deletions

diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index d7350e06da23..49298a54ed75 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	mailman
-DISTVERSION=	2.1.21
-PORTREVISION=	4
+DISTVERSION=	2.1.22
 CATEGORIES=	mail
 MASTER_SITES=	GNU \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
 		https://launchpad.net/mailman/${DISTVERSION:R}/${DISTVERSION}/+download/
-PATCH_SITES=	LOCAL/mandree
 DIST_SUBDIR=	mailman
 
+PATCH_SITES=	LOCAL/mandree
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	mandree@FreeBSD.org
@@ -112,16 +111,15 @@ MAIL_GID?=	_smtpd
 .if ${PORT_OPTIONS:MHTDIG}
 PKGNAMESUFFIX+=	-with-htdig
 # how to create PATCHFILES:
-#X fetch http://bazaar.launchpad.net/~msapiro/mailman/htdig/tarball/1632?start_revid=1632
+#X fetch http://bazaar.launchpad.net/~msapiro/mailman/htdig/tarball/1643
 #X unpack this tarball, and the original distfile
-#X diff -NEur original-unpack bazaar-unpack | xz --best -c >msapiro-htdig-1632.patch.xz
+#X diff -NEur original-unpack bazaar-unpack | xz --best -c >msapiro-htdig-1643.patch.xz
 #X upload the latter with mode 0644 or similar to freefall's public_distfiles/ directory
-PATCHFILES+=	msapiro-htdig-1632.patch.xz
+PATCHFILES+=	msapiro-htdig-1643.patch.xz
 RUN_DEPENDS+=	htdig:textproc/htdig
 PLIST_SUB+=	SUB_HTDIG=""
 .else
 PLIST_SUB+=	SUB_HTDIG="@comment "
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-LP1551075
 .endif
 
 .if ${PORT_OPTIONS:MNAMAZU2}
@@ -157,6 +155,7 @@ post-patch:
 .if empty(PORT_OPTIONS:MNLS)
 	${REINPLACE_CMD} -e 's/messages//' ${WRKSRC}/Makefile.in
 .endif
+	${MV} ${WRKSRC}/configure.in ${WRKSRC}/configure.ac # suppress warning
 
 .if ${PORT_OPTIONS:MPOSTFIX}
 pre-configure:
diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo
index 4090b7204ae4..f46e082ec018 100644
--- a/mail/mailman/distinfo
+++ b/mail/mailman/distinfo
@@ -1,4 +1,4 @@
-SHA256 (mailman/mailman-2.1.21.tgz) = fed33a18154deaa4e81a20798c814485ed4b2e5d8b42cf6d3d55867ff4f70843
-SIZE (mailman/mailman-2.1.21.tgz) = 9266286
-SHA256 (mailman/msapiro-htdig-1632.patch.xz) = 241128c0a10a0f4a31d62433de0cbdc7c96673ff5dd1012af70beb7658f9b38c
-SIZE (mailman/msapiro-htdig-1632.patch.xz) = 50956
+SHA256 (mailman/mailman-2.1.22.tgz) = 56daf64eb7d521cbef4623c83f626c13247098546f708558f267c96f8f7b8ac1
+SIZE (mailman/mailman-2.1.22.tgz) = 9267810
+SHA256 (mailman/msapiro-htdig-1643.patch.xz) = de616f797fd2bc2895485165bb2cf3ffecdb8cf22c3dfb83fc336de47b25303c
+SIZE (mailman/msapiro-htdig-1643.patch.xz) = 49988
diff --git a/mail/mailman/files/extra-patch-LP1551075 b/mail/mailman/files/extra-patch-LP1551075
deleted file mode 100644
index 35b8975a3720..000000000000
--- a/mail/mailman/files/extra-patch-LP1551075
+++ /dev/null
@@ -1,40 +0,0 @@
-=== 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
-