summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Smith <matthew@gentoo.org>2024-01-21 19:44:11 +0000
committerMatthew Smith <matthew@gentoo.org>2024-01-21 19:44:53 +0000
commita68f45ea0f1c0f438465e8f401744a41294c8b24 (patch)
tree5ee3c20e35fe9bb02a1b28572997871407fbc8a1
parentsys-kernel/linux-headers: Stabilize 6.6 sparc, #922644 (diff)
downloadgentoo-a68f45ea0f1c0f438465e8f401744a41294c8b24.tar.gz
gentoo-a68f45ea0f1c0f438465e8f401744a41294c8b24.tar.bz2
gentoo-a68f45ea0f1c0f438465e8f401744a41294c8b24.zip
net-dns/knot-resolver: fix USE=-systemd tmpfiles
Closes: https://bugs.gentoo.org/922635 Signed-off-by: Matthew Smith <matthew@gentoo.org>
-rw-r--r--net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch (renamed from net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch)13
-rw-r--r--net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild (renamed from net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild)2
2 files changed, 14 insertions, 1 deletions
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-r2-tmpfiles.patch
index e199806972cb..a909a6e8c89b 100644
--- a/net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch
+++ b/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch
@@ -2,6 +2,19 @@ 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)
diff --git a/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
index 23e7e7d6f11e..6757ff637a8b 100644
--- a/net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild
+++ b/net-dns/knot-resolver/knot-resolver-5.7.0-r2.ebuild
@@ -54,7 +54,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch
# Bug #921567
- "${FILESDIR}"/${PN}-5.7.0-tmpfiles.patch
+ "${FILESDIR}"/${PN}-5.7.0-r2-tmpfiles.patch
)
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg