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

diff --git a/package/network/services/dnsmasq/patches/0023-Fix-typo-in-ra-param-man-page-section.patch b/package/network/services/dnsmasq/patches/0023-Fix-typo-in-ra-param-man-page-section.patch
new file mode 100644
index 0000000000..ecc060e1a9
--- /dev/null
+++ b/package/network/services/dnsmasq/patches/0023-Fix-typo-in-ra-param-man-page-section.patch
@@ -0,0 +1,33 @@
+From 2daca52b80afdc92e7c976629a2bf8182335a626 Mon Sep 17 00:00:00 2001
+From: Christian Weiske <cweiske@cweiske.de>
+Date: Thu, 3 Jan 2019 20:10:14 +0000
+Subject: [PATCH 23/30] Fix typo in ra-param man page section.
+
+Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
+---
+ man/dnsmasq.8    | 2 +-
+ man/fr/dnsmasq.8 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/man/dnsmasq.8
++++ b/man/dnsmasq.8
+@@ -1829,7 +1829,7 @@ The interval between router advertisemen
+ .B --ra-param=eth0,60.
+ The lifetime of the route may be changed or set to zero, which allows
+ a router to advertise prefixes but not a route via itself. 
+-.B --ra-parm=eth0,0,0
++.B --ra-param=eth0,0,0
+ (A value of zero for the interval means the default value.) All four parameters may be set at once.
+ .B --ra-param=eth0,mtu:1280,low,60,1200
+ 
+--- a/man/fr/dnsmasq.8
++++ b/man/fr/dnsmasq.8
+@@ -1774,7 +1774,7 @@ Un intervalle (en secondes) entre les an
+ .B --ra-param=eth0,60.
+ La durée de vie de la route peut être changée ou mise à zéro, auquel cas
+ le routeur peut annoncer les préfixes mais pas de route :
+-.B --ra-parm=eth0,0,0
++.B --ra-param=eth0,0,0
+ (une valeur de zéro pour l'intervalle signifie qu'il garde la valeur par défaut).
+ Ces quatre paramètres peuvent être configurés en une fois :
+ .B --ra-param=eth0,mtu:1280,low,60,1200