summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--package/dnsmasq/Config.in8
-rw-r--r--package/dnsmasq/dnsmasq.mk9
3 files changed, 16 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 23e66d131..98525cec8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,6 +40,7 @@
#709: Bump lighttpd package to 1.4.24
#713: Migrate openntpd package to Makefile.autotools.in
#715: Bump libidn package to 1.15 and other fixes
+ #717: Bump dnsmasq to 2.51 and introduce new IDN option
2009.08, Released August 31th, 2009:
diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index 073f57b3c..a8d0d9a6e 100644
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -20,3 +20,11 @@ config BR2_PACKAGE_DNSMASQ_DHCP
help
Enable DHCP server support in dnsmasq.
+config BR2_PACKAGE_DNSMASQ_IDN
+ bool "IDN support (BIG!)"
+ depends on BR2_PACKAGE_DNSMASQ
+ select BR2_PACKAGE_LIBINTL
+ select BR2_PACKAGE_LIBIDN
+ help
+ Enable IDN support in dnsmasq.
+ This option is a big space taker since is pulls in many libraries.
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index dec2971aa..07b3c484a 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,8 +4,7 @@
#
#############################################################
-DNSMASQ_VERSION = 2.50
-DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.gz
+DNSMASQ_VERSION = 2.51
DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
DNSMASQ_AUTORECONF = NO
DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
@@ -24,6 +23,12 @@ ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y)
DNSMASQ_COPTS += -DNO_TFTP
endif
+ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
+DNSMASQ_MAKE_OPT += all-i18n
+DNSMASQ_DEPENDENCIES += libidn libintl
+DNSMASQ_MAKE_ENV += LDFLAGS+="-lintl"
+endif
+
ifneq ($(BR2_LARGEFILE),y)
DNSMASQ_COPTS += -DNO_LARGEFILE
endif