1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## 05_gcc44_fixes.dpatch by Matt Arnold <mattarnold5@gmail.com>
4
## All lines beginning with `## DP:' are a description of the patch.
8
diff -urNad inspircd-1.1.22+dfsg~/src/channels.cpp inspircd-1.1.22+dfsg/src/channels.cpp
9
--- inspircd-1.1.22+dfsg~/src/channels.cpp 2008-03-29 11:02:06.000000000 -0400
10
+++ inspircd-1.1.22+dfsg/src/channels.cpp 2009-06-21 17:39:01.000000000 -0400
17
chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
19
diff -urNad inspircd-1.1.22+dfsg~/src/cmd_kill.cpp inspircd-1.1.22+dfsg/src/cmd_kill.cpp
20
--- inspircd-1.1.22+dfsg~/src/cmd_kill.cpp 2008-02-11 17:09:24.000000000 -0500
21
+++ inspircd-1.1.22+dfsg/src/cmd_kill.cpp 2009-06-21 17:39:48.000000000 -0400
25
#include "commands/cmd_kill.h"
28
extern "C" DllExport command_t* init_command(InspIRCd* Instance)
30
diff -urNad inspircd-1.1.22+dfsg~/src/cmd_oper.cpp inspircd-1.1.22+dfsg/src/cmd_oper.cpp
31
--- inspircd-1.1.22+dfsg~/src/cmd_oper.cpp 2008-01-10 08:45:53.000000000 -0500
32
+++ inspircd-1.1.22+dfsg/src/cmd_oper.cpp 2009-06-21 17:39:59.000000000 -0400
35
#include "commands/cmd_oper.h"
39
bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
41
diff -urNad inspircd-1.1.22+dfsg~/src/cmd_stats.cpp inspircd-1.1.22+dfsg/src/cmd_stats.cpp
42
--- inspircd-1.1.22+dfsg~/src/cmd_stats.cpp 2008-01-10 08:45:53.000000000 -0500
43
+++ inspircd-1.1.22+dfsg/src/cmd_stats.cpp 2009-06-21 17:40:16.000000000 -0400
46
#include "commands/cmd_stats.h"
47
#include "commands/cmd_whowas.h"
51
extern "C" DllExport command_t* init_command(InspIRCd* Instance)
52
diff -urNad inspircd-1.1.22+dfsg~/src/cmd_time.cpp inspircd-1.1.22+dfsg/src/cmd_time.cpp
53
--- inspircd-1.1.22+dfsg~/src/cmd_time.cpp 2008-01-10 08:45:53.000000000 -0500
54
+++ inspircd-1.1.22+dfsg/src/cmd_time.cpp 2009-06-21 17:40:26.000000000 -0400
56
#include "configreader.h"
58
#include "commands/cmd_time.h"
63
diff -urNad inspircd-1.1.22+dfsg~/src/command_parse.cpp inspircd-1.1.22+dfsg/src/command_parse.cpp
64
--- inspircd-1.1.22+dfsg~/src/command_parse.cpp 2008-11-02 00:18:52.000000000 -0400
65
+++ inspircd-1.1.22+dfsg/src/command_parse.cpp 2009-06-21 17:40:59.000000000 -0400
68
#include "command_parse.h"
69
#include "exitcodes.h"
72
/* Directory Searching for Unix-Only */
74
diff -urNad inspircd-1.1.22+dfsg~/src/dns.cpp inspircd-1.1.22+dfsg/src/dns.cpp
75
--- inspircd-1.1.22+dfsg~/src/dns.cpp 2008-03-15 14:02:21.000000000 -0400
76
+++ inspircd-1.1.22+dfsg/src/dns.cpp 2009-06-21 17:39:36.000000000 -0400
78
#include "socketengine.h"
79
#include "configreader.h"
83
using irc::sockets::insp_inaddr;
84
using irc::sockets::insp_ntoa;
85
diff -urNad inspircd-1.1.22+dfsg~/src/helperfuncs.cpp inspircd-1.1.22+dfsg/src/helperfuncs.cpp
86
--- inspircd-1.1.22+dfsg~/src/helperfuncs.cpp 2008-06-27 09:19:11.000000000 -0400
87
+++ inspircd-1.1.22+dfsg/src/helperfuncs.cpp 2009-06-21 17:40:46.000000000 -0400
91
#include "exitcodes.h"
94
static char TIMESTR[26];
95
static time_t LAST = 0;
96
diff -urNad inspircd-1.1.22+dfsg~/src/mode.cpp inspircd-1.1.22+dfsg/src/mode.cpp
97
--- inspircd-1.1.22+dfsg~/src/mode.cpp 2008-04-21 14:12:50.000000000 -0400
98
+++ inspircd-1.1.22+dfsg/src/mode.cpp 2009-06-21 17:39:10.000000000 -0400
101
#include "inspstring.h"
106
#include "modes/cmode_s.h"
107
diff -urNad inspircd-1.1.22+dfsg~/src/modes/cmode_b.cpp inspircd-1.1.22+dfsg/src/modes/cmode_b.cpp
108
--- inspircd-1.1.22+dfsg~/src/modes/cmode_b.cpp 2008-01-10 08:45:53.000000000 -0500
109
+++ inspircd-1.1.22+dfsg/src/modes/cmode_b.cpp 2009-06-21 17:38:11.000000000 -0400
111
#include "inspstring.h"
112
#include "hashcomp.h"
113
#include "modes/cmode_b.h"
116
ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, 'b', 1, 1, true, MODETYPE_CHANNEL, false)
118
diff -urNad inspircd-1.1.22+dfsg~/src/modes/cmode_h.cpp inspircd-1.1.22+dfsg/src/modes/cmode_h.cpp
119
--- inspircd-1.1.22+dfsg~/src/modes/cmode_h.cpp 2008-01-10 08:45:53.000000000 -0500
120
+++ inspircd-1.1.22+dfsg/src/modes/cmode_h.cpp 2009-06-21 17:37:58.000000000 -0400
124
#include "modes/cmode_h.h"
127
ModeChannelHalfOp::ModeChannelHalfOp(InspIRCd* Instance) : ModeHandler(Instance, 'h', 1, 1, true, MODETYPE_CHANNEL, false, '%')
129
diff -urNad inspircd-1.1.22+dfsg~/src/modes/cmode_k.cpp inspircd-1.1.22+dfsg/src/modes/cmode_k.cpp
130
--- inspircd-1.1.22+dfsg~/src/modes/cmode_k.cpp 2008-01-10 08:45:53.000000000 -0500
131
+++ inspircd-1.1.22+dfsg/src/modes/cmode_k.cpp 2009-06-21 17:37:25.000000000 -0400
133
#include "channels.h"
135
#include "modes/cmode_k.h"
138
ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k', 1, 1, false, MODETYPE_CHANNEL, false)
140
diff -urNad inspircd-1.1.22+dfsg~/src/modes/cmode_o.cpp inspircd-1.1.22+dfsg/src/modes/cmode_o.cpp
141
--- inspircd-1.1.22+dfsg~/src/modes/cmode_o.cpp 2008-01-10 08:45:53.000000000 -0500
142
+++ inspircd-1.1.22+dfsg/src/modes/cmode_o.cpp 2009-06-21 17:37:15.000000000 -0400
146
#include "modes/cmode_o.h"
149
ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@')
151
diff -urNad inspircd-1.1.22+dfsg~/src/modes/cmode_v.cpp inspircd-1.1.22+dfsg/src/modes/cmode_v.cpp
152
--- inspircd-1.1.22+dfsg~/src/modes/cmode_v.cpp 2008-01-10 08:45:53.000000000 -0500
153
+++ inspircd-1.1.22+dfsg/src/modes/cmode_v.cpp 2009-06-21 17:36:58.000000000 -0400
157
#include "modes/cmode_v.h"
160
ModeChannelVoice::ModeChannelVoice(InspIRCd* Instance) : ModeHandler(Instance, 'v', 1, 1, true, MODETYPE_CHANNEL, false, '+')
162
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_cgiirc.cpp inspircd-1.1.22+dfsg/src/modules/m_cgiirc.cpp
163
--- inspircd-1.1.22+dfsg~/src/modules/m_cgiirc.cpp 2008-11-02 00:20:54.000000000 -0400
164
+++ inspircd-1.1.22+dfsg/src/modules/m_cgiirc.cpp 2009-06-21 17:33:53.000000000 -0400
171
#include <sys/socket.h>
172
#include <netinet/in.h>
173
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_check.cpp inspircd-1.1.22+dfsg/src/modules/m_check.cpp
174
--- inspircd-1.1.22+dfsg~/src/modules/m_check.cpp 2008-01-10 08:45:53.000000000 -0500
175
+++ inspircd-1.1.22+dfsg/src/modules/m_check.cpp 2009-06-21 17:34:07.000000000 -0400
177
#include "channels.h"
179
#include "wildcard.h"
182
/* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
184
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_customtitle.cpp inspircd-1.1.22+dfsg/src/modules/m_customtitle.cpp
185
--- inspircd-1.1.22+dfsg~/src/modules/m_customtitle.cpp 2008-08-10 12:49:18.000000000 -0400
186
+++ inspircd-1.1.22+dfsg/src/modules/m_customtitle.cpp 2009-06-21 17:34:21.000000000 -0400
188
#include "channels.h"
190
#include "wildcard.h"
193
/* $ModDesc: Provides the TITLE command which allows setting of CUSTOM WHOIS TITLE line */
195
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_dnsbl.cpp inspircd-1.1.22+dfsg/src/modules/m_dnsbl.cpp
196
--- inspircd-1.1.22+dfsg~/src/modules/m_dnsbl.cpp 2008-01-10 08:45:53.000000000 -0500
197
+++ inspircd-1.1.22+dfsg/src/modules/m_dnsbl.cpp 2009-06-21 17:35:29.000000000 -0400
200
#include "channels.h"
205
#include <sys/types.h>
206
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_ident.cpp inspircd-1.1.22+dfsg/src/modules/m_ident.cpp
207
--- inspircd-1.1.22+dfsg~/src/modules/m_ident.cpp 2008-08-27 15:00:21.000000000 -0400
208
+++ inspircd-1.1.22+dfsg/src/modules/m_ident.cpp 2009-06-21 17:35:41.000000000 -0400
211
#include "channels.h"
215
using irc::sockets::NonBlocking;
217
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_invisible.cpp inspircd-1.1.22+dfsg/src/modules/m_invisible.cpp
218
--- inspircd-1.1.22+dfsg~/src/modules/m_invisible.cpp 2008-11-24 03:58:07.000000000 -0500
219
+++ inspircd-1.1.22+dfsg/src/modules/m_invisible.cpp 2009-06-21 17:35:52.000000000 -0400
221
#include "channels.h"
226
/* $ModDesc: Allows for opered clients to join channels without being seen, similar to unreal 3.1 +I mode */
228
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_messageflood.cpp inspircd-1.1.22+dfsg/src/modules/m_messageflood.cpp
229
--- inspircd-1.1.22+dfsg~/src/modules/m_messageflood.cpp 2008-04-06 08:05:34.000000000 -0400
230
+++ inspircd-1.1.22+dfsg/src/modules/m_messageflood.cpp 2009-06-21 17:36:04.000000000 -0400
233
#include "channels.h"
237
/* $ModDesc: Provides channel mode +f (message flood protection) */
239
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_namesx.cpp inspircd-1.1.22+dfsg/src/modules/m_namesx.cpp
240
--- inspircd-1.1.22+dfsg~/src/modules/m_namesx.cpp 2008-04-03 18:34:40.000000000 -0400
241
+++ inspircd-1.1.22+dfsg/src/modules/m_namesx.cpp 2009-06-21 17:36:14.000000000 -0400
244
#include "channels.h"
248
static const char* dummy = "ON";
250
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_safelist.cpp inspircd-1.1.22+dfsg/src/modules/m_safelist.cpp
251
--- inspircd-1.1.22+dfsg~/src/modules/m_safelist.cpp 2008-05-28 06:18:28.000000000 -0400
252
+++ inspircd-1.1.22+dfsg/src/modules/m_safelist.cpp 2009-06-21 17:36:23.000000000 -0400
254
#include "channels.h"
256
#include "wildcard.h"
259
/** Holds a users m_safelist state
261
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_spanningtree/main.cpp inspircd-1.1.22+dfsg/src/modules/m_spanningtree/main.cpp
262
--- inspircd-1.1.22+dfsg~/src/modules/m_spanningtree/main.cpp 2008-09-11 12:33:56.000000000 -0400
263
+++ inspircd-1.1.22+dfsg/src/modules/m_spanningtree/main.cpp 2009-06-21 17:33:14.000000000 -0400
265
#include "wildcard.h"
267
#include "transport.h"
270
#include "m_spanningtree/timesynctimer.h"
271
#include "m_spanningtree/resolvers.h"
272
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_spanningtree/treesocket1.cpp inspircd-1.1.22+dfsg/src/modules/m_spanningtree/treesocket1.cpp
273
--- inspircd-1.1.22+dfsg~/src/modules/m_spanningtree/treesocket1.cpp 2008-08-05 15:08:59.000000000 -0400
274
+++ inspircd-1.1.22+dfsg/src/modules/m_spanningtree/treesocket1.cpp 2009-06-21 17:33:28.000000000 -0400
276
#include "transport.h"
278
#include "socketengine.h"
281
#include "m_spanningtree/main.h"
282
#include "m_spanningtree/utils.h"
283
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_spanningtree/treesocket2.cpp inspircd-1.1.22+dfsg/src/modules/m_spanningtree/treesocket2.cpp
284
--- inspircd-1.1.22+dfsg~/src/modules/m_spanningtree/treesocket2.cpp 2008-11-27 18:22:59.000000000 -0500
285
+++ inspircd-1.1.22+dfsg/src/modules/m_spanningtree/treesocket2.cpp 2009-06-21 17:33:41.000000000 -0400
288
#include "transport.h"
289
#include "socketengine.h"
292
#include "m_spanningtree/main.h"
293
#include "m_spanningtree/utils.h"
294
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_spy.cpp inspircd-1.1.22+dfsg/src/modules/m_spy.cpp
295
--- inspircd-1.1.22+dfsg~/src/modules/m_spy.cpp 2008-01-10 08:45:53.000000000 -0500
296
+++ inspircd-1.1.22+dfsg/src/modules/m_spy.cpp 2009-06-21 17:36:36.000000000 -0400
298
#include "channels.h"
300
#include "wildcard.h"
303
void spy_userlist(userrec *user, chanrec *c)
305
diff -urNad inspircd-1.1.22+dfsg~/src/modules/m_tline.cpp inspircd-1.1.22+dfsg/src/modules/m_tline.cpp
306
--- inspircd-1.1.22+dfsg~/src/modules/m_tline.cpp 2008-01-10 08:45:53.000000000 -0500
307
+++ inspircd-1.1.22+dfsg/src/modules/m_tline.cpp 2009-06-21 17:36:47.000000000 -0400
309
#include "channels.h"
311
#include "wildcard.h"
314
/* $ModDesc: Provides /tline command used to test who a mask matches */
316
diff -urNad inspircd-1.1.22+dfsg~/src/snomasks.cpp inspircd-1.1.22+dfsg/src/snomasks.cpp
317
--- inspircd-1.1.22+dfsg~/src/snomasks.cpp 2008-01-10 08:45:53.000000000 -0500
318
+++ inspircd-1.1.22+dfsg/src/snomasks.cpp 2009-06-21 17:41:10.000000000 -0400
320
#include "configreader.h"
322
#include "snomasks.h"
325
SnomaskManager::SnomaskManager(InspIRCd* Instance) : ServerInstance(Instance)
327
diff -urNad inspircd-1.1.22+dfsg~/src/socketengine_epoll.cpp inspircd-1.1.22+dfsg/src/socketengine_epoll.cpp
328
--- inspircd-1.1.22+dfsg~/src/socketengine_epoll.cpp 2008-08-23 19:22:53.000000000 -0400
329
+++ inspircd-1.1.22+dfsg/src/socketengine_epoll.cpp 2009-06-21 17:38:50.000000000 -0400
331
#include "exitcodes.h"
332
#include <sys/epoll.h>
333
#include "socketengine_epoll.h"
336
EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
338
diff -urNad inspircd-1.1.22+dfsg~/src/userprocess.cpp inspircd-1.1.22+dfsg/src/userprocess.cpp
339
--- inspircd-1.1.22+dfsg~/src/userprocess.cpp 2008-02-11 17:09:24.000000000 -0500
340
+++ inspircd-1.1.22+dfsg/src/userprocess.cpp 2009-06-21 17:38:23.000000000 -0400
343
#include "socketengine.h"
344
#include "command_parse.h"
347
void InspIRCd::FloodQuitUser(userrec* current)
349
diff -urNad inspircd-1.1.22+dfsg~/src/users.cpp inspircd-1.1.22+dfsg/src/users.cpp
350
--- inspircd-1.1.22+dfsg~/src/users.cpp 2008-10-28 19:47:33.000000000 -0400
351
+++ inspircd-1.1.22+dfsg/src/users.cpp 2009-06-21 17:40:35.000000000 -0400
353
#include "wildcard.h"
355
#include "commands/cmd_whowas.h"
358
static unsigned long already_sent[MAX_DESCRIPTORS] = {0};
360
diff -urNad inspircd-1.1.22+dfsg~/src/xline.cpp inspircd-1.1.22+dfsg/src/xline.cpp
361
--- inspircd-1.1.22+dfsg~/src/xline.cpp 2008-02-11 08:22:46.000000000 -0500
362
+++ inspircd-1.1.22+dfsg/src/xline.cpp 2009-06-21 17:39:21.000000000 -0400
365
#include "wildcard.h"
369
/* Version two, now with optimized expiry!