Compare commits

...
3 Commits
Author SHA1 Message Date
Simon Kelley 9def963c65 Bump debian version. 2012-12-14 11:58:56 +00:00
Simon Kelley 990123a937 Fix regexp foobar. 2012-12-14 11:56:15 +00:00
Simon Kelley 1d6c639310 Fix broken cache. 2012-12-14 11:19:36 +00:00
4 changed files with 11 additions and 3 deletions

No files matched your search

+2
View File
@@ -6,6 +6,8 @@ version 2.65
Fix failure to build with DHCP support excluded. Thanks to Fix failure to build with DHCP support excluded. Thanks to
Gustavo Zacarias for the patch. Gustavo Zacarias for the patch.
Fix nasty regression in 2.64 which completely broke cacheing.
version 2.64 version 2.64
Handle DHCP FQDN options with all flag bits zero and Handle DHCP FQDN options with all flag bits zero and
+1 -1
View File
@@ -17,7 +17,7 @@ elif grep '\$Format:%d\$' $1/VERSION >/dev/null 2>&1; then
# unsubstituted VERSION, but no git available. # unsubstituted VERSION, but no git available.
echo UNKNOWN echo UNKNOWN
else else
vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep $v[0-9]` vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]`
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "${vers}" | sort | head -n 1 | sed 's/^v//' echo "${vers}" | sort | head -n 1 | sed 's/^v//'
+7 -1
View File
@@ -1,8 +1,14 @@
dnsmasq (2.66-1) unstable; urgency=low
* New upstream.
-- Simon Kelley <simon@thekelleys.org.uk> Fri, 14 Dec 2012 11:58:41 +0000
dnsmasq (2.65-1) unstable; urgency=low dnsmasq (2.65-1) unstable; urgency=low
* New upstream. * New upstream.
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 4 Dec 2012 20:58:12 +0000 -- Simon Kelley <simon@thekelleys.org.uk> Fri, 14 Dec 2012 11:34:12 +0000
dnsmasq (2.64-1) unstable; urgency=low dnsmasq (2.64-1) unstable; urgency=low
+1 -1
View File
@@ -394,7 +394,7 @@ struct crec *cache_insert(char *name, struct all_addr *addr,
int freed_all = flags & F_REVERSE; int freed_all = flags & F_REVERSE;
int free_avail = 0; int free_avail = 0;
if(daemon->max_cache_ttl < ttl) if (daemon->max_cache_ttl != 0 && daemon->max_cache_ttl < ttl)
ttl = daemon->max_cache_ttl; ttl = daemon->max_cache_ttl;
/* Don't log keys */ /* Don't log keys */