commit: cdb04d6f99096bf4c2ecde6e0bab5ebed249f39b Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Fri Nov 22 14:19:37 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Fri Nov 29 12:05:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb04d6f
net-dns/knot-resolver: fix RUNDIR default value for RUNDIR (/var/run/kresd) does not match the one provided by upstream tmpfile (/var/run/knot-resolver). Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Closes: https://github.com/gentoo/gentoo/pull/39414 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> net-dns/knot-resolver/files/kresd.initd-r2 | 31 ++++++++++++++++++++++ ...-5.7.4.ebuild => knot-resolver-5.7.4-r1.ebuild} | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/net-dns/knot-resolver/files/kresd.initd-r2 b/net-dns/knot-resolver/files/kresd.initd-r2 new file mode 100644 index 000000000000..9af292e1dbd0 --- /dev/null +++ b/net-dns/knot-resolver/files/kresd.initd-r2 @@ -0,0 +1,31 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${KRESD_GROUP:=knot-resolver} +: ${KRESD_USER:=knot-resolver} +: ${KRESD_CONFIG:=/etc/knot-resolver/kresd.conf} +: ${KRESD_RUNDIR:=/var/run/knot-resolver} +: ${KRESD_PIDFILE:=/var/run/kresd.pid} + +command="/usr/sbin/kresd" +command_args="${KRESD_OPTS} -n -c ${KRESD_CONFIG} ${KRESD_RUNDIR}" +command_user="${KRESD_USER}:${KRESD_GROUP}" +pidfile="${KRESD_PIDFILE}" +command_background=true +retry="TERM/60/KILL/5" + +capabilities="^cap_net_bind_service,^cap_setpcap" + +name="knot-resolver" +description="scaleable caching DNS resolver" + +depend() { + need net + use logger + provide dns +} + +start_pre() { + checkpath -d -m 0750 -o "${KRESD_USER}:${KRESD_GROUP}" ${KRESD_RUNDIR} +} diff --git a/net-dns/knot-resolver/knot-resolver-5.7.4.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.4-r1.ebuild similarity index 97% rename from net-dns/knot-resolver/knot-resolver-5.7.4.ebuild rename to net-dns/knot-resolver/knot-resolver-5.7.4-r1.ebuild index 6a8533cca0cc..a9a5bf746da9 100644 --- a/net-dns/knot-resolver/knot-resolver-5.7.4.ebuild +++ b/net-dns/knot-resolver/knot-resolver-5.7.4-r1.ebuild @@ -83,7 +83,7 @@ src_install() { meson_src_install fowners -R ${PN}: /etc/${PN} - newinitd "${FILESDIR}"/kresd.initd-r1 kresd + newinitd "${FILESDIR}"/kresd.initd-r2 kresd newconfd "${FILESDIR}"/kresd.confd-r1 kresd }