From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- net-irc/unrealircd/files/unrealircd.confd-r3 | 32 ----------------------- net-irc/unrealircd/files/unrealircd.initd-r2 | 38 ---------------------------- net-irc/unrealircd/files/unrealircd.initd-r3 | 5 ++-- 3 files changed, 3 insertions(+), 72 deletions(-) delete mode 100644 net-irc/unrealircd/files/unrealircd.confd-r3 delete mode 100644 net-irc/unrealircd/files/unrealircd.initd-r2 (limited to 'net-irc/unrealircd/files') diff --git a/net-irc/unrealircd/files/unrealircd.confd-r3 b/net-irc/unrealircd/files/unrealircd.confd-r3 deleted file mode 100644 index 66d9878f014c..000000000000 --- a/net-irc/unrealircd/files/unrealircd.confd-r3 +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Which configuration file to load instead of unrealircd.conf. If you -# want to run multiple instances of unrealircd, you must edit -# files::pidfile to match UNREALIRCD_PIDFILE. You should also ensure -# that files::tunefile is different for each unrealircd instance. See -# https://www.unrealircd.org/docs/Configuration#Files_block -# -# To support multiple instances of unrealircd, you may create symlinks -# in /etc/init.d pointing to /etc/init.d/unrealircd. It is recommended -# that the scheme unrealircd.${instance_name} be used. For each -# instance, you may make a copy of this file with the appropriate name -# to override default options specific to that instance. -UNREALIRCD_CONF="/etc/unrealircd/${SVCNAME}.conf" - -# The path where unrealircd is configured to create its pidfile. -UNREALIRCD_PIDFILE="/run/unrealircd/${SVCNAME#unreal}.pid" - -# extra options to pass to unrealircd ... -# You should not specify the -f option here; use -# UNREALIRCD_CONF instead. -# -# [-h servername] -# [-p portnumber] -# [-x loglevel] -# [-t] (to enable debug output) -UNREALIRCD_OPTS="" - -# Extra flags to pass to start-stop-daemon. When initially -# debugging, removing --quiet may help. -UNREALIRCD_SSD_OPTS="--quiet" diff --git a/net-irc/unrealircd/files/unrealircd.initd-r2 b/net-irc/unrealircd/files/unrealircd.initd-r2 deleted file mode 100644 index 7d733a6e185a..000000000000 --- a/net-irc/unrealircd/files/unrealircd.initd-r2 +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Defaults -: ${UNREALIRCD_CONF:=/etc/unrealircd/${SVCNAME}.conf} -: ${UNREALIRCD_PIDFILE:=/run/unrealircd/${SVCNAME#unreal}.pid} - -command="/usr/bin/unrealircd" -# Run the daemon in the foreground and let OpenRC background it. -# This way the PID file is created securely, as root. -command_args="-F -f ${UNREALIRCD_CONF} ${UNREALIRCD_OPTS}" -command_user=unrealircd -command_background=true -pidfile="${UNREALIRCD_PIDFILE}" -start_stop_daemon_args="${UNREALIRCD_SSD_OPTS}" -extra_started_commands="reload" - -depend() { - use dns net - provide ircd -} - -# It is unsafe for the unrealircd user to be able to write to its own -# PID file, since root will be sending e.g. kill signals to the PID -# listed in that file. Ensure that we overwrite the ownership and -# permissions on /run/unrealircd from previous init scripts. -start_pre() { - checkpath --directory --owner root:root --mode 0700 /run/unrealircd -} - -reload() { - ebegin "Reloading ${RC_SVCNAME}" - start-stop-daemon --signal HUP \ - --pidfile "${pidfile}" \ - ${UNREALIRCD_SSD_OPTS} - eend $? -} diff --git a/net-irc/unrealircd/files/unrealircd.initd-r3 b/net-irc/unrealircd/files/unrealircd.initd-r3 index d2ff1a64c969..5bc03001e87f 100644 --- a/net-irc/unrealircd/files/unrealircd.initd-r3 +++ b/net-irc/unrealircd/files/unrealircd.initd-r3 @@ -32,8 +32,9 @@ else fi checkconfig() { - # command_args weirdness because We want to preserve the chroot arguments if it's set - su -s /bin/sh ${command_user:=root} -c "${command} ${command_args%${UNREALIRCD_COMMAND_ARGS}}" configtest + # command_args weirdness because we want to preserve the chroot arguments if it's set + # Only run the configtest for the main instance; it can't work right now for others (no way to specify config file) + [ ${SVCNAME} = unrealircd ] && su -s /bin/sh ${command_user:=root} -c "${command} ${command_args%${UNREALIRCD_COMMAND_ARGS}}" configtest } depend() { -- cgit v1.2.3