Skip to content
Snippets Groups Projects
Commit 576a8ae3 authored by Sébastien Luttringer's avatar Sébastien Luttringer
Browse files

upgpkg: 2.1.23-2

parent afbe1922
No related branches found
No related tags found
No related merge requests found
=== 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'):
......@@ -4,7 +4,7 @@
pkgname=mailman
_pkgver=2.1.23
pkgver=${_pkgver//-/.}
pkgrel=1
pkgrel=2
pkgdesc='The GNU Mailing List Manager'
arch=(i686 x86_64)
license=('GPL')
......@@ -15,7 +15,7 @@ depends=('glibc' 'python2' 'smtp-server' 'python2-dnspython' 'systemd')
# 'Defaults.py' should not be changed by users; 'mm_cfg.py' should instead.
backup=('usr/lib/mailman/Mailman/mm_cfg.py')
install=$pkgname.install
source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$_pkgver.tgz"
source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$_pkgver.tgz"{,.sig}
'mailman.profile.sh'
'mailman.profile.csh'
'mailman.sysusers'
......@@ -36,7 +36,9 @@ source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$_pkgver.tgz"
'mailman-senddigests.timer'
'01-mailman-2.1-build.patch'
)
validpgpkeys=('C638CAEF0AC21563736B5A22555B975E953B8693') # Mark Sapiro <mark@msapiro.net>
md5sums=('ceb2d8427e29f4e69b2505423ffeb60b'
'SKIP'
'a9c71ec940c56173415fbd49087d10b0'
'85a8c30ffc444e677b286f54df530482'
'5ced9364c38ee40046007ee9587b1228'
......@@ -64,8 +66,8 @@ prepare() {
local filename
for filename in "${source[@]}"; do
if [[ "$filename" =~ \.patch$ ]]; then
msg2 "Applying patch $filename"
patch -p1 -N -i "$srcdir/$filename"
msg2 "Applying patch ${filename##*/}"
patch -p1 -N -i "$srcdir/${filename##*/}"
fi
done
......
......@@ -2,8 +2,6 @@
## arg 1: the new package version
post_install() {
# ensure system users are present
systemd-sysusers mailman.conf
# check file permissions
cd /usr/lib/mailman && bin/check_perms > /dev/null
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment