From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C25E215838C for ; Sun, 21 Jan 2024 14:12:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C45DDE29D5; Sun, 21 Jan 2024 14:12:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6EBAE29D5 for ; Sun, 21 Jan 2024 14:12:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FA5134329C for ; Sun, 21 Jan 2024 14:12:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A594213A0 for ; Sun, 21 Jan 2024 14:12:10 +0000 (UTC) From: "Matthew Smith" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Smith" Message-ID: <1705846326.91c56fb74d6419e4384f56a6dd514a33cdef5ca8.matthew@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/knot-resolver/, net-dns/knot-resolver/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild net-dns/knot-resolver/knot-resolver-5.7.0.ebuild X-VCS-Directories: net-dns/knot-resolver/ net-dns/knot-resolver/files/ X-VCS-Committer: matthew X-VCS-Committer-Name: Matthew Smith X-VCS-Revision: 91c56fb74d6419e4384f56a6dd514a33cdef5ca8 X-VCS-Branch: master Date: Sun, 21 Jan 2024 14:12:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2002783d-f33f-4b1d-b921-539548836abc X-Archives-Hash: 0e02b1c7eb655413724e4bea9196b7b0 commit: 91c56fb74d6419e4384f56a6dd514a33cdef5ca8 Author: Matthew Smith gentoo org> AuthorDate: Sun Jan 21 14:11:02 2024 +0000 Commit: Matthew Smith gentoo org> CommitDate: Sun Jan 21 14:12:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c56fb7 net-dns/knot-resolver: always install tmpfiles config Closes: https://bugs.gentoo.org/921567 Signed-off-by: Matthew Smith gentoo.org> .../files/knot-resolver-5.7.0-tmpfiles.patch | 47 ++++++++++++++++++++++ ...-5.7.0.ebuild => knot-resolver-5.7.0-r1.ebuild} | 7 +++- 2 files changed, 52 insertions(+), 2 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-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 similarity index 93% rename from net-dns/knot-resolver/knot-resolver-5.7.0.ebuild rename to 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 }