[patch] Proposed patch

realpatch (text/plain), 3.04 KB, created by Wade Cline on 2017-05-07 03:06:10 UTC

From 19f9f0d28ddb3c8a9f738c250c52f82e02c26dc9 Mon Sep 17 00:00:00 2001
From: Wade Cline <[e-mail]>
Date: Sat, 6 May 2017 19:53:57 -0700
Subject: [PATCH] net-irc/inspircd: Run without '--logfile'.

Use the '<log>' option provided by the config file instead.

Gentoo-Bug: 617686
---
 net-irc/inspircd/files/{inspircd-r2.initd => inspircd-r3.initd}      | 3 +--
 net-irc/inspircd/files/inspircd.confd                                | 5 -----
 .../inspircd/{inspircd-2.0.23.ebuild => inspircd-2.0.23-r2.ebuild}   | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)
 rename net-irc/inspircd/files/{inspircd-r2.initd => inspircd-r3.initd} (92%)
 rename net-irc/inspircd/{inspircd-2.0.23.ebuild => inspircd-2.0.23-r2.ebuild} (98%)

diff --git a/net-irc/inspircd/files/inspircd-r2.initd b/net-irc/inspircd/files/inspircd-r3.initd
similarity index 92%
rename from net-irc/inspircd/files/inspircd-r2.initd
rename to net-irc/inspircd/files/inspircd-r3.initd
index 653e501..1771095 100644
--- a/net-irc/inspircd/files/inspircd-r2.initd
+++ b/net-irc/inspircd/files/inspircd-r3.initd
@@ -5,14 +5,13 @@
 INSPIRCD_USER=${INSPIRCD_USER:-"inspircd"}
 INSPIRCD_GROUP=${INSPIRCD_GROUP:-"inspircd"}
 INSPIRCD_CONFIGFILE=${INSPIRCD_CONFIGFILE:-"/etc/inspircd/inspircd.conf"}
-INSPIRCD_LOGFILE=${INSPIRCD_LOGFILE:-"/var/log/inspircd/ircd.log"}
 INSPIRCD_PIDFILE=${INSPIRCD_PIDFILE:-"/run/inspircd/inspircd.pid"}
 INSPIRCD_SSDARGS=${INSPIRCD_SSDARGS:-"--quiet --user \"${INSPIRCD_USER}\" --wait 1000"}
 INSPIRCD_TERMTIMEOUT=${INSPIRCD_TERMTIMEOUT:-"TERM/25/KILL/5"}
 INSPIRCD_OPTS=${INSPIRCD_OPTS:-""}
 
 command="/usr/bin/inspircd"
-command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\" --logfile \"${INSPIRCD_LOGFILE}\""
+command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\""
 start_stop_daemon_args="${INSPIRCD_SSDARGS}"
 pidfile="${INSPIRCD_PIDFILE}"
 retry="${INSPIRCD_TERMTIMEOUT}"
diff --git a/net-irc/inspircd/files/inspircd.confd b/net-irc/inspircd/files/inspircd.confd
index 1291f9f..af9b3fe 100644
--- a/net-irc/inspircd/files/inspircd.confd
+++ b/net-irc/inspircd/files/inspircd.confd
@@ -5,11 +5,6 @@
 #
 #INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf"
 
-# Location of log file. Modify if you don't like the standard
-# one.
-#
-#INSPIRCD_LOGFILE="/var/log/inspircd/ircd.log"
-
 # File used to store the PID file. Usually you won't need to touch it.
 # If you are changing PID file do not forget to set new PID file in
 # INSPIRCD_CONFIGFILE as well.
diff --git a/net-irc/inspircd/inspircd-2.0.23.ebuild b/net-irc/inspircd/inspircd-2.0.23-r2.ebuild
similarity index 98%
rename from net-irc/inspircd/inspircd-2.0.23.ebuild
rename to net-irc/inspircd/inspircd-2.0.23-r2.ebuild
index 78dbcfc..beca3f5 100644
--- a/net-irc/inspircd/inspircd-2.0.23.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.23-r2.ebuild
@@ -87,7 +87,7 @@ src_install() {
 	dodir "/var/lib/${PN}"
 	dodir "/var/lib/${PN}/data"
 
-	newinitd "${FILESDIR}/${PN}-r2.initd" "${PN}"
+	newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 
 	keepdir "/var/log/${PN}"
-- 
2.10.2