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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 216B815838C for ; Sun, 21 Jan 2024 19:46:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F53EE29FE; Sun, 21 Jan 2024 19:46:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 37E4CE29FE for ; Sun, 21 Jan 2024 19:46:07 +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 25C10343295 for ; Sun, 21 Jan 2024 19:46:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 850F197B for ; Sun, 21 Jan 2024 19:46:04 +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: <1705866293.a68f45ea0f1c0f438465e8f401744a41294c8b24.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-r2-tmpfiles.patch 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-r2.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: a68f45ea0f1c0f438465e8f401744a41294c8b24 X-VCS-Branch: master Date: Sun, 21 Jan 2024 19:46:04 +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: 948f6893-6114-492b-a96f-09277530cdf5 X-Archives-Hash: 21879f0f3c64d8f9309ddba3536d259a commit: a68f45ea0f1c0f438465e8f401744a41294c8b24 Author: Matthew Smith gentoo org> AuthorDate: Sun Jan 21 19:44:11 2024 +0000 Commit: Matthew Smith gentoo org> CommitDate: Sun Jan 21 19:44:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68f45ea net-dns/knot-resolver: fix USE=-systemd tmpfiles Closes: https://bugs.gentoo.org/922635 Signed-off-by: Matthew Smith gentoo.org> ...tmpfiles.patch => knot-resolver-5.7.0-r2-tmpfiles.patch} | 13 +++++++++++++ ...solver-5.7.0-r1.ebuild => knot-resolver-5.7.0-r2.ebuild} | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) 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 similarity index 85% rename from net-dns/knot-resolver/files/knot-resolver-5.7.0-tmpfiles.patch rename to 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 similarity index 97% rename from net-dns/knot-resolver/knot-resolver-5.7.0-r1.ebuild rename to 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