[gentoo-commits] repo/gentoo:master commit in: mail-filter/opendmarc/files/

[Conrad Kostecki]

commit:     c73a9d408e58333cee20dfa301aa599a42928cb2
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Aug 27 07:21:52 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 23:35:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c73a9d40

mail-filter/opendmarc: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/22125
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/opendmarc-1.3.2-multiple-From.patch      | 35 ------------------
 .../files/opendmarc-1.3.3-CVE-2020-12460.patch     | 41 ----------------------
 2 files changed, 76 deletions(-)

diff --git a/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch b/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch
deleted file mode 100644
index 28b2f852f39..00000000000
--- a/mail-filter/opendmarc/files/opendmarc-1.3.2-multiple-From.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f6b615e345037408b88b2ffd1acd03239af8a858 Mon Sep 17 00:00:00 2001
-From: Marcin Seremak <panpilkarz@××××××××××.com>
-Date: Tue, 30 Jul 2019 08:05:28 +0200
-Subject: [PATCH] Fix multiple addresses in From vulnerability
-
----
- libopendmarc/tests/test_finddomain.c | 1 +
- opendmarc/opendmarc.c                | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libopendmarc/tests/test_finddomain.c b/libopendmarc/tests/test_finddomain.c
-index 50cf405..8447463 100644
---- a/libopendmarc/tests/test_finddomain.c
-+++ b/libopendmarc/tests/test_finddomain.c
-@@ -23,6 +23,7 @@ main(int argc, char **argv)
- 		/* 11 */ {"(,) joe@×××.com", "joe.com"},
- 		/* 12 */ {"\"( bob@×××.com)\" joe@×××.com", "joe.com"},
- 		/* 12 */ {"From: Davide D'Marco <user@××××.com>", "blah.com"},
-+		/* 13 */ {"blah.com", "blah.com"},
- 			 {NULL, NULL},
- 	};
- 	u_char dbuf[256];
-diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
-index 419c15a..9b7fe3a 100644
---- a/opendmarc/opendmarc.c
-+++ b/opendmarc/opendmarc.c
-@@ -2193,7 +2193,7 @@ mlfi_eom(SMFICTX *ctx)
- 	strncpy(dfc->mctx_fromdomain, domain, sizeof dfc->mctx_fromdomain - 1);
- 
- 	ostatus = opendmarc_policy_store_from_domain(cc->cctx_dmarc,
--	                                             from->hdr_value);
-+	                                             dfc->mctx_fromdomain);
- 	if (ostatus != DMARC_PARSE_OKAY)
- 	{
- 		if (conf->conf_dolog)

diff --git a/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch b/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch
deleted file mode 100644
index 334c11d5302..00000000000
--- a/mail-filter/opendmarc/files/opendmarc-1.3.3-CVE-2020-12460.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 50d28af25d8735504b6103537228ce7f76ad765f Mon Sep 17 00:00:00 2001
-From: "Murray S. Kucherawy" <msk@××××××××.org>
-Date: Wed, 5 Aug 2020 21:56:01 +0000
-Subject: [PATCH] In opendmarc_xml_parse(), ensure NULL-termination of the
- buffer passed to opendmarc_xml().
-
----
- libopendmarc/opendmarc_xml.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libopendmarc/opendmarc_xml.c b/libopendmarc/opendmarc_xml.c
-index 26bb9dc..b3ac55a 100644
---- a/libopendmarc/opendmarc_xml.c
-+++ b/libopendmarc/opendmarc_xml.c
-@@ -158,7 +158,7 @@ opendmarc_xml(char *b, size_t blen, char *e, size_t elen)
- 			if (*cp != '<')
- 				continue;
- 			++cp;
--			for(sp = cp; *sp != '\0'; ++sp)
-+			for (sp = cp; *sp != '\0'; ++sp)
- 			{
- 				if (*sp == '?')
- 					break;
-@@ -546,7 +546,7 @@ opendmarc_xml_parse(char *fname, char *err_buf, size_t err_len)
- 	if (fname == NULL)
- 	{
- 		xerror = errno;
--		(void) snprintf(err_buf, err_len, "%s: %s", fname, "File name was NULL");
-+		(void) snprintf(err_buf, err_len, "%s", "File name was NULL");
- 		errno = EINVAL;
- 		return NULL;
- 	}
-@@ -572,7 +572,7 @@ opendmarc_xml_parse(char *fname, char *err_buf, size_t err_len)
- 		return NULL;
- 	}
- 
--	bufp = calloc(statb.st_size, 1);
-+	bufp = calloc(statb.st_size + 1, 1);
- 	if (bufp == NULL)
- 	{
- 		xerror = errno;