gentoo resync : 11.07.2019

6 files changed, 262 insertions, 34 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index ea27dd507573..95268f5f9ec1 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 170f3c2934ac..b668f7c54ed2 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -9,5 +9,6 @@ AUX opendkim.service 439 BLAKE2B 203f8d5a55f9f08069eec0bac8b9af743e3c0414a927c47
 AUX opendkim.service.conf 60 BLAKE2B 797a3947c9c984378955701252cc9d956c8398f1bba7696e7d5c052dd8103355dbf147ac05ae5b7f372867f2b330aaaf160e83709e440a9fc942e9069dbe7c2e SHA512 635e474464f81abe8444030b3cdc6e747298fc463bd02e4292e914ad622761f354b92921cd380387c8e9272435e1660de1a1cf8dbe34ded870e728ecc9e00246
 DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8
 EBUILD opendkim-2.10.3-r15.ebuild 7370 BLAKE2B 4dece98e2599700b5a3add3cf3ec0ea6430c6b07be798f051cd45b2ab9f8b9b74cb1c7a643d55e54982097ed9c78260e945587f07b881fdbb2320678bff00a5a SHA512 e7caccb36dc6bc5a7b046d9c8fb56cf4606657026c5ffc91dbfb7ce043631bf87168fd8f8278141296573d3e7e3ecebe91ce871d504dc4b49ca170737d194f76
+EBUILD opendkim-2.10.3-r16.ebuild 7439 BLAKE2B 0d84107e8fa725827c315b8599b9c06333f9d1720f7f7c04d664f2c3afc16a0a7cdac60ed5b5c6201a6ffdaa0d4736f5c120b10d0a4a59a2a6c6e92ab74eb7b9 SHA512 4751a54b4182e5cbb61229b26ed5bc1baa05a8ec71d7812dc2b003e42f9c4e7e8f96e12fc93cfe5a0c55aaff5af81ad27164b048d9ffd394cf01d95b4ee38f76
 EBUILD opendkim-2.10.3-r8.ebuild 7233 BLAKE2B 81c780d136560365a2a4eebf31901448cadec91616388ab9851c0bbd24dfff965c517cec5af73fd3adc4507708aba1c24d13d8905f7e5499c09ef4e6751171ee SHA512 385e2da6c53900a98f35a9839007f5dd7caa65fb9138599e1ced1639759fbb674223ecd2ccf8bddd4341334934440476112b07f280efabf345af8e0b77098815
-MISC metadata.xml 1988 BLAKE2B 14cc3bed4822cd17ff675b16aba8a973476b78da8fcd73953ecc419778498c7d8e2b6837c7bacf7a0221086ec740ffbac6900cfb8d50143f995c6f8ddcb72752 SHA512 dea34aca15c223d2195de689333b98c23abb18830a64f73e602405d36b5ca7f46b065533f116307075ab2d01570e52e8352a394efae39a6e5d1af51c56b91543
+MISC metadata.xml 2186 BLAKE2B 849f52c2a72b9891732476203f9368204e0323a21306ef11a5b114ab66d9946b5028ad6b424f659dfa5cecf88b90e1a2fe3a55b8868f02a3f999151b19f85f82 SHA512 57caed2ca4c63ddb76ef643c1dcc76662efc767c37d2c0c084abfea0af864e8fbdf6d7b041114aad2478f4b0ebbace4dde0a427a4464e5d785ec9eac78f4fda3
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 88da01998627..e70d2e70d706 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -59,6 +59,12 @@
     <flag name="lmdb">
       Add support for using <pkg>dev-db/lmdb</pkg>
     </flag>
+    <flag name="query_cache">
+      Add support for query caching (requires 'berkdb' flag)
+    </flag>
+    <flag name="stats">
+      Add support for statistics (requires 'opendbx' flag)
+    </flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">opendkim</remote-id>
diff --git a/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
new file mode 100644
index 000000000000..dd5ca50e9a3b
--- /dev/null
+++ b/mail-filter/opendkim/opendkim-2.10.3-r16.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools db-use eutils systemd tmpfiles user
+
+DESCRIPTION="A milter providing DKIM signing and verification"
+HOMEPAGE="http://opendkim.org/"
+SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
+
+# The GPL-2 is for the init script, bug 425960.
+LICENSE="BSD GPL-2 Sendmail-Open-Source"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs stats query_cache test unbound"
+
+COMMON_DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
+	dev-libs/libbsd
+	sys-apps/grep
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	berkdb? ( >=sys-libs/db-3.2:* )
+	opendbx? ( >=dev-db/opendbx-1.4.0 )
+	lua? ( dev-lang/lua:* )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb )
+	memcached? ( dev-libs/libmemcached )
+	sasl? ( dev-libs/cyrus-sasl )
+	unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root )
+	!unbound? ( net-libs/ldns )"
+
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-lang/lua:* )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-process/psmisc
+	selinux? ( sec-policy/selinux-dkim )"
+
+REQUIRED_USE="sasl? ( ldap )
+	stats? ( opendbx )
+	query_cache? ( berkdb )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-openrc.patch"
+	"${FILESDIR}/${P}-openssl-1.1.1.patch.r2"
+)
+
+pkg_setup() {
+	# This user can read your private keys, and must therefore not be
+	# shared with any other package.
+	enewgroup opendkim
+	enewuser opendkim -1 -1 -1 opendkim
+}
+
+src_prepare() {
+	default
+	sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \
+		-i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \
+		|| die
+	sed -e 's:dist_doc_DATA:dist_html_DATA:' \
+		-i libopendkim/docs/Makefile.am \
+		|| die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	if use berkdb ; then
+		myconf+=( --with-db-incdir=$(db_includedir) )
+	fi
+	if use unbound; then
+		myconf+=( --with-unbound )
+	else
+		myconf+=( --with-ldns )
+	fi
+	if use ldap; then
+		myconf+=( $(use_with sasl) )
+	fi
+
+	# We install the our configuration filed under e.g. /etc/opendkim,
+	# so the next line is necessary to point the daemon and all of its
+	# documentation to the right location by default.
+	myconf+=( --sysconfdir="${EPREFIX}/etc/${PN}" )
+
+	econf \
+		$(use_with berkdb db) \
+		$(use_with opendbx odbx) \
+		$(use_with lua) \
+		$(use_enable lua rbl) \
+		$(use_with ldap openldap) \
+		$(use_with lmdb) \
+		$(use_enable poll) \
+		$(use_enable query_cache) \
+		$(use_enable static-libs static) \
+		$(use_enable stats) \
+		$(use_with memcached libmemcached) \
+		"${myconf[@]}" \
+		--enable-filter \
+		--enable-atps \
+		--enable-identity_header \
+		--enable-rate_limit \
+		--enable-resign \
+		--enable-replace_rules \
+		--enable-default_sender \
+		--enable-sender_macro \
+		--enable-vbr \
+		--disable-live-testing \
+		--with-test-socket="${T}/opendkim.sock"
+}
+
+src_compile() {
+	emake runstatedir=/run
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+
+	dosbin stats/opendkim-reportstats
+
+	newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}"
+	systemd_newtmpfilesd "${S}/contrib/systemd/opendkim.tmpfiles" "${PN}.conf"
+	systemd_newunit "contrib/systemd/opendkim.service" "${PN}.service"
+
+	dodir /etc/opendkim
+	keepdir /var/lib/opendkim
+
+	# The OpenDKIM data (particularly, your keys) should be read-only to
+	# the UserID that the daemon runs as.
+	fowners root:opendkim /var/lib/opendkim
+	fperms 750 /var/lib/opendkim
+
+	# Tweak the "simple" example configuration a bit before installing
+	# it unconditionally.
+	local cf="${T}/opendkim.conf"
+	# Some MTAs are known to break DKIM signatures with "simple"
+	# canonicalization [1], so we choose the "relaxed" policy
+	# over OpenDKIM's current default settings.
+	# [1] https://wordtothewise.com/2016/12/dkim-canonicalization-or-why-microsoft-breaks-your-mail/
+	sed -E -e 's:^(Canonicalization)[[:space:]]+.*:\1\trelaxed/relaxed:' \
+		"${S}/opendkim/opendkim.conf.simple" >"${cf}" || die
+	cat >>"${cf}" <<EOT || die
+
+# The UMask is really only used for the PID file (root:root) and the
+# local UNIX socket, if you're using one. It should be 0117 for the
+# socket.
+UMask			0117
+UserID			opendkim
+
+# For use with unbound
+#TrustAnchorFile	/etc/dnssec/root-anchors.txt
+EOT
+	insinto /etc/opendkim
+	doins "${cf}"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+	if [[ -z ${REPLACING_VERSION} ]]; then
+		elog "If you want to sign your mail messages and need some help"
+		elog "please run:"
+		elog "	emerge --config ${CATEGORY}/${PN}"
+		elog "It will help you create your key and give you hints on how"
+		elog "to configure your DNS and MTA."
+
+		elog "If you are using a local (UNIX) socket, then you will"
+		elog "need to make sure that your MTA has read/write access"
+		elog "to the socket file. This is best accomplished by creating"
+		elog "a completely-new group with only your MTA user and the"
+		elog "\"opendkim\" user in it. Step-by-step instructions can be"
+		elog "found on our Wiki, at https://wiki.gentoo.org/wiki/OpenDKIM ."
+	else
+		ewarn "The user account for the OpenDKIM daemon has changed"
+		ewarn "from \"milter\" to \"opendkim\" to prevent unrelated services"
+		ewarn "from being able to read your private keys. You should"
+		ewarn "adjust your existing configuration to use the \"opendkim\""
+		ewarn "user and group, and change the permissions on"
+		ewarn "${ROOT}var/lib/opendkim to root:opendkim with mode 0750."
+		ewarn "The owner and group of the files within that directory"
+		ewarn "will likely need to be adjusted as well."
+	fi
+}
+
+pkg_config() {
+	local selector keysize pubkey
+
+	read -p "Enter the selector name (default ${HOSTNAME}): " selector
+	[[ -n "${selector}" ]] || selector="${HOSTNAME}"
+	if [[ -z "${selector}" ]]; then
+		eerror "Oddly enough, you don't have a HOSTNAME."
+		return 1
+	fi
+	if [[ -f "${ROOT}var/lib/opendkim/${selector}.private" ]]; then
+		ewarn "The private key for this selector already exists."
+	else
+		keysize=1024
+		# Generate the private and public keys. Note that opendkim-genkeys
+		# sets umask=077 on its own to keep these safe. However, we want
+		# them to be readable (only!) to the opendkim user, and we manage
+		# that by changing their groups and making everything group-readable.
+		opendkim-genkey -b ${keysize} -D "${ROOT}"var/lib/opendkim/ \
+			-s "${selector}" -d '(your domain)' && \
+			chgrp --no-dereference opendkim \
+				"${ROOT}var/lib/opendkim/${selector}".{private,txt} || \
+				{ eerror "Failed to create private and public keys."; return 1; }
+		chmod g+r "${ROOT}var/lib/opendkim/${selector}".{private,txt}
+	fi
+
+	# opendkim selector configuration
+	echo
+	einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:"
+	einfo "  Keyfile /var/lib/opendkim/${selector}.private"
+	einfo "  Selector ${selector}"
+
+	# MTA configuration
+	echo
+	einfo "If you are using Postfix, add following lines to your main.cf:"
+	einfo "  smtpd_milters	   = unix:/run/opendkim/opendkim.sock"
+	einfo "  non_smtpd_milters = unix:/run/opendkim/opendkim.sock"
+	einfo "  and read http://www.postfix.org/MILTER_README.html"
+
+	# DNS configuration
+	einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:"
+	cat "${ROOT}var/lib/opendkim/${selector}.txt"
+	einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:"
+	einfo "  http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text"
+}
diff --git a/mail-filter/postfwd/Manifest b/mail-filter/postfwd/Manifest
index 92ac2173b044..92b35ad7a6c0 100644
--- a/mail-filter/postfwd/Manifest
+++ b/mail-filter/postfwd/Manifest
@@ -7,7 +7,8 @@ AUX postfwd.service 596 BLAKE2B b11a4f82fcf52556dc0271c29c68feb268b5ce9afc684b81
 AUX postfwd.service.3 572 BLAKE2B 92963bc0a479994a43556a8e1afbcca46544351ad967d448dd2255a9af13f7b1f69242421f7bc14f0ac6f0a2840b90af4d68b07eb98576bf20cff8ea3b8c6fe7 SHA512 0cc4942230d9a435cc9a49b888de95dcbe038da087eda03cc1f6347cb67e8640ab0810f55c921afdc0456c21a9cc06f562c395538b0548c492d7aadd8cdf9478
 DIST postfwd-1.35.tar.gz 354609 BLAKE2B 8e85db37d7f81be4613d9c2e411760af48650125af7b22439e3b47a8c3c7285564bfcd7a9fe4eed35d2603ddf80dcdf11d75f84afcaf3e57d53c4e986068f06c SHA512 7b0e8c8a755f085c108c45b28ec8c32139581ce129d0b8586f1876ae87f134a4fb1606d45105ccfa62351ca2d3b87f001ea52aacab0680f3345c41562bec5207
 DIST postfwd-2.00.tar.gz 265346 BLAKE2B ec67bffb5f6959e9516965516688e72f337f717a3159a094dc0373331a5fc09a451f664643a7f3e739b28d4137c130acfb39129b8557b4d41f4d445679f52623 SHA512 b9994b7dd96f1460d66ef35f173c5a4a4d72beb5b955092349304eae2672182874f07236fe5512ba3d0ecc68e2f0472e76b3667ded011536b0cf6f2d874bb039
+DIST postfwd-2.02.tar.gz 265781 BLAKE2B de63bdab4f7c1b117a16ebed2248f1e89b7c973bb34cee1b3fbbceda8c9d9b92d180fb5de8a332732b69a05d1b157be1c95d81ded003641d78665064a4881432 SHA512 23b48ca7218fba46f4b1887c4c6724112866c2e22e56f749602ba74430c4cf4c8418b9effb400ea4a468a5f137c764cac9611879e37d1585cf6d0b31dd41060f
 EBUILD postfwd-1.35-r3.ebuild 2249 BLAKE2B 27265ee578452dcc2ba2ea26715da9096cc69338e1ab468291a8d7cca41ee086efc3c2c073351440a941a9e9647f81b1c23405bc75d6db1e22847a567d14342c SHA512 1d54c65e8a5bb3ca5a7a9c0d010298c59ac9dcb840108cccf4e02afdb6d433f84cfd658415347baa7cb677f26e0f8547a7be56aa1daa394bbc80315adb114cd0
 EBUILD postfwd-2.00-r1.ebuild 2364 BLAKE2B 43abdcb97314874953742729023cf679054d49e034f39b10ce9c491c25c0c5c813270d4cd0ce1f824efb7927247a1edbb459a649accc885451194469d603fcb5 SHA512 e42a004bce7b32f365ccd6f337f68cb5b537c295747845800c24044934877797a40e19fae977d07f19cf8e692645b1b6332f844d5a8fd1f13b76e79fa96f99d7
-EBUILD postfwd-2.00.ebuild 2522 BLAKE2B d436f1e9a9ea924b6999064d6231c92ca01f6e3499b748667f28d6b4a58a46f54746479abc57515d93481185d73e3f0baf974cd2864de81d3ed1f8c3e8e69344 SHA512 badf3029a8e798df302facfc44d1e348b6046e7004e24fabcd3414d7a4220e72d4f6879f6a9ff6dffa1e6a014cf9661cf5d7463eeb9788c971ae804ffc5a3fac
+EBUILD postfwd-2.02.ebuild 2364 BLAKE2B 43abdcb97314874953742729023cf679054d49e034f39b10ce9c491c25c0c5c813270d4cd0ce1f824efb7927247a1edbb459a649accc885451194469d603fcb5 SHA512 e42a004bce7b32f365ccd6f337f68cb5b537c295747845800c24044934877797a40e19fae977d07f19cf8e692645b1b6332f844d5a8fd1f13b76e79fa96f99d7
 MISC metadata.xml 1223 BLAKE2B c42b60106ab2dbbed00dcedf73347b95c4011afe1a12c76b6d4aec3d186f1c037e79e9c47ab9d5a56dc26d4fe3291b42218748a42856c5a46b23857087de8b30 SHA512 e9e6433e9bec304617bc0d57977781991b7891e1531224fef8db93df3576367c624785be9c844453e1747e798e50b8e8d93e6114143495183a8ad47228b52376
diff --git a/mail-filter/postfwd/postfwd-2.00.ebuild b/mail-filter/postfwd/postfwd-2.02.ebuild
index f4ce5c30fd15..df52b4a6f052 100644
--- a/mail-filter/postfwd/postfwd-2.00.ebuild
+++ b/mail-filter/postfwd/postfwd-2.02.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils user systemd
+inherit systemd user
 
 DESCRIPTION="Versatile Postfix policy server with a flexible ruleset based configuration"
-HOMEPAGE="http://www.postfwd.org/"
-SRC_URI="http://www.postfwd.org/${P}.tar.gz"
+HOMEPAGE="https://www.postfwd.org/"
+SRC_URI="https://www.postfwd.org/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+tools"
 
 DEPEND=""
 RDEPEND=">=dev-lang/perl-5.16.3
@@ -35,27 +34,21 @@ pkg_setup() {
 
 src_install() {
 	local BIN="postfwd3"
-	# programs and tools
-	dosbin "${S}"/sbin/${BIN}
+	# program
+	dosbin sbin/${BIN}
 
 	# man pages and documentation
-	doman "${S}"/man/man8/${BIN}.8
-	dodoc "${S}"/doc/{${BIN}.CHANGELOG,${BIN}.txt}
+	doman man/man8/${BIN}.8
+	dodoc doc/{${BIN}.CHANGELOG,${BIN}.txt}
 
-	# example configuration(s)
-	insinto /usr/share/doc/${PF}/examples
-	newins "${S}"/etc/${PN}.cf.sample ${PN}.cf.dist
+	# example configuration
+	dodoc etc/${PN}.cf.sample
 
-	# plugins
-	dodoc -r "${S}"/plugins
-
-	# tools
-	if use tools; then
-		dodoc -r "${S}"/tools
-	fi
+	# plugins and tools
+	dodoc -r plugins tools
 
 	# start scripts script and respective configuration file
-	newinitd "${FILESDIR}"/${PN}.init.3 ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.3-r1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf.3 ${PN}
 	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
 }
@@ -65,33 +58,30 @@ pkg_postinst() {
 	einfo "${PN} has no default configuration for safety reasons. Every"
 	einfo "mail system is different, so you should craft a set of rules"
 	einfo "that is suitable for your environment and save it to:"
-	einfo "   /etc/postfwd.cf"
-	einfo "You can find example configurations in:"
-	einfo "   /usr/share/doc/${PF}/examples"
+	einfo "   ${EROOT}/etc/postfwd.cf"
+	einfo "You can find a sample configuration in:"
+	einfo "   ${EROOT}/usr/share/doc/${PF}"
 	einfo
 	einfo "If you want ${PN} to start on system boot, you have to add it your"
 	einfo "default run level if using OpenRC:"
 	einfo "   # rc-update add postfwd default"
-	einfo "Also remember to edit /etc/conf.d/${PN} to your liking."A
+	einfo "Also remember to edit ${EROOT}/etc/conf.d/${PN} to your liking."
 	einfo
 	einfo "Or - if you are using systemd - enable the service:"
 	einfo "   # systemctl enable postfwd"
 	einfo
 	einfo "A plugins sample folder has been placed under:"
 	einfo
-	einfo "   /usr/share/doc/${PF}/plugins"
-
-	if use tools; then
-		einfo
-		einfo "You can find additional tools for testing ${PN} in:"
-		einfo "   /usr/share/doc/${PF}/tools"
-	fi
+	einfo "   ${EROOT}/usr/share/doc/${PF}/plugins"
+	einfo
+	einfo "You can find additional tools for testing ${PN} in:"
+	einfo "   ${EROOT}/usr/share/doc/${PF}/tools"
 
 	ewarn
 	ewarn "Please read the documentation carefully and properly test new"
 	ewarn "rulesets before putting them into production use. Otherwise you"
 	ewarn "risk accidental mail loss or worse."
 	ewarn
-	ewarn "Visit http://www.postfwd.org/ for more information."
+	ewarn "Visit https://www.postfwd.org/ for more information."
 	ewarn
 }