gentoo auto-resync : 04:08:2022 - 08:04:47

13 files changed, 367 insertions, 3 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index eb8f838e59d3..4e1a4c7cd10d 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index 805e8fb25044..f06b1d58966b 100644
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -5,5 +5,6 @@ DIST amavisd-milter-1.7.1.tar.gz 193425 BLAKE2B e93f7f8f4c3b5e59fbfc160e60c86202
 DIST amavisd-milter-1.7.2.tar.gz 191224 BLAKE2B 82865acacec1004e611bbafd940d5721660b0daa1af1aea742d4176c613ce2af0e4bde523d0363b97e3f361270641acda477797eab9e8df9feb266c80ef6009c SHA512 639a5a4f92131f9b8d004255819e36dedd529ec95f8290663c6ea5860dbbce049a822ba0e68158228716778265009b93024e9102defdf9250d4e889157008181
 EBUILD amavisd-milter-1.7.0-r1.ebuild 650 BLAKE2B 40e8095761fd9ca4e873283291d89ccc1350b0eb06d84d8ceebff1dc2ca2321b01e29b90709c64d49dde1ee045288eda0c176190ffce4e3b4bab396f23c92e66 SHA512 1b685eb610e6aa50593325378c76e8501297354256a06fe10e6e6463634d21e97ca0d360e96e7298b90940d784929391149a632d69dbd0fc6410ba6b0ec2ed45
 EBUILD amavisd-milter-1.7.1.ebuild 652 BLAKE2B 09317271c519d835155c510ed1ab6cb55502066eb4849cb00b7da8efd85c41ea16f1b540b9e8826751b6d6ac36910902f1a110b7e737ad958b18a03abbbf095a SHA512 7a51d4a44c20a186476fb29d92d2901477cc3c01e06b03c93ddcd583a2cd2f63e936486111a7446b7d1ad5298de15cb3fde53cd89fcbfe4de7430ffadd6f1a69
+EBUILD amavisd-milter-1.7.2-r1.ebuild 622 BLAKE2B 53e4ca91bdc13e0c07113ab77445f355c28abb8bdbb6dcfd64e7920ed59857b2d92b7b5c87c01cb2e1888786ba246922f5a25216c5fef59ca07519e3325ea3a9 SHA512 f0d519838ed9d276d20100443ef6d8c9cc105d72bdd83f4f0d5799d6c90540fa1f08529411827848bb7d3db363247bbddce7f4ff617ee6ef45a85e9ac6241517
 EBUILD amavisd-milter-1.7.2.ebuild 652 BLAKE2B 351952943ca9b1cd61f1b0fd6e7ad5c2617547d41322eb7d9c1388079df8cd6fdcf335cdc779cb4e84430b2c2124ea25799a463dd59fa9107d064d26e5e8b5ab SHA512 7ec8bf28179f7e671d1072daceb199e212ee365228d9e04846f836ed6238e94b48ced3e8eecb4fa1b60e1c77a65a79d82ede28e2c15df90e4cf24dcfcc7bc3fb
 MISC metadata.xml 333 BLAKE2B 612ff1239b67cc232069226263c42531349ec44f51a249afd1db683761a99bdac63a1b19ea96707a809af26f9cfcd52d90ffe343e1f32dbd20317cbff7f2aad0 SHA512 845a38e47210175bc6a4a4cd2927135d7463514c0d5907e702064a1ce4670faef0675a41e17873616a1bb6c779756ace4344122d32a707783d075770d1acf0ce
diff --git a/mail-filter/amavisd-milter/amavisd-milter-1.7.2-r1.ebuild b/mail-filter/amavisd-milter/amavisd-milter-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..059749c766a1
--- /dev/null
+++ b/mail-filter/amavisd-milter/amavisd-milter-1.7.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="sendmail milter for amavisd-new"
+HOMEPAGE="https://github.com/prehor/amavisd-milter/"
+SRC_URI="https://github.com/prehor/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="mail-filter/libmilter:="
+RDEPEND="${DEPEND}
+	mail-filter/amavisd-new"
+
+DOCS=( AMAVISD-MILTER.md CHANGES INSTALL )
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/amavisd-milter.initd-r2" amavisd-milter
+	newconfd "${FILESDIR}/amavisd-milter.confd" amavisd-milter
+}
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index ead90d1ee6bc..f30ae3e58b59 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -4,4 +4,5 @@ AUX dcc.confd 274 BLAKE2B 757f3e751028b0c35c166f708c328b506721549267bf1e87e841b7
 AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc96207fa80a7331d15ba77ac8b5e369c2bec5e164819da876e2ba022f31db3a455d72a6e52387a014d8de38 SHA512 e171e4333d735aa7da99ae322ce04954554a6738b943ca085e51707dd0bf231f7c170211f019027ddf01ec750ed1b8728b5d54b48dee6ee7fc37f8a810aded01
 DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
 EBUILD dcc-1.3.158-r1.ebuild 3750 BLAKE2B 976ca6b2cd285416c6d2703ec294207dc0a45685537a2cbaf2a2f343f4e478ecaa40a8a9ac064e8ae0d3e36540ac83bec3e58b9fc3c18ee4b19a816afdf57e6e SHA512 3d8e190823ec4a46e00262a51a68a4f9d4869fe928de2657659080295647d4eb17a33de488991676d11c6f0ff45d8fd42dbb81b5ac14582084fb3a8fa42d1630
+EBUILD dcc-1.3.158-r2.ebuild 3716 BLAKE2B 2d4b40676751ad4d82c638b938900a8d54c2a9e206d97f28fcbb797d793bac38a6e672b359117138a3b168a4a466510120a92953bf8ea1719028a6bde1d1764a SHA512 103b8d4d1a66bda07562c5d3bfa28e6cfcee5e1aa93038e2cb764ce23d6116ea4bb06ea9e01ace141dd3838d9f2ff9b33f527840b37238b5a752619fddd4b17f
 MISC metadata.xml 317 BLAKE2B 92e853d40d112a562ad2e3afd351af700b6f751f7f2451e41d5db02100be2732730d40df236cbc11354077f0818771715174f0839f36aa824daa69e2218eded9 SHA512 7fe6a76ef0450fccc2121d94e03a45dc87fb21fcc3ed39a5016423a658e61c6ddf7cdcfa9d23fe4269662987268c50ddc25335ccb61f65f5fc2bba6131027b4b
diff --git a/mail-filter/dcc/dcc-1.3.158-r2.ebuild b/mail-filter/dcc/dcc-1.3.158-r2.ebuild
new file mode 100644
index 000000000000..7a01e900a63e
--- /dev/null
+++ b/mail-filter/dcc/dcc-1.3.158-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Distributed Checksum Clearinghouse"
+HOMEPAGE="https://www.rhyolite.com/dcc/"
+SRC_URI="https://www.rhyolite.com/dcc/source/old/${P}.tar.Z"
+
+LICENSE="DCC GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="cgi ipv6 rrdtool milter"
+
+RDEPEND="
+	dev-lang/perl
+	|| (
+		net-ftp/ftp
+		net-misc/curl
+		net-misc/wget
+		www-client/fetch
+	)
+	milter? ( mail-filter/libmilter:= )
+	rrdtool? ( net-analyzer/rrdtool )"
+DEPEND="${RDEPEND}"
+
+dcc_cgibin=var/www/localhost/cgi-bin/dcc
+dcc_homedir=var/dcc
+dcc_libexec=usr/sbin
+dcc_man=usr/share/man
+dcc_rundir=var/run/dcc
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.140-freebsd.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+	tc-export CC AR RANLIB
+	local myconf=(
+		--bindir="${EPREFIX}"/usr/bin
+		--homedir="${EPREFIX}"/${dcc_homedir}
+		--libexecdir="${EPREFIX}"/${dcc_libexec}
+		--mandir="${EPREFIX}"/usr/share/man
+		--enable-dccifd
+		--enable-server
+		--with-DDC-MD5
+		--with-installroot="${D}"
+		--with-rundir="${EPREFIX}"/${dcc_rundir}
+		--with-uid=root
+		--with-updatedcc_pfile="${EPREFIX}"/${dcc_homedir}/updatecc.pfile
+		--with-db-memory=64
+		--with-max-db-mem=128
+		--with-max-log-size=0
+		--with-make-cmd=${MAKE:-make}
+		$(use_enable ipv6 IPv6)
+		$(use_enable milter dccm)
+		$(use_with cgi cgibin ${dcc_cgibin})
+		$(use_with milter sendmail)
+	)
+
+	einfo "Using config: ${myconf[@]}"
+
+	# This is NOT a normal configure script.
+	./configure "${myconf[@]}" || die "configure failed!"
+}
+
+moveconf() {
+	local i
+	for i in $@; do
+		mv "${ED}/${dcc_homedir}/${i}" "${ED}"/etc/dcc || die
+		dosym ../../etc/dcc/"${i}" "${dcc_homedir}/${i}"
+	done
+}
+
+src_install() {
+	# stolen from the RPM .spec and modified for gentoo
+	export MANOWN=root
+	export MANGRP=$(id -g -n root)
+	export BINOWN="${MANOWN}"
+	export BINGRP="${MANGRP}"
+	export DCC_PROTO_HOMEDIR="${ED}/${dcc_homedir}"
+	export DCC_CGIBINDIR="${ED}/${dcc_cgibin}"
+	export DCC_SUID="${BINOWN}"
+	export DCC_OWN="${BINOWN}"
+	export DCC_GRP="${BINGRP}"
+
+	dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc
+	if use cgi ; then
+		dodir "${dcc_cgibin}"
+	fi
+	keepdir /var/log/dcc
+
+	emake install
+
+	# branding and setting reasonable defaults
+	sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \
+		-e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \
+		-e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \
+		-e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \
+		-e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \
+		-e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \
+		-e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \
+		-e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \
+		-i "${ED}/${dcc_homedir}/dcc_conf" || die
+
+	if use milter ; then
+		# enable milter
+		sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \
+			"${ED}/${dcc_homedir}"/dcc_conf || die
+	fi
+
+	# provide cronjob
+	mv "${ED}"/usr/sbin/cron-dccd "${ED}"/etc/cron.daily/dccd || die "mv failed"
+
+	# clean up
+	mv "${ED}"/usr/sbin/logger "${ED}"/usr/sbin/logger-dcc || die "mv failed"
+
+	if ! use rrdtool; then
+		# remove rrdtool interface scripts
+		rm "${ED}"/usr/sbin/dcc-stats-{collect,graph,init} || die "Failed to clean up rrdtool scripts"
+	fi
+
+	# clean up
+	rm "${ED}"/usr/sbin/{rcDCC,updatedcc} || die
+
+	# place configuration files into /etc instead of /var/dcc
+	moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist
+
+	newinitd "${FILESDIR}"/dcc.initd-1.3.154 dcc
+	newconfd "${FILESDIR}"/dcc.confd dcc
+
+	rmdir "${ED}"/var/dcc/log/ || die
+
+	dodoc CHANGES RESTRICTIONS
+	doman *.{0,8}
+}
diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index bf11dce50345..c8d58f9e685b 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -2,5 +2,6 @@ AUX milter-regex-2.6-gentoo.patch 1078 BLAKE2B 30b782e70b2b9b23d3bdfb22ac5bdecfc
 AUX milter-regex-conf-2.6 459 BLAKE2B d15f232945a919e49f26df7a5489701b1a13567fca10d877e93943e2ac31865bdf6af26a10da196a64ce0d42238e58631b041e2b846187e82dff0ff38e8aac83 SHA512 2178c0b11ca6fca9121da66a2b4c828105efe9e94ba4b4b6dd56b235dfe3b3ab14a6f7ac9004d7a1fb2b50ff4730f875e85afa0d11c72ab2949aa150b28f1c8c
 AUX milter-regex-init 818 BLAKE2B 9130db7e295262a02cfc61464945029810f61fba4947e422fca9820d0d58762db228bcc760bc8e1f55aaa61cff9455abed19f66ff7bd910aecd9a969eaa3c12d SHA512 04549ec85a8b3c9fe4e65bcfe903aefbd9019b8324041448586bb3ed3bada20c0bf60fbe485e90bb1cf777703c696d2a0c9b3630c218d7037e1c6b2680eace75
 DIST milter-regex-2.7.tar.gz 20579 BLAKE2B e48c5747537d439372d8f473d9b39e337501c24b46d52e13f727b32ee29bb58f266e45ecabad01937f5e56a4a773659daf34d12c6728b6700679b04a2cb595d0 SHA512 d698a7c35768846bcc87a31167cf9a5c41c99d8fa3f3cb5c231e100a7e149d9bca6fc689ece805bd80688787b6d3fa0d9ace49592e1d6c53a25fc2086ebf9962
+EBUILD milter-regex-2.7-r1.ebuild 1110 BLAKE2B 8e3ce76e1d1db9231bd6bb2454219a85e598e4c6daee7bce7213fdfa5638db11e4a18faf2f838f528786d49005aa78de1dd0e6d48548006ae426fa11b7e85446 SHA512 2972ee083e31f5cb884ade0d0834f5610d319dca7faecef679996dbe96a32b418fbe9e4e4683e780817c7c4f66b6d0e0e849f0210f62216d54bc816c70432aa2
 EBUILD milter-regex-2.7.ebuild 1122 BLAKE2B 7974a8b954484fabec28215b75101f07a71ba4cee8228f2ab9c0b99123ff265bba062fd8ef62be5e0e06f5931f402daff79429a77baa5e987dd935fe3256c182 SHA512 d5d0a071a6c461186c14fc0416f4bd6290e0057290fc1e027bf93fc9855b654a8acd4060aa1aa02c4820701973c3cb55f3c6982e47d11fbff5d914fa4b217177
 MISC metadata.xml 727 BLAKE2B 46c3ce4f04ed4db2d8ce595744c16f46a0270186c4620d5245db9b0aedf4867bbd04c2b44e59591def9a01da8b5387baeaf77aae32dd9f7a18267ff2984ccc21 SHA512 a13def0da2410e52c7c63ec9cf1b72c304652e9f7ddce89cadec60285794dc70fc90c714e8a5860525426fd3768ce31a82375059c12ae42528fef57854cad282
diff --git a/mail-filter/milter-regex/milter-regex-2.7-r1.ebuild b/mail-filter/milter-regex/milter-regex-2.7-r1.ebuild
new file mode 100644
index 000000000000..a4095fb37dbb
--- /dev/null
+++ b/mail-filter/milter-regex/milter-regex-2.7-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A milter-based regular expression filter"
+HOMEPAGE="https://www.benzedrine.ch/milter-regex.html"
+SRC_URI="https://www.benzedrine.ch/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="acct-user/milter-regex
+	>=mail-filter/libmilter-1.0.2_p2:="
+DEPEND="${RDEPEND}
+	virtual/yacc"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.6-gentoo.patch"
+	eapply_user
+	# Change default user
+	sed -i -e 's/_\(milter-regex\)/\1/g' ${PN}.[8c] || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" -f Makefile.linux all
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc
+	newins rules ${PN}.conf
+	newconfd "${FILESDIR}/${PN}-conf-2.6" ${PN}
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+	doman *.8
+}
+
+pkg_postinst() {
+	elog "Postfix configuration example (add to main.cf or master.cf):"
+	elog "  smtpd_milters=unix:/run/milter-regex/socket"
+	elog "Sendmail configuration example:"
+	elog "  INPUT_MAIL_FILTER(\`${PN}',\`S=unix:/run/milter-regex/socket,T=S:30s;R:2m')"
+}
diff --git a/mail-filter/mimedefang/Manifest b/mail-filter/mimedefang/Manifest
index 60cdf224ff88..203d8fda883c 100644
--- a/mail-filter/mimedefang/Manifest
+++ b/mail-filter/mimedefang/Manifest
@@ -4,4 +4,5 @@ AUX mimedefang.conf 4760 BLAKE2B 14457894f4f42557ee06aca1454a85978fee1d0dd21dca7
 AUX mimedefang.init 1740 BLAKE2B bf00f5797e2dd72a29dc5b955a18a7faff1e9fd2b82d011f0628222ebc2b4117e1a9262d096706b83729c4e3851a09a65a0d1c0ee57d68c155c9136c63b569a2 SHA512 f45b3ce8a085b3559c80e4bf361ecf3cc16c360322986ac5381a1707e217a282fec4a9bec7856dd153107557911bd6eb9a9ec66b160c0b6bfec3e783aaef321a
 DIST mimedefang-2.84.tar.gz 371596 BLAKE2B b9b871d6a438792afbcebfcd99a77a1f9bb2c0dc7826abea74db913c6dc154403753a3016dc0647e9873256fe354649dea096c0e50d54f8db16ff8d2b91f54f4 SHA512 ffe039654d2e3f649219efc559380e39b21ce910becc36e262356d59d50129f8683ee2e59dd9680aff46478ccebd6b3d9c4567f85ade9a8464077350f4e52f48
 EBUILD mimedefang-2.84-r1.ebuild 1795 BLAKE2B 8f9134d7f5c9236e294a09d2bc8a8126b18d0de1a3f6b8587bf82f1631feb1814d36f46e781b881bbfa47526edec916779684582c4af997897d9cf5df209995b SHA512 dc0e51681879d2fbb00979e035f9e7ef8e9af99b91ecc0b94a52714850afee97b6391b88a327da79fb05184cde3e3d0d97833ef1a74fa8ae171b2913ef2c5b56
+EBUILD mimedefang-2.84-r2.ebuild 1772 BLAKE2B 0adfb92ea77a804bbdba8148e98dc5de53141edaa5ebaf750c77e774349cba136fad5989ec325150d6da8b9fee9cdf0b0da8d2081dbdf27b6cf5528f829df439 SHA512 51934b795a546a48f2bfc021db0dfd69ad284ab9cb4444d782777ad7635fc054e50b4f5656e3e0bb9c719ca5b6c61c4484f3ffa942e4e7b1b4e1497ac32cc413
 MISC metadata.xml 651 BLAKE2B 0cf985310000a64a001cf88c0714b3f64c8c6e87b120a861389c2c25b454d43712ff0223a7288af9a46685851eb0ba5965965129d292c6dac0d3de5f5240f240 SHA512 7024c53bfd408a46ac3f91bdecc7b26b783a71b0ed6f60c37ad640ee1a9274aa43f192da16ab7611e7ffe1b122c1e5fcaf81b46cf41b459b9da2cf8697be8c3a
diff --git a/mail-filter/mimedefang/mimedefang-2.84-r2.ebuild b/mail-filter/mimedefang/mimedefang-2.84-r2.ebuild
new file mode 100644
index 000000000000..5b86e55f2dba
--- /dev/null
+++ b/mail-filter/mimedefang/mimedefang-2.84-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Antispam, antivirus and other customizable filters for MTAs with Milter support"
+HOMEPAGE="http://www.mimedefang.org/"
+SRC_URI="http://www.mimedefang.org/static/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clamav +poll test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/defang
+	acct-user/defang
+	dev-perl/Digest-SHA1
+	dev-perl/IO-stringy
+	dev-perl/MailTools
+	dev-perl/MIME-tools
+	dev-perl/Unix-Syslog
+	mail-filter/libmilter:=
+	virtual/perl-MIME-Base64
+	clamav? ( app-antivirus/clamav )
+"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-perl/Test-Class
+		dev-perl/Test-Most
+	)
+"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.72-ldflags.patch"
+	eapply "${FILESDIR}/${PN}-tests.patch"
+	eapply_user
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-user=defang
+		$(use_enable poll)
+		$(use_enable clamav)
+		$(use_enable clamav clamd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_STRIP_FLAG="" install
+
+	fowners defang:defang /etc/mail/mimedefang-filter
+	fperms 644 /etc/mail/mimedefang-filter
+	insinto /etc/mail/
+	newins "${S}"/SpamAssassin/spamassassin.cf sa-mimedefang.cf
+
+	keepdir /var/spool/{MD-Quarantine,MIMEDefang}
+	fowners defang:defang /var/spool/{MD-Quarantine,MIMEDefang}
+	fperms 700 /var/spool/{MD-Quarantine,MIMEDefang}
+
+	keepdir /var/log/mimedefang
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	dodoc -r examples contrib
+}
+
+pkg_postinst() {
+	elog "You can install Mail::SpamAssassin (mail-filter/spamassassin) and"
+	elog "HTML::Parser (dev-perl/HTML-Parser) even after installing if you require"
+	elog "them as they are loaded at run-time."
+}
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index 02b386a6af06..fa788debf893 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -5,4 +5,5 @@ AUX opendmarc.initd 1521 BLAKE2B a397bbcbd6eb773ec8b80ac1243578391b1afb65830c726
 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-r4.ebuild 1739 BLAKE2B 6c3f8849951fa3a0e7215053a46dc8dd52d3dbb6ba380fd46812a7332e66cca3cad0bc734ea40e1b59c8f4b1cca973c61999c5e283a38622bb67a042c73584e7 SHA512 fe8ad02b7e8a53f34c012665fe75c465645c7c0390aec31da04cb6bb4c85ab6525f6179da63b5d5f9507bddc5b27589a0d745c674b1be0bddb190c627c7ba30f
+EBUILD opendmarc-1.4.1.1-r5.ebuild 1716 BLAKE2B 97d7af348a6c42a0a4db000e36fb9f5c48aa6bbf1549ff1a1f6aac50387a4444536161335dc1b5f96c5ba935e0f911ea88c0406428cc3b619826674f2e115de9 SHA512 2cce3c29b10bbc3464cf1437412522fe7d982f526d2db54d82c16ec5518078f0a914716e2cd792a28259705498aeae83f53d7009c9779942712eb4e87b283e2c
 MISC metadata.xml 513 BLAKE2B 6af2b5fb83bcc5e942e86f2d57455a54209186f8786fb6e76ce558c4bb0167d85ce419f7270e9b6e83914bdc8d0e963dc285227700bc5940096bbdbf78da93dd SHA512 eef3e5d89bf553098937118f2454cf0a7d715b31e2e49f5648260fd8c7abd03676f7a4047843e621406b54bb3c16bd4aa1409dc56d6d5ab0267a628a0cb15a99
diff --git a/mail-filter/opendmarc/opendmarc-1.4.1.1-r5.ebuild b/mail-filter/opendmarc/opendmarc-1.4.1.1-r5.ebuild
new file mode 100644
index 000000000000..c78d15504262
--- /dev/null
+++ b/mail-filter/opendmarc/opendmarc-1.4.1.1-r5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+DEPEND="mail-filter/libmilter:=
+	reports? ( dev-perl/DBI )"
+RDEPEND="${DEPEND}
+	acct-user/opendmarc
+	reports? (
+		dev-perl/DBD-mysql
+		dev-perl/HTTP-Message
+		dev-perl/Switch
+	)
+	spf? ( mail-filter/libspf2 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1.1-CVE-2021-34555.patch
+	"${FILESDIR}"/${PN}-1.4.1.1-underlinking.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+	if use !reports ; then
+		sed -i -e '/^SUBDIRS =/s/reports//' Makefile.in || die
+	fi
+}
+
+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))
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/opendmarc.initd opendmarc
+	newconfd "${FILESDIR}"/opendmarc.confd opendmarc
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	dodir /etc/opendmarc
+
+	# create config file
+	sed \
+		-e 's:^# UserID .*$:UserID opendmarc:' \
+		-e "s:^# PidFile .*:PidFile ${EPREFIX}/var/run/opendmarc/opendmarc.pid:" \
+		-e '/^# Socket /s:^# ::' \
+		"${S}"/opendmarc/opendmarc.conf.sample \
+		> "${ED}"/etc/opendmarc/opendmarc.conf \
+		|| die
+}
diff --git a/mail-filter/sigh/Manifest b/mail-filter/sigh/Manifest
index 5000cce3181d..70e0868c0de4 100644
--- a/mail-filter/sigh/Manifest
+++ b/mail-filter/sigh/Manifest
@@ -1,5 +1,5 @@
 AUX sigh-1607.1.6-fno-common.patch 565 BLAKE2B 6c6c7e97a20a098ab7dd6924a5156f718a293cda0e0106ee0f96219d7183542cd7a363ae2b7cddcb85026a14cf60f9870247d8024822e8ebb57f99c956955e84 SHA512 4a80085b4da8df37bc8577d598f0966be402be77fed26f7d59e47c2c5836c45e0fba83bf00dc5b5e52be53e54eaa670364244f5405cf52653f41904347987523
 AUX sigh.initd 485 BLAKE2B 329efca4f269586b191e3cef3311d465ef1fbe760d34a7dbe8089cc187fe2c35b4b64be283edf8cef3efff1b3bd90cbc092a22bcdb9de3a2e118b204bbec5230 SHA512 34e1cc17fdc09ad0377604c951cc85682f56ed4a2a2f6f396d2e4d30777fa1bb8ddf693487eb100ff45fe15612bb68ba641eca3c28008431649b7f980cb3fec0
 DIST sigh-1607.1.6.tar.gz 58258 BLAKE2B 6d2743c4a850af4f28ba0f2b7a0d6fdef5b699f9521e0631b9bc534be872af4cfccd10de7648080389046faf3f34ba58e3ce68aa318d76ed8e1af5f495f47f70 SHA512 640fa35ea89d7aab956e597ef089a8b7f57af2a7e3de7087e6bd01b60715cc33263cd4fd84a8826ae37387ec802d4bb78c5fe9c83e5d404029d69de010b1ce6b
-EBUILD sigh-1607.1.6-r1.ebuild 612 BLAKE2B 7f583ba82990777fd20784686f8f00769f5e63c617c4c130faa2b8ea0603b3c724306a574bf02ba68f0e22f57c64ede168aa2edf6aba2f3ad9f073e55d2b0760 SHA512 7d403598c1bd858102282eb07665bc59215635b06b18626cfe58f4f21ed8b8c68118f16f380d0425e0495ff6aa383912a1b06ff555ac5cf921fe8f13c53b34a1
+EBUILD sigh-1607.1.6-r2.ebuild 614 BLAKE2B a422dd02896c40a00275a69c12f80fa5c607c7cfab70c7d88cd481762d5e8397ef54b6e9e42c1b4670dcc1fcb0a0b49d46c9692f27aa0cc58c32bd085d394c13 SHA512 855f7b2908499a55591d491feec09d9bbbddb24319feae27a04dbf467fa9ebf6a3208b971e060b920ffad7d0ff0860f5e5c6620b7b1e0bb476d456edbd5ba5b7
 MISC metadata.xml 330 BLAKE2B 0e4f30ad4acfb7ec48ec7a96a19100c39f7ab513de224e5dd2088a3a11187f83b76cf395527f45c0273f6d5d56cb069d153a5c4aeb87a7f17e78efb856a8be18 SHA512 2f154a9abaf0761b54bd57ef2247b1be36ab5a258ed59162b093cebff2ae0899fc5c5a26a69425e8b66cd34fefa69dfc4bc9d31e3aaa5e6fb25378e387ea36fc
diff --git a/mail-filter/sigh/sigh-1607.1.6-r1.ebuild b/mail-filter/sigh/sigh-1607.1.6-r2.ebuild
index 43bef3b3b138..bd79dd2d7237 100644
--- a/mail-filter/sigh/sigh-1607.1.6-r1.ebuild
+++ b/mail-filter/sigh/sigh-1607.1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ RDEPEND="
 	acct-user/sigh
 	dev-libs/boost
 	dev-libs/openssl:0=
-	mail-filter/libmilter"
+	mail-filter/libmilter:="
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )