gentoo auto-resync : 27:01:2024 - 00:57:29

4 files changed, 51 insertions, 7 deletions

diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index fa788debf893..ffe6edc84187 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1,9 +1,10 @@
 AUX opendmarc-1.4.1.1-CVE-2021-34555.patch 2517 BLAKE2B 93ebfb101591e5b797b52de4d85a6e199c208544076a7d5bc05fb8b7237c663a204a45172d4cf38d408daf57d5076929b3de227e4e787d97c85aad3e42af9d03 SHA512 24df989c7a501ffea5da43469e049f4a5d9de82f2fe67875f93bad690f558d1734b9d4ea2da1a6aebdedb80b576ada8e12844e7aa061117dd41da3e23c24e176
+AUX opendmarc-1.4.1.1-arc-seal-crash.patch 1310 BLAKE2B 15962d817cbcf06141e7a6f5764f6a5b5267e0c86ddbefec65f58149576495c50603d4a593c824bf8d31227cfdd47ac140aed8035571c67cd710a4d5550d48fb SHA512 bd1377e403a1572c7cff9253a6ed80cbd15657bcd432d37a14ea4ab8ae96a449098627fe41f09f8fec26459de64bbda0de53f9000d825011906186bf2d9ab48a
 AUX opendmarc-1.4.1.1-underlinking.patch 522 BLAKE2B 2d960253144f0c2a159a36bfa119d166e26643d89ee0982af0618373cd387a6375209a41cab0fcfb694d4ba212442428961d31f8323427204423e80d10c3a9c3 SHA512 a95b070bd0ab8d2f6a2b417d3a7c930bc5d8a8d5749c60bdb669dbb97c5dc4817d706aabe928842bead7d746e676ba8d172706c7355c8ae7ac0b9dc38998a5f4
 AUX opendmarc.confd 91 BLAKE2B 124b653c68cd7a1081d2374fb901d55f3cf5af6957745130848f6ae1e93b007ad5ecff5527bed9da03d7033195e599c6052e6d28ec43f2b1e3fc5d1a20631dbc SHA512 2febb226e9495835c515d92c8e7cbb85db3c08ac287a7449d8117b5e9533902d8b3d190fa8face4b69f4cf0c0ede5d860a8b5f97d776c6d7d95bf9f196eb67e2
 AUX opendmarc.initd 1521 BLAKE2B a397bbcbd6eb773ec8b80ac1243578391b1afb65830c726472d7890d6b59549092689022f34c7f314e3bfe3ca08fb903e2b363621b8752983d4aa73d94ee4da8 SHA512 ee61381a4b8d65dbea3306f0ed057767856fbfb6c65d5e3a2bb98843a8754527bd59999aaa3b3c0990725177c7de2c03c0ffccb9e6b4823176a0b9a5ba316931
-AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
+AUX opendmarc.service 806 BLAKE2B 822dd2c1f10ed204f64cd6e1614b636978417bbc2781aa2664500ffbb8db5aa0141e906b98e29d077a7ea3ade9c7e67418acfc751cd4e8e58192e8755ad414b1 SHA512 eb1461e31384b9b7ab637691e67ba3e9fb1670ddf7eca8ac47bac285fcee9d15327e1e68a6301d11551bbc0061e53bef08800085370ee0b9318e789d0e181d55
 DIST opendmarc-1.4.1.1.tar.gz 426618 BLAKE2B a74b2623bc35abb5c34f8d1eff737c71af8f5cadfd6a5d0a85adb6536efd2958118f9da25dd9b736dc24563221968c4ee1ff99b101fa30909764563bda2a8d88 SHA512 ee034386c70c75b87ca2fce0849a1a3538e10e0aebfb0fc9dcba6817d2cf71f52aa5586ccaacdee620190c5fbb81498419fb8e8db9fac15d7c71a61a7da396a6
-EBUILD opendmarc-1.4.1.1-r4.ebuild 1739 BLAKE2B 6c3f8849951fa3a0e7215053a46dc8dd52d3dbb6ba380fd46812a7332e66cca3cad0bc734ea40e1b59c8f4b1cca973c61999c5e283a38622bb67a042c73584e7 SHA512 fe8ad02b7e8a53f34c012665fe75c465645c7c0390aec31da04cb6bb4c85ab6525f6179da63b5d5f9507bddc5b27589a0d745c674b1be0bddb190c627c7ba30f
 EBUILD opendmarc-1.4.1.1-r5.ebuild 1716 BLAKE2B 97d7af348a6c42a0a4db000e36fb9f5c48aa6bbf1549ff1a1f6aac50387a4444536161335dc1b5f96c5ba935e0f911ea88c0406428cc3b619826674f2e115de9 SHA512 2cce3c29b10bbc3464cf1437412522fe7d982f526d2db54d82c16ec5518078f0a914716e2cd792a28259705498aeae83f53d7009c9779942712eb4e87b283e2c
+EBUILD opendmarc-1.4.1.1-r6.ebuild 1816 BLAKE2B 41d75368f0e496f6352570a345779e98f40832deed1132996a1e3eecbc59941aa7a3e0e3ede428911b7e6fe074ef7bcf6a4f126f594babc5b0cd403515789a5b SHA512 82bf0593cc8d0dea4a655bb290fc639eb2e4628b4db94c1f140188be216c3aee56000557ba3cc8daa18a4e71267e1ca3074e1aef547966f3722610c44a417ac6
 MISC metadata.xml 513 BLAKE2B 6af2b5fb83bcc5e942e86f2d57455a54209186f8786fb6e76ce558c4bb0167d85ce419f7270e9b6e83914bdc8d0e963dc285227700bc5940096bbdbf78da93dd SHA512 eef3e5d89bf553098937118f2454cf0a7d715b31e2e49f5648260fd8c7abd03676f7a4047843e621406b54bb3c16bd4aa1409dc56d6d5ab0267a628a0cb15a99
diff --git a/mail-filter/opendmarc/files/opendmarc-1.4.1.1-arc-seal-crash.patch b/mail-filter/opendmarc/files/opendmarc-1.4.1.1-arc-seal-crash.patch
new file mode 100644
index 000000000000..7f96512fe45c
--- /dev/null
+++ b/mail-filter/opendmarc/files/opendmarc-1.4.1.1-arc-seal-crash.patch
@@ -0,0 +1,38 @@
+https://github.com/trusteddomainproject/OpenDMARC/issues/183
+https://bugs.gentoo.org/900521
+
+--- a/opendmarc/opendmarc-arcseal.h	2021-04-30 17:34:43.000000000 +0100
++++ b/opendmarc/opendmarc-arcseal.h	2021-06-25 14:23:01.725593770 +0100
+@@ -32,7 +32,7 @@
+ /* max header tag value length (short) */
+ #define OPENDMARC_ARCSEAL_MAX_SHORT_VALUE_LEN 256
+ /* max header tag value length (long) */
+-#define OPENDMARC_ARCSEAL_MAX_LONG_VALUE_LEN  512
++#define OPENDMARC_ARCSEAL_MAX_LONG_VALUE_LEN  768
+ 
+ /* names and field labels */
+ #define OPENDMARC_ARCSEAL_HDRNAME	"ARC-Seal"
+--- a/opendmarc/opendmarc-arcseal.c	2021-04-30 17:34:43.000000000 +0100
++++ b/opendmarc/opendmarc-arcseal.c	2021-06-25 14:27:10.689908703 +0100
+@@ -29,7 +29,7 @@
+ #include "opendmarc.h"
+ 
+ #define OPENDMARC_ARCSEAL_MAX_FIELD_NAME_LEN 255
+-#define OPENDMARC_ARCSEAL_MAX_TOKEN_LEN      512
++#define OPENDMARC_ARCSEAL_MAX_TOKEN_LEN      768
+ 
+ /* tables */
+ struct opendmarc_arcseal_lookup
+@@ -167,7 +167,12 @@ opendmarc_arcseal_parse(u_char *hdr, str
+ 		if (*token_ptr == '\0')
+ 			return 0;
+ 		tag_label = strsep(&token_ptr, "=");
++		if (token_ptr == NULL)
++			return 0;
++
+ 		tag_value = opendmarc_arcseal_strip_whitespace(token_ptr);
++		if (tag_value == NULL)
++			return 0;
+ 
+ 		tag_code = opendmarc_arcseal_convert(as_tags, tag_label);
+ 
diff --git a/mail-filter/opendmarc/files/opendmarc.service b/mail-filter/opendmarc/files/opendmarc.service
index 90ee5ccb4341..b29aa1afafdc 100644
--- a/mail-filter/opendmarc/files/opendmarc.service
+++ b/mail-filter/opendmarc/files/opendmarc.service
@@ -4,8 +4,8 @@ Documentation=man:opendmarc(8) man:opendmarc.conf(5) man:opendmarc-expire(8) man
 After=network.target nss-lookup.target syslog.target
 
 [Service]
-User=milter
-Group=milter
+User=opendmarc
+Group=opendmarc
 PIDFile=/var/run/opendmarc/opendmarc.pid
 ExecStartPre=/usr/sbin/opendmarc -c /etc/opendmarc/opendmarc.conf -n 
 ExecStart=/usr/sbin/opendmarc -c /etc/opendmarc/opendmarc.conf -f -P /var/run/opendmarc/opendmarc.pid
diff --git a/mail-filter/opendmarc/opendmarc-1.4.1.1-r4.ebuild b/mail-filter/opendmarc/opendmarc-1.4.1.1-r6.ebuild
index e0d08ea8755b..b7957ed0d8ee 100644
--- a/mail-filter/opendmarc/opendmarc-1.4.1.1-r4.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.4.1.1-r6.ebuild
@@ -12,11 +12,11 @@ S="${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}"
 
 LICENSE="BSD"
 SLOT="0/3"  # 1.4 has API breakage with 1.3, yet uses same soname
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="spf +reports"
 
-DEPEND="reports? ( dev-perl/DBI )
-	|| ( mail-filter/libmilter mail-mta/sendmail )"
+DEPEND="mail-filter/libmilter:=
+	reports? ( dev-perl/DBI )"
 RDEPEND="${DEPEND}
 	acct-user/opendmarc
 	reports? (
@@ -29,6 +29,11 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.1.1-CVE-2021-34555.patch
 	"${FILESDIR}"/${PN}-1.4.1.1-underlinking.patch
+	"${FILESDIR}"/${PN}-1.4.1.1-arc-seal-crash.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	res_ndestroy
 )
 
 src_prepare() {