aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/dnsmasq/Makefile
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-06-18 10:04:34 +0000
committerSteven Barth <cyrus@openwrt.org>2014-06-18 10:04:34 +0000
commit495b237cc4d179b48a8c3587de267446d83855f8 (patch)
tree7b32592f4309bf4fd2800380d8c188f8d42ad29e /package/network/services/dnsmasq/Makefile
parent132cbe5e29a0f7e4f2b5b80dec42dec974571eac (diff)
downloadupstream-495b237cc4d179b48a8c3587de267446d83855f8.tar.gz
upstream-495b237cc4d179b48a8c3587de267446d83855f8.tar.bz2
upstream-495b237cc4d179b48a8c3587de267446d83855f8.zip
dnsmasq: various house-keeping updates
* Add Authoritative DNS and IPSET to full variant * Remove some bloat from IPSET support * Reintroduce "DHCP no address warning"-patch Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 41246
Diffstat (limited to 'package/network/services/dnsmasq/Makefile')
-rw-r--r--package/network/services/dnsmasq/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 34d543f151..5c54d855c1 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
PKG_VERSION:=2.71
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
@@ -28,7 +28,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/dnsmasq/Default
SECTION:=net
CATEGORY:=Base system
- TITLE:=A lightweight DNS and DHCP server
+ TITLE:=DNS and DHCP server
URL:=http://www.thekelleys.org.uk/dnsmasq/
endef
@@ -46,7 +46,7 @@ endef
define Package/dnsmasq-full
$(call Package/dnsmasq/Default)
- TITLE += (with DHCPv6 and DNSSEC)
+ TITLE += (with DNSSEC, DHCPv6, Auth DNS, IPSET)
DEPENDS:=@IPV6 +kmod-ipv6 +libnettle
VARIANT:=full
endef
@@ -64,7 +64,7 @@ endef
define Package/dnsmasq-full/description
$(call Package/dnsmasq/description)
-This is a variant with DHCPv6 and DNSSEC support
+This is a variant with DHCPv6, DNSSEC, Authroitative DNS and IPSET support
endef
define Package/dnsmasq/conffiles
@@ -78,7 +78,7 @@ Package/dnsmasq-full/conffiles = $(Package/dnsmasq/conffiles)
TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections
-COPTS = $(if $(CONFIG_IPV6),,-DNO_IPV6) -DNO_IPSET -DNO_AUTH
+COPTS = $(if $(CONFIG_IPV6),,-DNO_IPV6)
ifeq ($(BUILD_VARIANT),nodhcpv6)
COPTS += -DNO_DHCP6
@@ -87,6 +87,8 @@ endif
ifeq ($(BUILD_VARIANT),full)
COPTS += -DHAVE_DNSSEC
COPTS += $(if $(CONFIG_LIBNETTLE_MINI),-DNO_GMP,)
+else
+ COPTS += -DNO_AUTH -DNO_IPSET
endif
MAKE_FLAGS := \