Add more license tags with SPDX identifiers

[openwrt/staging/chunkeey.git] / package / network / services / dnsmasq / Makefile

diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 34d543f15181dd17ab78d5e694116fe140ff42aa..bf9fc8f5885422a1eaaaa1c8375800b96303badb 100644 (file)
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
-PKG_VERSION:=2.71
+PKG_VERSION:=2.72
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=15a68f7f6cc0119e843f67d2f79598f1
+PKG_MD5SUM:=cf82f81cf09ad3d47612985012240483
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
+PKG_LICENSE:=GPL-2.0 GPL-3.0
+PKG_LICENSE_FILES:=COPYING COPYING-v3
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -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 := \