Patch for freetz to use dnsmasq 2.78

dnsmasq_freetz.patch

diff --git a/make/dnsmasq/dnsmasq.mk b/make/dnsmasq/dnsmasq.mk
index 3e0e1c5..a22b871 100644
--- a/make/dnsmasq/dnsmasq.mk
+++ b/make/dnsmasq/dnsmasq.mk
@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 2.77)
+$(call PKG_INIT_BIN, 2.78)
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz
-$(PKG)_SOURCE_MD5:=5b973fea8e66e76a0e6bb44adefc6f9b
+$(PKG)_SOURCE_MD5:=6d0241b72c79d2b510776ccc4ed69ca4
 $(PKG)_SITE:=http://thekelleys.org.uk/dnsmasq
 #$(PKG)_SITE:=git://thekelleys.org.uk/dnsmasq.git
 
diff --git a/make/dnsmasq/patches/001-2446514e716075cfe2be35e2a9b9de4eacdbac99.upstream.patch b/make/dnsmasq/patches/001-2446514e716075cfe2be35e2a9b9de4eacdbac99.upstream.patch
deleted file mode 100644
index 1ff4aa5..0000000
--- a/make/dnsmasq/patches/001-2446514e716075cfe2be35e2a9b9de4eacdbac99.upstream.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Chris Novakovic <chris@chrisn.me.uk>
-Date: Tue, 6 Jun 2017 22:02:59 +0000 (+0100)
-Subject: Fix logic of appending ".<layer>" to PXE basename
-X-Git-Tag: v2.78test1~1
-X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff_plain;h=2446514e716075cfe2be35e2a9b9de4eacdbac99
-
-Fix logic of appending ".<layer>" to PXE basename
-
-Commit f77700aa, which fixes a compiler warning, also breaks the
-behaviour of prepending ".<layer>" to basenames in --pxe-service: in
-situations where the basename contains a ".", the ".<layer>" suffix is
-erroneously added, and in situations where the basename doesn't contain
-a ".", the ".<layer>" suffix is erroneously omitted.
-
-A patch against the git HEAD is attached that inverts this logic and
-restores the expected behaviour of --pxe-service.
----
-
-diff --git src/rfc2131.c src/rfc2131.c
-index a679470..1c850e5 100644
---- src/rfc2131.c
-+++ src/rfc2131.c
-@@ -836,10 +836,10 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
- 	  
- 	  if (strchr(service->basename, '.'))
- 	    snprintf((char *)mess->file, sizeof(mess->file),
--		"%s.%d", service->basename, layer);
-+		"%s", service->basename);
- 	  else
- 	    snprintf((char *)mess->file, sizeof(mess->file),
--		"%s", service->basename);
-+		"%s.%d", service->basename, layer);
- 	  
- 	  option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
- 	  option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr));
diff --git a/make/dnsmasq/patches/002-4bb68866a8aeb31db8100492bceae051e33be5d0.upstream.patch b/make/dnsmasq/patches/002-4bb68866a8aeb31db8100492bceae051e33be5d0.upstream.patch
deleted file mode 100644
index 723f043..0000000
--- a/make/dnsmasq/patches/002-4bb68866a8aeb31db8100492bceae051e33be5d0.upstream.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Thu, 15 Jun 2017 22:18:44 +0000 (+0100)
-Subject: Tweak ICMP ping check logic for DHCPv4.
-X-Git-Tag: v2.78test1^0
-X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff_plain;h=4bb68866a8aeb31db8100492bceae051e33be5d0
-
-Tweak ICMP ping check logic for DHCPv4.
----
-
-diff --git src/rfc2131.c src/rfc2131.c
-index 1c850e5..75792da 100644
---- src/rfc2131.c
-+++ src/rfc2131.c
-@@ -1040,7 +1040,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
- 		  else if (have_config(config, CONFIG_DECLINED) &&
- 			   difftime(now, config->decline_time) < (float)DECLINE_BACKOFF)
- 		    my_syslog(MS_DHCP | LOG_WARNING, _("not using configured address %s because it was previously declined"), addrs);
--		  else if (!do_icmp_ping(now, config->addr, 0, loopback))
-+		  else if ((!lease || lease->addr.s_addr != config->addr.s_addr) && !do_icmp_ping(now, config->addr, 0, loopback))
- 		    my_syslog(MS_DHCP | LOG_WARNING, _("not using configured address %s because it is in use by another host"), addrs);
- 		  else
- 		    conf = config->addr;
diff --git a/make/dnsmasq/patches/003-9396752c115b3ab733fa476b30da73237e12e7ba.upstream.patch b/make/dnsmasq/patches/003-9396752c115b3ab733fa476b30da73237e12e7ba.upstream.patch
deleted file mode 100644
index 169d9dc..0000000
--- a/make/dnsmasq/patches/003-9396752c115b3ab733fa476b30da73237e12e7ba.upstream.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9396752c115b3ab733fa476b30da73237e12e7ba Mon Sep 17 00:00:00 2001
-From: Hans Dedecker <dedeckeh@gmail.com>
-Date: Tue, 27 Jun 2017 22:08:47 +0100
-Subject: [PATCH] Try other servers if first returns REFUSED when
- --strict-order active.
-
-If a DNS server replies REFUSED for a given DNS query in strict order mode
-no failover to the next DNS server is triggered as the failover logic only
-covers non strict mode.
-As a result the client will be returned the REFUSED reply without first
-falling back to the secondary DNS server(s).
-
-Make failover support work as well for strict mode config in case REFUSED is
-replied by deleting the strict order check and rely only on forwardall being
-equal to 0 which is the case in non strict mode when a single server has been
-contacted or when strict order mode has been configured.
----
-
-diff --git a/src/forward.c b/src/forward.c
-index 4a3f831..f22556a 100644
---- src/forward.c
-+++ src/forward.c
-@@ -790,7 +790,6 @@ void reply_query(int fd, int family, time_t now)
-   /* Note: if we send extra options in the EDNS0 header, we can't recreate
-      the query from the reply. */
-   if (RCODE(header) == REFUSED &&
--      !option_bool(OPT_ORDER) &&
-       forward->forwardall == 0 &&
-       !(forward->flags & FREC_HAS_EXTRADATA))
-     /* for broken servers, attempt to send to another one. */