]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch
dnsmasq: Import patches from upstream
[ipfire-2.x.git] / src / patches / dnsmasq / 0039-Update-copyrights-for-dawn-of-2015.patch
1 From aff3396280e944833f0e23d834aa6acd5fe2605a Mon Sep 17 00:00:00 2001
2 From: Simon Kelley <simon@thekelleys.org.uk>
3 Date: Sat, 31 Jan 2015 20:13:40 +0000
4 Subject: [PATCH 39/98] Update copyrights for dawn of 2015.
5
6 ---
7 Makefile | 2 +-
8 src/auth.c | 2 +-
9 src/blockdata.c | 2 +-
10 src/bpf.c | 2 +-
11 src/cache.c | 2 +-
12 src/config.h | 2 +-
13 src/conntrack.c | 2 +-
14 src/dbus.c | 2 +-
15 src/dhcp-common.c | 2 +-
16 src/dhcp-protocol.h | 2 +-
17 src/dhcp.c | 2 +-
18 src/dhcp6-protocol.h | 2 +-
19 src/dhcp6.c | 2 +-
20 src/dns-protocol.h | 2 +-
21 src/dnsmasq.c | 2 +-
22 src/dnsmasq.h | 4 ++--
23 src/dnssec.c | 2 +-
24 src/domain.c | 2 +-
25 src/forward.c | 2 +-
26 src/helper.c | 2 +-
27 src/inotify.c | 2 +-
28 src/ip6addr.h | 2 +-
29 src/lease.c | 2 +-
30 src/log.c | 2 +-
31 src/loop.c | 2 +-
32 src/netlink.c | 2 +-
33 src/network.c | 2 +-
34 src/option.c | 2 +-
35 src/outpacket.c | 2 +-
36 src/radv-protocol.h | 2 +-
37 src/radv.c | 2 +-
38 src/rfc1035.c | 2 +-
39 src/rfc2131.c | 2 +-
40 src/rfc3315.c | 2 +-
41 src/slaac.c | 2 +-
42 src/tftp.c | 2 +-
43 src/util.c | 2 +-
44 37 files changed, 38 insertions(+), 38 deletions(-)
45
46 diff --git a/Makefile b/Makefile
47 index bcbd5571671d..21e4a5c4101c 100644
48 --- a/Makefile
49 +++ b/Makefile
50 @@ -1,4 +1,4 @@
51 -# dnsmasq is Copyright (c) 2000-2014 Simon Kelley
52 +# dnsmasq is Copyright (c) 2000-2015 Simon Kelley
53 #
54 # This program is free software; you can redistribute it and/or modify
55 # it under the terms of the GNU General Public License as published by
56 diff --git a/src/auth.c b/src/auth.c
57 index 59e05d3da38e..15721e52793f 100644
58 --- a/src/auth.c
59 +++ b/src/auth.c
60 @@ -1,4 +1,4 @@
61 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
62 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
63
64 This program is free software; you can redistribute it and/or modify
65 it under the terms of the GNU General Public License as published by
66 diff --git a/src/blockdata.c b/src/blockdata.c
67 index 5a70a7967fa3..c8f5eae811eb 100644
68 --- a/src/blockdata.c
69 +++ b/src/blockdata.c
70 @@ -1,4 +1,4 @@
71 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
72 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
73
74 This program is free software; you can redistribute it and/or modify
75 it under the terms of the GNU General Public License as published by
76 diff --git a/src/bpf.c b/src/bpf.c
77 index 4416b1c07287..997d87421bed 100644
78 --- a/src/bpf.c
79 +++ b/src/bpf.c
80 @@ -1,4 +1,4 @@
81 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
82 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
83
84 This program is free software; you can redistribute it and/or modify
85 it under the terms of the GNU General Public License as published by
86 diff --git a/src/cache.c b/src/cache.c
87 index abaf25ec0f18..117ae279fd4e 100644
88 --- a/src/cache.c
89 +++ b/src/cache.c
90 @@ -1,4 +1,4 @@
91 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
92 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
93
94 This program is free software; you can redistribute it and/or modify
95 it under the terms of the GNU General Public License as published by
96 diff --git a/src/config.h b/src/config.h
97 index 5e5009271eba..8def6f200461 100644
98 --- a/src/config.h
99 +++ b/src/config.h
100 @@ -1,4 +1,4 @@
101 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
102 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
103
104 This program is free software; you can redistribute it and/or modify
105 it under the terms of the GNU General Public License as published by
106 diff --git a/src/conntrack.c b/src/conntrack.c
107 index 6a5133ab93af..0fa2da903b03 100644
108 --- a/src/conntrack.c
109 +++ b/src/conntrack.c
110 @@ -1,4 +1,4 @@
111 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
112 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
113
114 This program is free software; you can redistribute it and/or modify
115 it under the terms of the GNU General Public License as published by
116 diff --git a/src/dbus.c b/src/dbus.c
117 index a2a94dc85dac..5b69de518beb 100644
118 --- a/src/dbus.c
119 +++ b/src/dbus.c
120 @@ -1,4 +1,4 @@
121 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
122 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
123
124 This program is free software; you can redistribute it and/or modify
125 it under the terms of the GNU General Public License as published by
126 diff --git a/src/dhcp-common.c b/src/dhcp-common.c
127 index 9d13ac8df6f1..ce115202a646 100644
128 --- a/src/dhcp-common.c
129 +++ b/src/dhcp-common.c
130 @@ -1,4 +1,4 @@
131 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
132 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
133
134 This program is free software; you can redistribute it and/or modify
135 it under the terms of the GNU General Public License as published by
136 diff --git a/src/dhcp-protocol.h b/src/dhcp-protocol.h
137 index 4c0961472482..701b6cb3346e 100644
138 --- a/src/dhcp-protocol.h
139 +++ b/src/dhcp-protocol.h
140 @@ -1,4 +1,4 @@
141 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
142 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
143
144 This program is free software; you can redistribute it and/or modify
145 it under the terms of the GNU General Public License as published by
146 diff --git a/src/dhcp.c b/src/dhcp.c
147 index 7acf2c4311a9..f29be9b489a7 100644
148 --- a/src/dhcp.c
149 +++ b/src/dhcp.c
150 @@ -1,4 +1,4 @@
151 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
152 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
153
154 This program is free software; you can redistribute it and/or modify
155 it under the terms of the GNU General Public License as published by
156 diff --git a/src/dhcp6-protocol.h b/src/dhcp6-protocol.h
157 index 5927dc32f6af..928a2fa162ed 100644
158 --- a/src/dhcp6-protocol.h
159 +++ b/src/dhcp6-protocol.h
160 @@ -1,4 +1,4 @@
161 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
162 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
163
164 This program is free software; you can redistribute it and/or modify
165 it under the terms of the GNU General Public License as published by
166 diff --git a/src/dhcp6.c b/src/dhcp6.c
167 index bc48fdddd3de..3c56e77c6085 100644
168 --- a/src/dhcp6.c
169 +++ b/src/dhcp6.c
170 @@ -1,4 +1,4 @@
171 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
172 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
173
174 This program is free software; you can redistribute it and/or modify
175 it under the terms of the GNU General Public License as published by
176 diff --git a/src/dns-protocol.h b/src/dns-protocol.h
177 index 0aced3ce6952..16fade33d98c 100644
178 --- a/src/dns-protocol.h
179 +++ b/src/dns-protocol.h
180 @@ -1,4 +1,4 @@
181 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
182 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
183
184 This program is free software; you can redistribute it and/or modify
185 it under the terms of the GNU General Public License as published by
186 diff --git a/src/dnsmasq.c b/src/dnsmasq.c
187 index 2c629fe422aa..e903a24c8105 100644
188 --- a/src/dnsmasq.c
189 +++ b/src/dnsmasq.c
190 @@ -1,4 +1,4 @@
191 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
192 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
193
194 This program is free software; you can redistribute it and/or modify
195 it under the terms of the GNU General Public License as published by
196 diff --git a/src/dnsmasq.h b/src/dnsmasq.h
197 index 0c322a93993e..89e758b56a0a 100644
198 --- a/src/dnsmasq.h
199 +++ b/src/dnsmasq.h
200 @@ -1,4 +1,4 @@
201 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
202 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
203
204 This program is free software; you can redistribute it and/or modify
205 it under the terms of the GNU General Public License as published by
206 @@ -14,7 +14,7 @@
207 along with this program. If not, see <http://www.gnu.org/licenses/>.
208 */
209
210 -#define COPYRIGHT "Copyright (c) 2000-2014 Simon Kelley"
211 +#define COPYRIGHT "Copyright (c) 2000-2015 Simon Kelley"
212
213 #ifndef NO_LARGEFILE
214 /* Ensure we can use files >2GB (log files may grow this big) */
215 diff --git a/src/dnssec.c b/src/dnssec.c
216 index d39ab85ed966..a8dfe3871c85 100644
217 --- a/src/dnssec.c
218 +++ b/src/dnssec.c
219 @@ -1,5 +1,5 @@
220 /* dnssec.c is Copyright (c) 2012 Giovanni Bajo <rasky@develer.com>
221 - and Copyright (c) 2012-2014 Simon Kelley
222 + and Copyright (c) 2012-2015 Simon Kelley
223
224 This program is free software; you can redistribute it and/or modify
225 it under the terms of the GNU General Public License as published by
226 diff --git a/src/domain.c b/src/domain.c
227 index fdd5e4f0838f..278698ca04b3 100644
228 --- a/src/domain.c
229 +++ b/src/domain.c
230 @@ -1,4 +1,4 @@
231 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
232 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
233
234 This program is free software; you can redistribute it and/or modify
235 it under the terms of the GNU General Public License as published by
236 diff --git a/src/forward.c b/src/forward.c
237 index b17bc34f865f..438e9fa490b8 100644
238 --- a/src/forward.c
239 +++ b/src/forward.c
240 @@ -1,4 +1,4 @@
241 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
242 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
243
244 This program is free software; you can redistribute it and/or modify
245 it under the terms of the GNU General Public License as published by
246 diff --git a/src/helper.c b/src/helper.c
247 index 4be53c361ee1..1fee72dead8c 100644
248 --- a/src/helper.c
249 +++ b/src/helper.c
250 @@ -1,4 +1,4 @@
251 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
252 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
253
254 This program is free software; you can redistribute it and/or modify
255 it under the terms of the GNU General Public License as published by
256 diff --git a/src/inotify.c b/src/inotify.c
257 index c537f4c1562a..470d6ed99213 100644
258 --- a/src/inotify.c
259 +++ b/src/inotify.c
260 @@ -1,4 +1,4 @@
261 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
262 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
263
264 This program is free software; you can redistribute it and/or modify
265 it under the terms of the GNU General Public License as published by
266 diff --git a/src/ip6addr.h b/src/ip6addr.h
267 index c7dcb39c33fa..f0b7e820e227 100644
268 --- a/src/ip6addr.h
269 +++ b/src/ip6addr.h
270 @@ -1,4 +1,4 @@
271 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
272 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
273
274 This program is free software; you can redistribute it and/or modify
275 it under the terms of the GNU General Public License as published by
276 diff --git a/src/lease.c b/src/lease.c
277 index 5d56b1b9147e..545bbb7fd09c 100644
278 --- a/src/lease.c
279 +++ b/src/lease.c
280 @@ -1,4 +1,4 @@
281 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
282 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
283
284 This program is free software; you can redistribute it and/or modify
285 it under the terms of the GNU General Public License as published by
286 diff --git a/src/log.c b/src/log.c
287 index 8083a8697323..a5ac605c7c5d 100644
288 --- a/src/log.c
289 +++ b/src/log.c
290 @@ -1,4 +1,4 @@
291 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
292 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
293
294 This program is free software; you can redistribute it and/or modify
295 it under the terms of the GNU General Public License as published by
296 diff --git a/src/loop.c b/src/loop.c
297 index bb377ad12644..565f7d8e58e0 100644
298 --- a/src/loop.c
299 +++ b/src/loop.c
300 @@ -1,4 +1,4 @@
301 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
302 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
303
304 This program is free software; you can redistribute it and/or modify
305 it under the terms of the GNU General Public License as published by
306 diff --git a/src/netlink.c b/src/netlink.c
307 index b39328376389..10f94db25a14 100644
308 --- a/src/netlink.c
309 +++ b/src/netlink.c
310 @@ -1,4 +1,4 @@
311 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
312 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
313
314 This program is free software; you can redistribute it and/or modify
315 it under the terms of the GNU General Public License as published by
316 diff --git a/src/network.c b/src/network.c
317 index 14d2af2ce313..7045253d467b 100644
318 --- a/src/network.c
319 +++ b/src/network.c
320 @@ -1,4 +1,4 @@
321 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
322 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
323
324 This program is free software; you can redistribute it and/or modify
325 it under the terms of the GNU General Public License as published by
326 diff --git a/src/option.c b/src/option.c
327 index 6ef80117cc8c..cb4e76ba0aa2 100644
328 --- a/src/option.c
329 +++ b/src/option.c
330 @@ -1,4 +1,4 @@
331 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
332 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
333
334 This program is free software; you can redistribute it and/or modify
335 it under the terms of the GNU General Public License as published by
336 diff --git a/src/outpacket.c b/src/outpacket.c
337 index dce68f7cb09f..5b1ff9318bbd 100644
338 --- a/src/outpacket.c
339 +++ b/src/outpacket.c
340 @@ -1,4 +1,4 @@
341 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
342 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
343
344 This program is free software; you can redistribute it and/or modify
345 it under the terms of the GNU General Public License as published by
346 diff --git a/src/radv-protocol.h b/src/radv-protocol.h
347 index 72ccda49d7fe..4cc1ea426e69 100644
348 --- a/src/radv-protocol.h
349 +++ b/src/radv-protocol.h
350 @@ -1,4 +1,4 @@
351 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
352 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
353
354 This program is free software; you can redistribute it and/or modify
355 it under the terms of the GNU General Public License as published by
356 diff --git a/src/radv.c b/src/radv.c
357 index 3c8b162dbd8e..6da125b864ae 100644
358 --- a/src/radv.c
359 +++ b/src/radv.c
360 @@ -1,4 +1,4 @@
361 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
362 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
363
364 This program is free software; you can redistribute it and/or modify
365 it under the terms of the GNU General Public License as published by
366 diff --git a/src/rfc1035.c b/src/rfc1035.c
367 index 262274fc5b80..5ef5ddb7485e 100644
368 --- a/src/rfc1035.c
369 +++ b/src/rfc1035.c
370 @@ -1,4 +1,4 @@
371 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
372 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
373
374 This program is free software; you can redistribute it and/or modify
375 it under the terms of the GNU General Public License as published by
376 diff --git a/src/rfc2131.c b/src/rfc2131.c
377 index 5c9040892f1d..55526443dc84 100644
378 --- a/src/rfc2131.c
379 +++ b/src/rfc2131.c
380 @@ -1,4 +1,4 @@
381 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
382 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
383
384 This program is free software; you can redistribute it and/or modify
385 it under the terms of the GNU General Public License as published by
386 diff --git a/src/rfc3315.c b/src/rfc3315.c
387 index e593ec9c362c..c1ddc805988d 100644
388 --- a/src/rfc3315.c
389 +++ b/src/rfc3315.c
390 @@ -1,4 +1,4 @@
391 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
392 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
393
394 This program is free software; you can redistribute it and/or modify
395 it under the terms of the GNU General Public License as published by
396 diff --git a/src/slaac.c b/src/slaac.c
397 index 351d6802f85e..abaad537e25a 100644
398 --- a/src/slaac.c
399 +++ b/src/slaac.c
400 @@ -1,4 +1,4 @@
401 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
402 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
403
404 This program is free software; you can redistribute it and/or modify
405 it under the terms of the GNU General Public License as published by
406 diff --git a/src/tftp.c b/src/tftp.c
407 index a527911fc0df..a57a31514f44 100644
408 --- a/src/tftp.c
409 +++ b/src/tftp.c
410 @@ -1,4 +1,4 @@
411 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
412 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
413
414 This program is free software; you can redistribute it and/or modify
415 it under the terms of the GNU General Public License as published by
416 diff --git a/src/util.c b/src/util.c
417 index d532444da207..91d02410b13f 100644
418 --- a/src/util.c
419 +++ b/src/util.c
420 @@ -1,4 +1,4 @@
421 -/* dnsmasq is Copyright (c) 2000-2014 Simon Kelley
422 +/* dnsmasq is Copyright (c) 2000-2015 Simon Kelley
423
424 This program is free software; you can redistribute it and/or modify
425 it under the terms of the GNU General Public License as published by
426 --
427 2.1.0
428