From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- .../files/inspircd-3.5.0-fix-path-builds.patch | 346 --------------------- .../files/inspircd-3.7.0-fix-path-builds.patch | 338 ++++++++++++++++++++ 2 files changed, 338 insertions(+), 346 deletions(-) delete mode 100644 net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch create mode 100644 net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch (limited to 'net-irc/inspircd/files') diff --git a/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch deleted file mode 100644 index 578453934c8f..000000000000 --- a/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch +++ /dev/null @@ -1,346 +0,0 @@ -diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.conf -similarity index 100% -rename from docs/conf/codepages/ascii.conf.example -rename to docs/conf/codepages/ascii.conf -diff --git a/docs/conf/codepages/latin1.conf.example b/docs/conf/codepages/latin1.conf -similarity index 97% -rename from docs/conf/codepages/latin1.conf.example -rename to docs/conf/codepages/latin1.conf -index 3beb002fd..f5c6b98dc 100644 ---- a/docs/conf/codepages/latin1.conf.example -+++ b/docs/conf/codepages/latin1.conf -@@ -39,4 +39,4 @@ - # þ => Þ - - # Include the ASCII rules to avoid duplication. -- -+ -diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.conf -similarity index 100% -rename from docs/conf/codepages/rfc1459.conf.example -rename to docs/conf/codepages/rfc1459.conf -diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.conf -similarity index 100% -rename from docs/conf/codepages/strict-rfc1459.conf.example -rename to docs/conf/codepages/strict-rfc1459.conf -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 98% -rename from docs/conf/inspircd.conf.example -rename to docs/conf/inspircd.conf -index dbd56d2fe..665d4dfb5 100644 ---- a/docs/conf/inspircd.conf.example -+++ b/docs/conf/inspircd.conf -@@ -247,10 +247,10 @@ - # This can be done by using # - - # To enable IRCCloud on your network uncomment this: --# -+# - - # To enable KiwiIRC.com on your network uncomment this: --# -+# - - # A connect class with set denies connections from the specified host/IP range. - -+# - - # This file has all the information about server links and ulined servers. - # You *MUST* edit it if you intend to link servers. --# -+# - - #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# - # # -@@ -507,7 +507,7 @@ - # - # motd - displayed on connect and when a user executes /MOTD - # 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. -@@ -543,7 +543,7 @@ - # the default of 'inspircd.pid' is used. # - # # - --# -+ - - #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -693,7 +693,7 @@ - # messages (requires the stripcolor module). - # - topiclock Channel mode +t - limits changing the topic to (half)ops - # You can also configure this on a per-channel basis with a channel mode. -- # See m_exemptchanops in modules.conf.example for more details. -+ # See m_exemptchanops in modules.conf for more details. - exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o" - - # invitebypassmodes: This allows /INVITE to bypass other channel modes. -@@ -1041,7 +1041,7 @@ - # provide almost all the features of InspIRCd. :) # - # # - # The default does nothing -- we include it for simplicity for you. # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -1050,13 +1050,13 @@ - # exemptions for services pseudoclients: # - # - # Anope users should uncomment this: --# -+# - # - # Atheme users should uncomment this: --# -+# - # - # Users of other services should uncomment this: --# -+# - - ######################################################################### - # # -diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf -similarity index 98% -rename from docs/conf/links.conf.example -rename to docs/conf/links.conf -index 09b3bb3d5..22db1bdab 100644 ---- a/docs/conf/links.conf.example -+++ b/docs/conf/links.conf -@@ -121,4 +121,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. -- -+ -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 d68248163..b55d368fb 100644 ---- a/docs/conf/modules.conf.example -+++ b/docs/conf/modules.conf -@@ -576,10 +576,10 @@ - # and case mapping. - # - # You should include one of the following files to set your codepage: --# --# --# --# -+# -+# -+# -+# - # - # You can also define a custom codepage. For details on how to do this - # please refer to the docs site: -@@ -853,7 +853,7 @@ - # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor, # - # censor, filter, flood, nickflood, noctcp, nonick, nonotice, # - # regmoderated, stripcolor, and topiclock. # --# See in inspircd.conf.example for a more # -+# See in inspircd.conf for a more # - # detailed list of the restriction modes that can be exempted. # - # These are settable using: /MODE #chan +X : # - # -@@ -889,7 +889,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 -#-#-#-#-#-#-#-#-#-#-#-# -@@ -898,7 +898,7 @@ - # specify below the path to the filter.conf file, or define some # - # tags. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)# -@@ -988,7 +988,7 @@ - # If you specify to use the helpop module, then specify below the # - # path to the helpop.conf file. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Hide chans module: Allows users to hide their channels list from non- -@@ -1575,7 +1575,7 @@ - # onoper - If on, the message is sent on /OPER, otherwise it's # - # only sent when /OPERMOTD is used. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Override module: Adds support for oper override. -@@ -2153,7 +2153,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 tag in opers.conf.example. -+# example tag in opers.conf. - # - # - # -diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt -similarity index 96% -rename from docs/conf/motd.txt.example -rename to docs/conf/motd.txt -index 9281cd4b9..a4ac6964b 100644 ---- a/docs/conf/motd.txt.example -+++ b/docs/conf/motd.txt -@@ -23,7 +23,7 @@ - `-.__ `----""" __.-' - `--..____..--' - -- +---- To change this see \bmotd.txt.example\x ----+ -+ +---- To change this see \bmotd.txt \x ----+ - | | - | * \bWeb:\x https://www.inspircd.org | - | * \bIRC:\x irc.inspircd.org #inspircd | -diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt -similarity index 96% -rename from docs/conf/opermotd.txt.example -rename to docs/conf/opermotd.txt -index a25d90380..68671a081 100644 ---- a/docs/conf/opermotd.txt.example -+++ b/docs/conf/opermotd.txt -@@ -23,7 +23,7 @@ - `-.__ `----""" __.-' - `--..____..--' - -- +-- To change this see \bopermotd.txt.example\x --+ -+ +-- To change this see \bopermotd.txt \x --+ - | | - | * \bWeb:\x https://www.inspircd.org | - | * \bIRC:\x 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. -- -+ -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..69a1ab50a 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. -- -+ - - # /GLOBAL - # 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..c1e906ff7 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. -- -+ - - # Long hand aliases for services pseudoclients. - -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 a57595c9d..42fef2563 100644 ---- a/make/template/main.mk -+++ b/make/template/main.mk -@@ -220,10 +220,10 @@ 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)/codepages -- @-$(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)/codepages -+ @-$(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) -@@ -240,11 +240,11 @@ 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/codepages/*.example $(EXAPATH)/codepages -- -$(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/codepages/* $(CONPATH)/codepages -+ -$(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 "*************************************" -@@ -258,7 +258,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 diff --git a/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch new file mode 100644 index 000000000000..92e1c4b6032f --- /dev/null +++ b/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch @@ -0,0 +1,338 @@ +diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.conf +similarity index 100% +rename from docs/conf/codepages/ascii.conf.example +rename to docs/conf/codepages/ascii.conf +diff --git a/docs/conf/codepages/latin1.conf.example b/docs/conf/codepages/latin1.conf +similarity index 97% +rename from docs/conf/codepages/latin1.conf.example +rename to docs/conf/codepages/latin1.conf +index 3beb002fd..f5c6b98dc 100644 +--- a/docs/conf/codepages/latin1.conf.example ++++ b/docs/conf/codepages/latin1.conf +@@ -39,4 +39,4 @@ + # þ => Þ + + # Include the ASCII rules to avoid duplication. +- ++ +diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.conf +similarity index 100% +rename from docs/conf/codepages/rfc1459.conf.example +rename to docs/conf/codepages/rfc1459.conf +diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.conf +similarity index 100% +rename from docs/conf/codepages/strict-rfc1459.conf.example +rename to docs/conf/codepages/strict-rfc1459.conf +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 d678b5be3..607141381 100644 +--- a/docs/conf/inspircd.conf.example ++++ b/docs/conf/inspircd.conf +@@ -250,7 +250,7 @@ + # This can be done by using # + + # To enable IRCCloud on your network uncomment this: +-# ++# + + # A connect class with set denies connections from the specified host/IP range. + ++# + + # This file has all the information about server links and ulined servers. + # You *MUST* edit it if you intend to link servers. +-# ++# + + #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# + # # +@@ -507,7 +507,7 @@ + # + # motd - displayed on connect and when a user executes /MOTD + # 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. +@@ -543,7 +543,7 @@ + # the default of 'inspircd.pid' is used. # + # # + +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-# + # # +@@ -697,7 +697,7 @@ + # messages (requires the stripcolor module). + # - topiclock Channel mode +t - limits changing the topic to (half)ops + # You can also configure this on a per-channel basis with a channel mode. +- # See m_exemptchanops in modules.conf.example for more details. ++ # See m_exemptchanops in modules.conf for more details. + exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o" + + # invitebypassmodes: This allows /INVITE to bypass other channel modes. +@@ -1045,7 +1045,7 @@ + # provide almost all the features of InspIRCd. :) # + # # + # The default does nothing -- we include it for simplicity for you. # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-# + # # +@@ -1054,13 +1054,13 @@ + # exemptions for services pseudoclients: # + # + # Anope users should uncomment this: +-# ++# + # + # Atheme users should uncomment this: +-# ++# + # + # Users of other services should uncomment this: +-# ++# + + ######################################################################### + # # +diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf +similarity index 98% +rename from docs/conf/links.conf.example +rename to docs/conf/links.conf +index 256ac10f9..40f5be35d 100644 +--- a/docs/conf/links.conf.example ++++ b/docs/conf/links.conf +@@ -121,4 +121,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. +- ++ +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 2e50977bd..315d376cf 100644 +--- a/docs/conf/modules.conf.example ++++ b/docs/conf/modules.conf +@@ -576,10 +576,10 @@ + # and case mapping. + # + # You should include one of the following files to set your codepage: +-# +-# +-# +-# ++# ++# ++# ++# + # + # You can also define a custom codepage. For details on how to do this + # please refer to the docs site: +@@ -853,7 +853,7 @@ + # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor, # + # censor, filter, flood, nickflood, noctcp, nonick, nonotice, # + # regmoderated, stripcolor, and topiclock. # +-# See in inspircd.conf.example for a more # ++# See in inspircd.conf for a more # + # detailed list of the restriction modes that can be exempted. # + # These are settable using: /MODE #chan +X : # + # +@@ -889,7 +889,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 -#-#-#-#-#-#-#-#-#-#-#-# +@@ -898,7 +898,7 @@ + # specify below the path to the filter.conf file, or define some # + # tags. # + # # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)# +@@ -988,7 +988,7 @@ + # If you specify to use the helpop module, then specify below the # + # path to the helpop.conf file. # + # # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # Hide chans module: Allows users to hide their channels list from non- +@@ -1581,7 +1581,7 @@ + # onoper - If on, the message is sent on /OPER, otherwise it's # + # only sent when /OPERMOTD is used. # + # # +-# ++# + + #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# + # Override module: Adds support for oper override. +@@ -2172,7 +2172,7 @@ + # connections in order to oper up. It is highly recommended to load + # this module if you use TLS (SSL) on your network. + # For how to use the oper features, please see the first +-# example tag in opers.conf.example. ++# example tag in opers.conf. + # + # + # +diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt +similarity index 96% +rename from docs/conf/motd.txt.example +rename to docs/conf/motd.txt +index 9281cd4b9..a4ac6964b 100644 +--- a/docs/conf/motd.txt.example ++++ b/docs/conf/motd.txt +@@ -23,7 +23,7 @@ + `-.__ `----""" __.-' + `--..____..--' + +- +---- To change this see \bmotd.txt.example\x ----+ ++ +---- To change this see \bmotd.txt \x ----+ + | | + | * \bWeb:\x https://www.inspircd.org | + | * \bIRC:\x irc.inspircd.org #inspircd | +diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt +similarity index 96% +rename from docs/conf/opermotd.txt.example +rename to docs/conf/opermotd.txt +index a25d90380..68671a081 100644 +--- a/docs/conf/opermotd.txt.example ++++ b/docs/conf/opermotd.txt +@@ -23,7 +23,7 @@ + `-.__ `----""" __.-' + `--..____..--' + +- +-- To change this see \bopermotd.txt.example\x --+ ++ +-- To change this see \bopermotd.txt \x --+ + | | + | * \bWeb:\x https://www.inspircd.org | + | * \bIRC:\x 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 d8c266b1f..9517b3685 100644 +--- a/docs/conf/opers.conf.example ++++ b/docs/conf/opers.conf +@@ -182,4 +182,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. +- ++ +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/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..69a1ab50a 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. +- ++ + + # /GLOBAL + # 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..c1e906ff7 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. +- ++ + + # Long hand aliases for services pseudoclients. + +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 9f905f970..c87da5d73 100644 +--- a/make/template/main.mk ++++ b/make/template/main.mk +@@ -221,10 +221,10 @@ 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)/codepages +- @-$(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)/codepages ++ @-$(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) +@@ -244,11 +244,11 @@ endif + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.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_BIN) tools/testssl $(BINPATH)/inspircd-testssl 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/codepages/*.example $(EXAPATH)/codepages +- -$(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/codepages/* $(CONPATH)/codepages ++ -$(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_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH) + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null + @echo "" +@@ -263,7 +263,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 -- cgit v1.2.3