projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dnsmasq: replace the iface hotplug script with a procd trigger
[openwrt/openwrt.git]
/
package
/
network
/
services
/
dnsmasq
/
Makefile
diff --git
a/package/network/services/dnsmasq/Makefile
b/package/network/services/dnsmasq/Makefile
index cddde5c0a2ef155bd8f5358ff7fa99331c51c427..d5acef578eec3afc66672c4a80cb09cd3fa048c8 100644
(file)
--- a/
package/network/services/dnsmasq/Makefile
+++ b/
package/network/services/dnsmasq/Makefile
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2006-201
5
OpenWrt.org
+# Copyright (C) 2006-201
6
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@
-8,12
+8,12
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
-PKG_VERSION:=2.7
5
-PKG_RELEASE:=
2
+PKG_VERSION:=2.7
6
+PKG_RELEASE:=
3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=
887236f1ddde6eb57cdb9d01916c9f72
+PKG_MD5SUM:=
00f5ee66b4e4b7f14538bf62ae3c9461
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING
@@
-25,7
+25,9
@@
PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dhcpv6 \
CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dnssec \
CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_auth \
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dhcpv6 \
CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_dnssec \
CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_auth \
- CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_ipset
+ CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_ipset \
+ CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_conntrack \
+ CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_broken_rtc
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
@@
-34,6
+36,7
@@
define Package/dnsmasq/Default
CATEGORY:=Base system
TITLE:=DNS and DHCP server
URL:=http://www.thekelleys.org.uk/dnsmasq/
CATEGORY:=Base system
TITLE:=DNS and DHCP server
URL:=http://www.thekelleys.org.uk/dnsmasq/
+ USERID:=dnsmasq=453:dnsmasq=453
endef
define Package/dnsmasq
endef
define Package/dnsmasq
@@
-50,9
+53,10
@@
endef
define Package/dnsmasq-full
$(call Package/dnsmasq/Default)
define Package/dnsmasq-full
$(call Package/dnsmasq/Default)
- TITLE += (with DNSSEC, DHCPv6, Auth DNS, IPset enabled by default)
+ TITLE += (with DNSSEC, DHCPv6, Auth DNS, IPset
, Conntrack
enabled by default)
DEPENDS:=+PACKAGE_dnsmasq_full_dnssec:libnettle \
DEPENDS:=+PACKAGE_dnsmasq_full_dnssec:libnettle \
- +PACKAGE_dnsmasq_full_ipset:kmod-ipt-ipset
+ +PACKAGE_dnsmasq_full_ipset:kmod-ipt-ipset \
+ +PACKAGE_dnsmasq_full_conntrack:libnetfilter-conntrack
VARIANT:=full
endef
VARIANT:=full
endef
@@
-69,8
+73,8
@@
endef
define Package/dnsmasq-full/description
$(call Package/dnsmasq/description)
define Package/dnsmasq-full/description
$(call Package/dnsmasq/description)
-This is a fully configurable variant with DHCPv6, DNSSEC, Auth
ro
itative DNS and
-IPset support enabled by default.
+This is a fully configurable variant with DHCPv6, DNSSEC, Auth
or
itative DNS and
+IPset
, Conntrack
support enabled by default.
endef
define Package/dnsmasq/conffiles
endef
define Package/dnsmasq/conffiles
@@
-93,6
+97,12
@@
define Package/dnsmasq-full/config
config PACKAGE_dnsmasq_full_ipset
bool "Build with IPset support."
default y
config PACKAGE_dnsmasq_full_ipset
bool "Build with IPset support."
default y
+ config PACKAGE_dnsmasq_full_conntrack
+ bool "Build with Conntrack support."
+ default y
+ config PACKAGE_dnsmasq_full_broken_rtc
+ bool "Build with HAVE_BROKEN_RTC."
+ default n
endif
endef
endif
endef
@@
-112,7
+122,9
@@
ifeq ($(BUILD_VARIANT),full)
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) \
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)
+ $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_ipset),,-DNO_IPSET) \
+ $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_conntrack),-DHAVE_CONNTRACK,) \
+ $(if $(CONFIG_PACKAGE_dnsmasq_$(BUILD_VARIANT)_broken_rtc),-DHAVE_BROKEN_RTC)
COPTS += $(if $(CONFIG_LIBNETTLE_MINI),-DNO_GMP,)
else
COPTS += -DNO_AUTH -DNO_IPSET
COPTS += $(if $(CONFIG_LIBNETTLE_MINI),-DNO_GMP,)
else
COPTS += -DNO_AUTH -DNO_IPSET
@@
-133,8
+145,8
@@
define Package/dnsmasq/install
$(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
$(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
- $(INSTALL_DIR) $(1)/etc/hotplug.d/
iface
- $(INSTALL_DATA) ./files/dnsmasq
.hotplug $(1)/etc/hotplug.d/iface/25-dnsmasq
+ $(INSTALL_DIR) $(1)/etc/hotplug.d/
ntp
+ $(INSTALL_DATA) ./files/dnsmasq
sec.hotplug $(1)/etc/hotplug.d/ntp/25-dnsmasqsec
endef
Package/dnsmasq-dhcpv6/install = $(Package/dnsmasq/install)
endef
Package/dnsmasq-dhcpv6/install = $(Package/dnsmasq/install)