Update to 2.1.30; includes fix for CVE-2020-12137.

ok sthen, jca
This commit is contained in:
okan 2020-04-27 12:27:49 +00:00
parent 575fd863a7
commit c870daa8fd
7 changed files with 31 additions and 30 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.92 2019/07/12 20:47:29 sthen Exp $
# $OpenBSD: Makefile,v 1.93 2020/04/27 12:27:49 okan Exp $
COMMENT= mailing list manager with web interface
DISTNAME= mailman-2.1.29
DISTNAME= mailman-2.1.30
CATEGORIES= mail www
HOMEPAGE= https://www.gnu.org/software/mailman/

View File

@ -1,2 +1,2 @@
SHA256 (mailman-2.1.29.tgz) = g4hycTYB6KEkFG5VD1NwlILB7xaPHhbSAUZcZRy/DSw=
SIZE (mailman-2.1.29.tgz) = 9376258
SHA256 (mailman-2.1.30.tgz) = 6gKNYQb3dgOM8TXN14brsUtP5wjXc4ZynEoiUySNA2Q=
SIZE (mailman-2.1.30.tgz) = 9411262

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-Mailman_Defaults_py_in,v 1.16 2018/02/05 21:38:44 okan Exp $
--- Mailman/Defaults.py.in.orig Sun Feb 4 12:04:39 2018
+++ Mailman/Defaults.py.in Sun Feb 4 17:36:01 2018
@@ -573,7 +573,7 @@ SMTPPORT = 0 # de
$OpenBSD: patch-Mailman_Defaults_py_in,v 1.17 2020/04/27 12:27:49 okan Exp $
Index: Mailman/Defaults.py.in
--- Mailman/Defaults.py.in.orig
+++ Mailman/Defaults.py.in
@@ -612,7 +612,7 @@ SMTPPORT = 0 # de
# Command for direct command pipe delivery to sendmail compatible program,
# when DELIVERY_MODULE is 'Sendmail'.

View File

@ -1,9 +1,10 @@
$OpenBSD: patch-Mailman_Post_py,v 1.1 2008/07/09 19:30:23 wcmaier Exp $
--- Mailman/Post.py.orig Fri Aug 26 20:40:17 2005
+++ Mailman/Post.py Wed Jul 9 13:13:53 2008
$OpenBSD: patch-Mailman_Post_py,v 1.2 2020/04/27 12:27:49 okan Exp $
Index: Mailman/Post.py
--- Mailman/Post.py.orig
+++ Mailman/Post.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!${MODPY_BIN}
#
# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
# Copyright (C) 2001-2018 by the Free Software Foundation, Inc.
#

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Mailman_htmlformat_py,v 1.10 2018/02/05 21:38:44 okan Exp $
$OpenBSD: patch-Mailman_htmlformat_py,v 1.11 2020/04/27 12:27:49 okan Exp $
Index: Mailman/htmlformat.py
--- Mailman/htmlformat.py.orig Sun Feb 4 12:04:39 2018
+++ Mailman/htmlformat.py Sun Feb 4 17:36:01 2018
@@ -646,12 +646,14 @@ class DefinitionList(Container):
--- Mailman/htmlformat.py.orig
+++ Mailman/htmlformat.py
@@ -648,12 +648,14 @@ class DefinitionList(Container):
from mm_cfg import MAILMAN_URL
PYTHON_URL = 'http://www.python.org/'
GNU_URL = 'http://www.gnu.org/'
@ -17,7 +17,7 @@ Index: Mailman/htmlformat.py
def MailmanLogo():
@@ -665,7 +667,9 @@ def MailmanLogo():
@@ -667,7 +669,9 @@ def MailmanLogo():
logo(PYTHON_POWERED)
gnulink = '<img src="%s" alt="GNU\'s Not Unix" border=0>' % \
logo(GNU_HEAD)
@ -28,7 +28,7 @@ Index: Mailman/htmlformat.py
else:
# use only textual links
version = mm_cfg.VERSION
@@ -673,7 +677,8 @@ def MailmanLogo():
@@ -675,7 +679,8 @@ def MailmanLogo():
_('Delivered by Mailman<br>version %(version)s'))
pylink = Link(PYTHON_URL, _('Python Powered'))
gnulink = Link(GNU_URL, _("Gnu's Not Unix"))

View File

@ -1,9 +1,10 @@
$OpenBSD: patch-tests_onebounce_py,v 1.2 2015/04/09 15:37:08 okan Exp $
--- tests/onebounce.py.orig Tue May 6 12:43:56 2014
+++ tests/onebounce.py Sun Jan 11 10:33:39 2015
$OpenBSD: patch-tests_onebounce_py,v 1.3 2020/04/27 12:27:49 okan Exp $
Index: tests/onebounce.py
--- tests/onebounce.py.orig
+++ tests/onebounce.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!${MODPY_BIN}
# Copyright (C) 2002-2013 by the Free Software Foundation, Inc.
# Copyright (C) 2002-2018 by the Free Software Foundation, Inc.
#

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.31 2018/09/05 13:37:08 okan Exp $
@comment $OpenBSD: PLIST,v 1.32 2020/04/27 12:27:49 okan Exp $
@pkgpath mail/mailman,postfix
@pkgpath mail/mailman,sendmail
@pkgpath mail/mailman,smtpd
@ -2499,6 +2499,7 @@ lib/mailman/tests/bounces/dsn_14.txt
lib/mailman/tests/bounces/dsn_15.txt
lib/mailman/tests/bounces/dsn_16.txt
lib/mailman/tests/bounces/dsn_17.txt
lib/mailman/tests/bounces/dsn_18.txt
lib/mailman/tests/bounces/dumbass_01.txt
lib/mailman/tests/bounces/exim_01.txt
lib/mailman/tests/bounces/groupwise_01.txt
@ -2615,6 +2616,10 @@ share/doc/mailman/README.NETSCAPE
share/doc/mailman/README.USERAGENT
share/doc/mailman/UPGRADING
share/doc/pkg-readmes/${PKGSTEM}
share/examples/mailman/
share/examples/mailman/sitelist.cfg
@sample /var/spool/mailman/data/sitelist.cfg
@extra /var/cron/tabs/_mailman
@mode 0775
@owner _mailman
@group _mailman
@ -2631,10 +2636,3 @@ share/doc/pkg-readmes/${PKGSTEM}
@sample /var/spool/mailman/qfiles/
@sample /var/spool/mailman/spam/
@unexec find %D/lib/mailman -name paths.pyc -exec rm -f {} \;
@mode
@owner
@group
share/examples/mailman/
share/examples/mailman/sitelist.cfg
@sample /var/spool/mailman/data/sitelist.cfg
@extra /var/cron/tabs/_mailman