Attachment #43393 for bug #68598

View | Details | Raw Unified | Return to bug 68598
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-17 / +954 lines)
0	-- dnsmasq-2.16.orig/src/cache.c	0	++ dnsmasq-2.16/src/cache.c
Lines 17-23 Link Here
17	static int cache_inserted, cache_live_freed, insert_error;	17	static int cache_inserted, cache_live_freed, insert_error;
18	static union bigname *big_free;	18	static union bigname *big_free;
19	static int bignames_left, log_queries, cache_size, hash_size;	19	static int bignames_left, log_queries, cache_size, hash_size;
20	static int index;	20	static int uid;
21		21
22	static void cache_free(struct crec *crecp);	22	static void cache_free(struct crec *crecp);
23	static void cache_unlink(struct crec *crecp);	23	static void cache_unlink(struct crec *crecp);
Lines 36-42 Link Here
36	cache_size = size;	36	cache_size = size;
37	big_free = NULL;	37	big_free = NULL;
38	bignames_left = size/10;	38	bignames_left = size/10;
39	index = 0;	39	uid = 0;
40		40
41	cache_inserted = cache_live_freed = 0;	41	cache_inserted = cache_live_freed = 0;
42		42
Lines 48-54 Link Here
48	{	48	{
49	cache_link(crecp);	49	cache_link(crecp);
50	crecp->flags = 0;	50	crecp->flags = 0;
51	crecp->uid = index++;	51	crecp->uid = uid++;
52	}	52	}
53	}	53	}
54		54
Lines 85-91 Link Here
85	{	85	{
86	crecp->flags &= ~F_FORWARD;	86	crecp->flags &= ~F_FORWARD;
87	crecp->flags &= ~F_REVERSE;	87	crecp->flags &= ~F_REVERSE;
88	crecp->uid = index++; /* invalidate CNAMES pointing to this. */	88	crecp->uid = uid++; /* invalidate CNAMES pointing to this. */
89		89
90	if (cache_tail)	90	if (cache_tail)
91	cache_tail->next = crecp;	91	cache_tail->next = crecp;
92	-- dnsmasq-2.16.orig/debian/rules	92	++ dnsmasq-2.16/debian/rules
Line 0 Link Here
0	-- dnsmasq-2.16.orig/debian/postinst	1	#!/usr/bin/make -f
		2	# debian/rules file - for dnsmasq.
		3	# Copyright 2001 by Simon Kelley
		4	# Based on the sample in the debian hello package which carries the following:
		5	# Copyright 1994,1995 by Ian Jackson.
		6	# I hereby give you perpetual unlimited permission to copy,
		7	# modify and relicense this file, provided that you do not remove
		8	# my name from the file itself. (I assert my moral right of
		9	# paternity under the Copyright, Designs and Patents Act 1988.)
		10	# This file may have to be extensively modified
		11
		12	package=dnsmasq
		13
		14	build:
		15	$(checkdir)
		16	make
		17	touch build
		18
		19	clean:
		20	$(checkdir)
		21	rm -f build
		22	rm -rf debian/tmp debian/~ debian/files debian/substvars
		23	make clean
		24
		25	binary-indep: checkroot build
		26	$(checkdir)
		27	# There are no architecture-independent files to be uploaded
		28	# generated by this package. If there were any they would be
		29	# made here.
		30
		31	binary-arch: checkroot build
		32	$(checkdir)
		33	rm -rf debian/tmp
		34	install -d debian/tmp/DEBIAN\
		35	-d debian/tmp/usr/sbin\
		36	-d debian/tmp/usr/share/doc/$(package)\
		37	-d debian/tmp/usr/share/man/man8\
		38	-d debian/tmp/etc/init.d\
		39	-d debian/tmp/etc/resolvconf/update.d\
		40	-d debian/tmp/etc/default\
		41	-d debian/tmp/var/run\
		42	-d debian/tmp/var/lib/misc
		43	install -m 644 debian/conffiles debian/tmp/DEBIAN
		44	install -m 755 debian/postinst debian/postrm debian/prerm debian/tmp/DEBIAN
		45	strip -R .note -R .comment src/dnsmasq
		46	install -m 755 src/dnsmasq debian/tmp/usr/sbin
		47	install -m 755 debian/init debian/tmp/etc/init.d/dnsmasq
		48	install -m 755 debian/resolvconf debian/tmp/etc/resolvconf/update.d/dnsmasq
		49	install -m 644 debian/default debian/tmp/etc/default/dnsmasq
		50	install -m 644 dnsmasq.conf.example debian/tmp/etc/dnsmasq.conf
		51	cp doc.html debian/tmp/usr/share/doc/$(package)/.
		52	cp setup.html debian/tmp/usr/share/doc/$(package)/.
		53	cp FAQ debian/tmp/usr/share/doc/$(package)/.
		54	gzip -9 debian/tmp/usr/share/doc/$(package)/FAQ
		55	cp UPGRADING_to_2.0 debian/tmp/usr/share/doc/$(package)/.
		56	gzip -9 debian/tmp/usr/share/doc/$(package)/UPGRADING_to_2.0
		57	cp CHANGELOG debian/tmp/usr/share/doc/$(package)/changelog
		58	gzip -9 debian/tmp/usr/share/doc/$(package)/changelog
		59	cp debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian
		60	gzip -9 debian/tmp/usr/share/doc/$(package)/changelog.Debian
		61	cp debian/readme debian/tmp/usr/share/doc/$(package)/README.Debian
		62	cp debian/copyright debian/tmp/usr/share/doc/$(package)/copyright
		63	cp dnsmasq.8 debian/tmp/usr/share/man/man8
		64	gzip -9 debian/tmp/usr/share/man/man8/dnsmasq.8
		65	dpkg-shlibdeps src/dnsmasq
66	dpkg-gencontrol -isp
67	chown -R root.root debian/tmp
68	chmod -R g-ws debian/tmp
69	dpkg --build debian/tmp ..
70
71	define checkdir
72	test -f dnsmasq.8 -a -f debian/rules
73	endef
74
75	# Below here is fairly generic really
76
77	binary: binary-indep binary-arch
78
79	checkroot:
80	$(checkdir)
81	test root = "`whoami`"
82
83	.PHONY: binary binary-arch binary-indep clean checkroot
84
85
		86	++ dnsmasq-2.16/debian/postinst
Line 0 Link Here
0	-- dnsmasq-2.16.orig/debian/prerm	1	#!/bin/sh
		2	set -e
		3
		4	# earlier versions stopped dnsmasq at priority 15, so we remove
		5	# all the symlinks here to ensure we get only the correct ones on upgrade.
		6	update-rc.d -f dnsmasq remove >/dev/null 2>&1
		7
		8	update-rc.d dnsmasq defaults 15 85 >/dev/null
		9
		10	if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
		11
		12	# belt and braces ....
		13	if [ -e /var/run/dnsmasq.pid ]; then
		14	if [ -x /usr/sbin/invoke-rc.d ] ; then
		15	invoke-rc.d dnsmasq stop >/dev/null 2>&1 && true
		16	else
		17	/etc/init.d/dnsmasq stop >/dev/null 2>&1 && true
		18	fi
		19	fi
		20
		21	if [ -x /usr/sbin/invoke-rc.d ] ; then
		22	invoke-rc.d dnsmasq start
		23	else
		24	/etc/init.d/dnsmasq start
		25	fi
		26
		27	fi
		28	++ dnsmasq-2.16/debian/prerm
Line 0 Link Here
0	-- dnsmasq-2.16.orig/debian/changelog	1	#!/bin/sh
		2	set -e
		3
		4	if [ $ "$1" = "upgrade" -o "$1" = "remove" $ -a -L /usr/doc/dnsmasq ]; then
		5	rm -f /usr/doc/dnsmasq
		6	fi
		7
		8	if [ -x /usr/sbin/invoke-rc.d ] ; then
		9	invoke-rc.d dnsmasq stop && true
		10	else
		11	/etc/init.d/dnsmasq stop && true
		12	fi
		13
		14	exit 0
		15
		16
		17	++ dnsmasq-2.16/debian/changelog
Line 0 Link Here
0	-- dnsmasq-2.16.orig/debian/postrm	1	dnsmasq (2.16-2) unstable; urgency=high
		2
		3	* Rename variable in cache.c which clashes with C headers
		4	under gcc-3.4 (closes: #277893)
		5
		6	-- Simon Kelley <simon@thekelleys.org.uk> Mon, 25 Oct 2004 16:03:24 +0000
		7
		8	dnsmasq (2.16-1) unstable; urgency=high
		9
		10	* New upstream.
		11	* Fixes interaction with Linux 2.4.x and 2.6.x not-quite-POSIX
		12	select behavior, which can cause hangs when receiving UDP
		13	packets with bad checksum.
		14	* Fix bad interaction with polipo. (closes: #275754)
		15	* Cache CNAMEs better. (closes: #276289)
		16
		17	-- Simon Kelley <simon@thekelleys.org.uk> Mon, 04 Oct 2004 15:25:44 +0000
		18
		19	dnsmasq (2.15-1) unstable; urgency=low
		20
		21	* New upstream.
		22	* Fix NXDOMAIN/NODATA confusion for locally known names. (closes: #271564)
		23
		24	-- Simon Kelley <simon@thekelleys.org.uk> Wed, 15 Sep 2004 15:01:44 +0000
		25
		26	dnsmasq (2.14-1) unstable; urgency=low
		27
		28	* New upstream.
		29
		30	-- Simon Kelley <simon@thekelleys.org.uk> Sat, 28 Aug 2004 20:39:33 +0000
		31
		32	dnsmasq (2.13-1) unstable; urgency=high
		33
		34	* New upstream - fixes crash. (closes #265313)
		35
		36	-- Simon Kelley <simon@thekelleys.org.uk> Thur, 12 Aug 2004 12:45:23 +0000
		37
		38	dnsmasq (2.12-1) unstable; urgency=low
		39
		40	* New upstream.
		41	* Log types of incoming queries (closes: #230123).
		42	* Don't set "filterwin2k" by default in the included
		43	config file - it breaks SRV lookups and Kerberos.
		44
		45	-- Simon Kelley <simon@thekelleys.org.uk> Sun, 8 Aug 2004 19:58:13 +0000
		46
		47	dnsmasq (2.11-1) unstable; urgency=low
		48
		49	* New upstream.
		50
		51	-- Simon Kelley <simon@thekelleys.org.uk> Wed, 28 July 2004 21:59:33 +0000
		52
		53	dnsmasq (2.10-1) unstable; urgency=low
		54
		55	* New upstream.
		56	* Allow query-port less than 1024 (closes: #236586)
		57	* Change behaviour of --bogus-priv (closes: #254711)
		58	* Match existing leases by MAC address when a client stops
		59	using client-id or they get suppressed by dnsmasq. (closes: #258519)
		60
		61	-- Simon Kelley <simon@thekelleys.org.uk> Thur, 24 June 2004 20:55:42 +0000
		62
		63	dnsmasq (2.9-2) unstable; urgency=low
		64
		65	* Fix typo in debian/control (closes: #255762)
66
67	-- Simon Kelley <simon@thekelleys.org.uk> Wed, 23 Jun 2004 20:40:13 +0000
68
69	dnsmasq (2.9-1) unstable; urgency=low
70
71	* New upstream.
72	* New version has improved server selection logic (closes: #251097)
73	* Improved initscript (closes: #252229)
74	* Conflict with old resolvconf versions to maintain compatibility.
75	* Updated README.debian (closes: #253429)
76	* Changed startup message to mention DHCP as well as DNS.
77	* New resolvconf update script (closes: #254765)
78
79	-- Simon Kelley <simon@thekelleys.org.uk> Wed, 26 May 2004 12:35:23 +0000
80
81	dnsmasq (2.8-1) unstable; urgency=low
82
83	* New upstream.
84	* Fixes problem with zero-length hostnames which can lose
85	DHCP leases over a restart. (closes: #248829)
86
87	-- Simon Kelley <simon@thekelleys.org.uk> Thur, 13 May 2004 18:40:12 +0000
88
89	dnsmasq (2.7-2) unstable; urgency=low
90
91	* New version of resolvconf script from Thomas Hood with the
92	following changes: (closes: #247695)
93	* Doesn't include nameservers listed in the lo.inet or lo.inet6 interface
94	records created by "ifup lo"
95	* Lists addresses in a specified order (by interface name)
96	* Eliminates duplicate nameserver addresses
97	* Updates /var/run/dnsmasq/resolv.conf atomically
98	* Doesn't generate empty lines
99
100	-- Simon Kelley <simon@thekelleys.org.uk> Tue, 11 May 2004 22:35:12 +0000
101
102	dnsmasq (2.7-1) unstable; urgency=low
103
104	* New upstream.
105
106	-- Simon Kelley <simon@thekelleys.org.uk> Sun, 18 Apr 2004 20:00:23 +0000
107
108	dnsmasq (2.6-3) unstable; urgency=low
109
110	* Removed reload command from start script and moved force-reload
111	to be equivalent to restart. This is needed to be policy compliant
112	since SIHGUP doesn't cause dnsmasq to reload its configuration file,
113	only the /etc/hosts, /etc/resolv.conf etc. (closes: #244208)
114
115	-- Simon Kelley <simon@thekelleys.org.uk> Sun, 18 Apr 2004 14:40:51 +0000
116
117	dnsmasq (2.6-2) unstable; urgency=low
118
119	* Added Conflict with pdnsd (closes: #242731).
120	Rationale: dnsmasq used to conflict with all the DNS servers
121	in Debian, but that was removed because some people wished
122	to run with dnsmasq listening on one interface and another DNS
123	server listening on another interface. However AFAIK it is not
124	possible to make pdnsd listen on a subset of a hosts interfaces,
125	so there is no scenario where running pdnsd and dnsmasq on the same
126	host would be useful, hence the conflict goes back.
127	* Added note about the --bind-interfaces option to
128	readme.Debian (closes: #241700)
129
130	-- Simon Kelley <simon@thekelleys.org.uk> Tues, 13 Apr 2004 18:37:55 +0000
131
132	dnsmasq (2.6-1) unstable; urgency=low
133
134	* New upstream.
135	* New version adds back ability to read ISC dhcpd lease files
136	for backwards compatibility. (closes: #229684) (closes: #236421)
137	* Fix parsing of # characters in options file. (closes: #241199)
138
139	-- Simon Kelley <simon@thekelleys.org.uk> Sun, 21 Mar 2004 19:59:25 +0000
140
141	dnsmasq (2.5-1) unstable; urgency=low
142
143	* New upstream, includes fix for IP-alias related
144	problem. (closes: #238268)
145
146	-- Simon Kelley <simon@thekelleys.org.uk> Sun, 14 Mar 2004 08:32:43 +0000
147
148	dnsmasq (2.4-3) unstable; urgency=low
149
150	* Fixed "bind-interfaces" option, even when
151	an "interface" option is given also.
152
153	-- Simon Kelley <simon@thekelleys.org.uk> Fri, 12 Mar 2004 08:14:23 +0000
154
155	dnsmasq (2.4-2) unstable; urgency=low
156
157	* Fixed "bind-interfaces" option (closes: #237543).
158
159	-- Simon Kelley <simon@thekelleys.org.uk> Fri, 12 Mar 2004 07:30:25 +0000
160
161	dnsmasq (2.4-1) unstable; urgency=low
162
163	* New upstream.
164
165	-- Simon Kelley <simon@thekelleys.org.uk> Thurs, 11 Mar 2004 07:59:55 +0000
166
167	dnsmasq (2.3-1) unstable; urgency=low
168
169	* New upstream.
170
171	-- Simon Kelley <simon@thekelleys.org.uk> Tues, 03 Feb 2004 20:33:10 +0000
172
173	dnsmasq (2.2-1) unstable; urgency=low
174
175	* New upstream. (fixes no DHCP with IPv6 problem)
176	* Restart (old) daemon on abort-upgrade. (closes: #230286)
177
178	-- Simon Kelley <simon@thekelleys.org.uk> Fri, 30 Jan 2004 10:23:00 +0000
179
180	dnsmasq (2.1-1) unstable; urgency=low
181
182	* New upstream.
183	* Allow addresses in /etc/hosts to be used for
184	DHCP leases (closes: #229681)
185	* Fix lease time processing. (closes: #229682) (closes: #229687)
186	* Fix example conf file. (closes: #229683) (closes: #229701)
187	* Allow address 0.0.0.0 to mean "self" in dhcp-option. (closes: #229685)
188	* Cope with ENODEV return from bind of
189	IPv6 server socket (closes: #229607)
190	* Document the strict-order option in dnsmasq.conf (closes: #229272)
191	* Fix local-only domain setting. (closes: #229846)
192	* Updates Debian readme to mention resolvconf and point at the
193	local copy of RFC2132.
194
195	-- Simon Kelley <simon@thekelleys.org.uk> Fri, 23 Jan 2004 14:38:29 +0000
196
197	dnsmasq (2.0-1) unstable; urgency=low
198
199	* New upstream: This removes the ability to read the
200	the leases file of ISC DHCP and replaces it with a built-in
201	DHCP server. Apologies in advance for breaking backwards
202	compatibilty, but this replaces a bit of a hack (the ISC stuff)
203	with a nicely engineered and much more apropriate solution.
204	Wearing my upstream-maintainer hat, I want to lose the hack now,
205	rather than have to support it into Sarge.
206	* New upstream closes some bugs since they become
207	irrelevant. (closes: #197295)
208	* Ensure that /var/run and /var/lib/misc exist.
209	* Remove sed dependency, which was a mistake.
210	* Remove extraneous "build" file. (closes: #226994)
211
212	-- Simon Kelley <simon@thekelleys.org.uk> Sun, 16 Jan 2004 19:35:49 +0000
213
214	dnsmasq (1.18-2) unstable; urgency=low
215
216	* Fixed manpage typo (closes: #220961)
217	* Added dependency for sed. (closes: #222401)
218	* Check for complete resolvconf installation before
219	calling it. (closes: #223442)
220	* Added Links section to doc.html
221
222	-- Simon Kelley <simon@thekelleys.org.uk> Sat, 27 Dec 2003 20:21:15 +0000
223
224	dnsmasq (1.18-1) unstable; urgency=low
225
226	* New upstream which does round-robin. (closes: #215460)
227	* Removed conflicts with other dns servers since it is now
228	possible to control exactly where dnsmasq listens on multi-homed
229	hosts, making co-existance with another nameserver
230	a viable proposition. (closes #176163)
231	* New upstream allows _ in hostnames and check for illegal
232	names in /etc/hosts. (closes: #218842)
233
234	-- Simon Kelley <simon@thekelleys.org.uk> Fri, 17 Oct 2003 16:23:14 +0000
235
236	dnsmasq (1.17-1) unstable; urgency=high
237
238	* New upstream (closes: #212680)
239
240	-- Simon Kelley <simon@thekelleys.org.uk> Wed, 8 Oct 2003 14:38:29 +0000
241
242	dnsmasq (1.16-1) unstable; urgency=low
243
244	* New upstream.
245	* Renamed Debian README to the standard README.Debian. (closes: #211577)
246	* Updated the installed /etc/dnsmasq.conf to reflect new options.
247
248	-- Simon Kelley <simon@thekelleys.org.uk> Tues, 16 Sep 2003 23:18:59 +0000
249
250	dnsmasq (1.15-1) unstable; urgency=low
251
252	* New upstream.
253
254	-- Simon Kelley <simon@thekelleys.org.uk> Tues, 16 Sep 2003 21:48:49 +0000
255
256	dnsmasq (1.14-1) unstable; urgency=low
257
258	* New upstream.
259	* Use invoke-rc.d in postinst and prerm scripts when available.
260	* Stop dnsmasq later (at priority 85). (closes: #200625)
261	* Updated /etc/resolvconf/update.d/dnsmasq. (closes: #202609)
262	* Suggest resolvconf. (closes: #208093)
263
264	-- Simon Kelley <simon@thekelleys.org.uk> Tues, 2 Sep 2003 16:43:29 +0000
265
266	dnsmasq (1.13-4) unstable; urgency=high
267
268	* Ignore failures in stopping existing dnsmasq
269	processes. (closes: #204127) (closes: #204129)
270	* Added download source to copyright. (closes: #206647)
271
272	-- Simon Kelley <simon@thekelleys.org.uk> Tues, 2 Sep 2003 15:28:28 +0000
273
274	dnsmasq (1.13-3) unstable; urgency=low
275
276	* Moved /etc/resolvconf/update.d/dnsmasq script into this package.
277	* Don't call resolvconf from /etc/init.d/dnsmasq if dnsmasq fails
278	to start. (Patch from Thomas Hood.)
279
280	-- Simon Kelley <simon@thekelleys.org.uk> Mon, 7 Jul 2003 20:55:29 +0000
281
282	dnsmasq (1.13-2) unstable; urgency=low
283
284	* Added support for the resolvconf nameserver configuration package.
285
286	-- Simon Kelley <simon@thekelleys.org.uk> Sun, 22 Jun 2003 20:30:19 +0000
287
288	dnsmasq (1.13-1) unstable; urgency=low
289
290	* New upstream.
291	* Added new options to the default dnsmasq.conf.
292	* Default config now reads /var/lib/dhcp/dhcp.leases (closes: #195185)
293	* Added option to disable negative caching. (closes: #194274)
294	* Added David Coe's query port patch. (closes: #196578)
295
296	-- Simon Kelley <simon@thekelleys.org.uk> Sat, 31 May 2003 18:10:29 +0000
297
298	dnsmasq (1.12-1) unstable; urgency=low
299
300	* New upstream.
301	* Added examples of "local" and "address" options to dnsmasq.conf.
302	* Remove /usr/doc symlink code.
303	* Remove period from end of description field.
304
305	-- Simon Kelley <simon@thekelleys.org.uk> Sat, 8 Mar 2003 12:16:09 +0000
306
307	dnsmasq (1.11-2) unstable; urgency=low
308
309	* Fixed thinko in example dnsmasq.conf. (closes: #180410)
310
311	-- Simon Kelley <simon@thekelleys.org.uk> Mon, 24 Feb 2003 20:06:19 +0000
312
313	dnsmasq (1.11-1) unstable; urgency=low
314
315	* New uptream.
316
317	-- Simon Kelley <simon@thekelleys.org.uk> Tues, 12 Jan 2003 22:25:17 -0100
318
319	dnsmasq (1.10-1) unstable; urgency=low
320
321	* New uptream.
322	* Force service to stop in postinst before restarting. I don't
323	understand the circumstances under which it would still be running at
324	this point, but this is the correct fix anyway. (closes: #169718)
325	* Add /etc/dnsmasq.conf as a conffile and add a comment to
326	/etc/default/dnsmasq deprecating its use and recommending
327	/etc/dnsmasq.conf instead, since upstream now supports this.
328
329	-- Simon Kelley <simon@thekelleys.org.uk> Mon, 9 Oct 2002 19:05:34 -0100
330
331	dnsmasq (1.9-1) unstable; urgency=low
332
333	* New uptream.
334
335	-- Simon Kelley <simon@thekelleys.org.uk> Mon, 23 Sept 2002 21:35:07 -0100
336
337	dnsmasq (1.8-1) unstable; urgency=low
338
339	* New upstream.
340
341	-- Simon Kelley <simon@thekelleys.org.uk> Mon, 12 Aug 2002 21:56:17 -0100
342
343	dnsmasq (1.7-1) unstable; urgency=low
344
345	* New upstream including better group-id manipulation. (closes: #152212)
346	* Conflict with bind9 (closes: #151812)
347	* Added more options to startup script. (closes: #148535)
348
349	-- Simon Kelley <simon@thekelleys.org.uk> Sun, 14 July 2002 20:23:14 -0100
350
351	dnsmasq (1.6-1) unstable; urgency=low
352
353	* New upstream.
354	* Fixed documentation typos. (closes: #144637)
355	* Fixed failure to remove package if daemon not running. (closes: #147083)
356	* Changed upload to tarball-and-diff. (closes: #144638)
357
358	-- Simon Kelley <simon@thekelleys.org.uk> Sun, 19 May 2002 22:30:17 -0100
359
360	dnsmasq (1.5-1) unstable; urgency=medium
361
362	* New upstream (includes hotmail.com fix).
363	* Fixed DHCP lease file bug. (closes: #143778)
364	* Fixed failure of "reload" command in startup script (closes: #141021)
365	* Allow more than one interface name in the DNSMASQ_INTERFACE variable.
366
367	-- Simon Kelley <simon@thekelleys.org.uk> Sun, 14 Apr 2002 16:39:13 -0100
368
369	dnsmasq (1.4-2) unstable; urgency=low
370
371	* Fixed snafu in startup script (closes: #139760)
372
373	-- Simon Kelley <simon@thekelleys.org.uk> Sun, 24 Mar 2002 23:06:18 +0000
374
375	dnsmasq (1.4-1) unstable; urgency=low
376
377	* New upstream
378
379	-- Simon Kelley <simon@thekelleys.org.uk> Thurs, 7 Mar 2002 21:02:05 +0000
380
381	dnsmasq (1.3-1) unstable; urgency=low
382
383	* New upstream
384
385	-- Simon Kelley <simon@thekelleys.org.uk> Fri, 15 Feb 2002 20:45:01 +0000
386
387	dnsmasq (1.2-4) unstable; urgency=low
388
389	* Updated standards-version.
390	* More aggressive strip of binaries.
391	* Added depends: netbase.
392	* distribution->unstable for upload.
393	* Updated readme.Debian since config in /etc/default/dnsmasq now.
394	* Updated readme.Debian to reflect fact that this package is official now!
395
396	-- Simon Kelley <simon@thekelleys.org.uk> Fri, 15 Feb 2002 20:45:01 +0000
397
398	dnsmasq (1.2-3) stable; urgency=low
399
400	* Added Suggests: and Conflicts: fields to control file.
401
402	-- Simon Kelley <simon@thekelleys.org.uk> Thurs, 14 Feb 2002 20:33:47 +0000
403
404	dnsmasq (1.2-2) stable; urgency=low
405
406	* Many packaging fixes, to please lintian
407	* Added extended description.
408	* Fixed copyright file.
409	* Compressed everything in /usr/share/doc/dnsmasq.
410	* Added code to remove /usr/doc/dnsmasq to prerm script.
411	* Moved configuration from /etc/init.d/dnsmasq to /etc/default/dnsmasq
412
413	-- Simon Kelley <simon@thekelleys.org.uk> Sat, 02 Feb 2002 18:54:37 +0000
414
415	dnsmasq (1.2-1) stable; urgency=low
416
417	* New upstream
418	* Added more options to startup script
419
420	-- Simon Kelley <simon@thekelleys.org.uk> Sat, 20 Dec 2001 21:15:07 +0000
421
422	dnsmasq (1.1-2) stable; urgency=low
423
424	* New upstream
425	* Strip binary
426	* Moved manpage from section 1 to section 8
427
428	-- Simon Kelley <simon@thekelleys.org.uk> Sat, 21 Oct 2001 17:32:04 -0100
429
430	dnsmasq (1.0-1) unstable; urgency=low
431
432	* New upstream
433
434	-- Simon Kelley <simon@thekelleys.org.uk> Sat, 10 Oct 2001 15:52:06 -0100
435
436	dnsmasq (0.996-1) unstable; urgency=low
437
438	* New upstream
439
440	-- Simon Kelley <simon@thkelleys.org.uk> Fri, 26 Oct 2001 10:32:06 -0100
441
442	dnsmasq (0.995-1) unstable; urgency=low
443
444	* New upstream
445
446	-- Simon Kelley <simon@thkelleys.org.uk> Tue, 09 Oct 2001 16:39:07 -0100
447
448	dnsmasq (0.994-1) unstable; urgency=low
449
450	* New upstream
451
452	-- Simon Kelley <simon@thkelleys.org.uk> Sat, 07 Oct 2001 15:45:04 -0100
453
454	dnsmasq (0.992-1) unstable; urgency=low
455
456	* New upstream
457
458	-- Simon Kelley <simon@thkelleys.org.uk> Fri, 31 Aug 2001 16:17:00 -0100
459
460	dnsmasq (0.98-1) unstable; urgency=low
461
462	* New upstream
463
464	-- Simon Kelley <simon@thkelleys.org.uk> Wed, 11 Jul 2001 11:31:00 -0100
465
466	dnsmasq (0.96-1) unstable; urgency=low
467
468	* Fixed thinko in cache code..
469
470	-- Simon Kelley <simon@thkelleys.org.uk> Sat, 07 Jul 2001 18:52:00 -0100
471
472	dnsmasq (0.95-1) unstable; urgency=low
473
474	* Initial Release.
475
476	-- Simon Kelley <simon@thkelleys.org.uk> Sat, 29 Aug 1998 20:27:27 -0400
477
478
479
480
481
482
483
484
485
486
		487	++ dnsmasq-2.16/debian/postrm
Line 0 Link Here
0	-- dnsmasq-2.16.orig/debian/conffiles	1	#!/bin/sh
		2	set -e
		3
		4	if [ purge = "$1" ]; then
		5	update-rc.d dnsmasq remove >/dev/null
		6	fi
		7	++ dnsmasq-2.16/debian/conffiles
Line 0 Link Here
0	-- dnsmasq-2.16.orig/debian/readme	1	/etc/init.d/dnsmasq
		2	/etc/default/dnsmasq
		3	/etc/dnsmasq.conf
		4	/etc/resolvconf/update.d/dnsmasq
		5	++ dnsmasq-2.16/debian/readme
Line 0 Link Here
0	-- dnsmasq-2.16.orig/debian/init	1	Notes on configuring dnsmasq as packaged for Debian.
		2
		3	(1) To configure dnsmasq edit /etc/dnsmasq.conf. The file is well
		4	commented; see also the dnsmasq.8 man page for explanation of
		5	the options. The file /etc/default/dnsmasq also exists but it
		6	shouldn't need to be touched in most cases. To set up DHCP
		7	options you might need to refer to a copy of RFC 2132. This is
		8	available on Debian systems in the package doc-rfc-std as the file
		9	/usr/share/doc/RFC/draft-standard/rfc2132.txt.gz .
		10
		11	(2) If the Debian resolvconf package is installed then, regardless
		12	of what interface configuration daemons are employed, the list of
		13	nameservers to which dnsmasq should forward queries can be found
		14	in /var/run/dnsmasq/resolv.conf; also, 127.0.0.1 is listed as the
		15	first nameserver address in /etc/resolv.conf. This works using the
		16	default configurations of resolvconf and dnsmasq.
		17
		18	(3) In the absence of resolvconf, if you are using dhcpcd then
		19	dnsmasq should read the list of nameservers from the automatically
		20	generated file /etc/dhcpc/resolv.conf. You should list 127.0.0.1
		21	as the first nameserver address in /etc/resolv.conf.
		22
		23	(4) In the absence of resolvconf, if you are using pppd then
		24	dnsmasq should read the list of nameservers from the automatically
		25	generated file /etc/ppp/resolv.conf. You should list 127.0.0.1
		26	as the first nameserver address in /etc/resolv.conf.
		27
		28	(5) If you run multiple DNS servers on a single machine, each
		29	listening on a different interface, then it is necessary from
		30	version 2.3 on to use the bind-interfaces option by uncommenting
		31	"bind-interfaces" in /etc/dnsmasq.conf. This option stops dnsmasq
		32	from binding the wildcard address and allows servers listening on
		33	port 53 on interfaces not in use by dnsmasq to work.
		34	++ dnsmasq-2.16/debian/init
Line 0 Link Here
0	-- dnsmasq-2.16.orig/debian/control	1	#!/bin/sh
		2	#
		3	# dnsmasq
		4
		5	set +e # Don't exit on error status
		6
		7	PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
		8	DAEMON=/usr/sbin/dnsmasq
		9	NAME=dnsmasq
		10	DESC="DNS forwarder and DHCP server"
		11
		12	# Most configuration options in /etc/default/dnsmasq are deprecated
		13	# but still honoured.
		14
		15	if [ -r /etc/default/$NAME ]; then
		16	. /etc/default/$NAME
		17	fi
		18
		19	test -x $DAEMON \|\| exit 0
		20
		21	# RESOLV_CONF:
		22	# If the resolvconf package is installed then use the resolv conf file
		23	# that it provides as the default. Otherwise use /etc/resolv.conf as
		24	# the default.
		25	#
		26	# This setting can be overridden by setting the RESOLV_CONF environment
		27	# variable in /etc/default/dnsmasq or by including a resolv-file
		28	# line in /etc/dnsmasq.conf .
		29
		30	if [ ! "$RESOLV_CONF" ] &&
		31	[ -x /sbin/resolvconf ]
		32	then
		33	RESOLV_CONF=/var/run/dnsmasq/resolv.conf
		34	fi
		35
		36	for INTERFACE in $DNSMASQ_INTERFACE; do
		37	DNSMASQ_INTERFACES="$DNSMASQ_INTERFACES -i $INTERFACE"
		38	done
		39
		40	start()
		41	{
		42	# Return
		43	# 0 if daemon has been started
		44	# 1 if daemon was already running
		45	# 2 if daemon could not be started
		46	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON --test > /dev/null \|\| return 1
		47	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- \
		48	${MAILHOSTNAME:+ -m $MAILHOSTNAME} \
		49	${MAILTARGET:+ -t $MAILTARGET} \
		50	${DNSMASQ_USER:+ -u $DNSMASQ_USER} \
		51	${DNSMASQ_INTERFACE:+ $DNSMASQ_INTERFACES} \
		52	${DHCP_LEASE:+ -l $DHCP_LEASE} \
		53	${DOMAIN_SUFFIX:+ -s $DOMAIN_SUFFIX} \
		54	${RESOLV_CONF:+ -r $RESOLV_CONF} \
		55	${CACHESIZE:+ -c $CACHESIZE} \
		56	${DNSMASQ_OPTS:+ $DNSMASQ_OPTS} \
		57	\|\| return 2
		58	}
		59
		60	start_resolvconf()
		61	{
		62	if [ -x /sbin/resolvconf ] ; then
		63	echo "nameserver 127.0.0.1" \| /sbin/resolvconf -a lo.$NAME
		64	fi
		65	return 0
66	}
67
68	stop()
69	{
70	# Return
71	# 0 if daemon has been stopped
72	# 1 if daemon was already stopped
73	# 2 if daemon could not be stopped
74	# other if a failure occurred
75	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile /var/run/$NAME.pid --name $NAME
76	RETVAL="$?"
77	[ "$RETVAL" = 2 ] && return 2
78	# Wait for children to finish too
79	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
80	[ "$?" = 2 ] && return 2
81	rm -f /var/run/$NAME.pid # Doesn't delete its own pidfile
82	return "$RETVAL"
83	}
84
85	stop_resolvconf()
86	{
87	if [ -x /sbin/resolvconf ] ; then
88	/sbin/resolvconf -d lo.$NAME
89	fi
90	return 0
91	}
92
93	case "$1" in
94	start)
95	echo -n "Starting $DESC: $NAME"
96	start
97	case "$?" in
98	0)
99	echo "."
100	start_resolvconf
101	exit 0
102	;;
103	1)
104	echo " (already running)."
105	exit 0
106	;;
107	*)
108	echo " (failed)."
109	exit 1
110	;;
111	esac
112	;;
113	stop)
114	stop_resolvconf
115	echo -n "Stopping $DESC: $NAME"
116	stop
117	case "$?" in
118	0) echo "." ; exit 0 ;;
119	1) echo " (not running)." ; exit 0 ;;
120	*) echo " (failed)." ; exit 1 ;;
121	esac
122	;;
123	restart\|force-reload)
124	stop_resolvconf
125	echo -n "Restarting $DESC: $NAME"
126	stop
127	case "$?" in
128	0\|1)
129	start
130	case "$?" in
131	0)
132	echo "."
133	start_resolvconf
134	exit 0
135	;;
136	1)
137	echo " (failed -- old process is still running)."
138	exit 1
139	;;
140	*)
141	echo " (failed to start)."
142	exit 1
143	;;
144	esac
145	;;
146	*)
147	echo " (failed to stop)."
148	exit 1
149	;;
150	esac
151	;;
152	*)
153	echo "Usage: /etc/init.d/$NAME {start\|stop\|restart\|force-reload}" >&2
154	exit 3
155	;;
156	esac
157
158	exit 0
159
		160	++ dnsmasq-2.16/debian/control
Line 0 Link Here
0	-- dnsmasq-2.16.orig/debian/copyright	1	Source: dnsmasq
		2	Section: net
		3	Priority: optional
		4	Maintainer: Simon Kelley <simon@thekelleys.org.uk>
		5	Standards-Version: 3.6.1
		6
		7	Package: dnsmasq
		8	Architecture: any
		9	Depends: netbase, ${shlibs:Depends}
		10	Suggests: resolvconf
		11	Conflicts: pdnsd, resolvconf (<<1.15)
		12	Description: A small caching DNS proxy and DHCP server.
		13	Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP
		14	server. It is designed to provide DNS and, optionally, DHCP, to a
		15	small network. It can serve the names of local machines which are
		16	not in the global DNS. The DHCP server integrates with the DNS
		17	server and allows machines with DHCP-allocated addresses
		18	to appear in the DNS with names configured either in each host or
		19	in a central configuration file. Dnsmasq supports static and dynamic
		20	DHCP leases and BOOTP for network booting of diskless machines.
		21
		22	++ dnsmasq-2.16/debian/copyright
Line 0 Link Here
0	-- dnsmasq-2.16.orig/debian/default	1	dnsmasq is Copyright (c) 2000 Simon Kelley
		2
		3	It was downloaded from: http://www.thekelleys.org.uk/dnsmasq/
		4
		5	This program is free software; you can redistribute it and/or modify
		6	it under the terms of the GNU General Public License as published by
		7	the Free Software Foundation; version 2 dated June, 1991.
		8
		9	This program is distributed in the hope that it will be useful,
		10	but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	GNU General Public License for more details.
		13
		14	On Debian GNU/Linux systems, the text of the GNU general public license is
		15	available in the file /usr/share/common-licenses/GPL
		16
		17	The Debian package of dnsmasq was created by Simon Kelley with assistance
		18	from Lars Bahner.
		19
		20	++ dnsmasq-2.16/debian/default
Line 0 Link Here
0	-- dnsmasq-2.16.orig/debian/resolvconf	1	# NOTE:
		2	#
		3	# From version 1.10, dnsmasq itself reads a
		4	# config file at /etc/dnsmasq.conf so you may
		5	# want to set options there rather than here.
		6	#
		7	# This file now has only two functions,
		8	# to set DOMAIN_SUFFIX by running `dnsdomainname`
		9	# and to select an alternative config file
		10	# by setting DNSMASQ_OPTS to --conf-file=<file>
		11	#
		12	# For upgraders, all the shell variables set here in previous versions
		13	# are still honored by the init script so if you just keep your old
		14	# version of this file nothing will break.
		15
		16	#DOMAIN_SUFFIX=`dnsdomainname`
		17	#DNSMASQ_OPTS="--conf-file=/etc/dnsmasq.alt"
		18	++ dnsmasq-2.16/debian/resolvconf
Line 0 Link Here
		1	#!/bin/sh
		2	#
		3	# Script to update the resolver list for dnsmasq
		4	#
		5	# N.B. Resolvconf may run us even if dnsmasq is not running.
		6	# If dnsmasq is installed then we go ahead and update
		7	# the resolver list in case dnsmasq is started later.
		8	#
		9	# Assumption: On entry, PWD contains the resolv.conf-type files
		10	#
		11	# Depends: resolvconf (>= 1.14)
		12	#
		13	# Licensed under the GNU GPL. See /usr/share/common-licenses/GPL.
		14	#
		15	# History
		16	# June 2003 - June 2004: Written by Thomas Hood <jdthood@yahoo.co.uk>
		17
		18	set -e
		19
		20	RUN_DIR="/var/run/dnsmasq"
		21	RSLVRLIST_FILE="${RUN_DIR}/resolv.conf"
		22	TMP_FILE="${RSLVRLIST_FILE}_new.$$"
		23
		24	[ -x /usr/sbin/dnsmasq ] \|\| exit 0
		25	[ -x /lib/resolvconf/list-records ] \|\| exit 1
		26
		27	PATH=/bin:/sbin
		28
		29	report_err() { echo "$0: Error: $*" >&2 ; }
		30
		31	# Stores arguments (minus duplicates) in RSLT, separated by spaces
		32	# Doesn't work properly if an argument itself contain whitespace
		33	uniquify()
		34	{
		35	RSLT=""
		36	while [ "$1" ] ; do
		37	for E in $RSLT ; do
		38	[ "$1" = "$E" ] && { shift ; continue 2 ; }
		39	done
		40	RSLT="${RSLT:+$RSLT }$1"
		41	shift
		42	done
		43	}
		44
		45	if [ ! -d "$RUN_DIR" ] && ! mkdir --parents --mode=0755 "$RUN_DIR" ; then
		46	report_err "Failed trying to create directory $RUN_DIR"
		47	exit 1
		48	fi
		49
		50	RSLVCNFFILES="$(/lib/resolvconf/list-records \| sed -e '/^lo.dnsmasq$/d')"
		51
		52	NMSRVRS=""
		53	if [ "$RSLVCNFFILES" ] ; then
		54	uniquify $(sed -n -e 's/^[[:space:]]*nameserver[[:space:]]\+//p' $RSLVCNFFILES)
		55	NMSRVRS="$RSLT"
		56	fi
		57
		58	clean_up() { rm -f "$TMP_FILE" ; }
		59	trap clean_up EXIT
		60	: >\| "$TMP_FILE"
		61	for N in $NMSRVRS ; do echo "nameserver $N" >> "$TMP_FILE" ; done
		62	mv -f "$TMP_FILE" "$RSLVRLIST_FILE"
		63
		64

Return to bug 68598