gentoo resync : 25.08.2020

3 files changed, 90 insertions, 3 deletions

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 0fffa208b3a9..f73361c802c8 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,8 +1,10 @@
 AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d587765ea5d432f02694b1a8583340c2e14e191bbdf5ddd5b921274cb2336c3520839d7cfe6f399a4d6c26 SHA512 385bee5725d927feb50fc0f40cd48cd365a495e39c0d947aa53dc454d84b7fe3806cd1d206056c96d111e7251db2cda27570ff8154c70bed145d37bc7d1db01d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
-AUX dnsdist.initd 1334 BLAKE2B db80ebec89cfc9050d0e43402d8cc9af56bd764ba52a6db948747585d23896d3e6daed4eaa5fabc2b500dc96c1f86e9e8624b8da755b87fdd3c730104c9082fd SHA512 0d17c476ba3d775bc6e2bda0133516bf5cf48183fdeaaf913337c393080eaff4770267842e81d7b6e66a7ae087ce3d73ba4daea3cbf9982719e0f205b0d096ba
+AUX dnsdist.initd 1338 BLAKE2B 47ccfdabcff27bd58ef1afffd19cdbe72e88d5a597f7026188aef7f8183daedf84c3f774a98de40868558be16e974d3cd6761341f8da74f046c243a8fd827b34 SHA512 681dbd4366437878eaeea7c8003bf6aaf4b88d160c54e3f102b5a8e6f23f2e7d1f815ab25c75330a553aba159d83bca70d87b51a93ea5c4a84262519c589ea3d
 DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
 DIST dnsdist-1.4.0.tar.bz2 1044479 BLAKE2B 79aef57ed2b1036f222e8bcfdf615c3221c9dfdbc8fd3f80d778fb050f74bc200958b4d605dcadd5c23ac6c4b5b1a36048108cd85394920e99d6037177b81342 SHA512 c9450e97325d8ad8c8c3a395412c46ea8053cbe1ebe73329a1618212ba29bdf2f8da908ae2b90c314b5aab613387f42363e3a5322b1a36f60190fb48e1c425c5
+DIST dnsdist-1.5.0.tar.bz2 1067645 BLAKE2B de07de8f862a633d8eb11ccf632e01c2ce779a35ef61ba2fcf932894d692f2f3edfd638ce77f178bbfbfc1115d8e76f5522e10061fcf61650170a5b59d5cc9ca SHA512 df6f8caae001f152f0d264176c570778842979484d16e4199afe0e2591006392444245dd8ce23287cdcf9613e2c40a9e3564f5236e5f5a6fd67b89d6ea0d9ed4
 EBUILD dnsdist-1.3.3-r1.ebuild 2646 BLAKE2B fdeae74f8a6f4aecd7fdd2ef0d25d2f1df238c98fe566f44455c7b951ca970d64cb3de43baa4dffa02e8c85db055916fe5c69bb5ee74bcffbfd6bb7d08a9465c SHA512 ba4a486dafd0cb5fc19a0263317646478d090ca4b872c75cc8bdc4ddca7da12956ed68cc8fc2c46d657785b00f1d85f885046781bc2f1621626540562d5a7ac6
 EBUILD dnsdist-1.4.0.ebuild 2373 BLAKE2B b61a275f984088a7ddd621c3441141af2cca5b0e640dbd0a8cd21d185b4e8be42dcfa8d777d4c34ace06cdf746778264cccb28e70434de214e0d5307ce0fbe6b SHA512 1baf3fba9a7f89c67f57d70199493d91d807669a07b323dd76481cd65eb42fb86c5224ca01e12d67e0ca528a41094702ff0f76933aa480158e8c98f7a2f22e75
+EBUILD dnsdist-1.5.0.ebuild 2332 BLAKE2B ba846827f5ef97652808b37c57c014a9a70c8acce6bbbf9609c4655b50d46b0535260bf3edd264b79f4876908833aa98083a02621d3427274c709b7ca20dd81d SHA512 68a5d7b6ab7d9a96fd973afe6346fd172d1f4794d747d040081e22468a3c40cee45d1837e68263aec3a4f46b7ef363c9ab71a048cc5e1acee8295f0900f2119c
 MISC metadata.xml 1213 BLAKE2B c4fe0c3ae740de6b996c8f54f48234a84a4f54cdef743a88fe9730c86ade3d7ccad0118ba0b8f17422fd57a91d2fa13999e7bcb855ffc70394ab3591e01f33d5 SHA512 eb88f1f798d82348e4f633382d3f422d4adf592dfdba878ccab9bdec9228805b5c41f9c5122904cd9d6374b5583a1de0ef3316585c88abada86c0ccb2fbb242a
diff --git a/net-dns/dnsdist/dnsdist-1.5.0.ebuild b/net-dns/dnsdist/dnsdist-1.5.0.ebuild
new file mode 100644
index 000000000000..b36be988dc3b
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.5.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
+HOMEPAGE="https://dnsdist.org"
+
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dnscrypt dnstap doh gnutls +lmdb luajit regex remote-logging snmp +ssl systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="dnscrypt? ( ssl )
+		gnutls? ( ssl )
+		doh? ( ssl !gnutls )"
+
+RDEPEND="acct-group/dnsdist
+	acct-user/dnsdist
+	>=dev-libs/boost-1.35:=
+	dev-libs/libedit:=
+	dnscrypt? ( dev-libs/libsodium:= )
+	dnstap? ( dev-libs/fstrm:= )
+	doh? ( www-servers/h2o:=[libh2o] )
+	lmdb? ( dev-db/lmdb:= )
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	regex? ( dev-libs/re2:= )
+	remote-logging? ( >=dev-libs/protobuf-3:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+	systemd? ( sys-apps/systemd:0= )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/dnsdist \
+		$(use_enable doh dns-over-https) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_with lmdb ) \
+		$(use luajit && echo "--with-lua=luajit" || echo "--with-lua=lua" ) \
+		$(use_with regex re2) \
+		$(use_with remote-logging protobuf) \
+		$(use_with snmp net-snmp) \
+		$(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \
+		$(use_enable systemd) \
+		$(use_enable test unit-tests)
+		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
+			-i "${S}/configure"
+}
+
+src_install() {
+	default
+
+	insinto /etc/dnsdist
+	doins "${FILESDIR}"/dnsdist.conf.example
+
+	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
+	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
+}
+
+pkg_postinst() {
+	elog "dnsdist provides multiple instances support. You can create more instances"
+	elog "by symlinking the dnsdist init script to another name."
+	elog
+	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
+	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
+}
diff --git a/net-dns/dnsdist/files/dnsdist.initd b/net-dns/dnsdist/files/dnsdist.initd
index f15a6d9e6a48..554c43b0150a 100644
--- a/net-dns/dnsdist/files/dnsdist.initd
+++ b/net-dns/dnsdist/files/dnsdist.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="configcheck"
@@ -31,7 +31,8 @@ start() {
 
 	ebegin "Starting dnsdist (${DNSDIST_INSTANCE})"
 	start-stop-daemon --start --exec $DNSDIST --pidfile ${PIDFILE} \
-		-b -- --supervised -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \
+		-b -m -- --supervised -u ${DNSDIST_USER} -g 
+${DNSDIST_GROUP} \
 		-C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS}
 	eend $?
 }