gentoo resync : 29.12.2022

3 files changed, 92 insertions, 3 deletions

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index ea98e84ee9c7..b6aa0d07fa04 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -7,9 +7,11 @@ DIST dnsdist-1.6.0.tar.bz2 1328707 BLAKE2B d093142875882cacaa456d76d42e703e45577
 DIST dnsdist-1.6.1.tar.bz2 1328069 BLAKE2B a9e9c0cb35ebc2ecd93d7fa0d6d3961b02d711da2df56240335786a5d2e529d4a7e8716f578b6e935edd3bc79dfed767d358b9feaff32dd9cd65993ef0b97b71 SHA512 68e114eeb1a7ae8a4ce52a7de31095c46d0ba8f572676a8ef1e858b97da199c04ec88656c7642160ba07b7db325cc2a49cd91794da8dd2e81a5301d089c34f90
 DIST dnsdist-1.7.0.tar.bz2 1392585 BLAKE2B 3766da5f63df6390f555307d665efcbb2ad1462abae3af44503479d4c6ae6453e43527d2bcac718fabeb8b60ec989f264860532b480c465afc440405f9efac74 SHA512 abaed7aaa18f4acaf220dc938da6896e521373b1da3b6b9c4114467dd5d8b0e6cd9809534edbc6ba5b789ed8387fb47317c47bd4e00e66a6ccb035f6dd6068af
 DIST dnsdist-1.7.1.tar.bz2 1392179 BLAKE2B 48189da6bceb1723b19bab7c42ec8cd834f3ef6d822b5da23fe2f4e02ec825d1566bce472f522fa9ac0b027d36f3089ce7c0c7eb1c7e1161c050dc50305dfdb6 SHA512 eee44a9994c6cab84977cad58539ca59882149d6898dfeed9e4190f06ddbc280b836bf426d22e6980d8acae1437290bddcc5166af165b6eb48c77c669281a310
+DIST dnsdist-1.7.2.tar.bz2 1391588 BLAKE2B cf2a9853be4c896b3909f871fad771d4298eb2586702a8a85eff2c612d275214cdad82e93961f4cfd58300f5629f06569c51a2c4f15de58188a69116bd5275de SHA512 2048ac0f861547fb103da1a128fd39a35ed689ccbf3c080232a3bd0550c9e7c7e01c95864d61e065e341a9f4111c974d2db2aba73eb8f7cba9bf8273da39b8a6
 EBUILD dnsdist-1.5.1-r100.ebuild 2294 BLAKE2B f8e88f0caba126be55c3ad6524be37321da60dba6f50e0cc07be0a70eb5897f35f361090fb1319ed2c08dd7fc38684d12c517ba782deeb3b54c8585d11f77dd9 SHA512 d65e938918fbd2b35a807d48cbe8466a2c6c705b3b18147bd4a79e77f7fd4775835c1ce8b05feaa7f7d4c24e92338a44197e2902db5b39b8451a518689749268
 EBUILD dnsdist-1.6.0.ebuild 2269 BLAKE2B 1a23ebd28849897dd3d62a312be60222da8b9048cb32ad21214b726b24fffa4bd43c4bc104fa4f367b4e07af51933b3c0c885f03e163f90a459ca91524aaf35d SHA512 8466bc936352defae74c6a9d4f19c970399b251b0eeb3f0fd59f3e2e922f88576be257006ff9e69c54a19d1aaa64ac2498ad2ad7c8329eedbfd4e382345929de
 EBUILD dnsdist-1.6.1.ebuild 2201 BLAKE2B 6cc3f47e8790d6a3f657b6bacb0bcd61a850f5f4fdb6fe87222a83e3a7081c1d6ccf514e4bca62cfe4ec5f240f53ba32494d88ab40038c00f26be861908b63ae SHA512 78b30965e4e89cfd241a83f40c9379d3093df0caabf75d6d0d78b8f72ef0e8882b76744f7c6ff9bc6bba4194a8ac501ba2ae38893ce898ae2771707e03e86fd1
 EBUILD dnsdist-1.7.0.ebuild 2219 BLAKE2B 3d5465d75769c886068ee6b75cb313d6fa0fe8170724548ce4a7f52fba3d667320e4fb5d963f6874bade766da5c83644b63a8bd7f82b60ea15d98bc56aa54814 SHA512 da8c63a23c564393a661dbe20740304b1c48eb5f26139d03c03ef52953ef9f3f2c345686a27db1f2e14a411de9e8a606103770cbd9b1dd3f492c6d9a9e447eb9
-EBUILD dnsdist-1.7.1.ebuild 2206 BLAKE2B 14eb16aa3933a861549d40e932aa82cec012a59e595aa1691bd466a61b073edc0c7697eb904feb89841e0083a66a489082df7908870ce8f9c4dac9ec5d618012 SHA512 5a1b4fcfc4991cb37dcdf0dc44032b2d1886cb78c869fd265a0e9a33b2c73dcea7ab69483171fd82ed54e6cf467ae0ba35c3625b3fee8935e864c6505bd6b48c
+EBUILD dnsdist-1.7.1.ebuild 2258 BLAKE2B 38141bac9d2ae4fbef947dd25639e3a1b4814415373069e514f5e15a7b9160a5db557999f042d153fe64b47cf5a3765d8ccecb7141fdc1c7ea91ed3f3dde37f7 SHA512 09ab9296ba9ae72bfedf0b2d2271e527f17a9fb68495afed0a7db00719b676627a6b251f9d0f1912a7419dff922421e7fd972f04f93f1aa49a1d57296134b079
+EBUILD dnsdist-1.7.2.ebuild 2258 BLAKE2B 38141bac9d2ae4fbef947dd25639e3a1b4814415373069e514f5e15a7b9160a5db557999f042d153fe64b47cf5a3765d8ccecb7141fdc1c7ea91ed3f3dde37f7 SHA512 09ab9296ba9ae72bfedf0b2d2271e527f17a9fb68495afed0a7db00719b676627a6b251f9d0f1912a7419dff922421e7fd972f04f93f1aa49a1d57296134b079
 MISC metadata.xml 1131 BLAKE2B 6e5955ebbb27298cc8e1be2afdec0a04cd29c99196586937c0fb518f0bfaf87d0a0cd369bd4fcb3c6815cd4fb7fad306b1c9982fb85df7f36d2f6220355a74e7 SHA512 3cca5ac1fa28c0efa56372a58271c6f8cb491e47dc16926e786b4174edfc14116ee0ea83e338f82fd01e58222e998e1d105e37763f4d7c1c4a8313503d7da085
diff --git a/net-dns/dnsdist/dnsdist-1.7.1.ebuild b/net-dns/dnsdist/dnsdist-1.7.1.ebuild
index 0a7f9c72b105..99404bcecece 100644
--- a/net-dns/dnsdist/dnsdist-1.7.1.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.7.1.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit lua-single
+inherit flag-o-matic lua-single
 
 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"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -46,6 +46,9 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_configure() {
+	# bug #822855
+	append-lfs-flags
+
 	econf \
 		--sysconfdir=/etc/dnsdist \
 		--with-lua="${ELUA}" \
diff --git a/net-dns/dnsdist/dnsdist-1.7.2.ebuild b/net-dns/dnsdist/dnsdist-1.7.2.ebuild
new file mode 100644
index 000000000000..99404bcecece
--- /dev/null
+++ b/net-dns/dnsdist/dnsdist-1.7.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit flag-o-matic lua-single
+
+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 regex remote-logging snmp +ssl systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+		dnscrypt? ( ssl )
+		gnutls? ( ssl )
+		doh? ( ssl !gnutls )"
+
+RDEPEND="acct-group/dnsdist
+	acct-user/dnsdist
+	>=dev-libs/boost-1.35:=
+	dev-libs/libedit:=
+	>=dev-libs/protobuf-3:=
+	dnscrypt? ( dev-libs/libsodium:= )
+	dnstap? ( dev-libs/fstrm:= )
+	doh? ( www-servers/h2o:=[libh2o] )
+	lmdb? ( dev-db/lmdb:= )
+	regex? ( dev-libs/re2:= )
+	snmp? ( net-analyzer/net-snmp:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+	systemd? ( sys-apps/systemd:0= )
+	${LUA_DEPS}
+	net-libs/nghttp2
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	# bug #822855
+	append-lfs-flags
+
+	econf \
+		--sysconfdir=/etc/dnsdist \
+		--with-lua="${ELUA}" \
+		$(use_enable doh dns-over-https) \
+		$(use_enable dnscrypt) \
+		$(use_enable dnstap) \
+		$(use_with lmdb ) \
+		$(use_with regex re2) \
+		$(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."
+}