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, 52 insertions, 0 deletions

diff --git a/package/network/services/dnsmasq/patches/0029-Fix-removal-of-DHCP_CLIENT_MAC-options-from-DHCPv6-r.patch b/package/network/services/dnsmasq/patches/0029-Fix-removal-of-DHCP_CLIENT_MAC-options-from-DHCPv6-r.patch
new file mode 100644
index 0000000000..d8ae0e7910
--- /dev/null
+++ b/package/network/services/dnsmasq/patches/0029-Fix-removal-of-DHCP_CLIENT_MAC-options-from-DHCPv6-r.patch
@@ -0,0 +1,52 @@
+From f8c77edbdffb8ada7753ea9fa104f0f6da70cfe3 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Thu, 10 Jan 2019 21:58:18 +0000
+Subject: [PATCH 29/30] Fix removal of DHCP_CLIENT_MAC options from DHCPv6
+ relay replies.
+
+Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+---
+ src/rfc3315.c | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+--- a/src/rfc3315.c
++++ b/src/rfc3315.c
+@@ -219,21 +219,25 @@ static int dhcp6_maybe_relay(struct stat
+       if (opt6_ptr(opt, 0) + opt6_len(opt) > end) 
+         return 0;
+      
+-      int o = new_opt6(opt6_type(opt));
+-      if (opt6_type(opt) == OPTION6_RELAY_MSG)
++      /* Don't copy MAC address into reply. */
++      if (opt6_type(opt) != OPTION6_CLIENT_MAC)
+ 	{
+-	  struct in6_addr align;
+-	  /* the packet data is unaligned, copy to aligned storage */
+-	  memcpy(&align, inbuff + 2, IN6ADDRSZ); 
+-	  state->link_address = &align;
+-	  /* zero is_unicast since that is now known to refer to the 
+-	     relayed packet, not the original sent by the client */
+-	  if (!dhcp6_maybe_relay(state, opt6_ptr(opt, 0), opt6_len(opt), client_addr, 0, now))
+-	    return 0;
++	  int o = new_opt6(opt6_type(opt));
++	  if (opt6_type(opt) == OPTION6_RELAY_MSG)
++	    {
++	      struct in6_addr align;
++	      /* the packet data is unaligned, copy to aligned storage */
++	      memcpy(&align, inbuff + 2, IN6ADDRSZ); 
++	      state->link_address = &align;
++	      /* zero is_unicast since that is now known to refer to the 
++		 relayed packet, not the original sent by the client */
++	      if (!dhcp6_maybe_relay(state, opt6_ptr(opt, 0), opt6_len(opt), client_addr, 0, now))
++		return 0;
++	    }
++	  else
++	    put_opt6(opt6_ptr(opt, 0), opt6_len(opt));
++	  end_opt6(o);
+ 	}
+-      else if (opt6_type(opt) != OPTION6_CLIENT_MAC)
+-	put_opt6(opt6_ptr(opt, 0), opt6_len(opt));
+-      end_opt6(o);	    
+     }
+   
+   return 1;