gentoo auto-resync : 23:11:2024 - 03:02:56

6 files changed, 128 insertions, 4 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 3c213ea1e087..f19f889925f7 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index e0f30a4f1d18..9b1d10fdc02e 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,9 +1,13 @@
 AUX knot-resolver-5.5.3-docdir.patch 925 BLAKE2B 9d40a287fe0a6d883d46dbe13fa3ba5f19f73b61fbd8c8eb6ec4061744b8c4b8eeb04533b18cede2051aaa5ddacca96b21432c0dac00f8be9087cb8e5d5fed0d SHA512 18259bc66b1b3ff20ee34a01373017267e1cf76a458c938673e925d972ded8bdc863bb961fd93983e45080d7b0b88ab30c513153e6b2b4323a3d95f6724baff5
 AUX knot-resolver-5.5.3-nghttp-openssl.patch 1087 BLAKE2B 4570658d9d358384c435c0b4694995945f9c788249899670e000d3273ae6c2631ff69319660db2d04f4143e24746bc0160295042a7887d30dae09de11556ce8e SHA512 50e8a99aef8bc4ce41ddb4d1760cd96818859b440aa74effdc1482af150c21f4fc3e451fae739a07161fc5a2e0ee2cd093c26950dd4e16de430e6bb8a635dd84
 AUX knot-resolver-5.7.0-r2-tmpfiles.patch 1353 BLAKE2B f93e30113275fb92d524cfd7daf72d8f1da95970d721d4e5a83cb8fd3d1d1d95d65ade26609028b413645be3d23c2d3f30f9b43a36b8900e456fd32f316ec146 SHA512 6f9ec265ff7a82292dfcb8b1ab5756f9835573048c29829dd41fc595b535ab7a4d8c2e03cbe49894a78319fb4cf01d6be0ad02dbdc2e7e5559552d5f52a94908
+AUX knot-resolver-5.7.4-libsystemd.patch 627 BLAKE2B c59e1ff9e99d11031227725625471a2229fc4143a5e0fdd2946aa35c025322981ad67b0717524cd7bbc0f13ea891906d3f7b74733c4bed534ad9a4ed41b59176 SHA512 2cfa807f2b72664ca6bc4ac7e41701bfe6fdab08b2f44fbd0eadb5aa165b726cb540eeef1480cc095e3b984f15205924984c3039cdc4d6cf1e0068f7524e9f99
 AUX kresd.confd-r1 284 BLAKE2B e57439a2b7fd0f433c8ea221129c1696a74c6db95f1182a0a434eb7a53feeb5a8f8678539323bb8094e19e45d781747aae3acccd683fd3b3b4f375934191a77c SHA512 40200c590638e19f9fe26367e10148c022f11dba1182cde2d10cab695de52fd2acb8133e9f05ecc93457fccb019ef4c0b3e47999e0926bd50f1d283ba80d1195
 AUX kresd.initd-r1 793 BLAKE2B 267b16475029eee74eed892fb73e8abc9f197a974f35fb22d6013b9ae68a4e5f18c0f5f371ec6309057aa31db7938f5f7dd3e87d9e1b00598253088a61aad452 SHA512 457eccdd9ec841920674d175d3bf8d25a75ea1f076cdb72a8aa24d743664412250436360e73e96fd5ce3370340c27ed6bf37faac502155e13971541653f84b72
 DIST knot-resolver-5.7.2.tar.xz 1928336 BLAKE2B c4f17a050752a5d1ed141bae646f53f313e866b91b80bb72d37c6b2907d365333ca02fbadf4ff49e5559b721b695d1e7af3417a25e0518dbdfdec1860f890408 SHA512 973e9a541b54cee0d230247d279785a83ce2127216b12ee9f314a49adedac3e23e8369900d6f0985b0a666e9bcae7772f29224565e6208ed4988b13530e4ff0b
 DIST knot-resolver-5.7.2.tar.xz.asc 833 BLAKE2B f73f52d7b2326a58a37b821cd8495d20c93017bd1f7bad2cc828f807f1886fc376dc95405b3b36047719f8566e27d7c1052b7ab11fae3d1d67c5563a293d965e SHA512 cf05ceca455400004cf249b1029b93619a1d5fcf839bca1259a7b411a1ddef1da0aff187ea0023c587de1981e91a8d26af3bb22341cf426e5055e8ca1c4024e2
-EBUILD knot-resolver-5.7.2.ebuild 2209 BLAKE2B 4a30a9b85434c986ddb6fb4af65c2932a367155437320fe5309fada11514bd39cf1b1527465dc35be1b3bf31c6715c20bf9848524dca195f0805947cababa6a4 SHA512 867ef76803913591eda097ac0c012446b7f59ba68a8b8a92f6c3cee323135adf29ac255a2455f1d2a24908b8e15fcaa806bac85f19282ea1778dfc075b8c7d12
-MISC metadata.xml 390 BLAKE2B 8d671225e024581137be9f98f3df0e32cfde1f0582d8169991417461bafbccaecbb7b8dd32d6652360a8c57bceabacec8194768e9177d7a75d0df821f2938a16 SHA512 e2ec3636fb2534ca3d3aee4215382e033ae9fd39df20152f3bb4deadf958b256dbe578954b6de348a9b80c173cd0d5bbe878561a09d094afd141644b5e512e44
+DIST knot-resolver-5.7.4.tar.xz 1931124 BLAKE2B 670bd0bac1417fde0f7b6a02797e49e22af081e55b63c23e1fcd8dee369f21b7a2a8997fe641f69e7f0de5cbc7960307f32c939eb85c260fb2de015542dfce1e SHA512 5d8ea5b5b0cba5a1058aaa6e04573c838895d6b2c204e8d09c9ad898fb074c52ef7589afdad164b007edf151167d31fd0f940466edfeec597f96e5bc1cd72171
+DIST knot-resolver-5.7.4.tar.xz.asc 833 BLAKE2B 6432bc23ff779998eb351d57db34bcd9e41ea928fa5d83463122012d8adad16edec7afbcbfb0f0b41789c7797c895216b793ced2d6a01d69fdc3b0f2d12879cb SHA512 d34a0e1fd8be372c325199ace5bb6f20b2b395a4fb5a6f6f4c2c89f29741ecfd36234900b0e836c174df831716012589231551b13426a6728e37aba6c74c197f
+EBUILD knot-resolver-5.7.2.ebuild 2215 BLAKE2B 373293e59d03c0d65329f3dba92072d7618206d7a5d084555495f639f8b906e5cc3014b4c4dcbcca56826af2afa418d6cd135ae22c1dc57e9132df056b54c1b6 SHA512 77f661a294e6fecda8fe0cbc31e8518822f30f6b05093ff629c28147f2bae780e81fef5d47251e654094b72f6eb533e3e05c61b787664fac0fc7e84399a3508a
+EBUILD knot-resolver-5.7.4.ebuild 2107 BLAKE2B 3ff91e90189617ca1733b2712a8745e2f1379997d4e18e2548bcb410378fc9560fe1db2a54c5fb515c4eb1e0c25b7b65a92b7868d9ab569b0ab2c712341d09a2 SHA512 a6bfdb2a9cdb2142d4783a6b1524c2236afb4078c4f5f13d4a37aaa85986488d39fefde60446b9c91f379fe6272c8214f932c3e2f7330fa2dfb37424e59382a0
+MISC metadata.xml 448 BLAKE2B 9314270946aa31927ca0e48d512acde53d11c56b295c91ddb64b17cc75d143ae84995c7810b37267966ee7d864283c3c363a4f1afc5dd71fd52991db2c67b0eb SHA512 c25cccfd240ef9f12572d836ffb5185dfb3acf482299fdd7b18c9bcc92363099df2a751cad18d014a16e6756c7887eb13732c576f606df636f36edb657d69e59
diff --git a/net-dns/knot-resolver/files/knot-resolver-5.7.4-libsystemd.patch b/net-dns/knot-resolver/files/knot-resolver-5.7.4-libsystemd.patch
new file mode 100644
index 000000000000..faa9d33cd464
--- /dev/null
+++ b/net-dns/knot-resolver/files/knot-resolver-5.7.4-libsystemd.patch
@@ -0,0 +1,25 @@
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -229,3 +229,10 @@
+   value: 'auto',
+   description: 'add rpath to the knot resolver executables',
+ )
++
++option(
++  'systemd',
++  type: 'feature',
++  value: 'auto',
++  description: 'systemd watchdog support',
++)
+
+--- a/meson.build
++++ b/meson.build
+@@ -126,7 +126,7 @@
+ 
+ ### Systemd
+ systemd_files = get_option('systemd_files')
+-libsystemd = dependency('libsystemd', required: systemd_files == 'enabled')
++libsystemd = dependency('libsystemd', required: get_option('systemd'))
+
+ ### Allocator
+ # use empty name to disable the dependency, but still compile the dependent kresd
diff --git a/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild
index e0467c5e893b..f6591f2c3a50 100644
--- a/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild
@@ -10,8 +10,8 @@ inherit lua-single meson tmpfiles verify-sig
 DESCRIPTION="A scaleable caching DNS resolver"
 HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
 SRC_URI="
-	https://secure.nic.cz/files/${PN}/${P}.tar.xz
-	verify-sig? ( https://secure.nic.cz/files/${PN}/${P}.tar.xz.asc )
+	https://knot-resolver.nic.cz/release/${P}.tar.xz
+	verify-sig? ( https://knot-resolver.nic.cz/release/${P}.tar.xz.asc )
 "
 
 LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
diff --git a/net-dns/knot-resolver/knot-resolver-5.7.4.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.4.ebuild
new file mode 100644
index 000000000000..6a8533cca0cc
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.7.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+
+inherit lua-single meson tmpfiles verify-sig
+
+DESCRIPTION="A scaleable caching DNS resolver"
+HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"
+SRC_URI="
+	https://knot-resolver.nic.cz/release/${P}.tar.xz
+	verify-sig? ( https://knot-resolver.nic.cz/release/${P}.tar.xz.asc )
+"
+
+LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="caps dnstap jemalloc kresc nghttp2 systemd test xdp"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	acct-group/knot-resolver
+	acct-user/knot-resolver
+	dev-db/lmdb:=
+	net-dns/knot:=
+	dev-libs/libuv:=
+	net-libs/gnutls:=
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c:=
+	)
+	jemalloc? ( dev-libs/jemalloc:= )
+	kresc? ( dev-libs/libedit )
+	nghttp2? ( net-libs/nghttp2:= )
+	systemd? ( sys-apps/systemd:= )
+	xdp? ( net-dns/knot:=[xdp] )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( >=sec-keys/openpgp-keys-knot-resolver-20240304 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.3-docdir.patch
+	"${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
+	"${FILESDIR}"/${PN}-5.7.4-libsystemd.patch
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var # double lib
+		# https://bugs.gentoo.org/870019
+		-Dauto_features=disabled
+		-Ddoc=disabled
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		-Dopenssl=disabled
+		-Dmalloc=$(usex jemalloc jemalloc disabled)
+		-Dsystemd_files=enabled
+		$(meson_feature caps capng)
+		$(meson_feature dnstap)
+		$(meson_feature kresc client)
+		$(meson_feature nghttp2)
+		$(meson_feature systemd)
+		$(meson_feature test unit_tests)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	fowners -R ${PN}: /etc/${PN}
+
+	newinitd "${FILESDIR}"/kresd.initd-r1 kresd
+	newconfd "${FILESDIR}"/kresd.confd-r1 kresd
+}
+
+pkg_postinst() {
+	tmpfiles_process knot-resolver.conf
+}
diff --git a/net-dns/knot-resolver/metadata.xml b/net-dns/knot-resolver/metadata.xml
index a535381c62c3..c6e3e25b513e 100644
--- a/net-dns/knot-resolver/metadata.xml
+++ b/net-dns/knot-resolver/metadata.xml
@@ -12,5 +12,8 @@
 		<flag name="nghttp2">
 			DNS-over-HTTPS support
 		</flag>
+		<flag name="xdp">
+			Enable eXpress Data Path
+		</flag>
 	</use>
 </pkgmetadata>