Date: Saturday, March 5, 2016 @ 14:50:59 Author: seblu Revision: 165149
upgpkg: mailman 2.1.21-2 - fix FS#48387 Added: mailman/trunk/02-fix-fs#48387.patch Modified: mailman/trunk/PKGBUILD -----------------------+ 02-fix-fs#48387.patch | 21 +++++++++++++++++++++ PKGBUILD | 9 ++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) Added: 02-fix-fs#48387.patch =================================================================== --- 02-fix-fs#48387.patch (rev 0) +++ 02-fix-fs#48387.patch 2016-03-05 13:50:59 UTC (rev 165149) @@ -0,0 +1,21 @@ +=== modified file 'Mailman/Handlers/MimeDel.py' +--- a/Mailman/Handlers/MimeDel.py 2011-04-13 04:13:10 +0000 ++++ b/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: PKGBUILD =================================================================== --- PKGBUILD 2016-03-05 13:48:11 UTC (rev 165148) +++ PKGBUILD 2016-03-05 13:50:59 UTC (rev 165149) @@ -5,7 +5,7 @@ pkgname=mailman _pkgver=2.1.21 pkgver=${_pkgver//-/.} -pkgrel=1 +pkgrel=2 pkgdesc='The GNU Mailing List Manager' arch=(i686 x86_64) license=('GPL') @@ -35,7 +35,9 @@ 'mailman-nightlygzip.timer' 'mailman-senddigests.service' 'mailman-senddigests.timer' - '01-mailman-2.1-build.patch') + '01-mailman-2.1-build.patch' + '02-fix-fs#48387.patch' + ) md5sums=('848fcb250ca1461445d07b8a30c07376' 'a9c71ec940c56173415fbd49087d10b0' '85a8c30ffc444e677b286f54df530482' @@ -55,7 +57,8 @@ '3af65082d3cd4d5746944890c7a72962' '350dac1e350691e3d9cb8f99fd4b669a' '52917f62441ac5d950789e8f8af28f09' - 'ed04d062379eb21e39ce1e70e6b1ade2') + 'ed04d062379eb21e39ce1e70e6b1ade2' + 'ba9bb00dd25448b85859926ed562e638') prepare() { # some files in mailman doesn't use configure parameter