dnsmasq: Add EDNS0 Upstream support

Signed-off-by: Carsten Schuette <[email protected]>

package/network/services/dnsmasq/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=dnsmasq
 PKG_UPSTREAM_VERSION:=2.90
 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
 PKG_SOURCE_URL:=https://thekelleys.org.uk/dnsmasq/

package/network/services/dnsmasq/files/dnsmasq.init

@@ -973,6 +973,21 @@ dnsmasq_start()
 	append_bool "$cfg" rapidcommit "--dhcp-rapid-commit"
 	append_bool "$cfg" scriptarp "--script-arp"
 
+	config_get add_mac "$cfg" add_mac
+	if [ "$add_mac" = "enabled" ] || [ "$add_mac" = "1" ]; then
+		xappend "--add-mac"
+	elif [ -n "$add_mac" ]; then
+		xappend "--add-mac=$add_mac"
+	fi
+	append_bool "$cfg" strip_mac "--strip-mac"
+	config_get add_subnet "$cfg" add_subnet
+	if [ "$add_subnet" = "enabled" ] || [ "$add_subnet" = "1" ]; then
+		xappend "--add-subnet"
+	elif [ -n "$add_subnet" ]; then
+		xappend "--add-subnet=$add_subnet"
+	fi
+	append_bool "$cfg" strip_subnet "--strip-subnet"
+
 	append_bool "$cfg" filter_aaaa "--filter-AAAA"
 	append_bool "$cfg" filter_a "--filter-A"