[ptxdist] [PATCH v2 5/8] dnsmasq: version bump 2.47 -> 2.70

[Markus Pargmann <mpa@pengutronix.de>]

The newer version of dnsmasq now includes IPv6 router advertisement
support. This patch also changes to tar.xz.

Some new compile time options are added, including DNSSEC support.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---

Notes:
    Changes in v2:
     - Added compiletime options introduced between 2.47 and 2.70
     - version bump to 2.70

 rules/dnsmasq.in   | 31 +++++++++++++++++++++++++++++++
 rules/dnsmasq.make | 23 ++++++++++++++++++++---
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/rules/dnsmasq.in b/rules/dnsmasq.in
index ed342d9..60499eb 100644
--- a/rules/dnsmasq.in
+++ b/rules/dnsmasq.in
@@ -41,6 +41,37 @@ config DNSMASQ_TFTP
 	help
 	  This includes TFTP services into dnsmasq
 
+config DNSMASQ_DHCP
+	bool
+	default y
+	prompt "include DHCP"
+	help
+	  This includes DHCP services into dnsmasq
+
+config DNSMASQ_SCRIPT
+	bool
+	default y
+	depends on DNSMASQ_DHCP
+	prompt "include lease script support"
+	help
+	  Without this option it is not possible to call scripts when a lease changes
+
+config DNSMASQ_SCRIPT_LUA
+	bool
+	default n
+	depends on DNSMASQ_SCRIPT
+	prompt "include lease script LUA support"
+	help
+	  This includes LUA script capabilities for lease scripts
+
+config DNSMASQ_DNSSEC
+	bool
+	default n
+	prompt "include DNSSEC support"
+	select NETTLE
+	help
+	  Without this option it is not possible to call scripts when a lease changes
+
 comment "runtime options   ---"
 
 choice
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index 675bf5c..9189c33 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_DNSMASQ) += dnsmasq
 #
 # Paths and names
 #
-DNSMASQ_VERSION		:= 2.47
-DNSMASQ_MD5		:= 4524081e56d0b935717d493e8e8d3e11
+DNSMASQ_VERSION		:= 2.70
+DNSMASQ_MD5		:= 1d654e80888ab5dbba015548fd284d46
 DNSMASQ			:= dnsmasq-$(DNSMASQ_VERSION)
-DNSMASQ_SUFFIX		:= tar.gz
+DNSMASQ_SUFFIX		:= tar.xz
 DNSMASQ_URL		:= http://www.thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX)
 DNSMASQ_SOURCE		:= $(SRCDIR)/$(DNSMASQ).$(DNSMASQ_SUFFIX)
 DNSMASQ_DIR		:= $(BUILDDIR)/$(DNSMASQ)
@@ -38,10 +38,27 @@ DNSMASQ_COPT :=
 ifndef PTXCONF_DNSMASQ_TFTP
 DNSMASQ_COPT += -DNO_TFTP
 endif
+
 ifndef PTXCONF_GLOBAL_IPV6
 DNSMASQ_COPT += -DNO_IPV6
 endif
 
+ifndef PTXCONF_DNSMASQ_DHCP
+DNSMASQ_COPT += -DNO_DHCP
+else
+ifndef PTXCONF_DNSMASQ_SCRIPT
+DNSMASQ_COPT += -DNO_SCRIPT
+else
+ifndef PTXCONF_DNSMASQ_SCRIPT_LUA
+DNSMASQ_COPT += -DHAVE_LUASCRIPT
+endif
+endif
+endif
+
+ifdef DNSMASQ_DNSSEC
+DNSMASQ_COPT += -DHAVE_DNSSEC
+endif
+
 DNSMASQ_MAKEVARS := PREFIX=/usr AWK=awk COPTS='$(DNSMASQ_COPT)'
 
 $(STATEDIR)/dnsmasq.prepare:
-- 
2.0.0.rc0


-- 
ptxdist mailing list
ptxdist@pengutronix.de