From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3424F15813A for ; Mon, 20 Jan 2025 21:53:07 +0000 (UTC) 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 (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 06F2F341B52 for ; Mon, 20 Jan 2025 21:53:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B887E01B5; Mon, 20 Jan 2025 21:53:04 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 9C0F1E01B5 for ; Mon, 20 Jan 2025 21:53:01 +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 71C4F33FDEE for ; Mon, 20 Jan 2025 21:52:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8610FB2C for ; Mon, 20 Jan 2025 21:52:55 +0000 (UTC) From: "Joshua Kinard" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joshua Kinard" Message-ID: <1737409778.fd0936ef936ff2bfcc8a976f5554d7954996eb2b.kumba@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/nsd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/nsd/files/nsd.confd-r1 net-dns/nsd/files/nsd.initd-r2 net-dns/nsd/files/nsd.tmpfilesd-r1 X-VCS-Directories: net-dns/nsd/files/ X-VCS-Committer: kumba X-VCS-Committer-Name: Joshua Kinard X-VCS-Revision: fd0936ef936ff2bfcc8a976f5554d7954996eb2b X-VCS-Branch: master Date: Mon, 20 Jan 2025 21:52:55 +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: 637e72fc-4979-4d37-ae2e-fe4b71416dc0 X-Archives-Hash: b9c8b8060e96b867628bd2f8ed45fda7 commit: fd0936ef936ff2bfcc8a976f5554d7954996eb2b Author: Joshua Kinard gentoo org> AuthorDate: Mon Jan 20 21:49:38 2025 +0000 Commit: Joshua Kinard gentoo org> CommitDate: Mon Jan 20 21:49:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0936ef net-dns/nsd: Remove unneeded files in FILESDIR The init.d, conf.d, and tmpfiles.d files in FILESDIR are part of upstream now, in the contrib/ folder in the source, so these copies are no longer needed. Signed-off-by: Joshua Kinard gentoo.org> net-dns/nsd/files/nsd.confd-r1 | 16 ------------ net-dns/nsd/files/nsd.initd-r2 | 52 -------------------------------------- net-dns/nsd/files/nsd.tmpfilesd-r1 | 1 - 3 files changed, 69 deletions(-) diff --git a/net-dns/nsd/files/nsd.confd-r1 b/net-dns/nsd/files/nsd.confd-r1 deleted file mode 100644 index 7c9a7effb844..000000000000 --- a/net-dns/nsd/files/nsd.confd-r1 +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/conf.d/nsd - -# NSD_ARGS is set by default to run in the foreground (-d) and to not -# create its own PID file (-P ''), as we let OpenRC handle that instead. -# It is recommended to keep these defaults and append additional flags -# to them. -NSD_ARGS="-d -P ''" - -# NSD_CONFBASE sets the base configuration directory for nsd's -# configuration and, by default, uses the standard '/etc/nsd' path. -NSD_CONFBASE="/etc/nsd" - -# NSD_CONFNAME sets the first part of the nsd config file name to be that -# of the calling service script name. This allows you to create symlinks -# that point at '/etc/init.d/nsd' for different instances of nsd. -NSD_CONFNAME="${RC_SVCNAME}.conf" diff --git a/net-dns/nsd/files/nsd.initd-r2 b/net-dns/nsd/files/nsd.initd-r2 deleted file mode 100644 index e1825433ac3b..000000000000 --- a/net-dns/nsd/files/nsd.initd-r2 +++ /dev/null @@ -1,52 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="NSD is an authoritative-only, high performance, open source name server" -extra_commands="configtest" -extra_started_commands="reload" - -# These can be overridden in /etc/conf.d/nsd if necessary. -NSD_ARGS="${NSD_ARGS:--d -P ''}" -NSD_CONFBASE="${NSD_CONFBASE:-/etc/nsd}" -NSD_CONFNAME="${NSD_CONFNAME:-${RC_SVCNAME}.conf}" - -# The conf.d defaults shipped with nsd-4.9.1+ will run it in the foreground -# and tell it not to create a PID file, as we allow OpenRC to handle those -# details. -config_file="${NSD_CONFBASE}/${NSD_CONFNAME}" -checkconf="/usr/sbin/nsd-checkconf" -command="/usr/sbin/nsd" -command_args="-c ${config_file} ${NSD_ARGS}" -command_background=true -pidfile="/run/${RC_SVCNAME}.pid" -required_files="${config_file}" - -depend() { - use logger -} - -checkconfig() { - if ! "${checkconf}" "${config_file}"; then - eerror "You have errors in your configfile (${config_file})" - return $? - fi - return 0 -} - -configtest() { - ebegin "Checking ${RC_SVCNAME} configuration" - checkconfig - eend $? -} - -start_pre() { - checkconfig || return $? -} - -reload() { - checkconfig || return $? - ebegin "Reloading config and zone files" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} diff --git a/net-dns/nsd/files/nsd.tmpfilesd-r1 b/net-dns/nsd/files/nsd.tmpfilesd-r1 deleted file mode 100644 index 0e2211770cd2..000000000000 --- a/net-dns/nsd/files/nsd.tmpfilesd-r1 +++ /dev/null @@ -1 +0,0 @@ -d /run/nsd 0750 nsd nsd