gentoo resync : 12.05.2022

4 files changed, 29 insertions, 10 deletions

diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 038b02fcf090..02b386a6af06 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1,7 +1,8 @@
 AUX opendmarc-1.4.1.1-CVE-2021-34555.patch 2517 BLAKE2B 93ebfb101591e5b797b52de4d85a6e199c208544076a7d5bc05fb8b7237c663a204a45172d4cf38d408daf57d5076929b3de227e4e787d97c85aad3e42af9d03 SHA512 24df989c7a501ffea5da43469e049f4a5d9de82f2fe67875f93bad690f558d1734b9d4ea2da1a6aebdedb80b576ada8e12844e7aa061117dd41da3e23c24e176
+AUX opendmarc-1.4.1.1-underlinking.patch 522 BLAKE2B 2d960253144f0c2a159a36bfa119d166e26643d89ee0982af0618373cd387a6375209a41cab0fcfb694d4ba212442428961d31f8323427204423e80d10c3a9c3 SHA512 a95b070bd0ab8d2f6a2b417d3a7c930bc5d8a8d5749c60bdb669dbb97c5dc4817d706aabe928842bead7d746e676ba8d172706c7355c8ae7ac0b9dc38998a5f4
 AUX opendmarc.confd 91 BLAKE2B 124b653c68cd7a1081d2374fb901d55f3cf5af6957745130848f6ae1e93b007ad5ecff5527bed9da03d7033195e599c6052e6d28ec43f2b1e3fc5d1a20631dbc SHA512 2febb226e9495835c515d92c8e7cbb85db3c08ac287a7449d8117b5e9533902d8b3d190fa8face4b69f4cf0c0ede5d860a8b5f97d776c6d7d95bf9f196eb67e2
-AUX opendmarc.initd 1509 BLAKE2B b1cde9546c95b51c8c395f10eddf85bcb2fd17fd8a537df523e04a71d241c0fad4a3d2e4c34c950d7b684be518368fe78538828b81627d647e3531177eabb85e SHA512 00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129
+AUX opendmarc.initd 1521 BLAKE2B a397bbcbd6eb773ec8b80ac1243578391b1afb65830c726472d7890d6b59549092689022f34c7f314e3bfe3ca08fb903e2b363621b8752983d4aa73d94ee4da8 SHA512 ee61381a4b8d65dbea3306f0ed057767856fbfb6c65d5e3a2bb98843a8754527bd59999aaa3b3c0990725177c7de2c03c0ffccb9e6b4823176a0b9a5ba316931
 AUX opendmarc.service 800 BLAKE2B 866b1aaa0c8570494ac56aaa9962821204a7a24437cdb8bec0343c716cfc1d3748a368a32ec314dfce7e4264188cfb1dff51212d60340d4be8e33394a85486f6 SHA512 b140dc3ac99ee7c3dcee80743d6c4295dec4ce5090ab9f560ffe35f9d5e63c7f5af871edcc759be462b8110706028c047cd05ae910a74ecba0436620d6b291bb
 DIST opendmarc-1.4.1.1.tar.gz 426618 BLAKE2B a74b2623bc35abb5c34f8d1eff737c71af8f5cadfd6a5d0a85adb6536efd2958118f9da25dd9b736dc24563221968c4ee1ff99b101fa30909764563bda2a8d88 SHA512 ee034386c70c75b87ca2fce0849a1a3538e10e0aebfb0fc9dcba6817d2cf71f52aa5586ccaacdee620190c5fbb81498419fb8e8db9fac15d7c71a61a7da396a6
-EBUILD opendmarc-1.4.1.1-r2.ebuild 1733 BLAKE2B e086228ba2e38b5c01346b23c12d6f82fb0c574303e7bf61ed86e52e2a0029b6bdaf9a51bad0c2f2015a60c4a561746478ea3c9192668df32fd8e62f74e5e40f SHA512 8be05d69f76638cfae700c40d58257fe4f9736f5d78f928e7ed6db08a9c60810085a96d278e5386a1edc3b0b03309a0e87357d3d801fed3dc7a949360c139a10
+EBUILD opendmarc-1.4.1.1-r4.ebuild 1739 BLAKE2B 6c3f8849951fa3a0e7215053a46dc8dd52d3dbb6ba380fd46812a7332e66cca3cad0bc734ea40e1b59c8f4b1cca973c61999c5e283a38622bb67a042c73584e7 SHA512 fe8ad02b7e8a53f34c012665fe75c465645c7c0390aec31da04cb6bb4c85ab6525f6179da63b5d5f9507bddc5b27589a0d745c674b1be0bddb190c627c7ba30f
 MISC metadata.xml 513 BLAKE2B 6af2b5fb83bcc5e942e86f2d57455a54209186f8786fb6e76ce558c4bb0167d85ce419f7270e9b6e83914bdc8d0e963dc285227700bc5940096bbdbf78da93dd SHA512 eef3e5d89bf553098937118f2454cf0a7d715b31e2e49f5648260fd8c7abd03676f7a4047843e621406b54bb3c16bd4aa1409dc56d6d5ab0267a628a0cb15a99
diff --git a/mail-filter/opendmarc/files/opendmarc-1.4.1.1-underlinking.patch b/mail-filter/opendmarc/files/opendmarc-1.4.1.1-underlinking.patch
new file mode 100644
index 000000000000..825ee461dfd6
--- /dev/null
+++ b/mail-filter/opendmarc/files/opendmarc-1.4.1.1-underlinking.patch
@@ -0,0 +1,17 @@
+libopendmarc.so.2.0.3 uses
+* __dn_expand
+* __dn_skipname
+* __res_nquery
+which are defined in libresolv in glibc 2.33 and older.
+
+See: https://bugs.gentoo.org/839951
+
+--- a/libopendmarc/Makefile.am
++++ b/libopendmarc/Makefile.am
+@@ -15,5 +15,6 @@
+ 			  opendmarc_spf_dns.c \
+                           opendmarc_internal.h
+ libopendmarc_la_LDFLAGS = -version-info $(LIBOPENDMARC_VERSION_INFO)
++libopendmarc_la_LIBADD = $(LIBRESOLV)
+ libopendmarc_includedir = $(includedir)/opendmarc
+ libopendmarc_include_HEADERS = dmarc.h
diff --git a/mail-filter/opendmarc/files/opendmarc.initd b/mail-filter/opendmarc/files/opendmarc.initd
index 6a8300f145d6..3f55464e11b4 100644
--- a/mail-filter/opendmarc/files/opendmarc.initd
+++ b/mail-filter/opendmarc/files/opendmarc.initd
@@ -15,8 +15,9 @@ check_cfg() {
 		return 1
 	fi
 	# create /var/run/opendmarc
-	mkdir -p /var/run/opendmarc >& /dev/null
-	chown ${OPENDMARC_USER}:${OPENDMARC_GROUP} /var/run/opendmarc >& /dev/null
+	mkdir -p /var/run/opendmarc > /dev/null 2>&1
+	chown ${OPENDMARC_USER}:${OPENDMARC_GROUP} \
+		/var/run/opendmarc > /dev/null 2>&1
 	PIDFILE=$(sed -ne 's/^[[:space:]]*PidFile[[:space:]]\+//p' "${CONFFILE}")
 	local PIDDIR="${PIDFILE%/*}"
 	if [ ! -d  "${PIDDIR}" ] ; then
diff --git a/mail-filter/opendmarc/opendmarc-1.4.1.1-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.4.1.1-r4.ebuild
index e0c31d75209b..e0d08ea8755b 100644
--- a/mail-filter/opendmarc/opendmarc-1.4.1.1-r2.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.4.1.1-r4.ebuild
@@ -8,11 +8,12 @@ inherit autotools systemd
 DESCRIPTION="Open source DMARC implementation"
 HOMEPAGE="http://www.trusteddomain.org/opendmarc/"
 SRC_URI="https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${PN}-${PV//./-}.tar.gz -> ${P}.tar.gz"
+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"
-IUSE="spf +reports static-libs"
+IUSE="spf +reports"
 
 DEPEND="reports? ( dev-perl/DBI )
 	|| ( mail-filter/libmilter mail-mta/sendmail )"
@@ -25,10 +26,9 @@ RDEPEND="${DEPEND}
 	)
 	spf? ( mail-filter/libspf2 )"
 
-S=${WORKDIR}/OpenDMARC-rel-${PN}-${PV//./-}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.1.1-CVE-2021-34555.patch
+	"${FILESDIR}"/${PN}-1.4.1.1-underlinking.patch
 )
 
 src_prepare() {
@@ -42,16 +42,16 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_with spf) \
 		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
-		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable static-libs static)
+		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir))
 }
 
 src_install() {
 	default
 
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.la
+	find "${ED}" -name '*.la' -delete || die
 
 	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
 	newconfd "${FILESDIR}"/opendmarc.confd opendmarc