From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- .../files/inspircd-2.0.23-fix-path-builds.patch | 253 --------------------- net-irc/inspircd/files/inspircd-r2.initd | 48 ---- net-irc/inspircd/files/inspircd-r3.confd | 33 --- net-irc/inspircd/files/inspircd-r3.initd | 48 ---- net-irc/inspircd/files/inspircd.confd | 5 - net-irc/inspircd/files/inspircd.initd | 48 ++++ 6 files changed, 48 insertions(+), 387 deletions(-) delete mode 100644 net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch delete mode 100644 net-irc/inspircd/files/inspircd-r2.initd delete mode 100644 net-irc/inspircd/files/inspircd-r3.confd delete mode 100644 net-irc/inspircd/files/inspircd-r3.initd create mode 100644 net-irc/inspircd/files/inspircd.initd (limited to 'net-irc/inspircd/files') diff --git a/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch deleted file mode 100644 index debf62a15f5e..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch +++ /dev/null @@ -1,253 +0,0 @@ -diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example ---- a/docs/conf/inspircd.conf.example 2015-05-10 00:24:10.000000000 -0500 -+++ b/docs/conf/inspircd.conf.example 2015-07-27 05:22:26.107849785 -0500 -@@ -412,11 +412,11 @@ - - # This file has all the information about oper classes, types and o:lines. - # You *MUST* edit it. -- -+ - - # This file has all the information about server links and ulined servers. - # You *MUST* edit it if you intend to link servers. -- -+ - - #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# - # # -@@ -426,7 +426,8 @@ - # motd - displayed on connect and when a user executes /MOTD - # rules - displayed when the user executes /RULES - # Modules can also define their own files -- -+ - - # Example of an executable file include. Note this will be read on rehash, - # not when the command is run. -@@ -472,7 +473,7 @@ - # the default of 'inspircd.pid' is used. # - # # - --# -+ - - #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -953,7 +954,7 @@ - # provide almost all the features of InspIRCd. :) # - # # - # The default does nothing -- we include it for simplicity for you. # -- -+ - - # Here are some pre-built modules.conf files that closely match the - # default configurations of some popular IRCd's. You still may want to -@@ -965,10 +966,10 @@ - # recommended that you make your own modules file based on modules.conf.example. - - # Settings similar to UnrealIRCd defaults. --# -+# - - # Settings similar to Charybdis IRCd defaults. --# -+# - - - ######################################################################### -diff -Nuar a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example ---- a/docs/conf/modules.conf.example 2016-02-28 17:38:30.492335461 -0600 -+++ b/docs/conf/modules.conf.example 2016-02-28 17:39:20.068559846 -0600 -@@ -315,7 +315,7 @@ - # specify some censor tags. See also: # - # http://wiki.inspircd.org/Modules/censor # - # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # CGI:IRC module: Adds support for automatic host changing in CGI:IRC -@@ -778,7 +778,7 @@ - # specify below the path to the filter.conf file, or define some # - # tags. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Gecos ban: Implements extended ban 'r', which stops anyone matching -@@ -834,7 +834,7 @@ - # # - # If you specify to use the m_helpop.so module, then specify below # - # the path to the helpop.conf file. # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Hide chans module: Allows users to hide their channels list from non- -@@ -1284,7 +1284,7 @@ - # Read the comment above in # - # inspircd.conf.example for details. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Override module: Adds support for oper override. -diff -Nuar a/make/template/main.mk b/make/template/main.mk ---- a/make/template/main.mk 2015-05-10 00:24:10.000000000 -0500 -+++ b/make/template/main.mk 2015-07-27 05:22:26.107849785 -0500 -@@ -34,7 +34,7 @@ - SYSTEM = @SYSTEM@ - BUILDPATH = @BUILD_DIR@ - SOCKETENGINE = @SOCKETENGINE@ --CXXFLAGS = -pipe -fPIC -DPIC -+MYCXXFLAGS = -pipe -fPIC -DPIC - LDLIBS = -pthread -lstdc++ - LDFLAGS = - CORELDFLAGS = -rdynamic -L. $(LDFLAGS) -@@ -51,9 +51,9 @@ - INSTMODE_LIB = 0644 - - @IFEQ $(CC) icpc -- CXXFLAGS += -Wshadow -+ MYCXXFLAGS += -Wshadow - @ELSE -- CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall -+ MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall - @ENDIF - - -@@ -75,46 +75,46 @@ - INSTALL = ginstall - @ENDIF - @IFEQ $(SYSTEM) darwin -- CXXFLAGS += -DDARWIN -frtti -+ MYCXXFLAGS += -DDARWIN -frtti - LDLIBS += -ldl - CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS) - PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS) - @ENDIF - @IFEQ $(SYSTEM) interix -- CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include -+ MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include - @ENDIF - --@IFNDEF D -- D=0 -+@IFNDEF DEBUGLEVEL -+ DEBUGLEVEL=0 - @ENDIF - - GCC6=@GCC6@ - @IFEQ $(GCC6) true -- CXXFLAGS += -fno-delete-null-pointer-checks -+ MYCXXFLAGS += -fno-delete-null-pointer-checks - @ENDIF - - DBGOK=0 --@IFEQ $(D) 0 -- CXXFLAGS += -O2 -+@IFEQ $(DEBUGLEVEL) 0 -+ MYCXXFLAGS += -O2 - @IFEQ $(CC) g++ -- CXXFLAGS += -g1 -+ MYCXXFLAGS += -g1 - @ENDIF - HEADER = std-header - DBGOK=1 - @ENDIF --@IFEQ $(D) 1 -- CXXFLAGS += -O0 -g3 -Werror -+@IFEQ $(DEBUGLEVEL) 1 -+ MYCXXFLAGS += -O0 -g3 -Werror - HEADER = debug-header - DBGOK=1 - @ENDIF --@IFEQ $(D) 2 -- CXXFLAGS += -O2 -g3 -+@IFEQ $(DEBUGLEVEL) 2 -+ MYCXXFLAGS += -O2 -g3 - HEADER = debug-header - DBGOK=1 - @ENDIF - FOOTER = finishmessage - --CXXFLAGS += -Iinclude -+MYCXXFLAGS += -Iinclude - - @GNU_ONLY MAKEFLAGS += --no-print-directory - -@@ -134,10 +134,11 @@ - @ENDIF - - @IFDEF PURE_STATIC -- CXXFLAGS += -DPURE_STATIC -+ MYCXXFLAGS += -DPURE_STATIC - @ENDIF - --@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS -+MYCXXFLAGS += $(CXXFLAGS) -+@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS - @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC - - # Default target -@@ -150,10 +151,10 @@ - @GNU_ONLY TARGET = modules/$(M:.so=).so - @ENDIF - --@IFDEF T -+@IFDEF TGT - HEADER = - FOOTER = target -- TARGET = $(T) -+ TARGET = $(TGT) - @ENDIF - - @IFEQ $(DBGOK) 0 -@@ -228,8 +229,8 @@ - @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data - @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs - @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH) -- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases -- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules -+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases -+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules - @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH) - [ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH) - @IFNDEF PURE_STATIC -@@ -237,9 +238,9 @@ - @ENDIF - -$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null - -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null -- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples -- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases -- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules -+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH) -+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases -+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules - @echo "" - @echo "*************************************" - @echo "* INSTALL COMPLETE! *" -@@ -252,7 +253,7 @@ - @echo ' Data:' $(DATPATH) - @echo 'To start the ircd, run:' $(BASE)/inspircd start - @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf -- @echo 'Examples are available at:' $(CONPATH)/examples/ -+ @echo 'Examples are available at:' $(CONPATH) - - @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh) - @BSD_ONLY RCS_FILES = src/version.sh -diff -Nuar a/make/unit-cc.pl b/make/unit-cc.pl ---- a/make/unit-cc.pl 2015-05-10 00:24:10.000000000 -0500 -+++ b/make/unit-cc.pl 2015-07-27 05:22:26.107849785 -0500 -@@ -113,7 +113,7 @@ - my $libs = ''; - my $binary = $ENV{RUNCC}; - if ($do_compile) { -- $flags = $ENV{CXXFLAGS}; -+ $flags = $ENV{MYCXXFLAGS}; - $flags =~ s/ -pedantic// if nopedantic($file); - $flags .= ' ' . getcompilerflags($file); - diff --git a/net-irc/inspircd/files/inspircd-r2.initd b/net-irc/inspircd/files/inspircd-r2.initd deleted file mode 100644 index 653e501627e6..000000000000 --- a/net-irc/inspircd/files/inspircd-r2.initd +++ /dev/null @@ -1,48 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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}\"" -start_stop_daemon_args="${INSPIRCD_SSDARGS}" -pidfile="${INSPIRCD_PIDFILE}" -retry="${INSPIRCD_TERMTIMEOUT}" - -required_files="${INSPIRCD_CONFIGFILE}" - -name="InspIRCd" - -description="InspIRCd is a modular Internet Relay Chat (IRC) server." - -extra_commands="version" -extra_started_commands="rehash" - -depend() { - use dns - provide ircd -} - -start_pre() { - checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")" -} - -rehash() { - ebegin "Rehashing InspIRCd" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} - -version() { - ebegin "Retrieve InspIRCd version" - ${command} --version - eend $? -} diff --git a/net-irc/inspircd/files/inspircd-r3.confd b/net-irc/inspircd/files/inspircd-r3.confd deleted file mode 100644 index af9b3fe15e22..000000000000 --- a/net-irc/inspircd/files/inspircd-r3.confd +++ /dev/null @@ -1,33 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -# Location of configuration file. Modify if you don't like the standard -# one. -# -#INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf" - -# 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. -# -#INSPIRCD_PIDFILE="/run/inspircd/inspircd.pid" - -# User to run InspIRCd as -# -#INSPIRCD_USER="inspircd" -#INSPIRCD_GROUP="inspircd" - -# You can use this configuration option to pass additional options to the -# start-stop-daemon, see start-stop-daemon(8) for more details. -# Per default we start InspIRCd without any output (quiet) -# as user $INSPIRCD_USER and wait 1000ms after we have started the service -# to ensure that the daemon is really up and running. -#INSPIRCD_SSDARGS="--quiet --user \"${INSPIRCD_USER}\" --wait 1000" - -# The termination timeout (start-stop-daemon parameter "retry") ensures -# that the service will be terminated within a given time (25 + 5 seconds -# per default) when you are stopping the service. -#INSPIRCD_TERMTIMEOUT="TERM/25/KILL/5" - -# Options to collectd -# See `/usr/bin/inspircd --help` for more details -#INSPIRCD_OPTS="" diff --git a/net-irc/inspircd/files/inspircd-r3.initd b/net-irc/inspircd/files/inspircd-r3.initd deleted file mode 100644 index 4d8dac819368..000000000000 --- a/net-irc/inspircd/files/inspircd-r3.initd +++ /dev/null @@ -1,48 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: ${INSPIRCD_USER:="inspircd"} -: ${INSPIRCD_GROUP:="inspircd"} -: ${INSPIRCD_CONFIGFILE:="/etc/inspircd/inspircd.conf"} -: ${INSPIRCD_PIDFILE:="/run/inspircd/inspircd.pid"} -: ${INSPIRCD_SSDARGS:="--quiet --wait 1000"} -: ${INSPIRCD_TERMTIMEOUT:="TERM/25/KILL/5"} -: ${INSPIRCD_OPTS:=""} - -command="/usr/bin/inspircd" -command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\"" -command_user="${INSPIRCD_USER}" -start_stop_daemon_args="${INSPIRCD_SSDARGS}" -pidfile="${INSPIRCD_PIDFILE}" -retry="${INSPIRCD_TERMTIMEOUT}" - -required_files="${INSPIRCD_CONFIGFILE}" - -name="InspIRCd" - -description="InspIRCd is a modular Internet Relay Chat (IRC) server." - -extra_commands="version" -extra_started_commands="rehash" - -depend() { - use dns - provide ircd -} - -start_pre() { - checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")" -} - -rehash() { - ebegin "Rehashing InspIRCd" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} - -version() { - ebegin "Retrieve InspIRCd version" - ${command} --version - eend $? -} diff --git a/net-irc/inspircd/files/inspircd.confd b/net-irc/inspircd/files/inspircd.confd index 1291f9fd552f..af9b3fe15e22 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/files/inspircd.initd b/net-irc/inspircd/files/inspircd.initd new file mode 100644 index 000000000000..4d8dac819368 --- /dev/null +++ b/net-irc/inspircd/files/inspircd.initd @@ -0,0 +1,48 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +: ${INSPIRCD_USER:="inspircd"} +: ${INSPIRCD_GROUP:="inspircd"} +: ${INSPIRCD_CONFIGFILE:="/etc/inspircd/inspircd.conf"} +: ${INSPIRCD_PIDFILE:="/run/inspircd/inspircd.pid"} +: ${INSPIRCD_SSDARGS:="--quiet --wait 1000"} +: ${INSPIRCD_TERMTIMEOUT:="TERM/25/KILL/5"} +: ${INSPIRCD_OPTS:=""} + +command="/usr/bin/inspircd" +command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\"" +command_user="${INSPIRCD_USER}" +start_stop_daemon_args="${INSPIRCD_SSDARGS}" +pidfile="${INSPIRCD_PIDFILE}" +retry="${INSPIRCD_TERMTIMEOUT}" + +required_files="${INSPIRCD_CONFIGFILE}" + +name="InspIRCd" + +description="InspIRCd is a modular Internet Relay Chat (IRC) server." + +extra_commands="version" +extra_started_commands="rehash" + +depend() { + use dns + provide ircd +} + +start_pre() { + checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")" +} + +rehash() { + ebegin "Rehashing InspIRCd" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} + +version() { + ebegin "Retrieve InspIRCd version" + ${command} --version + eend $? +} -- cgit v1.2.3