From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Tue, 17 Jul 2012 11:48:27 +0000 (+0000)
Subject: dnsmasq: Bump to 2.62, add DHCPv6 variant
X-Git-Tag: reboot~13360
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=81a84b03ea82616015a1803691d3acf6575e109d;p=oweals%2Fopenwrt.git

dnsmasq: Bump to 2.62, add DHCPv6 variant

SVN-Revision: 32764
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 10f1806dd3..f19e012635 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -8,37 +8,63 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
-PKG_VERSION:=2.59
-PKG_RELEASE:=4
+PKG_VERSION:=2.62
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=b5757ef2d7b651748eeebb88af29d7d6
+PKG_MD5SUM:=f47e5cb8f5bac6343f24b2dbe317ab40
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/dnsmasq
+define Package/dnsmasq/Default
   SECTION:=net
   CATEGORY:=Base system
   TITLE:=A lightweight DNS and DHCP server
   URL:=http://www.thekelleys.org.uk/dnsmasq/
 endef
 
+define Package/dnsmasq
+$(call Package/dnsmasq/Default)
+  VARIANT:=nodhcpv6
+endef
+
+define Package/dnsmasq-dhcpv6
+$(call Package/dnsmasq/Default)
+  TITLE += (with DHCPv6 support)
+  DEPENDS:=@IPV6 +kmod-ipv6
+  VARIANT:=dhcpv6
+endef
+
 define Package/dnsmasq/description
   It is intended to provide coupled DNS and DHCP service to a LAN.
 endef
 
+define Package/dnsmasq-dhcpv6/description
+$(call Package/dnsmasq/description)
+
+This is a variant with DHCPv6 support
+endef
+
 define Package/dnsmasq/conffiles
 /etc/config/dhcp
 /etc/dnsmasq.conf
 endef
 
+Package/dnsmasq-dhcpv6/conffiles = $(Package/dnsmasq/conffiles)
+
 TARGET_CFLAGS += \
 	-ffunction-sections -fdata-sections \
 	$(if $(CONFIG_IPV6),,-DNO_IPV6)
 
+ifeq ($(BUILD_VARIANT),nodhcpv6)
+  TARGET_CFLAGS += -DNO_DHCP6
+endif
+
 MAKE_FLAGS := \
 	$(TARGET_CONFIGURE_OPTS) \
 	CFLAGS="$(TARGET_CFLAGS)" \
@@ -55,4 +81,7 @@ define Package/dnsmasq/install
 	$(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
 endef
 
+Package/dnsmasq-dhcpv6/install = $(Package/dnsmasq/install)
+
 $(eval $(call BuildPackage,dnsmasq))
+$(eval $(call BuildPackage,dnsmasq-dhcpv6))
diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch
deleted file mode 100644
index 5a0c01b141..0000000000
--- a/package/dnsmasq/patches/101-ipv6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/config.h
-+++ b/src/config.h
-@@ -263,8 +263,9 @@ NOTES:
- /* We assume that systems which don't have IPv6
-    headers don't have ntop and pton either */
- 
--#if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6)
-+#if defined(INET6_ADDRSTRLEN) && !defined(NO_IPV6)
- #  define HAVE_IPV6
-+#  define IPV6_V6ONLY 26
- #  define ADDRSTRLEN INET6_ADDRSTRLEN
- #  if defined(SOL_IPV6)
- #    define IPV6_LEVEL SOL_IPV6