diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index 716f3cc89ed3..896e644d213d 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mailman -DISTVERSION= 2.1.33 -PORTREVISION= 1 +DISTVERSION= 2.1.34 CATEGORIES= mail MASTER_SITES= GNU \ SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ @@ -128,11 +127,11 @@ MAIL_GID?= _smtpd PKGNAMESUFFIX+= -with-htdig # how to create PATCHFILES: #X identify what is the version of msapiro's patches corresponding to the release. -#X fetch http://bazaar.launchpad.net/~msapiro/mailman/htdig/tarball/1815 +#X fetch http://bazaar.launchpad.net/~msapiro/mailman/htdig/tarball/1822 #X unpack this tarball, and the original distfile -#X diff -NEur original-unpack bazaar-unpack | xz --best -c >msapiro-htdig-1815.patch.xz +#X diff -NEur original-unpack bazaar-unpack | xz --best -c >msapiro-htdig-1822.patch.xz #X upload the latter with mode 0644 or similar to freefall's public_distfiles/ directory -_HTDIGREV= 1815 +_HTDIGREV= 1822 PATCHFILES+= msapiro-htdig-${_HTDIGREV}.patch.xz RUN_DEPENDS+= htdig:textproc/htdig PLIST_SUB+= SUB_HTDIG="" diff --git a/mail/mailman/distinfo b/mail/mailman/distinfo index 48e6c5388617..0c199860f61c 100644 --- a/mail/mailman/distinfo +++ b/mail/mailman/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1588881655 -SHA256 (mailman/mailman-2.1.33.tgz) = 6d7e81753c78120f479a275ea623194cac188a3daf301eb76aa9d39a942d5234 -SIZE (mailman/mailman-2.1.33.tgz) = 9412979 -SHA256 (mailman/msapiro-htdig-1815.patch.xz) = 740aeb99b1e25706ad32bd73ac2035f758b5ec566856d6816aed76496931563b -SIZE (mailman/msapiro-htdig-1815.patch.xz) = 50408 +TIMESTAMP = 1593337994 +SHA256 (mailman/mailman-2.1.34.tgz) = daeec8917f75620be1397833fe81293b9a6af528aa1ed0020f5a888b86102389 +SIZE (mailman/mailman-2.1.34.tgz) = 9414225 +SHA256 (mailman/msapiro-htdig-1822.patch.xz) = fa1da6fb7c0946a6723bc2766501c222fa73c8d794566a3b6e5718a7d1840265 +SIZE (mailman/msapiro-htdig-1822.patch.xz) = 50700 diff --git a/mail/mailman/files/patch-zzz-bzr-1850 b/mail/mailman/files/patch-zzz-bzr-1850 deleted file mode 100644 index 1bb4bd73862c..000000000000 --- a/mail/mailman/files/patch-zzz-bzr-1850 +++ /dev/null @@ -1,45 +0,0 @@ -=== modified file 'Mailman/MailList.py' ---- Mailman/MailList.py 2020-01-10 01:00:40 +0000 -+++ Mailman/MailList.py 2020-05-13 18:10:04 +0000 -@@ -1,4 +1,4 @@ --# Copyright (C) 1998-2018 by the Free Software Foundation, Inc. -+# Copyright (C) 1998-2020 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 -@@ -846,9 +846,8 @@ - for k, v in pends.items(): - if k in ('evictions', 'version'): - continue -- op, data = v -- if (op == Pending.SUBSCRIPTION and -- data.address.lower() == email.lower()): -+ if (v[0] == Pending.SUBSCRIPTION and -+ v[1].address.lower() == email.lower()): - return True - return False - - -=== modified file 'NEWS' ---- NEWS 2020-05-07 13:53:40 +0000 -+++ NEWS 2020-05-13 18:10:04 +0000 -@@ -1,10 +1,17 @@ - -*- coding: iso-8859-1 -*- - Mailman - The GNU Mailing List Management System --Copyright (C) 1998-2018 by the Free Software Foundation, Inc. -+Copyright (C) 1998-2020 by the Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - - Here is a history of user visible changes to Mailman. - -+2.1.34 (xx-xxx-xxxx) -+ -+ Bug Fixes and other patches -+ -+ - The fix for LP: #1859104 can result in ValueError being thrown on -+ attempts to subscribe to a list. This is fixed. (LP: #1878458) -+ - 2.1.33 (07-May-2020) - - Security -