git: 9d3c1f8ac580 - main - mail/opendmarc: Update to 1.4.2

The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9d3c1f8ac5801fa8c9d1bc2d79e15d68e0fbe46a

commit 9d3c1f8ac5801fa8c9d1bc2d79e15d68e0fbe46a
Author:     Dan Mahoney <freebsd@gushi.org>
AuthorDate: 2021-12-24 17:29:44 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2021-12-24 17:39:45 +0000

    mail/opendmarc: Update to 1.4.2
    
     - Update to 1.4.2
     - Change master site to github
     - Resolve CVE-2021-34555 and many other CVEs
    
    PR:     260594
---
 mail/opendmarc/Makefile                                      | 12 +++++++-----
 mail/opendmarc/distinfo                                      |  6 +++---
 .../files/patch-libopendmarc_tests_test__finddomain.c        | 10 ----------
 mail/opendmarc/files/patch-opendmarc_opendmarc.c             | 11 -----------
 mail/opendmarc/pkg-plist                                     |  2 +-
 5 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile
index 78958cec7459..2b35748d2ec8 100644
--- a/mail/opendmarc/Makefile
+++ b/mail/opendmarc/Makefile
@@ -1,11 +1,9 @@
 # Created by: Jaap Akkerhuis <jaap@NLnetLabs.nl>
 
 PORTNAME=	opendmarc
-PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTVERSION=	1.4.2
 CATEGORIES=	mail security
-MASTER_SITES=	SF/${PORTNAME} \
-		SF/${PORTNAME}/Previous%20Releases
+MASTER_SITES=	GH
 
 MAINTAINER=	freebsd@gushi.org
 COMMENT=	DMARC library and milter implementation
@@ -18,16 +16,20 @@ RUN_DEPENDS=	p5-Switch>=0:lang/p5-Switch \
 		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
 		p5-HTTP-Message>=0:www/p5-HTTP-Message
 
+USES=		cpe libtool perl5 shebangfix autoreconf
 LICENSE_FILE_SENDMAIL=	${WRKSRC}/LICENSE.Sendmail
 LICENSE_GROUPS_SENDMAIL=	FSF OSI
 LICENSE_NAME_SENDMAIL=	Sendmail Open Source License
 LICENSE_PERMS_SENDMAIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		cpe libtool perl5 shebangfix
 CPE_VENDOR=	trusteddomain
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	opendmarc
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	trusteddomainproject
+GH_TAGNAME=	rel-opendmarc-1-4-2
+GH_PROJECT=	OpenDMARC
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=		SPF DOCS
diff --git a/mail/opendmarc/distinfo b/mail/opendmarc/distinfo
index 1610182ddbe4..84ace6b0729d 100644
--- a/mail/opendmarc/distinfo
+++ b/mail/opendmarc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500636334
-SHA256 (opendmarc-1.3.2.tar.gz) = 213c4b01a9ff5dcdf331f7bd1dd6a382077abbf8ee9111852f2101ec917c2ffb
-SIZE (opendmarc-1.3.2.tar.gz) = 593448
+TIMESTAMP = 1639988466
+SHA256 (trusteddomainproject-OpenDMARC-1.4.2-rel-opendmarc-1-4-2_GH0.tar.gz) = ee1dcdd158fd5fd2b16de2b86980c4a4be60a070641ca19591a713da4e4008bb
+SIZE (trusteddomainproject-OpenDMARC-1.4.2-rel-opendmarc-1-4-2_GH0.tar.gz) = 426996
diff --git a/mail/opendmarc/files/patch-libopendmarc_tests_test__finddomain.c b/mail/opendmarc/files/patch-libopendmarc_tests_test__finddomain.c
deleted file mode 100644
index 8765c76e029b..000000000000
--- a/mail/opendmarc/files/patch-libopendmarc_tests_test__finddomain.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libopendmarc/tests/test_finddomain.c.orig	2012-10-25 15:38:55 UTC
-+++ libopendmarc/tests/test_finddomain.c
-@@ -23,6 +23,7 @@ main(int argc, char **argv)
- 		/* 11 */ {"(,) joe@joe.com", "joe.com"},
- 		/* 12 */ {"\"( bob@bob.com)\" joe@joe.com", "joe.com"},
- 		/* 12 */ {"From: Davide D'Marco <user@blah.com>", "blah.com"},
-+		/* 13 */ {"blah.com>", "blah.com"},
- 			 {NULL, NULL},
- 	};
- 	u_char dbuf[256];
diff --git a/mail/opendmarc/files/patch-opendmarc_opendmarc.c b/mail/opendmarc/files/patch-opendmarc_opendmarc.c
deleted file mode 100644
index 818f761b8529..000000000000
--- a/mail/opendmarc/files/patch-opendmarc_opendmarc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- opendmarc/opendmarc.c.orig	2017-03-04 13:28:39 UTC
-+++ 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/opendmarc/pkg-plist b/mail/opendmarc/pkg-plist
index 39aa5442e0d8..cbabbab5030d 100644
--- a/mail/opendmarc/pkg-plist
+++ b/mail/opendmarc/pkg-plist
@@ -3,7 +3,7 @@ include/opendmarc/dmarc.h
 lib/libopendmarc.a
 lib/libopendmarc.so
 lib/libopendmarc.so.2
-lib/libopendmarc.so.2.0.2
+lib/libopendmarc.so.2.0.3
 man/man5/opendmarc.conf.5.gz
 man/man8/opendmarc-check.8.gz
 man/man8/opendmarc-expire.8.gz