hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dnsmasq: allow de-selecting features from -full variant. 

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43733 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Steven Barth 2014-12-17 05:59:12 +00:00
parent 6137fb30db
commit 9bc9764c57
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
package/network/services/dnsmasq/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.72 PKG_VERSION:=2.72
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
@ -72,6 +72,26 @@ define Package/dnsmasq/conffiles
/etc/dnsmasq.conf /etc/dnsmasq.conf
endef endef
define Package/dnsmasq/config/Default
if PACKAGE_$(1)-$(2)
config PACKAGE_dnsmasq_$(2)_dhcpv6
bool "Build with DHCPv6 support."
default y
config PACKAGE_dnsmasq_$(2)_dnssec
bool "Build with DNSSEC support."
default y
config PACKAGE_dnsmasq_$(2)_auth
bool "Build with the facility to act as an authoritative DNS server."
default y
config PACKAGE_dnsmasq_$(2)_ipset
bool "Build with ipset support."
select PACKAGE_kmod-ipt-ipset
default y
endif
endef
Package/dnsmasq-full/config=$(call Package/dnsmasq/config/Default,dnsmasq,full)
Package/dnsmasq-dhcpv6/conffiles = $(Package/dnsmasq/conffiles) Package/dnsmasq-dhcpv6/conffiles = $(Package/dnsmasq/conffiles)
Package/dnsmasq-full/conffiles = $(Package/dnsmasq/conffiles) Package/dnsmasq-full/conffiles = $(Package/dnsmasq/conffiles)
@ -85,7 +105,10 @@ ifeq ($(BUILD_VARIANT),nodhcpv6)
endif endif
ifeq ($(BUILD_VARIANT),full) ifeq ($(BUILD_VARIANT),full)
COPTS += -DHAVE_DNSSEC COPTS += $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dhcpv6),,-DNO_DHCP6) \
$(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dnssec),-DHAVE_DNSSEC) \
$(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_auth),,-DNO_AUTH) \
$(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_ipset),,-DNO_IPSET)
COPTS += $(if $(CONFIG_LIBNETTLE_MINI),-DNO_GMP,) COPTS += $(if $(CONFIG_LIBNETTLE_MINI),-DNO_GMP,)
else else
COPTS += -DNO_AUTH -DNO_IPSET COPTS += -DNO_AUTH -DNO_IPSET

5
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -85,6 +85,10 @@ append_address() {
xappend "--address=$1" xappend "--address=$1"
} }
append_ipset() {
xappend "--ipset=$1"
}
append_interface() { append_interface() {
local ifname=$(uci_get_state network "$1" ifname "$1") local ifname=$(uci_get_state network "$1" ifname "$1")
xappend "--interface=$ifname" xappend "--interface=$ifname"
@ -135,6 +139,7 @@ dnsmasq() {
append_parm "$cfg" "local" "--server" append_parm "$cfg" "local" "--server"
config_list_foreach "$cfg" "server" append_server config_list_foreach "$cfg" "server" append_server
config_list_foreach "$cfg" "address" append_address config_list_foreach "$cfg" "address" append_address
config_list_foreach "$cfg" "ipset" append_ipset
config_list_foreach "$cfg" "interface" append_interface config_list_foreach "$cfg" "interface" append_interface
config_list_foreach "$cfg" "notinterface" append_notinterface config_list_foreach "$cfg" "notinterface" append_notinterface
config_list_foreach "$cfg" "addnhosts" append_addnhosts config_list_foreach "$cfg" "addnhosts" append_addnhosts