Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 May 2020 18:00:30 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r534101 - in head/mail/mailman: . files
Message-ID:  <202005051800.045I0UOO077935@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Tue May  5 18:00:30 2020
New Revision: 534101
URL: https://svnweb.freebsd.org/changeset/ports/534101

Log:
  mail/mailman: security update to 2.1.31
  
  Over the upstream 2.1.31, additional fixes were needed:
  + fix up quoting in one string of the messages/es/ translation
    to unbreak gettext
  + fix up all */LC_MESSAGES/mailman.po to match up with the security fix.
  
  Upstream Changelog for 2.1.31, cited from
  <https://bazaar.launchpad.net/~mailman-coders/mailman/2.1/view/1845/NEWS#L8>:
  Security
      - A content injection vulnerability via the options login page has been
        discovered and reported by Vishal Singh. This is fixed.  (LP: #1873722)
  i18n
      - The Spanish translation has been updated by Omar Walid Llorente.
  Bug Fixes and other patches
      - Bounce recognition for a non-compliant Yahoo format is added.
      - Archiving workaround for non-ascii in string.lowercase in some Python
        packages is added.
  
  MFH:		2020Q2
  Security:	88760f4d-8ef7-11ea-a66d-4b2ef158be83

Added:
  head/mail/mailman/files/patch-messages_es_LC__MESSAGES_mailman.po   (contents, props changed)
Modified:
  head/mail/mailman/Makefile
  head/mail/mailman/distinfo
  head/mail/mailman/pkg-plist

Modified: head/mail/mailman/Makefile
==============================================================================
--- head/mail/mailman/Makefile	Tue May  5 17:51:48 2020	(r534100)
+++ head/mail/mailman/Makefile	Tue May  5 18:00:30 2020	(r534101)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mailman
-DISTVERSION=	2.1.30
-PORTREVISION=	2
+DISTVERSION=	2.1.31
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	GNU \
 		SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \
@@ -132,6 +132,9 @@ PKGNAMESUFFIX+=	-with-htdig
 #X unpack this tarball, and the original distfile
 #X diff -NEur original-unpack bazaar-unpack | xz --best -c >msapiro-htdig-1812.patch.xz
 #X upload the latter with mode 0644 or similar to freefall's public_distfiles/ directory
+#
+# 2.1.31: deliberately continue using the 1812 patch that was for 2.1.30.
+# There is no full merge of 2.1.31 for the htdig branch yet.
 _HTDIGREV=	1812
 PATCHFILES+=	msapiro-htdig-${_HTDIGREV}.patch.xz
 RUN_DEPENDS+=	htdig:textproc/htdig
@@ -178,6 +181,10 @@ post-patch:
 	${REINPLACE_CMD} -e 's/messages//' ${WRKSRC}/Makefile.in
 .endif
 	${MV} ${WRKSRC}/configure.in ${WRKSRC}/configure.ac # suppress warning
+	# 2.1.31: fix up translations for security fix - upstream rushed the fix
+	# but did not see to translations on 2020-05-05.
+	${REINPLACE_CMD} -Ee '/Illegal Email Address:/,+1s/ *. %\(safeuser\)s//' \
+		${WRKSRC}/messages/*/LC_MESSAGES/mailman.po
 
 # post-patch-HTDIG-on is to fix https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238508
 post-patch-HTDIG-on:

Modified: head/mail/mailman/distinfo
==============================================================================
--- head/mail/mailman/distinfo	Tue May  5 17:51:48 2020	(r534100)
+++ head/mail/mailman/distinfo	Tue May  5 18:00:30 2020	(r534101)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1586853855
-SHA256 (mailman/mailman-2.1.30.tgz) = ea028d6106f776038cf135cdd786ebb14b4fe708d77386729c4a2253248d0364
-SIZE (mailman/mailman-2.1.30.tgz) = 9411262
+TIMESTAMP = 1588700126
+SHA256 (mailman/mailman-2.1.31.tgz) = 0722e6da3aea6d9792ab4daf7e411724d5e455bbdfa2df2f15a01754b59dade5
+SIZE (mailman/mailman-2.1.31.tgz) = 9413155
 SHA256 (mailman/msapiro-htdig-1812.patch.xz) = 9294d42f52d2e0892220c06c74f8ee94fe650c892d68d36e79de6db5863849dd
 SIZE (mailman/msapiro-htdig-1812.patch.xz) = 50412

Added: head/mail/mailman/files/patch-messages_es_LC__MESSAGES_mailman.po
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/mailman/files/patch-messages_es_LC__MESSAGES_mailman.po	Tue May  5 18:00:30 2020	(r534101)
@@ -0,0 +1,11 @@
+--- messages/es/LC_MESSAGES/mailman.po.orig	2020-05-05 15:17:13 UTC
++++ messages/es/LC_MESSAGES/mailman.po
+@@ -6463,7 +6463,7 @@ msgstr ""
+ "(como\n"
+ "                 perder direcciones en correos reenviados y copias enviadas "
+ "a la\n"
+-"                 dirección de rebote cuando se usa "responder a todos"), así que puede ser \n"
++"                 dirección de rebote cuando se usa \"responder a todos\"), así que puede ser \n"
+ "                 deshabilitada aquí."
+ 
+ #: Mailman/Gui/General.py:512

Modified: head/mail/mailman/pkg-plist
==============================================================================
--- head/mail/mailman/pkg-plist	Tue May  5 17:51:48 2020	(r534100)
+++ head/mail/mailman/pkg-plist	Tue May  5 18:00:30 2020	(r534101)
@@ -2404,6 +2404,7 @@
 %%MMDIR%%/tests/bounces/yahoo_09.txt
 %%MMDIR%%/tests/bounces/yahoo_10.txt
 %%MMDIR%%/tests/bounces/yahoo_11.txt
+%%MMDIR%%/tests/bounces/yahoo_12.txt
 %%MMDIR%%/tests/bounces/yale_01.txt
 %%MMDIR%%/tests/fblast.py
 %%MMDIR%%/tests/msgs/bad_01.txt



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005051800.045I0UOO077935>