gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

net-irc/inspircd: security cleanup (drop <3.8.1)

Browse Source 
Bug: https://bugs.gentoo.org/743205
Bug: https://bugs.gentoo.org/755851
Bug: https://bugs.gentoo.org/755854
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/18885
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
John Helmert III
2020-12-30 15:25:02 -06:00
committed by Sam James
parent 22f43f4367
commit 83567ff235
5 changed files with 0 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net-irc/inspircd/Manifest
View File

@@ -1,3 +1 @@
DIST inspircd-2.0.29.tar.gz 736116 BLAKE2B bd634b81e5a21f4d5e12a4057c4dfb65a241b696be373d24a047594d1d175028dcabff2f28defcf4c340859cfc50637afec755f399c24366e1134c7d69c843f2 SHA512 83da7b089dca8035ffa4f30a2e757661150bb9337aa8124958daa317b44a98fb15fdcb872f8512737b5a39f1b641616eb27c4398d4c8d8fcd40d1f8872bd2052
DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B aebf085b21b99fae989d5d75c28223cf5ef5aa8f872886af099800683718e51aa3650a8968968e2434de738a5d5770a26f84a02c9b1270dffdc9efdd2e8c9f86 SHA512 be16dd18882bdb424ebeb131e382db073adaf37914e7c8333bd1c266242f2c48e6c721f0ecae72159bca229790413dabee67fd4a4a3c83588c48c8bb15e604fa

257
net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch
View File

@@ -1,257 +0,0 @@
diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
index d54cdc916..ee21be7f3 100644
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf.example
@@ -425,11 +425,11 @@
# This file has all the information about oper classes, types and o:lines.
# You *MUST* edit it.
-<include file="conf/examples/opers.conf.example">
+<include file="/etc/inspircd/opers.conf.example">
# This file has all the information about server links and ulined servers.
# You *MUST* edit it if you intend to link servers.
-<include file="conf/examples/links.conf.example">
+<include file="/etc/inspircd/links.conf.example">
#-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-#
# #
@@ -439,7 +439,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
-<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
+<files motd="/etc/inspircd/motd.txt.example"
+ rules="/etc/inspircd/rules.txt.example">
# Example of an executable file include. Note this will be read on rehash,
# not when the command is run.
@@ -485,7 +486,7 @@
# the default of 'inspircd.pid' is used. #
# #
-#<pid file="/path/to/inspircd.pid">
+<pid file="/var/run/inspircd/inspircd.pid">
#-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# #
@@ -994,7 +995,7 @@
# provide almost all the features of InspIRCd. :) #
# #
# The default does nothing -- we include it for simplicity for you. #
-<include file="conf/examples/modules.conf.example">
+<include file="/etc/inspircd/modules.conf.example">
# Here are some pre-built modules.conf files that closely match the
# default configurations of some popular IRCd's. You still may want to
@@ -1006,10 +1007,10 @@
# recommended that you make your own modules file based on modules.conf.example.
# Settings similar to UnrealIRCd defaults.
-#<include file="conf/examples/modules/unrealircd.conf.example">
+#<include file="/etc/inspircd/modules/unrealircd.conf.example">
# Settings similar to Charybdis IRCd defaults.
-#<include file="conf/examples/modules/charybdis.conf.example">
+#<include file="/etc/inspircd/modules/charybdis.conf.example">
#########################################################################
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index c3f074b94..4b0a584bb 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -315,7 +315,7 @@
# specify some censor tags. See also: #
# https://wiki.inspircd.org/Modules/2.0/censor #
#
-#<include file="conf/examples/censor.conf.example">
+#<include file="/etc/inspircd/censor.conf.example">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# CGI:IRC module: Adds support for automatic host changing in CGI:IRC
@@ -790,7 +790,7 @@
# specify below the path to the filter.conf file, or define some #
# <filter> tags. #
# #
-#<include file="conf/examples/filter.conf.example">
+#<include file="/etc/inspircd/filter.conf.example">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Gecos ban: Implements extended ban 'r', which stops anyone matching
@@ -849,7 +849,7 @@
# #
# If you specify to use the m_helpop.so module, then specify below #
# the path to the helpop.conf file. #
-#<include file="conf/examples/helpop-full.conf.example">
+#<include file="/etc/inspircd/helpop-full.conf.example">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Hide chans module: Allows users to hide their channels list from non-
@@ -1304,7 +1304,7 @@
# Read the comment above <connect:allowmotdcolors> in #
# inspircd.conf.example for details. #
# #
-#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
+#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Override module: Adds support for oper override.
diff --git a/make/template/main.mk b/make/template/main.mk
index 23daa7efc..386e0138a 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -34,7 +34,7 @@ CC = @CC@
SYSTEM = @SYSTEM@
BUILDPATH = @BUILD_DIR@
SOCKETENGINE = @SOCKETENGINE@
-CXXFLAGS = -pipe -fPIC -DPIC
+MYCXXFLAGS = -pipe -fPIC -DPIC
LDLIBS = -pthread -lstdc++
LDFLAGS =
CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
@@ -52,9 +52,9 @@ INSTMODE_BIN = 0755
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
@@ -76,46 +76,46 @@ INSTMODE_LIB = 0644
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
@@ -135,10 +135,11 @@ CXXFLAGS += -Iinclude
@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
@@ -151,10 +152,10 @@ TARGET = all
@GNU_ONLY TARGET = modules/$(M:.so=).so
@ENDIF
-@IFDEF T
+@IFDEF TGT
HEADER =
FOOTER = target
- TARGET = $(T)
+ TARGET = $(TGT)
@ENDIF
@IFEQ $(DBGOK) 0
@@ -229,8 +230,8 @@ install: target
@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH)
@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
@-$(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
@@ -238,9 +239,9 @@ install: target
@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! *"
@@ -253,7 +254,7 @@ install: target
@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 --git a/make/unit-cc.pl b/make/unit-cc.pl
index a494fb74b..2a570ec91 100755
--- a/make/unit-cc.pl
+++ b/make/unit-cc.pl
@@ -113,7 +113,7 @@ sub do_compile {
my $libs = '';
my $binary = $ENV{RUNCC};
if ($do_compile) {
- $flags = $ENV{CXXFLAGS};
+ $flags = $ENV{MYCXXFLAGS};
$flags =~ s/ -pedantic// if nopedantic($file);
$flags .= ' ' . getcompilerflags($file);

271
net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
View File

@@ -1,271 +0,0 @@
diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf
similarity index 100%
rename from docs/conf/filter.conf.example
rename to docs/conf/filter.conf
diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf
similarity index 100%
rename from docs/conf/helpop.conf.example
rename to docs/conf/helpop.conf
diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
similarity index 99%
rename from docs/conf/inspircd.conf.example
rename to docs/conf/inspircd.conf
index dbd56d2fe..9cda4baa7 100644
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf
@@ -494,11 +494,11 @@
# This file has all the information about oper classes, types and o:lines.
# You *MUST* edit it.
-#<include file="examples/opers.conf.example">
+#<include file="/etc/inspircd/opers.conf">
# This file has all the information about server links and ulined servers.
# You *MUST* edit it if you intend to link servers.
-#<include file="examples/links.conf.example">
+#<include file="/etc/inspircd/links.conf">
#-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-#
# #
@@ -507,7 +507,7 @@
#
# motd - displayed on connect and when a user executes /MOTD
# Modules can also define their own files
-<files motd="examples/motd.txt.example">
+<files motd="/etc/inspircd/motd.txt">
# Example of an executable file include. Note this will be read on rehash,
# not when the command is run.
@@ -543,7 +543,7 @@
# the default of 'inspircd.pid' is used. #
# #
-#<pid file="/path/to/inspircd.pid">
+<pid file="/var/run/inspircd/inspircd.pid">
#-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
# #
@@ -1041,7 +1041,7 @@
# provide almost all the features of InspIRCd. :) #
# #
# The default does nothing -- we include it for simplicity for you. #
-#<include file="examples/modules.conf.example">
+#<include file="/etc/inspircd/modules.conf">
#-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-#
# #
@@ -1050,13 +1050,13 @@
# exemptions for services pseudoclients: #
#
# Anope users should uncomment this:
-#<include file="examples/services/anope.conf.example">
+#<include file="/etc/inspircd/aliases/anope.conf">
#
# Atheme users should uncomment this:
-#<include file="examples/services/atheme.conf.example">
+#<include file="/etc/inspircd/aliases/atheme.conf">
#
# Users of other services should uncomment this:
-#<include file="examples/services/generic.conf.example">
+#<include file="/etc/inspircd/aliases/generic.conf">
#########################################################################
# #
diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf
similarity index 100%
rename from docs/conf/links.conf.example
rename to docs/conf/links.conf
diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf
similarity index 99%
rename from docs/conf/modules.conf.example
rename to docs/conf/modules.conf
index 639f02335..ea51e9b67 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf
@@ -838,7 +838,7 @@
# anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor, #
# censor, filter, flood, nickflood, noctcp, nonick, nonotice, #
# regmoderated, stripcolor, and topiclock. #
-# See <options:exemptchanops> in inspircd.conf.example for a more #
+# See <options:exemptchanops> in inspircd.conf for a more #
# detailed list of the restriction modes that can be exempted. #
# These are settable using: /MODE #chan +X <restriction>:<status> #
#<module name="exemptchanops">
@@ -874,7 +874,7 @@
# Your choice of regex engine must match on all servers network-wide. #
# #
# To learn more about the configuration of this module, read #
-# examples/filter.conf.example, which covers the various types of #
+# filter.conf, which covers the various types of #
# filters and shows how to add exemptions. #
# #
#-#-#-#-#-#-#-#-#-#-#- FILTER CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#
@@ -883,7 +883,7 @@
# specify below the path to the filter.conf file, or define some #
# <keyword> tags. #
# #
-#<include file="examples/filter.conf.example">
+#<include file="/etc/inspircd/filter.conf">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)#
@@ -973,7 +973,7 @@
# If you specify to use the helpop module, then specify below the #
# path to the helpop.conf file. #
# #
-#<include file="examples/helpop.conf.example">
+#<include file="/etc/inspircd/helpop.conf">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Hide chans module: Allows users to hide their channels list from non-
@@ -1551,7 +1551,7 @@
# onoper - If on, the message is sent on /OPER, otherwise it's #
# only sent when /OPERMOTD is used. #
# #
-#<opermotd file="examples/opermotd.txt.example" onoper="yes">
+#<opermotd file="/etc/inspircd/opermotd.txt" onoper="yes">
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
# Override module: Adds support for oper override.
@@ -2129,7 +2129,7 @@
# connections in order to oper up. It is highly recommended to load
# this module if you use SSL on your network.
# For how to use the oper features, please see the first
-# example <oper> tag in opers.conf.example.
+# example <oper> tag in opers.conf.
#
#<module name="sslinfo">
#
diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt
similarity index 97%
rename from docs/conf/motd.txt.example
rename to docs/conf/motd.txt
index c5266f844..34d85d965 100644
--- a/docs/conf/motd.txt.example
+++ b/docs/conf/motd.txt
@@ -24,7 +24,7 @@
`-.__ `----""" __.-'
`--..____..--'
- ---- To change, see motd.txt.example -----
+ ---- To change, see motd.txt -----
/ \
/ * Web: https://www.inspircd.org \
| * IRC: irc.inspircd.org #inspircd |
diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
similarity index 97%
rename from docs/conf/opermotd.txt.example
rename to docs/conf/opermotd.txt
index 7e1c82f33..73ad28621 100644
--- a/docs/conf/opermotd.txt.example
+++ b/docs/conf/opermotd.txt
@@ -24,7 +24,7 @@
`-.__ `----""" __.-'
`--..____..--'
- -- To change, see opermotd.txt.example ---
+ -- To change, see opermotd.txt ---
/ \
/ * Web: https://www.inspircd.org \
| * IRC: irc.inspircd.org #inspircd |
diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf
similarity index 99%
rename from docs/conf/opers.conf.example
rename to docs/conf/opers.conf
index 7cad2589c..082009da9 100644
--- a/docs/conf/opers.conf.example
+++ b/docs/conf/opers.conf
@@ -178,4 +178,4 @@
# Once you have edited this file you can remove this line. This is just to
# ensure that you don't hastily include the file without reading it.
-<die reason="Using opers.conf.example without editing it is a security risk">
+<die reason="Using opers.conf without editing it is a security risk">
diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
similarity index 100%
rename from docs/conf/providers/irccloud.conf.example
rename to docs/conf/providers/irccloud.conf
diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
similarity index 100%
rename from docs/conf/providers/kiwiirc-com.conf.example
rename to docs/conf/providers/kiwiirc-com.conf
diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt
similarity index 100%
rename from docs/conf/quotes.txt.example
rename to docs/conf/quotes.txt
diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf
similarity index 86%
rename from docs/conf/services/anope.conf.example
rename to docs/conf/services/anope.conf
index 5c8f859ff..b1179eb8c 100644
--- a/docs/conf/services/anope.conf.example
+++ b/docs/conf/services/anope.conf
@@ -2,7 +2,7 @@
# by Anope. See https://www.anope.org for more information on Anope.
# This file inherits from the generic config to avoid repetition.
-<include file="examples/services/generic.conf.example">
+<include file="examples/services/generic.conf">
# /GLOBAL <message>
# Sends a global notice.
diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf
similarity index 98%
rename from docs/conf/services/atheme.conf.example
rename to docs/conf/services/atheme.conf
index d509522b8..7605251db 100644
--- a/docs/conf/services/atheme.conf.example
+++ b/docs/conf/services/atheme.conf
@@ -3,7 +3,7 @@
# information on Atheme.
# This file inherits from the generic config to avoid repetition.
-<include file="examples/services/generic.conf.example">
+<include file="examples/services/generic.conf">
# Long hand aliases for services pseudoclients.
<alias text="ALIS" replace="SQUERY $requirement :$2-" requires="ALIS" uline="yes">
diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf
similarity index 100%
rename from docs/conf/services/generic.conf.example
rename to docs/conf/services/generic.conf
diff --git a/make/template/main.mk b/make/template/main.mk
index 1e6ba5cd0..3751937eb 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -210,9 +210,9 @@ install: target
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
@@ -229,10 +229,10 @@ endif
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql
-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
@echo ""
@echo "*************************************"
@@ -246,7 +246,6 @@ endif
@echo ' Data:' $(DATPATH)
@echo 'To start the ircd, run:' $(SCRPATH)/inspircd start
@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
- @echo 'Examples are available at:' $(EXAPATH)
GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
./configure --update

115
net-irc/inspircd/inspircd-2.0.29.ebuild
View File

@@ -1,115 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit toolchain-funcs
DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
HOMEPAGE="https://inspircd.github.com/"
SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
RDEPEND="
acct-group/inspircd
acct-user/inspircd
dev-lang/perl
ssl? ( dev-libs/openssl:= )
geoip? ( dev-libs/geoip )
gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
ldap? ( net-nds/openldap )
mysql? ( dev-db/mysql-connector-c:= )
postgres? ( dev-db/postgresql:= )
pcre? ( dev-libs/libpcre )
sqlite? ( >=dev-db/sqlite-3.0 )
tre? ( dev-libs/tre )"
DEPEND="${RDEPEND}"
DOCS=( docs/. )
PATCHES=( "${FILESDIR}"/${PN}-2.0.27-fix-path-builds.patch )
src_prepare() {
default
# Patch the inspircd launcher with the inspircd user
sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
}
src_configure() {
local extras=""
use geoip && extras+="m_geoip.cpp,"
use gnutls && extras+="m_ssl_gnutls.cpp,"
use ldap && extras+="m_ldapauth.cpp,m_ldapoper.cpp,"
use mysql && extras+="m_mysql.cpp,"
use pcre && extras+="m_regex_pcre.cpp,"
use posix && extras+="m_regex_posix.cpp,"
use postgres && extras+="m_pgsql.cpp,"
use sqlite && extras+="m_sqlite3.cpp,"
use ssl && extras+="m_ssl_openssl.cpp,"
use tre && extras+="m_regex_tre.cpp,"
# The first configuration run enables certain "extra" InspIRCd
# modules, the second run generates the actual makefile.
if [[ -n "${extras}" ]]; then
./configure --disable-interactive --enable-extras=${extras%,}
fi
local myconf=(
--with-cc="$(tc-getCXX)"
--disable-interactive
--prefix="/usr/$(get_libdir)/${PN}"
--config-dir="/etc/${PN}"
--data-dir="/var/lib/${PN}/data"
--log-dir="/var/log/${PN}"
--binary-dir="/usr/bin"
--module-dir="/usr/$(get_libdir)/${PN}/modules"
$(usex ipv6 '' '--disable-ipv6')
$(usex gnutls '--enable-gnutls' '')
$(usex ssl '--enable-openssl' ''))
./configure "${myconf[@]}"
}
src_compile() {
emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
}
src_install() {
emake INSTUID=${PN} DESTDIR="${D}" install
insinto "/usr/include/${PN}"
doins -r include/.
einstalldocs
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
keepdir "/var/log/${PN}"
diropts -o"${PN}" -g"${PN}" -m0700
keepdir "/var/lib/${PN}/data"
}
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
# This is a new installation
elog "You will find example configuration files under "
elog "/usr/share/doc/${PN}"
elog "Read the ${PN}.conf.example file carefully before "
elog "starting the service."
fi
local pv
for pv in ${REPLACING_VERSIONS}; do
if ver_test "${pv}" -lt "2.0.24-r1"; then
elog "Starting with 2.0.24-r1 the daemon is no longer started"
elog "with the --logfile option and you are thus expected to define"
elog "logging in the InspIRCd configuration file if you want it."
break
fi
done
}

121
net-irc/inspircd/inspircd-3.4.0-r1.ebuild
View File

@@ -1,121 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit toolchain-funcs
DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
HOMEPAGE="https://inspircd.github.com/"
SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
RDEPEND="
acct-group/inspircd
acct-user/inspircd
dev-lang/perl
gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
ldap? ( net-nds/openldap )
maxminddb? ( dev-libs/libmaxminddb )
mbedtls? ( net-libs/mbedtls:= )
mysql? ( dev-db/mysql-connector-c:= )
pcre? ( dev-libs/libpcre )
postgres? ( dev-db/postgresql:= )
re2? ( dev-libs/re2:= )
sqlite? ( >=dev-db/sqlite-3.0 )
ssl? ( dev-libs/openssl:= )
tre? ( dev-libs/tre )"
DEPEND="${RDEPEND}"
DOCS=( docs/. )
PATCHES=( "${FILESDIR}"/${PN}-3.4.0-fix-path-builds.patch )
src_prepare() {
default
# Patch the inspircd launcher with the inspircd user
sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die
}
src_configure() {
local extras=""
use gnutls && extras+="m_ssl_gnutls.cpp,"
use ldap && extras+="m_ldap.cpp,"
use maxminddb && extras+="m_geo_maxmind.cpp,"
use mbedtls && extras+="m_ssl_mbedtls.cpp,"
use mysql && extras+="m_mysql.cpp,"
use pcre && extras+="m_regex_pcre.cpp,"
use postgres && extras+="m_pgsql.cpp,"
use re2 && extras+="m_regex_re2.cpp,"
use regex-posix && extras+="m_regex_posix.cpp,"
use regex-stdlib && extras+="m_regex_stdlib.cpp,"
use sqlite && extras+="m_sqlite3.cpp,"
use ssl && extras+="m_ssl_openssl.cpp,"
use sslrehashsignal && extras+="m_sslrehashsignal.cpp,"
use tre && extras+="m_regex_tre.cpp,"
# The first configuration run enables certain "extra" InspIRCd
# modules, the second run generates the actual makefile.
if [[ -n "${extras}" ]]; then
./configure --disable-interactive --enable-extras=${extras%,}
fi
local myconf=(
--disable-interactive
--disable-auto-extras
--prefix="/usr/$(get_libdir)/${PN}"
--config-dir="/etc/${PN}"
--data-dir="/var/lib/${PN}/data"
--log-dir="/var/log/${PN}"
--binary-dir="/usr/bin"
--module-dir="/usr/$(get_libdir)/${PN}/modules"
--manual-dir="/usr/share/man")
CXX="$(tc-getCXX)" ./configure "${myconf[@]}"
}
src_compile() {
emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1
}
src_install() {
default
insinto "/usr/include/${PN}"
doins -r include/.
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
keepdir "/var/log/${PN}"
diropts -o"${PN}" -g"${PN}" -m0700
keepdir "/var/lib/${PN}/data"
}
pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
# This is a new installation
elog "You will find example configuration files under "
elog "/usr/share/doc/${PN}"
elog "Read the ${PN}.conf.example file carefully before "
elog "starting the service."
fi
local pv
for pv in ${REPLACING_VERSIONS}; do
if ver_test "${pv}" -lt "2.0.24-r1"; then
elog "Starting with 2.0.24-r1 the daemon is no longer started"
elog "with the --logfile option and you are thus expected to define"
elog "logging in the InspIRCd configuration file if you want it."
fi
if ver_test "${pv}" -lt "3.0.0"; then
elog "Version 3.0 is a major upgrade which contains breaking"
elog "changes. You will need to update your configuration files."
elog "See: https://docs.inspircd.org/3/configuration-changes"
fi
done
}