1 |
commit: 8651d910c504a5685f6a33f8c82274887b431251 |
2 |
Author: Wade Cline <wadecline <AT> hotmail <DOT> com> |
3 |
AuthorDate: Sun May 23 07:26:46 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 28 03:14:41 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8651d910 |
7 |
|
8 |
net-irc/inspircd: Add 3.10.0 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
RepoMan-Options: --force |
12 |
Bug: https://bugs.gentoo.org/791589 |
13 |
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/20942 |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
net-irc/inspircd/Manifest | 1 + |
18 |
.../files/inspircd-3.10.0-fix-path-builds.patch | 493 +++++++++++++++++++++ |
19 |
net-irc/inspircd/inspircd-3.10.0.ebuild | 121 +++++ |
20 |
3 files changed, 615 insertions(+) |
21 |
|
22 |
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest |
23 |
index 4e88d3d671d..0d3fc592437 100644 |
24 |
--- a/net-irc/inspircd/Manifest |
25 |
+++ b/net-irc/inspircd/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
+DIST inspircd-3.10.0.tar.gz 854024 BLAKE2B b6aed621c6c5c4ea082d07605c6a9fe8be5fce04896c820a9055b17103853b0091515f8a52448ecb1accbe39eef3f49b01acbecae73894b76f91bb4b75edf821 SHA512 6cb1c66ce2a4531628264fc4b4836b47b7cba2c8aa6ffef5d72489ae663815254783b09aeb149d8ae9e41cf51be3c703612d443da84995695449a94db86f8944 |
28 |
DIST inspircd-3.9.0.tar.gz 853862 BLAKE2B 68134412f12ac06dc5ab5f9ffc94cb6053d88430210cb516e3569aad5e06dacd985038f51e057c9d7bd88179f472f685be5cd6fb31031e79948b0d3aee60eac3 SHA512 2adc4c39fc80d0095a9157a4c72f1df8288c364d909b2200eb04fb7e6bf5eb6172fe80153b79fdd437882d0b252999abad5912cef28f29cbceb9ab540df8db70 |
29 |
|
30 |
diff --git a/net-irc/inspircd/files/inspircd-3.10.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.10.0-fix-path-builds.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..e1def8043c5 |
33 |
--- /dev/null |
34 |
+++ b/net-irc/inspircd/files/inspircd-3.10.0-fix-path-builds.patch |
35 |
@@ -0,0 +1,493 @@ |
36 |
+diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.conf |
37 |
+similarity index 100% |
38 |
+rename from docs/conf/codepages/ascii.conf.example |
39 |
+rename to docs/conf/codepages/ascii.conf |
40 |
+diff --git a/docs/conf/codepages/iso-8859-1.conf.example b/docs/conf/codepages/iso-8859-1.conf.example |
41 |
+deleted file mode 100644 |
42 |
+index 83a772600..000000000 |
43 |
+--- a/docs/conf/codepages/iso-8859-1.conf.example |
44 |
++++ /dev/null |
45 |
+@@ -1,42 +0,0 @@ |
46 |
+-# This file contains ISO 8859-1 codepage rules for use with the codepage module. |
47 |
+- |
48 |
+-<codepage name="iso-8859-1"> |
49 |
+- |
50 |
+-<cpchars begin="192" end="214" front="yes"> # ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ |
51 |
+-<cpchars begin="216" end="246" front="yes"> # ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö |
52 |
+-<cpchars begin="248" end="255" front="yes"> # øùúûüýþÿ |
53 |
+- |
54 |
+-<cpcase lower="83" upper="223"> # ß => S |
55 |
+-<cpcase lower="192" upper="224"> # à => À |
56 |
+-<cpcase lower="193" upper="225"> # á => Á |
57 |
+-<cpcase lower="194" upper="226"> # â => Â |
58 |
+-<cpcase lower="195" upper="227"> # ã => Ã |
59 |
+-<cpcase lower="196" upper="228"> # ä => Ä |
60 |
+-<cpcase lower="197" upper="229"> # å => Å |
61 |
+-<cpcase lower="198" upper="230"> # æ => Æ |
62 |
+-<cpcase lower="199" upper="231"> # ç => Ç |
63 |
+-<cpcase lower="200" upper="232"> # è => È |
64 |
+-<cpcase lower="201" upper="233"> # é => É |
65 |
+-<cpcase lower="202" upper="234"> # ê => Ê |
66 |
+-<cpcase lower="203" upper="235"> # ë => Ë |
67 |
+-<cpcase lower="204" upper="236"> # ì => Ì |
68 |
+-<cpcase lower="205" upper="237"> # í => Í |
69 |
+-<cpcase lower="206" upper="238"> # î => Î |
70 |
+-<cpcase lower="207" upper="239"> # ï => Ï |
71 |
+-<cpcase lower="208" upper="240"> # ð => Ð |
72 |
+-<cpcase lower="209" upper="241"> # ñ => Ñ |
73 |
+-<cpcase lower="210" upper="242"> # ò => Ò |
74 |
+-<cpcase lower="211" upper="243"> # ó => Ó |
75 |
+-<cpcase lower="212" upper="244"> # ô => Ô |
76 |
+-<cpcase lower="213" upper="245"> # õ => Õ |
77 |
+-<cpcase lower="214" upper="246"> # ö => Ö |
78 |
+-<cpcase lower="216" upper="248"> # ø => Ø |
79 |
+-<cpcase lower="217" upper="249"> # ù => Ù |
80 |
+-<cpcase lower="218" upper="250"> # ú => Ú |
81 |
+-<cpcase lower="219" upper="251"> # û => Û |
82 |
+-<cpcase lower="220" upper="252"> # ü => Ü |
83 |
+-<cpcase lower="221" upper="253"> # ý => Ý |
84 |
+-<cpcase lower="222" upper="254"> # þ => Þ |
85 |
+- |
86 |
+-# Include the ASCII rules to avoid duplication. |
87 |
+-<include file="examples/codepages/ascii.conf.example"> |
88 |
+diff --git a/docs/conf/codepages/iso-8859-2.conf.example b/docs/conf/codepages/iso-8859-2.conf.example |
89 |
+deleted file mode 100644 |
90 |
+index df41d88fb..000000000 |
91 |
+--- a/docs/conf/codepages/iso-8859-2.conf.example |
92 |
++++ /dev/null |
93 |
+@@ -1,60 +0,0 @@ |
94 |
+-# This file contains ISO 8859-2 codepage rules for use with the codepage module. |
95 |
+- |
96 |
+-<codepage name="iso-8859-2"> |
97 |
+- |
98 |
+-<cpchars index="161" front="yes"> # Ą |
99 |
+-<cpchars index="163" front="yes"> # Ł |
100 |
+-<cpchars begin="165" end="166" front="yes"> # ĽŚ |
101 |
+-<cpchars begin="169" end="172" front="yes"> # ŠŞŤŹ |
102 |
+-<cpchars begin="174" end="175" front="yes"> # ŽŻ |
103 |
+-<cpchars index="177" front="yes"> # ą |
104 |
+-<cpchars index="179" front="yes"> # ł |
105 |
+-<cpchars begin="181" end="182" front="yes"> # ľś |
106 |
+-<cpchars begin="185" end="188" front="yes"> # šşťź |
107 |
+-<cpchars begin="190" end="214" front="yes"> # žżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ |
108 |
+-<cpchars begin="216" end="246" front="yes"> # ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö |
109 |
+-<cpchars begin="248" end="254" front="yes"> # řůúűüýţ |
110 |
+- |
111 |
+-<cpcase lower="177" upper="161"> # ą => Ą |
112 |
+-<cpcase lower="179" upper="163"> # ł => Ł |
113 |
+-<cpcase lower="181" upper="165"> # ľ => Ľ |
114 |
+-<cpcase lower="182" upper="166"> # ś => Ś |
115 |
+-<cpcase lower="185" upper="169"> # š => Š |
116 |
+-<cpcase lower="186" upper="170"> # ş => Ş |
117 |
+-<cpcase lower="187" upper="171"> # ť => Ť |
118 |
+-<cpcase lower="188" upper="172"> # ź => Ź |
119 |
+-<cpcase lower="190" upper="174"> # ž => Ž |
120 |
+-<cpcase lower="191" upper="175"> # ż => Ż |
121 |
+-<cpcase lower="224" upper="192"> # ŕ => Ŕ |
122 |
+-<cpcase lower="225" upper="193"> # á => Á |
123 |
+-<cpcase lower="226" upper="194"> # â => Â |
124 |
+-<cpcase lower="227" upper="195"> # ă => Ă |
125 |
+-<cpcase lower="228" upper="196"> # ä => Ä |
126 |
+-<cpcase lower="229" upper="197"> # ĺ => Ĺ |
127 |
+-<cpcase lower="230" upper="198"> # ć => Ć |
128 |
+-<cpcase lower="231" upper="199"> # ç => Ç |
129 |
+-<cpcase lower="232" upper="200"> # č => Č |
130 |
+-<cpcase lower="233" upper="201"> # é => É |
131 |
+-<cpcase lower="234" upper="202"> # ę => Ę |
132 |
+-<cpcase lower="235" upper="203"> # ë => Ë |
133 |
+-<cpcase lower="236" upper="204"> # ě => Ě |
134 |
+-<cpcase lower="237" upper="205"> # í => Í |
135 |
+-<cpcase lower="238" upper="206"> # î => Î |
136 |
+-<cpcase lower="239" upper="207"> # ď => Ď |
137 |
+-<cpcase lower="240" upper="208"> # đ => Đ |
138 |
+-<cpcase lower="241" upper="209"> # ń => Ń |
139 |
+-<cpcase lower="242" upper="210"> # ň => Ň |
140 |
+-<cpcase lower="243" upper="211"> # ó => Ó |
141 |
+-<cpcase lower="244" upper="212"> # ô => Ô |
142 |
+-<cpcase lower="245" upper="213"> # ő => Ő |
143 |
+-<cpcase lower="246" upper="214"> # ö => Ö |
144 |
+-<cpcase lower="248" upper="216"> # ř => Ř |
145 |
+-<cpcase lower="249" upper="217"> # ů => Ů |
146 |
+-<cpcase lower="250" upper="218"> # ú => Ú |
147 |
+-<cpcase lower="251" upper="219"> # ű => Ű |
148 |
+-<cpcase lower="252" upper="220"> # ü => Ü |
149 |
+-<cpcase lower="253" upper="221"> # ý => Ý |
150 |
+-<cpcase lower="254" upper="222"> # ţ => Ţ |
151 |
+- |
152 |
+-# Include the ASCII rules to avoid duplication. |
153 |
+-<include file="examples/codepages/ascii.conf.example"> |
154 |
+diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.conf |
155 |
+similarity index 100% |
156 |
+rename from docs/conf/codepages/rfc1459.conf.example |
157 |
+rename to docs/conf/codepages/rfc1459.conf |
158 |
+diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.conf |
159 |
+similarity index 100% |
160 |
+rename from docs/conf/codepages/strict-rfc1459.conf.example |
161 |
+rename to docs/conf/codepages/strict-rfc1459.conf |
162 |
+diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf |
163 |
+similarity index 100% |
164 |
+rename from docs/conf/filter.conf.example |
165 |
+rename to docs/conf/filter.conf |
166 |
+diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf |
167 |
+similarity index 100% |
168 |
+rename from docs/conf/helpop.conf.example |
169 |
+rename to docs/conf/helpop.conf |
170 |
+diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf |
171 |
+similarity index 99% |
172 |
+rename from docs/conf/inspircd.conf.example |
173 |
+rename to docs/conf/inspircd.conf |
174 |
+index f07f21cdd..a731c0c1c 100644 |
175 |
+--- a/docs/conf/inspircd.conf.example |
176 |
++++ b/docs/conf/inspircd.conf |
177 |
+@@ -242,7 +242,7 @@ |
178 |
+ # This can be done by using <connect registered="no"> # |
179 |
+ |
180 |
+ # To enable IRCCloud on your network uncomment this: |
181 |
+-#<include file="examples/providers/irccloud.conf.example"> |
182 |
++#<include file="/etc/inspircd/providers/irccloud.conf"> |
183 |
+ |
184 |
+ # A connect class with <connect:deny> set denies connections from the specified host/IP range. |
185 |
+ <connect |
186 |
+@@ -494,11 +494,11 @@ |
187 |
+ |
188 |
+ # This file has all the information about oper classes, types and o:lines. |
189 |
+ # You *MUST* edit it. |
190 |
+-#<include file="examples/opers.conf.example"> |
191 |
++#<include file="/etc/inspircd/opers.conf"> |
192 |
+ |
193 |
+ # This file has all the information about server links and ulined servers. |
194 |
+ # You *MUST* edit it if you intend to link servers. |
195 |
+-#<include file="examples/links.conf.example"> |
196 |
++#<include file="/etc/inspircd/links.conf"> |
197 |
+ |
198 |
+ #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# |
199 |
+ # # |
200 |
+@@ -507,7 +507,7 @@ |
201 |
+ # |
202 |
+ # motd - displayed on connect and when a user executes /MOTD |
203 |
+ # Modules can also define their own files |
204 |
+-<files motd="examples/motd.txt.example"> |
205 |
++<files motd="/etc/inspircd/motd.txt"> |
206 |
+ |
207 |
+ # Example of an executable file include. Note this will be read on rehash, |
208 |
+ # not when the command is run. |
209 |
+@@ -543,7 +543,7 @@ |
210 |
+ # default of 'inspircd.pid' is used. # |
211 |
+ # # |
212 |
+ |
213 |
+-#<pid file="/path/to/inspircd.pid"> |
214 |
++#<pid file="/var/run/inspircd/inspircd.pid"> |
215 |
+ |
216 |
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-# |
217 |
+ # # |
218 |
+@@ -698,7 +698,7 @@ |
219 |
+ # - topiclock Channel mode +t - limits changing the topic to (half)ops |
220 |
+ # You can also configure this on a per-channel basis with a channel mode and |
221 |
+ # even negate the configured exemptions below. |
222 |
+- # See exemptchanops in modules.conf.example for more details. |
223 |
++ # See exemptchanops in modules.conf for more details. |
224 |
+ exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o" |
225 |
+ |
226 |
+ # invitebypassmodes: This allows /INVITE to bypass other channel modes. |
227 |
+@@ -1041,7 +1041,7 @@ |
228 |
+ # provide almost all the features of InspIRCd. :) # |
229 |
+ # # |
230 |
+ # The default does nothing -- we include it for simplicity for you. # |
231 |
+-#<include file="examples/modules.conf.example"> |
232 |
++#<include file="/etc/inspircd/modules.conf"> |
233 |
+ |
234 |
+ #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-# |
235 |
+ # # |
236 |
+@@ -1050,13 +1050,13 @@ |
237 |
+ # exemptions for services pseudoclients: # |
238 |
+ # |
239 |
+ # Anope users should uncomment this: |
240 |
+-#<include file="examples/services/anope.conf.example"> |
241 |
++#<include file="/etc/inspircd/aliases/anope.conf"> |
242 |
+ # |
243 |
+ # Atheme users should uncomment this: |
244 |
+-#<include file="examples/services/atheme.conf.example"> |
245 |
++#<include file="/etc/inspircd/aliases/atheme.conf"> |
246 |
+ # |
247 |
+ # Users of other services should uncomment this: |
248 |
+-#<include file="examples/services/generic.conf.example"> |
249 |
++#<include file="/etc/inspircd/aliases/generic.conf"> |
250 |
+ |
251 |
+ ######################################################################### |
252 |
+ # # |
253 |
+diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf |
254 |
+similarity index 98% |
255 |
+rename from docs/conf/links.conf.example |
256 |
+rename to docs/conf/links.conf |
257 |
+index 19d770d35..32986de9d 100644 |
258 |
+--- a/docs/conf/links.conf.example |
259 |
++++ b/docs/conf/links.conf |
260 |
+@@ -143,4 +143,4 @@ |
261 |
+ |
262 |
+ # Once you have edited this file you can remove this line. This is just to |
263 |
+ # ensure that you don't hastily include the file without reading it. |
264 |
+-<die reason="Using links.conf.example without editing it is a security risk"> |
265 |
++<die reason="Using links.conf without editing it is a security risk"> |
266 |
+diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf |
267 |
+similarity index 99% |
268 |
+rename from docs/conf/modules.conf.example |
269 |
+rename to docs/conf/modules.conf |
270 |
+index 6eb61cc38..feed59e18 100644 |
271 |
+--- a/docs/conf/modules.conf.example |
272 |
++++ b/docs/conf/modules.conf |
273 |
+@@ -617,11 +617,11 @@ |
274 |
+ #<module name="codepage"> |
275 |
+ # |
276 |
+ # You should include one of the following files to set your codepage: |
277 |
+-#<include file="examples/codepages/ascii.conf.example"> |
278 |
+-#<include file="examples/codepages/iso-8859-1.conf.example"> |
279 |
+-#<include file="examples/codepages/iso-8859-2.conf.example"> |
280 |
+-#<include file="examples/codepages/rfc1459.conf.example"> |
281 |
+-#<include file="examples/codepages/strict-rfc1459.conf.example"> |
282 |
++#<include file="/etc/inspircd/codepages/ascii.conf.example"> |
283 |
++#<include file="/etc/inspircd/codepages/iso-8859-1.conf.example"> |
284 |
++#<include file="/etc/inspircd/codepages/iso-8859-2.conf.example"> |
285 |
++#<include file="/etc/inspircd/codepages/rfc1459.conf.example"> |
286 |
++#<include file="/etc/inspircd/codepages/strict-rfc1459.conf.example"> |
287 |
+ # |
288 |
+ # You can also define a custom codepage. For details on how to do this |
289 |
+ # please refer to the docs site: |
290 |
+@@ -905,7 +905,7 @@ |
291 |
+ # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor, # |
292 |
+ # censor, filter, flood, nickflood, noctcp, nonick, nonotice, # |
293 |
+ # regmoderated, stripcolor, and topiclock. # |
294 |
+-# See <options:exemptchanops> in inspircd.conf.example for a more # |
295 |
++# See <options:exemptchanops> in inspircd.conf for a more # |
296 |
+ # detailed list of the restriction modes that can be exempted. # |
297 |
+ # These are settable using: /MODE #chan +X <restriction>:<status> # |
298 |
+ # Furthermore, the exemptions configured in <options:exemptchanops> # |
299 |
+@@ -943,7 +943,7 @@ |
300 |
+ # Your choice of regex engine must match on all servers network-wide. # |
301 |
+ # # |
302 |
+ # To learn more about the configuration of this module, read # |
303 |
+-# examples/filter.conf.example, which covers the various types of # |
304 |
++# filter.conf, which covers the various types of # |
305 |
+ # filters and shows how to add exemptions. # |
306 |
+ # # |
307 |
+ #-#-#-#-#-#-#-#-#-#-#- FILTER CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-# |
308 |
+@@ -952,7 +952,7 @@ |
309 |
+ # specify below the path to the filter.conf file, or define some # |
310 |
+ # <keyword> tags. # |
311 |
+ # # |
312 |
+-#<include file="examples/filter.conf.example"> |
313 |
++#<include file="/etc/inspircd/filter.conf"> |
314 |
+ |
315 |
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# |
316 |
+ # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)# |
317 |
+@@ -1042,7 +1042,7 @@ |
318 |
+ # If you specify to use the helpop module, then specify below the # |
319 |
+ # path to the helpop.conf file. # |
320 |
+ # # |
321 |
+-#<include file="examples/helpop.conf.example"> |
322 |
++#<include file="/etc/inspircd/helpop.conf"> |
323 |
+ |
324 |
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# |
325 |
+ # Hide chans module: Allows users to hide their channels list from non- |
326 |
+@@ -1647,7 +1647,7 @@ |
327 |
+ # onoper - If on, the message is sent on /OPER, otherwise it's # |
328 |
+ # only sent when /OPERMOTD is used. # |
329 |
+ # # |
330 |
+-#<opermotd file="examples/opermotd.txt.example" onoper="yes"> |
331 |
++#<opermotd file="/etc/inspircd/opermotd.txt" onoper="yes"> |
332 |
+ |
333 |
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# |
334 |
+ # Override module: Adds support for oper override. |
335 |
+@@ -2261,7 +2261,7 @@ |
336 |
+ # connections in order to oper up. It is highly recommended to load |
337 |
+ # this module if you use TLS (SSL) on your network. |
338 |
+ # For how to use the oper features, please see the first |
339 |
+-# example <oper> tag in opers.conf.example. |
340 |
++# example <oper> tag in opers.conf. |
341 |
+ # |
342 |
+ #<module name="sslinfo"> |
343 |
+ # |
344 |
+diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt |
345 |
+similarity index 96% |
346 |
+rename from docs/conf/motd.txt.example |
347 |
+rename to docs/conf/motd.txt |
348 |
+index cd993e9a3..0687a8aa0 100644 |
349 |
+--- a/docs/conf/motd.txt.example |
350 |
++++ b/docs/conf/motd.txt |
351 |
+@@ -21,7 +21,7 @@ |
352 |
+ \__/ /(_/ \__/ |
353 |
+ (__/ |
354 |
+ |
355 |
+- +---- To change this see \bmotd.txt.example\x ----+ |
356 |
++ +---- To change this see \bmotd.txt \x ----+ |
357 |
+ | | |
358 |
+ | * \bWeb:\x https://www.inspircd.org | |
359 |
+ | * \bIRC:\x irc.inspircd.org #inspircd | |
360 |
+diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt |
361 |
+similarity index 96% |
362 |
+rename from docs/conf/opermotd.txt.example |
363 |
+rename to docs/conf/opermotd.txt |
364 |
+index b0d9b4816..b0d37f385 100644 |
365 |
+--- a/docs/conf/opermotd.txt.example |
366 |
++++ b/docs/conf/opermotd.txt |
367 |
+@@ -21,7 +21,7 @@ |
368 |
+ \__/ /(_/ \__/ |
369 |
+ (__/ |
370 |
+ |
371 |
+- +-- To change this see \bopermotd.txt.example\x --+ |
372 |
++ +-- To change this see \bopermotd.txt \x --+ |
373 |
+ | | |
374 |
+ | * \bWeb:\x https://www.inspircd.org | |
375 |
+ | * \bIRC:\x irc.inspircd.org #inspircd | |
376 |
+diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf |
377 |
+similarity index 99% |
378 |
+rename from docs/conf/opers.conf.example |
379 |
+rename to docs/conf/opers.conf |
380 |
+index d8c266b1f..9517b3685 100644 |
381 |
+--- a/docs/conf/opers.conf.example |
382 |
++++ b/docs/conf/opers.conf |
383 |
+@@ -182,4 +182,4 @@ |
384 |
+ |
385 |
+ # Once you have edited this file you can remove this line. This is just to |
386 |
+ # ensure that you don't hastily include the file without reading it. |
387 |
+-<die reason="Using opers.conf.example without editing it is a security risk"> |
388 |
++<die reason="Using opers.conf without editing it is a security risk"> |
389 |
+diff --git a/docs/conf/providers/dronebl.conf.example b/docs/conf/providers/dronebl.conf.example |
390 |
+deleted file mode 100644 |
391 |
+index 72055d522..000000000 |
392 |
+--- a/docs/conf/providers/dronebl.conf.example |
393 |
++++ /dev/null |
394 |
+@@ -1,11 +0,0 @@ |
395 |
+-# This file contains configuration for using the dnsbl module with |
396 |
+-# the DroneBL DNSBL. See https://dronebl.org/ for more information on |
397 |
+-# DroneBL. |
398 |
+- |
399 |
+-<dnsbl name="DroneBL" |
400 |
+- domain="dnsbl.dronebl.org" |
401 |
+- type="record" |
402 |
+- records="3,5,6,7,8,9,10,11,13,14,15,16,17,19" |
403 |
+- action="zline" |
404 |
+- duration="7d" |
405 |
+- reason="You are listed in DroneBL. Please visit https://dronebl.org/lookup.do?ip=%ip% for more information."> |
406 |
+diff --git a/docs/conf/providers/efnet-rbl.conf.example b/docs/conf/providers/efnet-rbl.conf.example |
407 |
+deleted file mode 100644 |
408 |
+index 78dce53cb..000000000 |
409 |
+--- a/docs/conf/providers/efnet-rbl.conf.example |
410 |
++++ /dev/null |
411 |
+@@ -1,11 +0,0 @@ |
412 |
+-# This file contains configuration for using the dnsbl module with |
413 |
+-# the EFnet RBL. See https://rbl.efnetrbl.org/ for more information |
414 |
+-# on the EFnet RBL. |
415 |
+- |
416 |
+-<dnsbl name="EFnet RBL" |
417 |
+- domain="rbl.efnetrbl.org" |
418 |
+- type="record" |
419 |
+- records="1,2,3,4,5" |
420 |
+- action="zline" |
421 |
+- duration="7d" |
422 |
+- reason="You are listed in the EFnet RBL. Please visit https://rbl.efnetrbl.org/?i=%ip% for more information."> |
423 |
+diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf |
424 |
+similarity index 100% |
425 |
+rename from docs/conf/providers/irccloud.conf.example |
426 |
+rename to docs/conf/providers/irccloud.conf |
427 |
+diff --git a/docs/conf/providers/torexit.conf.example b/docs/conf/providers/torexit.conf.example |
428 |
+deleted file mode 100644 |
429 |
+index abc35c696..000000000 |
430 |
+--- a/docs/conf/providers/torexit.conf.example |
431 |
++++ /dev/null |
432 |
+@@ -1,12 +0,0 @@ |
433 |
+-# This file contains configuration for using the dnsbl module with |
434 |
+-# the dan.me.uk Tor exit node DNSBL. See https://www.dan.me.uk/dnsbl |
435 |
+-# for more information on the dan.me.uk Tor exit node DNSBL. |
436 |
+- |
437 |
+-<dnsbl name="torexit.dan.me.uk" |
438 |
+- domain="torexit.dan.me.uk" |
439 |
+- type="record" |
440 |
+- records="100" |
441 |
+- timeout="10s" |
442 |
+- action="zline" |
443 |
+- duration="7d" |
444 |
+- reason="Tor exit nodes are not allowed on this network. See https://metrics.torproject.org/rs.html#search/%ip% for more information."> |
445 |
+diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt |
446 |
+similarity index 100% |
447 |
+rename from docs/conf/quotes.txt.example |
448 |
+rename to docs/conf/quotes.txt |
449 |
+diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf |
450 |
+similarity index 86% |
451 |
+rename from docs/conf/services/anope.conf.example |
452 |
+rename to docs/conf/services/anope.conf |
453 |
+index 5c8f859ff..69a1ab50a 100644 |
454 |
+--- a/docs/conf/services/anope.conf.example |
455 |
++++ b/docs/conf/services/anope.conf |
456 |
+@@ -2,7 +2,7 @@ |
457 |
+ # by Anope. See https://www.anope.org for more information on Anope. |
458 |
+ |
459 |
+ # This file inherits from the generic config to avoid repetition. |
460 |
+-<include file="examples/services/generic.conf.example"> |
461 |
++<include file="/etc/inspircd/services/generic.conf"> |
462 |
+ |
463 |
+ # /GLOBAL <message> |
464 |
+ # Sends a global notice. |
465 |
+diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf |
466 |
+similarity index 98% |
467 |
+rename from docs/conf/services/atheme.conf.example |
468 |
+rename to docs/conf/services/atheme.conf |
469 |
+index d509522b8..c1e906ff7 100644 |
470 |
+--- a/docs/conf/services/atheme.conf.example |
471 |
++++ b/docs/conf/services/atheme.conf |
472 |
+@@ -3,7 +3,7 @@ |
473 |
+ # information on Atheme. |
474 |
+ |
475 |
+ # This file inherits from the generic config to avoid repetition. |
476 |
+-<include file="examples/services/generic.conf.example"> |
477 |
++<include file="/etc/inspircd/services/generic.conf"> |
478 |
+ |
479 |
+ # Long hand aliases for services pseudoclients. |
480 |
+ <alias text="ALIS" replace="SQUERY $requirement :$2-" requires="ALIS" uline="yes"> |
481 |
+diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf |
482 |
+similarity index 100% |
483 |
+rename from docs/conf/services/generic.conf.example |
484 |
+rename to docs/conf/services/generic.conf |
485 |
+diff --git a/make/template/main.mk b/make/template/main.mk |
486 |
+index a8783aa05..de9bbaa4e 100644 |
487 |
+--- a/make/template/main.mk |
488 |
++++ b/make/template/main.mk |
489 |
+@@ -214,10 +214,10 @@ install: target |
490 |
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH) |
491 |
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH) |
492 |
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH) |
493 |
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/codepages |
494 |
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers |
495 |
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services |
496 |
+- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql |
497 |
++ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/codepages |
498 |
++ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers |
499 |
++ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services |
500 |
++ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql |
501 |
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH) |
502 |
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH) |
503 |
+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH) |
504 |
+@@ -238,11 +238,11 @@ endif |
505 |
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.1 $(MANPATH) 2>/dev/null |
506 |
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null |
507 |
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null |
508 |
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH) |
509 |
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages |
510 |
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers |
511 |
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services |
512 |
+- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql |
513 |
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH) |
514 |
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/* $(CONPATH)/codepages |
515 |
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers |
516 |
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services |
517 |
++ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql |
518 |
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH) |
519 |
+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null |
520 |
+ @echo "" |
521 |
+@@ -256,7 +256,6 @@ endif |
522 |
+ @echo ' Data:' $(DATPATH) |
523 |
+ @echo 'To start the ircd, run:' $(SCRPATH)/inspircd start |
524 |
+ @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf |
525 |
+- @echo 'Examples are available at:' $(EXAPATH) |
526 |
+ |
527 |
+ GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@ |
528 |
+ ./configure --update |
529 |
|
530 |
diff --git a/net-irc/inspircd/inspircd-3.10.0.ebuild b/net-irc/inspircd/inspircd-3.10.0.ebuild |
531 |
new file mode 100644 |
532 |
index 00000000000..3dfa1dea335 |
533 |
--- /dev/null |
534 |
+++ b/net-irc/inspircd/inspircd-3.10.0.ebuild |
535 |
@@ -0,0 +1,121 @@ |
536 |
+# Copyright 1999-2021 Gentoo Authors |
537 |
+# Distributed under the terms of the GNU General Public License v2 |
538 |
+ |
539 |
+EAPI="7" |
540 |
+ |
541 |
+inherit toolchain-funcs |
542 |
+ |
543 |
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" |
544 |
+HOMEPAGE="https://www.inspircd.org/" |
545 |
+SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
546 |
+ |
547 |
+LICENSE="GPL-2" |
548 |
+SLOT="0" |
549 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
550 |
+IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre" |
551 |
+ |
552 |
+RDEPEND=" |
553 |
+ acct-group/inspircd |
554 |
+ acct-user/inspircd |
555 |
+ dev-lang/perl |
556 |
+ gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) |
557 |
+ ldap? ( net-nds/openldap ) |
558 |
+ maxminddb? ( dev-libs/libmaxminddb ) |
559 |
+ mbedtls? ( net-libs/mbedtls:= ) |
560 |
+ mysql? ( dev-db/mysql-connector-c:= ) |
561 |
+ pcre? ( dev-libs/libpcre ) |
562 |
+ postgres? ( dev-db/postgresql:= ) |
563 |
+ re2? ( dev-libs/re2:= ) |
564 |
+ sqlite? ( >=dev-db/sqlite-3.0 ) |
565 |
+ ssl? ( dev-libs/openssl:= ) |
566 |
+ tre? ( dev-libs/tre )" |
567 |
+DEPEND="${RDEPEND}" |
568 |
+ |
569 |
+DOCS=( docs/. ) |
570 |
+PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch ) |
571 |
+ |
572 |
+src_prepare() { |
573 |
+ default |
574 |
+ |
575 |
+ # Patch the inspircd launcher with the inspircd user |
576 |
+ sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die |
577 |
+} |
578 |
+ |
579 |
+src_configure() { |
580 |
+ local extras="" |
581 |
+ |
582 |
+ use gnutls && extras+="m_ssl_gnutls.cpp," |
583 |
+ use ldap && extras+="m_ldap.cpp," |
584 |
+ use maxminddb && extras+="m_geo_maxmind.cpp," |
585 |
+ use mbedtls && extras+="m_ssl_mbedtls.cpp," |
586 |
+ use mysql && extras+="m_mysql.cpp," |
587 |
+ use pcre && extras+="m_regex_pcre.cpp," |
588 |
+ use postgres && extras+="m_pgsql.cpp," |
589 |
+ use re2 && extras+="m_regex_re2.cpp," |
590 |
+ use regex-posix && extras+="m_regex_posix.cpp," |
591 |
+ use regex-stdlib && extras+="m_regex_stdlib.cpp," |
592 |
+ use sqlite && extras+="m_sqlite3.cpp," |
593 |
+ use ssl && extras+="m_ssl_openssl.cpp," |
594 |
+ use sslrehashsignal && extras+="m_sslrehashsignal.cpp," |
595 |
+ use tre && extras+="m_regex_tre.cpp," |
596 |
+ |
597 |
+ # The first configuration run enables certain "extra" InspIRCd |
598 |
+ # modules, the second run generates the actual makefile. |
599 |
+ if [[ -n "${extras}" ]]; then |
600 |
+ ./configure --disable-interactive --enable-extras=${extras%,} |
601 |
+ fi |
602 |
+ |
603 |
+ local myconf=( |
604 |
+ --disable-interactive |
605 |
+ --disable-auto-extras |
606 |
+ --prefix="/usr/$(get_libdir)/${PN}" |
607 |
+ --config-dir="/etc/${PN}" |
608 |
+ --data-dir="/var/lib/${PN}/data" |
609 |
+ --log-dir="/var/log/${PN}" |
610 |
+ --binary-dir="/usr/bin" |
611 |
+ --module-dir="/usr/$(get_libdir)/${PN}/modules" |
612 |
+ --manual-dir="/usr/share/man") |
613 |
+ CXX="$(tc-getCXX)" ./configure "${myconf[@]}" |
614 |
+} |
615 |
+ |
616 |
+src_compile() { |
617 |
+ emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1 |
618 |
+} |
619 |
+ |
620 |
+src_install() { |
621 |
+ default |
622 |
+ |
623 |
+ insinto "/usr/include/${PN}" |
624 |
+ doins -r include/. |
625 |
+ |
626 |
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
627 |
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}" |
628 |
+ |
629 |
+ keepdir "/var/log/${PN}" |
630 |
+ |
631 |
+ diropts -o"${PN}" -g"${PN}" -m0700 |
632 |
+ keepdir "/var/lib/${PN}/data" |
633 |
+} |
634 |
+ |
635 |
+pkg_postinst() { |
636 |
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then |
637 |
+ # This is a new installation |
638 |
+ elog "You will find example configuration files under " |
639 |
+ elog "/usr/share/doc/${PN}" |
640 |
+ elog "Read the ${PN}.conf.example file carefully before " |
641 |
+ elog "starting the service." |
642 |
+ fi |
643 |
+ local pv |
644 |
+ for pv in ${REPLACING_VERSIONS}; do |
645 |
+ if ver_test "${pv}" -lt "2.0.24-r1"; then |
646 |
+ elog "Starting with 2.0.24-r1 the daemon is no longer started" |
647 |
+ elog "with the --logfile option and you are thus expected to define" |
648 |
+ elog "logging in the InspIRCd configuration file if you want it." |
649 |
+ fi |
650 |
+ if ver_test "${pv}" -lt "3.0.0"; then |
651 |
+ elog "Version 3.0 is a major upgrade which contains breaking" |
652 |
+ elog "changes. You will need to update your configuration files." |
653 |
+ elog "See: https://docs.inspircd.org/3/configuration-changes" |
654 |
+ fi |
655 |
+ done |
656 |
+} |