From b6e823198d27bc8b1abf6ad0956f3b33ff1d35a0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 21 Jan 2024 22:50:10 +0000
Subject: gentoo auto-resync : 21:01:2024 - 22:50:10

---
 net-dns/knot-resolver/Manifest                     |  4 +-
 .../files/knot-resolver-5.7.0-r2-tmpfiles.patch    | 60 +++++++++++++
 .../files/knot-resolver-5.7.0-tmpfiles.patch       | 47 ----------
 .../knot-resolver/knot-resolver-5.7.0-r1.ebuild    | 99 ----------------------
 .../knot-resolver/knot-resolver-5.7.0-r2.ebuild    | 99 ++++++++++++++++++++++
 5 files changed, 161 insertions(+), 148 deletions(-)
 create mode 100644 net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
 delete mode 100644 net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch
 delete mode 100644 net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
 create mode 100644 net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild

(limited to 'net-dns/knot-resolver')

diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index 7fe3beafd872..b214098cdcbd 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,9 +1,9 @@
 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-tmpfiles.patch 1154 BLAKE2B d3e57a0d0e46ddaf51d9a26f6d4ab7ef02e779239242e8bb00cec6dcc120dad21239c3a9310559f0500ebe07a15df25fcc89b22bfc86dbd42d544c92ce694e7f SHA512 1ba53ef2645a01a07f7ef37ef1b3970297a80eb7df0f03a61df943213705b5ef9dfbb893cbf35e0ed823a3207ce6b0e0c9e39daf8048a6e875ff10554e54f81b
+AUX knot-resolver-5.7.0-r2-tmpfiles.patch 1353 BLAKE2B f93e30113275fb92d524cfd7daf72d8f1da95970d721d4e5a83cb8fd3d1d1d95d65ade26609028b413645be3d23c2d3f30f9b43a36b8900e456fd32f316ec146 SHA512 6f9ec265ff7a82292dfcb8b1ab5756f9835573048c29829dd41fc595b535ab7a4d8c2e03cbe49894a78319fb4cf01d6be0ad02dbdc2e7e5559552d5f52a94908
 AUX kresd.confd-r1 284 BLAKE2B e57439a2b7fd0f433c8ea221129c1696a74c6db95f1182a0a434eb7a53feeb5a8f8678539323bb8094e19e45d781747aae3acccd683fd3b3b4f375934191a77c SHA512 40200c590638e19f9fe26367e10148c022f11dba1182cde2d10cab695de52fd2acb8133e9f05ecc93457fccb019ef4c0b3e47999e0926bd50f1d283ba80d1195
 AUX kresd.initd-r1 793 BLAKE2B 267b16475029eee74eed892fb73e8abc9f197a974f35fb22d6013b9ae68a4e5f18c0f5f371ec6309057aa31db7938f5f7dd3e87d9e1b00598253088a61aad452 SHA512 457eccdd9ec841920674d175d3bf8d25a75ea1f076cdb72a8aa24d743664412250436360e73e96fd5ce3370340c27ed6bf37faac502155e13971541653f84b72
 DIST knot-resolver-5.7.0.tar.xz 1926196 BLAKE2B 8debd339b12781374721b4800957d4a30ed1e3455110babbab4ad9cac7b72eabe3436fe42c97a6c898d6ac48644102ac8afcbbaca435d8fc7c54fd7bd21c2457 SHA512 38095b94ef341717ba99f1dd354fe184acdce05cb234ff685d2ff84992d8cba6ca1b8b3623998dfd3ffe9d728282963c6973c30996b836060c75e1d2ac3ee544
 DIST knot-resolver-5.7.0.tar.xz.asc 833 BLAKE2B 1a8384c1db6101ab52db3b7472f6d0022e7046b0544cfc272807376391994c7d57f53a1def2be68cc86a587997bc64d8bddcfbda07969b5ae8573a9396394619 SHA512 a0403af705ac39d80ec0a3a608e0210f50bc647c078a8dc74a3c814b6c3541a777a2c83ce11c448a10ac9bfa8f96b38537c5a54c2d4cd15ba3ee402793eb92a4
-EBUILD knot-resolver-5.7.0-r1.ebuild 2105 BLAKE2B cd628fc36a77451f7ff9b4076d5927046ee763bd7f3b175d7771cac627c49f013eb28f03bb0f81b8d5b54efa4d4ec980cff372141e3aa48fa0960285eac3e40c SHA512 965436146a39a5f7c7c8d5d5ababcac639970bc14ad15e4dc4c32b545a5770618ea767b8f9ba1b38b57feb2a87872aa5f1978de03ef8d371305a31e93c918073
+EBUILD knot-resolver-5.7.0-r2.ebuild 2108 BLAKE2B b72f4daa3bd88f0712ada69c0865ee815f2f7ab60c6207488fb7351a38e4deb4f2d32eb9f44885e173c7ce72808431d38f63bfe3aab04f94f51482ce563543d3 SHA512 38e965f79f541dd7759c59512680884766093d653f9b1818993c61dee6dc5d41c1a44b1c0602bfac3f4188a4e73ee4268041ade1b2da07eca8e9f9f2fc5b4eaf
 MISC metadata.xml 470 BLAKE2B 16d945ec59b8b4bf54306a3f3182bc61f45ec8cc1880480366a6a918cbad337fc102ae6d2f0cdf3347e7a7a85fc5bc58129bb7e2f1378e42cb047aaa15dbc138 SHA512 09e7fce327eff1d4b5c4702ac4c90c6cf157d076715808eaea42cf0371007ed44a84466bed7c03b296c3fc1b99059cfd0cb575a2a957e7730d49a26bb35c160a
diff --git a/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch b/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
new file mode 100644
index 000000000000..a909a6e8c89b
--- /dev/null
+++ b/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
@@ -0,0 +1,60 @@
+Always install tmpfiles config.
+
+Bug: https://bugs.gentoo.org/921567
+Bug: https://gitlab.nic.cz/knot/knot-resolver/-/issues/886
+--- a/meson.build
++++ b/meson.build
+@@ -237,9 +237,7 @@ subdir('etc')
+ 
+ 
+ # Systemd unit files
+-if systemd_files != 'disabled'
+-  subdir('systemd')
+-endif
++subdir('systemd')
+ 
+ 
+ # Additional files
+--- a/systemd/meson.build
++++ b/systemd/meson.build
+@@ -12,6 +12,18 @@ systemd_config.set('etc_dir', etc_dir)
+ systemd_config.set('run_dir', run_dir)
+ systemd_config.set('lib_dir', lib_dir)
+ 
++## tmpfiles
++tmpfiles = configure_file(
++  input: 'tmpfiles.d/knot-resolver.conf.in',
++  output: 'knot-resolver.tmpfiles',
++  configuration: systemd_config,
++)
++install_data(
++  tmpfiles,
++  rename: ['knot-resolver.conf'],
++  install_dir: systemd_tmpfiles_dir,
++)
++
+ if systemd_files == 'enabled'
+   ## unit files
+   kresd_service = configure_file(
+@@ -39,18 +51,6 @@ if systemd_files == 'enabled'
+   )
+   install_man(kresd_systemd_man)
+ 
+-  ## tmpfiles
+-  tmpfiles = configure_file(
+-    input: 'tmpfiles.d/knot-resolver.conf.in',
+-    output: 'knot-resolver.tmpfiles',
+-    configuration: systemd_config,
+-  )
+-  install_data(
+-    tmpfiles,
+-    rename: ['knot-resolver.conf'],
+-    install_dir: systemd_tmpfiles_dir,
+-  )
+-
+   ## sysusers
+   sysusers = configure_file(
+     input: 'sysusers.d/knot-resolver.conf.in',
+-- 
+2.43.0
+
diff --git a/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch b/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch
deleted file mode 100644
index e199806972cb..000000000000
--- a/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Always install tmpfiles config.
-
-Bug: https://bugs.gentoo.org/921567
-Bug: https://gitlab.nic.cz/knot/knot-resolver/-/issues/886
---- a/systemd/meson.build
-+++ b/systemd/meson.build
-@@ -12,6 +12,18 @@ systemd_config.set('etc_dir', etc_dir)
- systemd_config.set('run_dir', run_dir)
- systemd_config.set('lib_dir', lib_dir)
- 
-+## tmpfiles
-+tmpfiles = configure_file(
-+  input: 'tmpfiles.d/knot-resolver.conf.in',
-+  output: 'knot-resolver.tmpfiles',
-+  configuration: systemd_config,
-+)
-+install_data(
-+  tmpfiles,
-+  rename: ['knot-resolver.conf'],
-+  install_dir: systemd_tmpfiles_dir,
-+)
-+
- if systemd_files == 'enabled'
-   ## unit files
-   kresd_service = configure_file(
-@@ -39,18 +51,6 @@ if systemd_files == 'enabled'
-   )
-   install_man(kresd_systemd_man)
- 
--  ## tmpfiles
--  tmpfiles = configure_file(
--    input: 'tmpfiles.d/knot-resolver.conf.in',
--    output: 'knot-resolver.tmpfiles',
--    configuration: systemd_config,
--  )
--  install_data(
--    tmpfiles,
--    rename: ['knot-resolver.conf'],
--    install_dir: systemd_tmpfiles_dir,
--  )
--
-   ## sysusers
-   sysusers = configure_file(
-     input: 'sysusers.d/knot-resolver.conf.in',
--- 
-2.43.0
-
diff --git a/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
deleted file mode 100644
index 23e7e7d6f11e..000000000000
--- a/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2022-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://secure.nic.cz/files/${PN}/${P}.tar.xz
-	verify-sig? ( https://secure.nic.cz/files/${PN}/${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 kresc nghttp2 systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	${LUA_DEPS}
-	acct-group/knot-resolver
-	acct-user/knot-resolver
-	dev-db/lmdb:=
-	dev-libs/libuv:=
-	net-dns/knot:=
-	net-libs/gnutls:=
-	caps? ( sys-libs/libcap-ng )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c:=
-	)
-	kresc? ( dev-libs/libedit )
-	nghttp2? ( net-libs/nghttp2:= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		  dev-util/cmocka
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-knot-resolver )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.5.3-docdir.patch
-	"${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
-
-	# Bug #921567
-	"${FILESDIR}"/${PN}-5.7.0-tmpfiles.patch
-)
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
-	fi
-
-	unpack ${P}.tar.xz
-}
-
-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
-		$(meson_feature caps capng)
-		$(meson_feature dnstap)
-		$(meson_feature kresc client)
-		$(meson_feature nghttp2)
-		$(meson_feature test unit_tests)
-		$(meson_feature systemd systemd_files)
-	)
-
-	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/knot-resolver-5.7.0-r2.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
new file mode 100644
index 000000000000..6757ff637a8b
--- /dev/null
+++ b/net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 2022-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://secure.nic.cz/files/${PN}/${P}.tar.xz
+	verify-sig? ( https://secure.nic.cz/files/${PN}/${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 kresc nghttp2 systemd test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	acct-group/knot-resolver
+	acct-user/knot-resolver
+	dev-db/lmdb:=
+	dev-libs/libuv:=
+	net-dns/knot:=
+	net-libs/gnutls:=
+	caps? ( sys-libs/libcap-ng )
+	dnstap? (
+		dev-libs/fstrm
+		dev-libs/protobuf-c:=
+	)
+	kresc? ( dev-libs/libedit )
+	nghttp2? ( net-libs/nghttp2:= )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		  dev-util/cmocka
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-knot-resolver )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.3-docdir.patch
+	"${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
+
+	# Bug #921567
+	"${FILESDIR}"/${PN}-5.7.0-r2-tmpfiles.patch
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc}
+	fi
+
+	unpack ${P}.tar.xz
+}
+
+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
+		$(meson_feature caps capng)
+		$(meson_feature dnstap)
+		$(meson_feature kresc client)
+		$(meson_feature nghttp2)
+		$(meson_feature test unit_tests)
+		$(meson_feature systemd systemd_files)
+	)
+
+	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
+}
-- 
cgit v1.2.3