Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/shadowircd/, profiles/, net-irc/shadowircd/files/
Date: Sat, 20 Apr 2019 23:26:48
Message-Id: 1555747328.52a188be6bff606c21bdce4677a8d20c2219c0f2.mgorny@gentoo
1 commit: 52a188be6bff606c21bdce4677a8d20c2219c0f2
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 20 08:02:08 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 20 08:02:08 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52a188be
7
8 net-irc/shadowircd: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/674528
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 net-irc/shadowircd/Manifest | 1 -
14 net-irc/shadowircd/files/format-security.patch | 384 -------------------------
15 net-irc/shadowircd/files/shadowircd.confd | 6 -
16 net-irc/shadowircd/files/shadowircd.initd-r1 | 26 --
17 net-irc/shadowircd/metadata.xml | 10 -
18 net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild | 95 ------
19 profiles/package.mask | 2 -
20 7 files changed, 524 deletions(-)
21
22 diff --git a/net-irc/shadowircd/Manifest b/net-irc/shadowircd/Manifest
23 deleted file mode 100644
24 index 62e6e18fb83..00000000000
25 --- a/net-irc/shadowircd/Manifest
26 +++ /dev/null
27 @@ -1 +0,0 @@
28 -DIST shadowircd-6.3.3.tar.gz 1980432 BLAKE2B d9f443011668bf407624cb5da2a9f8396861e4c4c7e587bae35d7ac3bd9513a109865e56fd92efc1d022d773c10a36ba95cc2f1f763e06b74f46e300cb142b5a SHA512 f3638bee6d49c56738cf05dd7c67d93344ed5787eb8777589390dbc38a1481e9a28895bdd4534124dcc8dbe247f3e28e299fe0bc0bb89e4d974b4aff734701d4
29
30 diff --git a/net-irc/shadowircd/files/format-security.patch b/net-irc/shadowircd/files/format-security.patch
31 deleted file mode 100644
32 index bd6e26e28a5..00000000000
33 --- a/net-irc/shadowircd/files/format-security.patch
34 +++ /dev/null
35 @@ -1,384 +0,0 @@
36 -From 6055fe3ee3b7b932e2a21160251fff0f0c6bcc39 Mon Sep 17 00:00:00 2001
37 -From: Michael Orlitzky <michael@××××××××.com>
38 -Date: Mon, 24 Jul 2017 10:39:43 -0400
39 -Subject: [PATCH 1/1] Supply trivial format strings to fix format-security
40 - warnings.
41 -
42 -This commit adds a trivial format string "%s" to a number of function
43 -calls that are otherwise missing them. This avoids GCC's
44 -format-security warnings, which cause compilation failures with
45 --Werror=format-security.
46 -
47 -Gentoo-Bug: 520620
48 ----
49 - bandb/bandb.c | 2 +-
50 - modules/core/m_kill.c | 4 ++--
51 - modules/m_away.c | 4 ++--
52 - modules/m_challenge.c | 8 ++++----
53 - modules/m_info.c | 6 +++---
54 - modules/m_map.c | 4 ++--
55 - modules/m_oper.c | 6 +++---
56 - modules/m_stats.c | 22 +++++++++++-----------
57 - src/chmode.c | 4 ++--
58 - src/parse.c | 2 +-
59 - src/s_auth.c | 2 +-
60 - src/sslproc.c | 8 ++++----
61 - 12 files changed, 36 insertions(+), 36 deletions(-)
62 -
63 -diff --git a/bandb/bandb.c b/bandb/bandb.c
64 -index 33166b1..2d272a1 100644
65 ---- a/bandb/bandb.c
66 -+++ b/bandb/bandb.c
67 -@@ -289,7 +289,7 @@ db_error_cb(const char *errstr)
68 - {
69 - char buf[256];
70 - rb_snprintf(buf, sizeof(buf), "! :%s", errstr);
71 -- rb_helper_write(bandb_helper, buf);
72 -+ rb_helper_write(bandb_helper, "%s", buf);
73 - rb_sleep(2 << 30, 0);
74 - exit(1);
75 - }
76 -diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
77 -index 80df7df..2fa91da 100644
78 ---- a/modules/core/m_kill.c
79 -+++ b/modules/core/m_kill.c
80 -@@ -97,7 +97,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
81 - if((target_p = get_history(user, (long) KILLCHASETIMELIMIT)) == NULL)
82 - {
83 - if (strchr(user, '.'))
84 -- sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
85 -+ sendto_one_numeric(source_p, ERR_CANTKILLSERVER, "%s", form_str(ERR_CANTKILLSERVER));
86 - else
87 - sendto_one_numeric(source_p, ERR_NOSUCHNICK,
88 - form_str(ERR_NOSUCHNICK), user);
89 -@@ -216,7 +216,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
90 -
91 - if(IsServer(target_p) || IsMe(target_p))
92 - {
93 -- sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
94 -+ sendto_one_numeric(source_p, ERR_CANTKILLSERVER, "%s", form_str(ERR_CANTKILLSERVER));
95 - return 0;
96 - }
97 -
98 -diff --git a/modules/m_away.c b/modules/m_away.c
99 -index 557371e..13c4c39 100644
100 ---- a/modules/m_away.c
101 -+++ b/modules/m_away.c
102 -@@ -85,7 +85,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
103 - free_away(source_p);
104 - }
105 - if(MyConnect(source_p))
106 -- sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
107 -+ sendto_one_numeric(source_p, RPL_UNAWAY, "%s", form_str(RPL_UNAWAY));
108 - return 0;
109 - }
110 -
111 -@@ -99,7 +99,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
112 - }
113 -
114 - if(MyConnect(source_p))
115 -- sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
116 -+ sendto_one_numeric(source_p, RPL_NOWAWAY, "%s", form_str(RPL_NOWAWAY));
117 -
118 - return 0;
119 - }
120 -diff --git a/modules/m_challenge.c b/modules/m_challenge.c
121 -index 2066095..b8514c4 100644
122 ---- a/modules/m_challenge.c
123 -+++ b/modules/m_challenge.c
124 -@@ -172,7 +172,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
125 -
126 - if(oper_p == NULL)
127 - {
128 -- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
129 -+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
130 - ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
131 - source_p->localClient->opername, source_p->name,
132 - source_p->username, source_p->host,
133 -@@ -203,7 +203,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
134 -
135 - if(oper_p == NULL)
136 - {
137 -- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
138 -+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
139 - ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
140 - parv[1], source_p->name,
141 - source_p->username, source_p->host, source_p->sockhost);
142 -@@ -223,7 +223,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
143 -
144 - if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
145 - {
146 -- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
147 -+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
148 - ilog(L_FOPER, "FAILED CHALLENGE (%s) by (%s!%s@%s) (%s) -- requires SSL/TLS",
149 - parv[1], source_p->name, source_p->username, source_p->host,
150 - source_p->sockhost);
151 -@@ -241,7 +241,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
152 - {
153 - if (source_p->certfp == NULL || strcasecmp(source_p->certfp, oper_p->certfp))
154 - {
155 -- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
156 -+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
157 - ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- client certificate fingerprint mismatch",
158 - parv[1], source_p->name,
159 - source_p->username, source_p->host, source_p->sockhost);
160 -diff --git a/modules/m_info.c b/modules/m_info.c
161 -index dd14294..bab156f 100644
162 ---- a/modules/m_info.c
163 -+++ b/modules/m_info.c
164 -@@ -722,7 +722,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
165 - /* safe enough to give this on a local connect only */
166 - sendto_one(source_p, form_str(RPL_LOAD2HI),
167 - me.name, source_p->name, "INFO");
168 -- sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
169 -+ sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
170 - return 0;
171 - }
172 - else
173 -@@ -736,7 +736,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
174 - send_info_text(source_p);
175 - send_birthdate_online_time(source_p);
176 -
177 -- sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
178 -+ sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
179 - return 0;
180 - }
181 -
182 -@@ -761,7 +761,7 @@ mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *
183 -
184 - send_birthdate_online_time(source_p);
185 -
186 -- sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
187 -+ sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
188 - }
189 -
190 - return 0;
191 -diff --git a/modules/m_map.c b/modules/m_map.c
192 -index 7a45140..baadc86 100644
193 ---- a/modules/m_map.c
194 -+++ b/modules/m_map.c
195 -@@ -59,7 +59,7 @@ m_map(struct Client *client_p, struct Client *source_p, int parc, const char *pa
196 - }
197 -
198 - dump_map(client_p, &me, buf);
199 -- sendto_one_numeric(client_p, RPL_MAPEND, form_str(RPL_MAPEND));
200 -+ sendto_one_numeric(client_p, RPL_MAPEND, "%s", form_str(RPL_MAPEND));
201 - return 0;
202 - }
203 -
204 -@@ -71,7 +71,7 @@ mo_map(struct Client *client_p, struct Client *source_p, int parc, const char *p
205 - {
206 - dump_map(client_p, &me, buf);
207 - scache_send_missing(client_p);
208 -- sendto_one_numeric(client_p, RPL_MAPEND, form_str(RPL_MAPEND));
209 -+ sendto_one_numeric(client_p, RPL_MAPEND, "%s", form_str(RPL_MAPEND));
210 -
211 - return 0;
212 - }
213 -diff --git a/modules/m_oper.c b/modules/m_oper.c
214 -index b403b28..af1e008 100644
215 ---- a/modules/m_oper.c
216 -+++ b/modules/m_oper.c
217 -@@ -83,7 +83,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
218 -
219 - if(oper_p == NULL)
220 - {
221 -- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
222 -+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
223 - ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
224 - name, source_p->name,
225 - source_p->username, source_p->host, source_p->sockhost);
226 -@@ -100,7 +100,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
227 -
228 - if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
229 - {
230 -- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
231 -+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
232 - ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- requires SSL/TLS",
233 - name, source_p->name,
234 - source_p->username, source_p->host, source_p->sockhost);
235 -@@ -118,7 +118,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
236 - {
237 - if (source_p->certfp == NULL || strcasecmp(source_p->certfp, oper_p->certfp))
238 - {
239 -- sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
240 -+ sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
241 - ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- client certificate fingerprint mismatch",
242 - name, source_p->name,
243 - source_p->username, source_p->host, source_p->sockhost);
244 -diff --git a/modules/m_stats.c b/modules/m_stats.c
245 -index dc826bc..51555b4 100644
246 ---- a/modules/m_stats.c
247 -+++ b/modules/m_stats.c
248 -@@ -223,7 +223,7 @@ m_stats(struct Client *client_p, struct Client *source_p, int parc, const char *
249 - if(stats_cmd_table[i].need_oper && !IsOper(source_p))
250 - {
251 - sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
252 -- form_str (ERR_NOPRIVILEGES));
253 -+ "%s", form_str (ERR_NOPRIVILEGES));
254 - break;
255 - }
256 - if(stats_cmd_table[i].need_admin && !IsOperAdmin(source_p))
257 -@@ -285,7 +285,7 @@ stats_connect(struct Client *source_p)
258 - (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
259 - !IsOper(source_p))
260 - {
261 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
262 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
263 - form_str(ERR_NOPRIVILEGES));
264 - return;
265 - }
266 -@@ -487,7 +487,7 @@ stats_hubleaf(struct Client *source_p)
267 - (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
268 - !IsOper(source_p))
269 - {
270 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
271 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
272 - form_str (ERR_NOPRIVILEGES));
273 - return;
274 - }
275 -@@ -513,7 +513,7 @@ stats_auth (struct Client *source_p)
276 - {
277 - /* Oper only, if unopered, return ERR_NOPRIVS */
278 - if((ConfigFileEntry.stats_i_oper_only == 2) && !IsOper (source_p))
279 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
280 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
281 - form_str (ERR_NOPRIVILEGES));
282 -
283 - /* If unopered, Only return matching auth blocks */
284 -@@ -556,7 +556,7 @@ stats_tklines(struct Client *source_p)
285 - {
286 - /* Oper only, if unopered, return ERR_NOPRIVS */
287 - if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
288 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
289 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
290 - form_str (ERR_NOPRIVILEGES));
291 -
292 - /* If unopered, Only return matching klines */
293 -@@ -621,7 +621,7 @@ stats_klines(struct Client *source_p)
294 - {
295 - /* Oper only, if unopered, return ERR_NOPRIVS */
296 - if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
297 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
298 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
299 - form_str (ERR_NOPRIVILEGES));
300 -
301 - /* If unopered, Only return matching klines */
302 -@@ -689,7 +689,7 @@ stats_oper(struct Client *source_p)
303 -
304 - if(!IsOper(source_p) && ConfigFileEntry.stats_o_oper_only)
305 - {
306 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
307 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
308 - form_str (ERR_NOPRIVILEGES));
309 - return;
310 - }
311 -@@ -752,7 +752,7 @@ static void
312 - stats_ports (struct Client *source_p)
313 - {
314 - if(!IsOper (source_p) && ConfigFileEntry.stats_P_oper_only)
315 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
316 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
317 - form_str (ERR_NOPRIVILEGES));
318 - else
319 - show_ports (source_p);
320 -@@ -1063,7 +1063,7 @@ stats_servers (struct Client *source_p)
321 - if(ConfigServerHide.flatten_links && !IsOper(source_p) &&
322 - !IsExemptShide(source_p))
323 - {
324 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
325 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
326 - form_str (ERR_NOPRIVILEGES));
327 - return;
328 - }
329 -@@ -1137,7 +1137,7 @@ static void
330 - stats_class(struct Client *source_p)
331 - {
332 - if(ConfigFileEntry.stats_y_oper_only && !IsOper(source_p))
333 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
334 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
335 - form_str (ERR_NOPRIVILEGES));
336 - else
337 - report_classes(source_p);
338 -@@ -1411,7 +1411,7 @@ stats_servlinks (struct Client *source_p)
339 - if(ConfigServerHide.flatten_links && !IsOper (source_p) &&
340 - !IsExemptShide(source_p))
341 - {
342 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
343 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
344 - form_str (ERR_NOPRIVILEGES));
345 - return;
346 - }
347 -diff --git a/src/chmode.c b/src/chmode.c
348 -index 0a43199..cd649d3 100644
349 ---- a/src/chmode.c
350 -+++ b/src/chmode.c
351 -@@ -644,7 +644,7 @@ chm_hidden(struct Client *source_p, struct Channel *chptr,
352 - if(!IsOper(source_p) && !IsServer(source_p))
353 - {
354 - if(!(*errors & SM_ERR_NOPRIVS))
355 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
356 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
357 - *errors |= SM_ERR_NOPRIVS;
358 - return;
359 - }
360 -@@ -734,7 +734,7 @@ chm_staff(struct Client *source_p, struct Channel *chptr,
361 - if(!IsOper(source_p) && !IsServer(source_p))
362 - {
363 - if(!(*errors & SM_ERR_NOPRIVS))
364 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
365 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
366 - *errors |= SM_ERR_NOPRIVS;
367 - return;
368 - }
369 -diff --git a/src/parse.c b/src/parse.c
370 -index a8ce091..9e17de4 100644
371 ---- a/src/parse.c
372 -+++ b/src/parse.c
373 -@@ -719,7 +719,7 @@ static void do_alias(struct alias_entry *aptr, struct Client *source_p, char *te
374 - int
375 - m_not_oper(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
376 - {
377 -- sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
378 -+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
379 - return 0;
380 - }
381 -
382 -diff --git a/src/s_auth.c b/src/s_auth.c
383 -index 2644ff1..52e4633 100644
384 ---- a/src/s_auth.c
385 -+++ b/src/s_auth.c
386 -@@ -116,7 +116,7 @@ typedef enum
387 - }
388 - ReportType;
389 -
390 --#define sendheader(c, r) sendto_one_notice(c, HeaderMessages[(r)])
391 -+#define sendheader(c, r) sendto_one_notice(c, "%s", HeaderMessages[(r)])
392 -
393 - static rb_dlink_list auth_poll_list;
394 - static rb_bh *auth_heap;
395 -diff --git a/src/sslproc.c b/src/sslproc.c
396 -index 11fadbb..51078fb 100644
397 ---- a/src/sslproc.c
398 -+++ b/src/sslproc.c
399 -@@ -455,13 +455,13 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
400 - break;
401 - case 'I':
402 - ssl_ok = 0;
403 -- ilog(L_MAIN, cannot_setup_ssl);
404 -- sendto_realops_snomask(SNO_GENERAL, L_ALL, cannot_setup_ssl);
405 -+ ilog(L_MAIN, "%s", cannot_setup_ssl);
406 -+ sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", cannot_setup_ssl);
407 - case 'U':
408 - zlib_ok = 0;
409 - ssl_ok = 0;
410 -- ilog(L_MAIN, no_ssl_or_zlib);
411 -- sendto_realops_snomask(SNO_GENERAL, L_ALL, no_ssl_or_zlib);
412 -+ ilog(L_MAIN, "%s", no_ssl_or_zlib);
413 -+ sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", no_ssl_or_zlib);
414 - ssl_killall();
415 - break;
416 - case 'z':
417 ---
418 -2.13.0
419 -
420
421 diff --git a/net-irc/shadowircd/files/shadowircd.confd b/net-irc/shadowircd/files/shadowircd.confd
422 deleted file mode 100644
423 index 4712b525985..00000000000
424 --- a/net-irc/shadowircd/files/shadowircd.confd
425 +++ /dev/null
426 @@ -1,6 +0,0 @@
427 -#!/sbin/openrc-run
428 -# Copyright 1999-2012 Gentoo Foundation
429 -# Distributed under the terms of the GNU General Public License v2
430 -
431 -# Specify any extra options to pass to shadowircd
432 -SHADOWIRCD_OPTS=""
433
434 diff --git a/net-irc/shadowircd/files/shadowircd.initd-r1 b/net-irc/shadowircd/files/shadowircd.initd-r1
435 deleted file mode 100644
436 index 38ccab8b3f3..00000000000
437 --- a/net-irc/shadowircd/files/shadowircd.initd-r1
438 +++ /dev/null
439 @@ -1,26 +0,0 @@
440 -#!/sbin/openrc-run
441 -# Copyright 1999-2017 Gentoo Foundation
442 -# Distributed under the terms of the GNU General Public License v2
443 -
444 -command="/usr/bin/shadowircd-ircd"
445 -command_args="${SHADOWIRCD_OPTS}"
446 -command_user="shadowircd"
447 -extra_started_commands="reload"
448 -pidfile="/run/shadowircd/ircd.pid"
449 -
450 -depend() {
451 - use dns net
452 - provide ircd
453 -}
454 -
455 -start_pre() {
456 - ebegin "Creating /run/shadowircd for ${SVCNAME}"
457 - checkpath --directory --owner :shadowircd --mode 0770 /run/shadowircd
458 - eend $?
459 -}
460 -
461 -reload() {
462 - ebegin "Reloading ${SVCNAME}"
463 - start-stop-daemon --signal HUP --pidfile "${pidfile}"
464 - eend $?
465 -}
466
467 diff --git a/net-irc/shadowircd/metadata.xml b/net-irc/shadowircd/metadata.xml
468 deleted file mode 100644
469 index d90bc327274..00000000000
470 --- a/net-irc/shadowircd/metadata.xml
471 +++ /dev/null
472 @@ -1,10 +0,0 @@
473 -<?xml version="1.0" encoding="UTF-8"?>
474 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
475 -<pkgmetadata>
476 - <use>
477 - <flag name="largenet">Enable support/tweaks for large networks</flag>
478 - </use>
479 - <upstream>
480 - <remote-id type="github">shadowircd/shadowircd</remote-id>
481 - </upstream>
482 -</pkgmetadata>
483
484 diff --git a/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild b/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild
485 deleted file mode 100644
486 index 56dcbf33ad8..00000000000
487 --- a/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild
488 +++ /dev/null
489 @@ -1,95 +0,0 @@
490 -# Copyright 1999-2017 Gentoo Foundation
491 -# Distributed under the terms of the GNU General Public License v2
492 -
493 -EAPI=6
494 -
495 -inherit user
496 -
497 -DESCRIPTION="An IRCd based on charybdis that adds several useful features"
498 -HOMEPAGE="http://shadowircd.net"
499 -SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
500 -LICENSE="GPL-2"
501 -
502 -SLOT="0"
503 -KEYWORDS="amd64 x86"
504 -IUSE="debug +ipv6 largenet ssl zlib"
505 -
506 -RDEPEND="ssl? ( dev-libs/openssl:0 )
507 - zlib? ( sys-libs/zlib )"
508 -DEPEND="${RDEPEND}
509 - virtual/yacc
510 - sys-devel/flex"
511 -
512 -S="${WORKDIR}/${PN}-${P}"
513 -
514 -PATCHES=( "${FILESDIR}/format-security.patch" )
515 -
516 -pkg_setup() {
517 - enewgroup ${PN}
518 - enewuser ${PN} -1 -1 "${EPREFIX}"/usr ${PN}
519 -}
520 -
521 -src_prepare() {
522 - default
523 -
524 - # Fill the example configuration file with proper paths.
525 - sed -i \
526 - -e "s:path =.*modules:path = \"$(get_libdir)/${PN}/modules:g" \
527 - -e "s:etc/:../etc/${PN}/:g" \
528 - -e "s:logs/:../var/log/shadowircd/:g" \
529 - -e "s:test\.\(cert\|key\):ssl.\1:g" \
530 - doc/example.conf \
531 - doc/reference.conf \
532 - || die
533 -}
534 -
535 -src_configure() {
536 - econf \
537 - ac_cv_prog_cc_g=no \
538 - --disable-gnutls \
539 - $(use_enable debug assert soft) \
540 - $(use_enable debug iodebug) \
541 - $(use_enable ipv6) \
542 - $(use_enable !largenet small-net) \
543 - $(use_enable ssl openssl) \
544 - $(use_enable zlib) \
545 - --with-program-prefix=shadowircd- \
546 - \
547 - --enable-fhs-paths \
548 - --sysconfdir="${EPREFIX}"/etc/${PN} \
549 - --libdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN} \
550 - --with-logdir="${EPREFIX}"/var/log/${PN} \
551 - --with-moduledir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
552 - --with-rundir="${EPREFIX}"/run
553 -}
554 -
555 -src_install() {
556 - default
557 -
558 - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
559 - newconfd "${FILESDIR}"/${PN}.confd ${PN}
560 -
561 - insinto etc/${PN}
562 - newins doc/reference.conf ircd.conf
563 -
564 - keepdir var/{lib,log}/${PN}
565 -
566 - # The runtime directory will be created by the init script, so we
567 - # kill this here to avoid a QA warning about it.
568 - rm -rf "${D}"/run || die
569 -
570 - # shadowircd needs writing to its state (bandb) and log directories
571 - fowners :shadowircd /var/{lib,log}/${PN}
572 - fperms 770 /var/{lib,log}/${PN}
573 -
574 - # ensure that shadowircd can access but not modify its configuration
575 - # while protecting it from others
576 - fowners :shadowircd /etc/${PN}{,/ircd.conf}
577 - fperms 750 /etc/${PN}
578 - fperms 640 /etc/${PN}/ircd.conf
579 -}
580 -
581 -pkg_postinst() {
582 - elog "All of the shadowircd binaries in PATH have been prefixed with"
583 - elog "'shadowircd-' to prevent file collisions."
584 -}
585
586 diff --git a/profiles/package.mask b/profiles/package.mask
587 index c8f73cc7122..835b27bb935 100644
588 --- a/profiles/package.mask
589 +++ b/profiles/package.mask
590 @@ -621,7 +621,6 @@ x11-libs/hippo-canvas
591 # net-im/climm: #674160, dead homepage, last commits in 2010
592 # net-irc/bip: #674240, may need new snapshot, current ver is from 2013
593 # net-irc/epic4: #677734, needs bump, current is from 2009, also #613120
594 -# net-irc/shadowircd: #674528, dead homepage, last commits in 2012
595 #
596 # Removal in 30 days.
597 app-crypt/keynote
598 @@ -640,7 +639,6 @@ net-im/ayttm
599 net-im/climm
600 net-irc/bip
601 net-irc/epic4
602 -net-irc/shadowircd
603
604 # Miroslav Šulc <fordfrog@g.o> (19 Mar 2019)
605 # Depends on >=virtual/{jdk,jre}-11 which is masked