gentoo auto-resync : 21:01:2024 - 16:50:45

3 files changed, 54 insertions, 3 deletions

diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest
index d5688f9386df..7fe3beafd872 100644
--- a/net-dns/knot-resolver/Manifest
+++ b/net-dns/knot-resolver/Manifest
@@ -1,8 +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 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.ebuild 2062 BLAKE2B c2e38922f049e245cd36d0b0486edbad145e0feeaa6457c1c1d3b6ee3b7ec785c6aced50df08dce35f63ec754854afbd8a0bf8bbe49123b203e607e0aec95dc0 SHA512 a31aad755295d4633e20953b6ad6b4ef6f10dc1617efecf67302c6b82fd82236c92c0fc6d5588138a3f902bf149259ab70fe3bbc5729b60760b241ea552df9ed
+EBUILD knot-resolver-5.7.0-r1.ebuild 2105 BLAKE2B cd628fc36a77451f7ff9b4076d5927046ee763bd7f3b175d7771cac627c49f013eb28f03bb0f81b8d5b54efa4d4ec980cff372141e3aa48fa0960285eac3e40c SHA512 965436146a39a5f7c7c8d5d5ababcac639970bc14ad15e4dc4c32b545a5770618ea767b8f9ba1b38b57feb2a87872aa5f1978de03ef8d371305a31e93c918073
 MISC metadata.xml 470 BLAKE2B 16d945ec59b8b4bf54306a3f3182bc61f45ec8cc1880480366a6a918cbad337fc102ae6d2f0cdf3347e7a7a85fc5bc58129bb7e2f1378e42cb047aaa15dbc138 SHA512 09e7fce327eff1d4b5c4702ac4c90c6cf157d076715808eaea42cf0371007ed44a84466bed7c03b296c3fc1b99059cfd0cb575a2a957e7730d49a26bb35c160a
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
new file mode 100644
index 000000000000..e199806972cb
--- /dev/null
+++ b/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch
@@ -0,0 +1,47 @@
+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.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
index 7388f32ffb47..23e7e7d6f11e 100644
--- a/net-dns/knot-resolver/knot-resolver-5.7.0.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -52,6 +52,9 @@ BDEPEND="
 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
@@ -92,5 +95,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	use systemd && tmpfiles_process knot-resolver.conf
+	tmpfiles_process knot-resolver.conf
 }