From owner-svn-ports-all@freebsd.org Wed Mar 24 22:13:30 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0FF3757978C; Wed, 24 Mar 2021 22:13:30 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F5MvF75ZLz3KJl; Wed, 24 Mar 2021 22:13:29 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E69BB1BD35; Wed, 24 Mar 2021 22:13:29 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12OMDTco030575; Wed, 24 Mar 2021 22:13:29 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12OMDT3a030573; Wed, 24 Mar 2021 22:13:29 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202103242213.12OMDT3a030573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 24 Mar 2021 22:13:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569163 - in head/mail/mlmmj: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/mail/mlmmj: . files X-SVN-Commit-Revision: 569163 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2021 22:13:30 -0000 Author: bapt Date: Wed Mar 24 22:13:29 2021 New Revision: 569163 URL: https://svnweb.freebsd.org/changeset/ports/569163 Log: mlmmj: Incorporate from NetBSD's pkgsrc The patch reduces subscription confirmation address length to fit RFC 5321 Added: head/mail/mlmmj/files/patch-reduce-subscription-confirmation-address-length.diff (contents, props changed) Modified: head/mail/mlmmj/Makefile Modified: head/mail/mlmmj/Makefile ============================================================================== --- head/mail/mlmmj/Makefile Wed Mar 24 21:29:19 2021 (r569162) +++ head/mail/mlmmj/Makefile Wed Mar 24 22:13:29 2021 (r569163) @@ -3,6 +3,7 @@ PORTNAME= mlmmj PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://mlmmj.org/releases/ Added: head/mail/mlmmj/files/patch-reduce-subscription-confirmation-address-length.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mlmmj/files/patch-reduce-subscription-confirmation-address-length.diff Wed Mar 24 22:13:29 2021 (r569163) @@ -0,0 +1,88 @@ +$NetBSD: patch-reduce-subscription-confirmation-address-length.diff,v 1.1 2020/03/31 20:37:47 roy Exp $ + +From cb0788bc35c471a87fc75aca6d4e405fdbaccfd8 Mon Sep 17 00:00:00 2001 +From: Geert Stappers +Date: Thu, 25 May 2017 09:17:55 +0200 +Subject: [PATCH] Reduce subscription confirmation address length to fit RFC + 5321 + +The local part of mailing list subscription confirmation addresses +formed of: + + mailing-list-name "+confsub-" 16-random-hex "-" sender-address + +can get very long, especially if sender-address is long. +However, RFC limits it at 64 characters. + +Closes http://mlmmj.org/bugs/bug.php?id=63 + +Reported-by: mgorny@gentoo.org +--- + src/mlmmj-sub.c | 2 +- + src/mlmmj-unsub.c | 2 +- + src/strgen.c | 23 +---------------------- + 3 files changed, 3 insertions(+), 24 deletions(-) + +diff --git a/src/mlmmj-sub.c b/src/mlmmj-sub.c +index 3335817..5c8c1ae 100644 +--- src/mlmmj-sub.c ++++ src/mlmmj-sub.c +@@ -413,7 +413,7 @@ void generate_subconfirm(const char *listdir, const char *listaddr, + do { + myfree(confirmfilename); + myfree(randomstr); +- randomstr = random_plus_addr(subaddr); ++ randomstr = random_str(); + confirmfilename = concatstr(3, listdir, "/subconf/", + randomstr); + +diff --git a/src/mlmmj-unsub.c b/src/mlmmj-unsub.c +index 0fa42a1..8e13f3c 100644 +--- src/mlmmj-unsub.c ++++ src/mlmmj-unsub.c +@@ -171,7 +171,7 @@ void generate_unsubconfirm(const char *listdir, const char *listaddr, + do { + myfree(confirmfilename); + myfree(randomstr); +- randomstr = random_plus_addr(subaddr); ++ randomstr = random_str(); + confirmfilename = concatstr(3, listdir, "/unsubconf/", + randomstr); + +diff --git a/src/strgen.c b/src/strgen.c +index f13db47..673f44a 100644 +--- src/strgen.c ++++ src/strgen.c +@@ -40,31 +40,10 @@ + + char *random_str() + { +- size_t len = 17; ++ size_t len = 17; /* sixteen hex digits plus terminating zero */ + char *dest = mymalloc(len); + + snprintf(dest, len, "%08x%08x", random_int(), random_int()); +- +- return dest; +-} +- +-char *random_plus_addr(const char *addr) +-{ +- size_t len = strlen(addr) + 128; +- char *dest = mymalloc(len); +- char *atsign; +- char *tmpstr; +- +- tmpstr = mymalloc(len); +- snprintf(tmpstr, len, "%s", addr); +- +- atsign = strchr(tmpstr, '@'); +- MY_ASSERT(atsign); +- *atsign = '='; +- +- snprintf(dest, len, "%08x%08x-%s", random_int(), random_int(), tmpstr); +- +- myfree(tmpstr); + + return dest; + }