Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 May 2020 22:56:26 +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: r534208 - in head/mail/mailman: . files
Message-ID:  <202005062256.046MuQNK060672@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Wed May  6 22:56:26 2020
New Revision: 534208
URL: https://svnweb.freebsd.org/changeset/ports/534208

Log:
  mail/mailman: update to 2.1.32
  
  - fixes the i18n issues in 2.1.31
    - drop local patch for Spanish Castilian mailman.po file
    - drop local REINPLACE_CMD for translations of the security fixed code
  
  - uses a patch from the upstream merged rev 1814 of the htdig branch

Deleted:
  head/mail/mailman/files/patch-messages_es_LC__MESSAGES_mailman.po
Modified:
  head/mail/mailman/Makefile
  head/mail/mailman/distinfo

Modified: head/mail/mailman/Makefile
==============================================================================
--- head/mail/mailman/Makefile	Wed May  6 22:23:51 2020	(r534207)
+++ head/mail/mailman/Makefile	Wed May  6 22:56:26 2020	(r534208)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mailman
-DISTVERSION=	2.1.31
+DISTVERSION=	2.1.32
 PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	GNU \
@@ -128,14 +128,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/1812
+#X fetch http://bazaar.launchpad.net/~msapiro/mailman/htdig/tarball/1814
 #X unpack this tarball, and the original distfile
-#X diff -NEur original-unpack bazaar-unpack | xz --best -c >msapiro-htdig-1812.patch.xz
+#X diff -NEur original-unpack bazaar-unpack | xz --best -c >msapiro-htdig-1814.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
+_HTDIGREV=	1814
 PATCHFILES+=	msapiro-htdig-${_HTDIGREV}.patch.xz
 RUN_DEPENDS+=	htdig:textproc/htdig
 PLIST_SUB+=	SUB_HTDIG=""
@@ -181,10 +178,6 @@ 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	Wed May  6 22:23:51 2020	(r534207)
+++ head/mail/mailman/distinfo	Wed May  6 22:56:26 2020	(r534208)
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1588720179
+SHA256 (mailman/mailman-2.1.32.tgz) = 3755322b23cb41cd726407658dc1ae0d2dcc9887c9239945491a551933505e5d
+SIZE (mailman/mailman-2.1.32.tgz) = 9413055
+SHA256 (mailman/msapiro-htdig-1814.patch.xz) = 91c69185f06e2d581d5a4429e678b740074016511557dae4aa5ee7ded0be349c
+SIZE (mailman/msapiro-htdig-1814.patch.xz) = 50400



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