dnsmasq: backport latest pre2.81 patches

f52bb5b fix previous commit
18eac67 Fix entries in /etc/hosts disabling static leases.
f8c77ed Fix removal of DHCP_CLIENT_MAC options from DHCPv6 relay replies.
4bf62f6 Tidy cache_blockdata_free()
9c0d445 Fix e7bfd556c079c8b5e7425aed44abc35925b24043 to actually work.
2896e24 Check for not(DS or DNSKEY) in is_outdated_cname_pointer()
a90f09d Fix crash freeing negative SRV cache entries.
5b99eae Cache SRV records.
2daca52 Fix typo in ra-param man page section.
2c59473 File logic bug in cache-marshalling code. Introduced a couple of commits back.
cc921df Remove nested struct/union in cache records and all_addr.
ab194ed Futher address union tidying.
65a01b7 Tidy address-union handling: move class into explicit argument.
bde4647 Tidy all_addr union, merge log and rcode fields.
e7bfd55 Alter DHCP address selection after DECLINE in consec-addr mode. Avoid offering the same address after a recieving a DECLINE message to stop an infinite protocol loop. This has long been done in default address allocation mode: this adds similar behaviour when allocaing addresses consecutively.

The most relevant fix for openwrt is 18eac67 (& my own local f52bb5b
which fixes a missing bracket silly) To quote the patch:

It is possible for a config entry to have one address family specified by a
dhcp-host directive and the other added from /etc/hosts. This is especially
common on OpenWrt because it uses odhcpd for DHCPv6 and IPv6 leases are
imported into dnsmasq via a hosts file.

To handle this case there need to be separate *_HOSTS flags for IPv4 and IPv6.
Otherwise when the hosts file is reloaded it will clear the CONFIG_ADDR(6) flag
which was set by the dhcp-host directive.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>

1 files changed, 36 insertions, 0 deletions

diff --git a/package/network/services/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch b/package/network/services/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch
new file mode 100644
index 0000000000..ed8170c59b
--- /dev/null
+++ b/package/network/services/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch
@@ -0,0 +1,36 @@
+From 4bf62f616b82fad7a7f91195b0204dd64d79a35c Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Thu, 10 Jan 2019 21:54:22 +0000
+Subject: [PATCH 28/30] Tidy cache_blockdata_free()
+
+Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+---
+ src/cache.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+--- a/src/cache.c
++++ b/src/cache.c
+@@ -200,14 +200,17 @@ static void cache_hash(struct crec *crec
+ 
+ static void cache_blockdata_free(struct crec *crecp)
+ {
+-  if (crecp->flags & F_SRV && !(crecp->flags & F_NEG))
+-    blockdata_free(crecp->addr.srv.target);
++  if (!(crecp->flags & F_NEG))
++    {
++      if (crecp->flags & F_SRV)
++	blockdata_free(crecp->addr.srv.target);
+ #ifdef HAVE_DNSSEC
+-  else if (crecp->flags & F_DNSKEY)
+-    blockdata_free(crecp->addr.key.keydata);
+-  else if ((crecp->flags & F_DS) && !(crecp->flags & F_NEG))
+-    blockdata_free(crecp->addr.ds.keydata);
++      else if (crecp->flags & F_DNSKEY)
++	blockdata_free(crecp->addr.key.keydata);
++      else if (crecp->flags & F_DS)
++	blockdata_free(crecp->addr.ds.keydata);
+ #endif
++    }
+ }
+ 
+ static void cache_free(struct crec *crecp)