Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/
Date: Thu, 31 Dec 2020 01:13:56
Message-Id: 1609377221.83567ff2355ef80076990e51cc58fcef2cdf1138.sam@gentoo
1 commit: 83567ff2355ef80076990e51cc58fcef2cdf1138
2 Author: John Helmert III <jchelmert3 <AT> posteo <DOT> net>
3 AuthorDate: Wed Dec 30 21:25:02 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 31 01:13:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83567ff2
7
8 net-irc/inspircd: security cleanup (drop <3.8.1)
9
10 Bug: https://bugs.gentoo.org/743205
11 Bug: https://bugs.gentoo.org/755851
12 Bug: https://bugs.gentoo.org/755854
13 Package-Manager: Portage-3.0.12, Repoman-3.0.2
14 Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
15 Closes: https://github.com/gentoo/gentoo/pull/18885
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 net-irc/inspircd/Manifest | 2 -
19 .../files/inspircd-2.0.27-fix-path-builds.patch | 257 -------------------
20 .../files/inspircd-3.4.0-fix-path-builds.patch | 271 ---------------------
21 net-irc/inspircd/inspircd-2.0.29.ebuild | 115 ---------
22 net-irc/inspircd/inspircd-3.4.0-r1.ebuild | 121 ---------
23 5 files changed, 766 deletions(-)
24
25 diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
26 index c650dfb20e9..26f0ac924f9 100644
27 --- a/net-irc/inspircd/Manifest
28 +++ b/net-irc/inspircd/Manifest
29 @@ -1,3 +1 @@
30 -DIST inspircd-2.0.29.tar.gz 736116 BLAKE2B bd634b81e5a21f4d5e12a4057c4dfb65a241b696be373d24a047594d1d175028dcabff2f28defcf4c340859cfc50637afec755f399c24366e1134c7d69c843f2 SHA512 83da7b089dca8035ffa4f30a2e757661150bb9337aa8124958daa317b44a98fb15fdcb872f8512737b5a39f1b641616eb27c4398d4c8d8fcd40d1f8872bd2052
31 -DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
32 DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B aebf085b21b99fae989d5d75c28223cf5ef5aa8f872886af099800683718e51aa3650a8968968e2434de738a5d5770a26f84a02c9b1270dffdc9efdd2e8c9f86 SHA512 be16dd18882bdb424ebeb131e382db073adaf37914e7c8333bd1c266242f2c48e6c721f0ecae72159bca229790413dabee67fd4a4a3c83588c48c8bb15e604fa
33
34 diff --git a/net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch
35 deleted file mode 100644
36 index da00a8491d1..00000000000
37 --- a/net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch
38 +++ /dev/null
39 @@ -1,257 +0,0 @@
40 -diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
41 -index d54cdc916..ee21be7f3 100644
42 ---- a/docs/conf/inspircd.conf.example
43 -+++ b/docs/conf/inspircd.conf.example
44 -@@ -425,11 +425,11 @@
45 -
46 - # This file has all the information about oper classes, types and o:lines.
47 - # You *MUST* edit it.
48 --<include file="conf/examples/opers.conf.example">
49 -+<include file="/etc/inspircd/opers.conf.example">
50 -
51 - # This file has all the information about server links and ulined servers.
52 - # You *MUST* edit it if you intend to link servers.
53 --<include file="conf/examples/links.conf.example">
54 -+<include file="/etc/inspircd/links.conf.example">
55 -
56 - #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-#
57 - # #
58 -@@ -439,7 +439,8 @@
59 - # motd - displayed on connect and when a user executes /MOTD
60 - # rules - displayed when the user executes /RULES
61 - # Modules can also define their own files
62 --<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
63 -+<files motd="/etc/inspircd/motd.txt.example"
64 -+ rules="/etc/inspircd/rules.txt.example">
65 -
66 - # Example of an executable file include. Note this will be read on rehash,
67 - # not when the command is run.
68 -@@ -485,7 +486,7 @@
69 - # the default of 'inspircd.pid' is used. #
70 - # #
71 -
72 --#<pid file="/path/to/inspircd.pid">
73 -+<pid file="/var/run/inspircd/inspircd.pid">
74 -
75 - #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
76 - # #
77 -@@ -994,7 +995,7 @@
78 - # provide almost all the features of InspIRCd. :) #
79 - # #
80 - # The default does nothing -- we include it for simplicity for you. #
81 --<include file="conf/examples/modules.conf.example">
82 -+<include file="/etc/inspircd/modules.conf.example">
83 -
84 - # Here are some pre-built modules.conf files that closely match the
85 - # default configurations of some popular IRCd's. You still may want to
86 -@@ -1006,10 +1007,10 @@
87 - # recommended that you make your own modules file based on modules.conf.example.
88 -
89 - # Settings similar to UnrealIRCd defaults.
90 --#<include file="conf/examples/modules/unrealircd.conf.example">
91 -+#<include file="/etc/inspircd/modules/unrealircd.conf.example">
92 -
93 - # Settings similar to Charybdis IRCd defaults.
94 --#<include file="conf/examples/modules/charybdis.conf.example">
95 -+#<include file="/etc/inspircd/modules/charybdis.conf.example">
96 -
97 -
98 - #########################################################################
99 -diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
100 -index c3f074b94..4b0a584bb 100644
101 ---- a/docs/conf/modules.conf.example
102 -+++ b/docs/conf/modules.conf.example
103 -@@ -315,7 +315,7 @@
104 - # specify some censor tags. See also: #
105 - # https://wiki.inspircd.org/Modules/2.0/censor #
106 - #
107 --#<include file="conf/examples/censor.conf.example">
108 -+#<include file="/etc/inspircd/censor.conf.example">
109 -
110 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
111 - # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
112 -@@ -790,7 +790,7 @@
113 - # specify below the path to the filter.conf file, or define some #
114 - # <filter> tags. #
115 - # #
116 --#<include file="conf/examples/filter.conf.example">
117 -+#<include file="/etc/inspircd/filter.conf.example">
118 -
119 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
120 - # Gecos ban: Implements extended ban 'r', which stops anyone matching
121 -@@ -849,7 +849,7 @@
122 - # #
123 - # If you specify to use the m_helpop.so module, then specify below #
124 - # the path to the helpop.conf file. #
125 --#<include file="conf/examples/helpop-full.conf.example">
126 -+#<include file="/etc/inspircd/helpop-full.conf.example">
127 -
128 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
129 - # Hide chans module: Allows users to hide their channels list from non-
130 -@@ -1304,7 +1304,7 @@
131 - # Read the comment above <connect:allowmotdcolors> in #
132 - # inspircd.conf.example for details. #
133 - # #
134 --#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
135 -+#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
136 -
137 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
138 - # Override module: Adds support for oper override.
139 -diff --git a/make/template/main.mk b/make/template/main.mk
140 -index 23daa7efc..386e0138a 100644
141 ---- a/make/template/main.mk
142 -+++ b/make/template/main.mk
143 -@@ -34,7 +34,7 @@ CC = @CC@
144 - SYSTEM = @SYSTEM@
145 - BUILDPATH = @BUILD_DIR@
146 - SOCKETENGINE = @SOCKETENGINE@
147 --CXXFLAGS = -pipe -fPIC -DPIC
148 -+MYCXXFLAGS = -pipe -fPIC -DPIC
149 - LDLIBS = -pthread -lstdc++
150 - LDFLAGS =
151 - CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
152 -@@ -52,9 +52,9 @@ INSTMODE_BIN = 0755
153 - INSTMODE_LIB = 0644
154 -
155 - @IFEQ $(CC) icpc
156 -- CXXFLAGS += -Wshadow
157 -+ MYCXXFLAGS += -Wshadow
158 - @ELSE
159 -- CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
160 -+ MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
161 - @ENDIF
162 -
163 -
164 -@@ -76,46 +76,46 @@ INSTMODE_LIB = 0644
165 - INSTALL = ginstall
166 - @ENDIF
167 - @IFEQ $(SYSTEM) darwin
168 -- CXXFLAGS += -DDARWIN -frtti
169 -+ MYCXXFLAGS += -DDARWIN -frtti
170 - LDLIBS += -ldl
171 - CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
172 - PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
173 - @ENDIF
174 - @IFEQ $(SYSTEM) interix
175 -- CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
176 -+ MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
177 - @ENDIF
178 -
179 --@IFNDEF D
180 -- D=0
181 -+@IFNDEF DEBUGLEVEL
182 -+ DEBUGLEVEL=0
183 - @ENDIF
184 -
185 - GCC6=@GCC6@
186 - @IFEQ $(GCC6) true
187 -- CXXFLAGS += -fno-delete-null-pointer-checks
188 -+ MYCXXFLAGS += -fno-delete-null-pointer-checks
189 - @ENDIF
190 -
191 - DBGOK=0
192 --@IFEQ $(D) 0
193 -- CXXFLAGS += -O2
194 -+@IFEQ $(DEBUGLEVEL) 0
195 -+ MYCXXFLAGS += -O2
196 - @IFEQ $(CC) g++
197 -- CXXFLAGS += -g1
198 -+ MYCXXFLAGS += -g1
199 - @ENDIF
200 - HEADER = std-header
201 - DBGOK=1
202 - @ENDIF
203 --@IFEQ $(D) 1
204 -- CXXFLAGS += -O0 -g3 -Werror
205 -+@IFEQ $(DEBUGLEVEL) 1
206 -+ MYCXXFLAGS += -O0 -g3 -Werror
207 - HEADER = debug-header
208 - DBGOK=1
209 - @ENDIF
210 --@IFEQ $(D) 2
211 -- CXXFLAGS += -O2 -g3
212 -+@IFEQ $(DEBUGLEVEL) 2
213 -+ MYCXXFLAGS += -O2 -g3
214 - HEADER = debug-header
215 - DBGOK=1
216 - @ENDIF
217 - FOOTER = finishmessage
218 -
219 --CXXFLAGS += -Iinclude
220 -+MYCXXFLAGS += -Iinclude
221 -
222 - @GNU_ONLY MAKEFLAGS += --no-print-directory
223 -
224 -@@ -135,10 +135,11 @@ CXXFLAGS += -Iinclude
225 - @ENDIF
226 -
227 - @IFDEF PURE_STATIC
228 -- CXXFLAGS += -DPURE_STATIC
229 -+ MYCXXFLAGS += -DPURE_STATIC
230 - @ENDIF
231 -
232 --@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
233 -+MYCXXFLAGS += $(CXXFLAGS)
234 -+@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
235 - @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
236 -
237 - # Default target
238 -@@ -151,10 +152,10 @@ TARGET = all
239 - @GNU_ONLY TARGET = modules/$(M:.so=).so
240 - @ENDIF
241 -
242 --@IFDEF T
243 -+@IFDEF TGT
244 - HEADER =
245 - FOOTER = target
246 -- TARGET = $(T)
247 -+ TARGET = $(TGT)
248 - @ENDIF
249 -
250 - @IFEQ $(DBGOK) 0
251 -@@ -229,8 +230,8 @@ install: target
252 - @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH)
253 - @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
254 - @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
255 -- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
256 -- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
257 -+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
258 -+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules
259 - @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
260 - [ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
261 - @IFNDEF PURE_STATIC
262 -@@ -238,9 +239,9 @@ install: target
263 - @ENDIF
264 - -$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
265 - -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
266 -- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
267 -- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
268 -- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
269 -+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
270 -+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
271 -+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules
272 - @echo ""
273 - @echo "*************************************"
274 - @echo "* INSTALL COMPLETE! *"
275 -@@ -253,7 +254,7 @@ install: target
276 - @echo ' Data:' $(DATPATH)
277 - @echo 'To start the ircd, run:' $(BASE)/inspircd start
278 - @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
279 -- @echo 'Examples are available at:' $(CONPATH)/examples/
280 -+ @echo 'Examples are available at:' $(CONPATH)
281 -
282 - @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
283 - @BSD_ONLY RCS_FILES = src/version.sh
284 -diff --git a/make/unit-cc.pl b/make/unit-cc.pl
285 -index a494fb74b..2a570ec91 100755
286 ---- a/make/unit-cc.pl
287 -+++ b/make/unit-cc.pl
288 -@@ -113,7 +113,7 @@ sub do_compile {
289 - my $libs = '';
290 - my $binary = $ENV{RUNCC};
291 - if ($do_compile) {
292 -- $flags = $ENV{CXXFLAGS};
293 -+ $flags = $ENV{MYCXXFLAGS};
294 - $flags =~ s/ -pedantic// if nopedantic($file);
295 - $flags .= ' ' . getcompilerflags($file);
296 -
297
298 diff --git a/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
299 deleted file mode 100644
300 index 9bf99a6e74d..00000000000
301 --- a/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
302 +++ /dev/null
303 @@ -1,271 +0,0 @@
304 -diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf
305 -similarity index 100%
306 -rename from docs/conf/filter.conf.example
307 -rename to docs/conf/filter.conf
308 -diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf
309 -similarity index 100%
310 -rename from docs/conf/helpop.conf.example
311 -rename to docs/conf/helpop.conf
312 -diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
313 -similarity index 99%
314 -rename from docs/conf/inspircd.conf.example
315 -rename to docs/conf/inspircd.conf
316 -index dbd56d2fe..9cda4baa7 100644
317 ---- a/docs/conf/inspircd.conf.example
318 -+++ b/docs/conf/inspircd.conf
319 -@@ -494,11 +494,11 @@
320 -
321 - # This file has all the information about oper classes, types and o:lines.
322 - # You *MUST* edit it.
323 --#<include file="examples/opers.conf.example">
324 -+#<include file="/etc/inspircd/opers.conf">
325 -
326 - # This file has all the information about server links and ulined servers.
327 - # You *MUST* edit it if you intend to link servers.
328 --#<include file="examples/links.conf.example">
329 -+#<include file="/etc/inspircd/links.conf">
330 -
331 - #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-#
332 - # #
333 -@@ -507,7 +507,7 @@
334 - #
335 - # motd - displayed on connect and when a user executes /MOTD
336 - # Modules can also define their own files
337 --<files motd="examples/motd.txt.example">
338 -+<files motd="/etc/inspircd/motd.txt">
339 -
340 - # Example of an executable file include. Note this will be read on rehash,
341 - # not when the command is run.
342 -@@ -543,7 +543,7 @@
343 - # the default of 'inspircd.pid' is used. #
344 - # #
345 -
346 --#<pid file="/path/to/inspircd.pid">
347 -+<pid file="/var/run/inspircd/inspircd.pid">
348 -
349 - #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
350 - # #
351 -@@ -1041,7 +1041,7 @@
352 - # provide almost all the features of InspIRCd. :) #
353 - # #
354 - # The default does nothing -- we include it for simplicity for you. #
355 --#<include file="examples/modules.conf.example">
356 -+#<include file="/etc/inspircd/modules.conf">
357 -
358 - #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-#
359 - # #
360 -@@ -1050,13 +1050,13 @@
361 - # exemptions for services pseudoclients: #
362 - #
363 - # Anope users should uncomment this:
364 --#<include file="examples/services/anope.conf.example">
365 -+#<include file="/etc/inspircd/aliases/anope.conf">
366 - #
367 - # Atheme users should uncomment this:
368 --#<include file="examples/services/atheme.conf.example">
369 -+#<include file="/etc/inspircd/aliases/atheme.conf">
370 - #
371 - # Users of other services should uncomment this:
372 --#<include file="examples/services/generic.conf.example">
373 -+#<include file="/etc/inspircd/aliases/generic.conf">
374 -
375 - #########################################################################
376 - # #
377 -diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf
378 -similarity index 100%
379 -rename from docs/conf/links.conf.example
380 -rename to docs/conf/links.conf
381 -diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf
382 -similarity index 99%
383 -rename from docs/conf/modules.conf.example
384 -rename to docs/conf/modules.conf
385 -index 639f02335..ea51e9b67 100644
386 ---- a/docs/conf/modules.conf.example
387 -+++ b/docs/conf/modules.conf
388 -@@ -838,7 +838,7 @@
389 - # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor, #
390 - # censor, filter, flood, nickflood, noctcp, nonick, nonotice, #
391 - # regmoderated, stripcolor, and topiclock. #
392 --# See <options:exemptchanops> in inspircd.conf.example for a more #
393 -+# See <options:exemptchanops> in inspircd.conf for a more #
394 - # detailed list of the restriction modes that can be exempted. #
395 - # These are settable using: /MODE #chan +X <restriction>:<status> #
396 - #<module name="exemptchanops">
397 -@@ -874,7 +874,7 @@
398 - # Your choice of regex engine must match on all servers network-wide. #
399 - # #
400 - # To learn more about the configuration of this module, read #
401 --# examples/filter.conf.example, which covers the various types of #
402 -+# filter.conf, which covers the various types of #
403 - # filters and shows how to add exemptions. #
404 - # #
405 - #-#-#-#-#-#-#-#-#-#-#- FILTER CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-#
406 -@@ -883,7 +883,7 @@
407 - # specify below the path to the filter.conf file, or define some #
408 - # <keyword> tags. #
409 - # #
410 --#<include file="examples/filter.conf.example">
411 -+#<include file="/etc/inspircd/filter.conf">
412 -
413 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
414 - # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)#
415 -@@ -973,7 +973,7 @@
416 - # If you specify to use the helpop module, then specify below the #
417 - # path to the helpop.conf file. #
418 - # #
419 --#<include file="examples/helpop.conf.example">
420 -+#<include file="/etc/inspircd/helpop.conf">
421 -
422 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
423 - # Hide chans module: Allows users to hide their channels list from non-
424 -@@ -1551,7 +1551,7 @@
425 - # onoper - If on, the message is sent on /OPER, otherwise it's #
426 - # only sent when /OPERMOTD is used. #
427 - # #
428 --#<opermotd file="examples/opermotd.txt.example" onoper="yes">
429 -+#<opermotd file="/etc/inspircd/opermotd.txt" onoper="yes">
430 -
431 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
432 - # Override module: Adds support for oper override.
433 -@@ -2129,7 +2129,7 @@
434 - # connections in order to oper up. It is highly recommended to load
435 - # this module if you use SSL on your network.
436 - # For how to use the oper features, please see the first
437 --# example <oper> tag in opers.conf.example.
438 -+# example <oper> tag in opers.conf.
439 - #
440 - #<module name="sslinfo">
441 - #
442 -diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt
443 -similarity index 97%
444 -rename from docs/conf/motd.txt.example
445 -rename to docs/conf/motd.txt
446 -index c5266f844..34d85d965 100644
447 ---- a/docs/conf/motd.txt.example
448 -+++ b/docs/conf/motd.txt
449 -@@ -24,7 +24,7 @@
450 - `-.__ `----""" __.-'
451 - `--..____..--'
452 -
453 -- ---- To change, see motd.txt.example -----
454 -+ ---- To change, see motd.txt -----
455 - / \
456 - / * Web: https://www.inspircd.org \
457 - | * IRC: irc.inspircd.org #inspircd |
458 -diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
459 -similarity index 97%
460 -rename from docs/conf/opermotd.txt.example
461 -rename to docs/conf/opermotd.txt
462 -index 7e1c82f33..73ad28621 100644
463 ---- a/docs/conf/opermotd.txt.example
464 -+++ b/docs/conf/opermotd.txt
465 -@@ -24,7 +24,7 @@
466 - `-.__ `----""" __.-'
467 - `--..____..--'
468 -
469 -- -- To change, see opermotd.txt.example ---
470 -+ -- To change, see opermotd.txt ---
471 - / \
472 - / * Web: https://www.inspircd.org \
473 - | * IRC: irc.inspircd.org #inspircd |
474 -diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf
475 -similarity index 99%
476 -rename from docs/conf/opers.conf.example
477 -rename to docs/conf/opers.conf
478 -index 7cad2589c..082009da9 100644
479 ---- a/docs/conf/opers.conf.example
480 -+++ b/docs/conf/opers.conf
481 -@@ -178,4 +178,4 @@
482 -
483 - # Once you have edited this file you can remove this line. This is just to
484 - # ensure that you don't hastily include the file without reading it.
485 --<die reason="Using opers.conf.example without editing it is a security risk">
486 -+<die reason="Using opers.conf without editing it is a security risk">
487 -diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
488 -similarity index 100%
489 -rename from docs/conf/providers/irccloud.conf.example
490 -rename to docs/conf/providers/irccloud.conf
491 -diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
492 -similarity index 100%
493 -rename from docs/conf/providers/kiwiirc-com.conf.example
494 -rename to docs/conf/providers/kiwiirc-com.conf
495 -diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt
496 -similarity index 100%
497 -rename from docs/conf/quotes.txt.example
498 -rename to docs/conf/quotes.txt
499 -diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf
500 -similarity index 86%
501 -rename from docs/conf/services/anope.conf.example
502 -rename to docs/conf/services/anope.conf
503 -index 5c8f859ff..b1179eb8c 100644
504 ---- a/docs/conf/services/anope.conf.example
505 -+++ b/docs/conf/services/anope.conf
506 -@@ -2,7 +2,7 @@
507 - # by Anope. See https://www.anope.org for more information on Anope.
508 -
509 - # This file inherits from the generic config to avoid repetition.
510 --<include file="examples/services/generic.conf.example">
511 -+<include file="examples/services/generic.conf">
512 -
513 - # /GLOBAL <message>
514 - # Sends a global notice.
515 -diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf
516 -similarity index 98%
517 -rename from docs/conf/services/atheme.conf.example
518 -rename to docs/conf/services/atheme.conf
519 -index d509522b8..7605251db 100644
520 ---- a/docs/conf/services/atheme.conf.example
521 -+++ b/docs/conf/services/atheme.conf
522 -@@ -3,7 +3,7 @@
523 - # information on Atheme.
524 -
525 - # This file inherits from the generic config to avoid repetition.
526 --<include file="examples/services/generic.conf.example">
527 -+<include file="examples/services/generic.conf">
528 -
529 - # Long hand aliases for services pseudoclients.
530 - <alias text="ALIS" replace="SQUERY $requirement :$2-" requires="ALIS" uline="yes">
531 -diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf
532 -similarity index 100%
533 -rename from docs/conf/services/generic.conf.example
534 -rename to docs/conf/services/generic.conf
535 -diff --git a/make/template/main.mk b/make/template/main.mk
536 -index 1e6ba5cd0..3751937eb 100644
537 ---- a/make/template/main.mk
538 -+++ b/make/template/main.mk
539 -@@ -210,9 +210,9 @@ install: target
540 - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
541 - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
542 - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
543 -- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
544 -- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
545 -- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
546 -+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers
547 -+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services
548 -+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql
549 - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
550 - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
551 - @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
552 -@@ -229,10 +229,10 @@ endif
553 - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
554 - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
555 - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
556 -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
557 -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
558 -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
559 -- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
560 -+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
561 -+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers
562 -+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services
563 -+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql
564 - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
565 - @echo ""
566 - @echo "*************************************"
567 -@@ -246,7 +246,6 @@ endif
568 - @echo ' Data:' $(DATPATH)
569 - @echo 'To start the ircd, run:' $(SCRPATH)/inspircd start
570 - @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
571 -- @echo 'Examples are available at:' $(EXAPATH)
572 -
573 - GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
574 - ./configure --update
575
576 diff --git a/net-irc/inspircd/inspircd-2.0.29.ebuild b/net-irc/inspircd/inspircd-2.0.29.ebuild
577 deleted file mode 100644
578 index 5e0f22ce457..00000000000
579 --- a/net-irc/inspircd/inspircd-2.0.29.ebuild
580 +++ /dev/null
581 @@ -1,115 +0,0 @@
582 -# Copyright 1999-2020 Gentoo Authors
583 -# Distributed under the terms of the GNU General Public License v2
584 -
585 -EAPI="7"
586 -
587 -inherit toolchain-funcs
588 -
589 -DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
590 -HOMEPAGE="https://inspircd.github.com/"
591 -SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
592 -
593 -LICENSE="GPL-2"
594 -SLOT="0"
595 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
596 -IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
597 -
598 -RDEPEND="
599 - acct-group/inspircd
600 - acct-user/inspircd
601 - dev-lang/perl
602 - ssl? ( dev-libs/openssl:= )
603 - geoip? ( dev-libs/geoip )
604 - gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
605 - ldap? ( net-nds/openldap )
606 - mysql? ( dev-db/mysql-connector-c:= )
607 - postgres? ( dev-db/postgresql:= )
608 - pcre? ( dev-libs/libpcre )
609 - sqlite? ( >=dev-db/sqlite-3.0 )
610 - tre? ( dev-libs/tre )"
611 -DEPEND="${RDEPEND}"
612 -
613 -DOCS=( docs/. )
614 -PATCHES=( "${FILESDIR}"/${PN}-2.0.27-fix-path-builds.patch )
615 -
616 -src_prepare() {
617 - default
618 -
619 - # Patch the inspircd launcher with the inspircd user
620 - sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
621 -}
622 -
623 -src_configure() {
624 - local extras=""
625 -
626 - use geoip && extras+="m_geoip.cpp,"
627 - use gnutls && extras+="m_ssl_gnutls.cpp,"
628 - use ldap && extras+="m_ldapauth.cpp,m_ldapoper.cpp,"
629 - use mysql && extras+="m_mysql.cpp,"
630 - use pcre && extras+="m_regex_pcre.cpp,"
631 - use posix && extras+="m_regex_posix.cpp,"
632 - use postgres && extras+="m_pgsql.cpp,"
633 - use sqlite && extras+="m_sqlite3.cpp,"
634 - use ssl && extras+="m_ssl_openssl.cpp,"
635 - use tre && extras+="m_regex_tre.cpp,"
636 -
637 - # The first configuration run enables certain "extra" InspIRCd
638 - # modules, the second run generates the actual makefile.
639 - if [[ -n "${extras}" ]]; then
640 - ./configure --disable-interactive --enable-extras=${extras%,}
641 - fi
642 -
643 - local myconf=(
644 - --with-cc="$(tc-getCXX)"
645 - --disable-interactive
646 - --prefix="/usr/$(get_libdir)/${PN}"
647 - --config-dir="/etc/${PN}"
648 - --data-dir="/var/lib/${PN}/data"
649 - --log-dir="/var/log/${PN}"
650 - --binary-dir="/usr/bin"
651 - --module-dir="/usr/$(get_libdir)/${PN}/modules"
652 - $(usex ipv6 '' '--disable-ipv6')
653 - $(usex gnutls '--enable-gnutls' '')
654 - $(usex ssl '--enable-openssl' ''))
655 - ./configure "${myconf[@]}"
656 -}
657 -
658 -src_compile() {
659 - emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
660 -}
661 -
662 -src_install() {
663 - emake INSTUID=${PN} DESTDIR="${D}" install
664 -
665 - insinto "/usr/include/${PN}"
666 - doins -r include/.
667 -
668 - einstalldocs
669 -
670 - newinitd "${FILESDIR}/${PN}.initd" "${PN}"
671 - newconfd "${FILESDIR}/${PN}.confd" "${PN}"
672 -
673 - keepdir "/var/log/${PN}"
674 -
675 - diropts -o"${PN}" -g"${PN}" -m0700
676 - keepdir "/var/lib/${PN}/data"
677 -}
678 -
679 -pkg_postinst() {
680 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
681 - # This is a new installation
682 - elog "You will find example configuration files under "
683 - elog "/usr/share/doc/${PN}"
684 - elog "Read the ${PN}.conf.example file carefully before "
685 - elog "starting the service."
686 - fi
687 - local pv
688 - for pv in ${REPLACING_VERSIONS}; do
689 - if ver_test "${pv}" -lt "2.0.24-r1"; then
690 - elog "Starting with 2.0.24-r1 the daemon is no longer started"
691 - elog "with the --logfile option and you are thus expected to define"
692 - elog "logging in the InspIRCd configuration file if you want it."
693 - break
694 - fi
695 - done
696 -}
697
698 diff --git a/net-irc/inspircd/inspircd-3.4.0-r1.ebuild b/net-irc/inspircd/inspircd-3.4.0-r1.ebuild
699 deleted file mode 100644
700 index 174cabeb02b..00000000000
701 --- a/net-irc/inspircd/inspircd-3.4.0-r1.ebuild
702 +++ /dev/null
703 @@ -1,121 +0,0 @@
704 -# Copyright 1999-2019 Gentoo Authors
705 -# Distributed under the terms of the GNU General Public License v2
706 -
707 -EAPI="7"
708 -
709 -inherit toolchain-funcs
710 -
711 -DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
712 -HOMEPAGE="https://inspircd.github.com/"
713 -SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
714 -
715 -LICENSE="GPL-2"
716 -SLOT="0"
717 -KEYWORDS="amd64 ~ppc ~ppc64 x86"
718 -IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
719 -
720 -RDEPEND="
721 - acct-group/inspircd
722 - acct-user/inspircd
723 - dev-lang/perl
724 - gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
725 - ldap? ( net-nds/openldap )
726 - maxminddb? ( dev-libs/libmaxminddb )
727 - mbedtls? ( net-libs/mbedtls:= )
728 - mysql? ( dev-db/mysql-connector-c:= )
729 - pcre? ( dev-libs/libpcre )
730 - postgres? ( dev-db/postgresql:= )
731 - re2? ( dev-libs/re2:= )
732 - sqlite? ( >=dev-db/sqlite-3.0 )
733 - ssl? ( dev-libs/openssl:= )
734 - tre? ( dev-libs/tre )"
735 -DEPEND="${RDEPEND}"
736 -
737 -DOCS=( docs/. )
738 -PATCHES=( "${FILESDIR}"/${PN}-3.4.0-fix-path-builds.patch )
739 -
740 -src_prepare() {
741 - default
742 -
743 - # Patch the inspircd launcher with the inspircd user
744 - sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die
745 -}
746 -
747 -src_configure() {
748 - local extras=""
749 -
750 - use gnutls && extras+="m_ssl_gnutls.cpp,"
751 - use ldap && extras+="m_ldap.cpp,"
752 - use maxminddb && extras+="m_geo_maxmind.cpp,"
753 - use mbedtls && extras+="m_ssl_mbedtls.cpp,"
754 - use mysql && extras+="m_mysql.cpp,"
755 - use pcre && extras+="m_regex_pcre.cpp,"
756 - use postgres && extras+="m_pgsql.cpp,"
757 - use re2 && extras+="m_regex_re2.cpp,"
758 - use regex-posix && extras+="m_regex_posix.cpp,"
759 - use regex-stdlib && extras+="m_regex_stdlib.cpp,"
760 - use sqlite && extras+="m_sqlite3.cpp,"
761 - use ssl && extras+="m_ssl_openssl.cpp,"
762 - use sslrehashsignal && extras+="m_sslrehashsignal.cpp,"
763 - use tre && extras+="m_regex_tre.cpp,"
764 -
765 - # The first configuration run enables certain "extra" InspIRCd
766 - # modules, the second run generates the actual makefile.
767 - if [[ -n "${extras}" ]]; then
768 - ./configure --disable-interactive --enable-extras=${extras%,}
769 - fi
770 -
771 - local myconf=(
772 - --disable-interactive
773 - --disable-auto-extras
774 - --prefix="/usr/$(get_libdir)/${PN}"
775 - --config-dir="/etc/${PN}"
776 - --data-dir="/var/lib/${PN}/data"
777 - --log-dir="/var/log/${PN}"
778 - --binary-dir="/usr/bin"
779 - --module-dir="/usr/$(get_libdir)/${PN}/modules"
780 - --manual-dir="/usr/share/man")
781 - CXX="$(tc-getCXX)" ./configure "${myconf[@]}"
782 -}
783 -
784 -src_compile() {
785 - emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1
786 -}
787 -
788 -src_install() {
789 - default
790 -
791 - insinto "/usr/include/${PN}"
792 - doins -r include/.
793 -
794 - newinitd "${FILESDIR}/${PN}.initd" "${PN}"
795 - newconfd "${FILESDIR}/${PN}.confd" "${PN}"
796 -
797 - keepdir "/var/log/${PN}"
798 -
799 - diropts -o"${PN}" -g"${PN}" -m0700
800 - keepdir "/var/lib/${PN}/data"
801 -}
802 -
803 -pkg_postinst() {
804 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
805 - # This is a new installation
806 - elog "You will find example configuration files under "
807 - elog "/usr/share/doc/${PN}"
808 - elog "Read the ${PN}.conf.example file carefully before "
809 - elog "starting the service."
810 - fi
811 - local pv
812 - for pv in ${REPLACING_VERSIONS}; do
813 - if ver_test "${pv}" -lt "2.0.24-r1"; then
814 - elog "Starting with 2.0.24-r1 the daemon is no longer started"
815 - elog "with the --logfile option and you are thus expected to define"
816 - elog "logging in the InspIRCd configuration file if you want it."
817 - fi
818 - if ver_test "${pv}" -lt "3.0.0"; then
819 - elog "Version 3.0 is a major upgrade which contains breaking"
820 - elog "changes. You will need to update your configuration files."
821 - elog "See: https://docs.inspircd.org/3/configuration-changes"
822 - fi
823 - done
824 -}
Report Message
Find on MARC Find on Google Groups