Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

unbound: enable ipset support for the unbound-daemon-heavy variant.

Browse source 
This patch enables ipset support in the unbound-daemon-heavy variant. See [1] for
instructions on how to use it.

Also fix a minor typo in the libunbound-light description.

[1] https://github.com/NLnetLabs/unbound/pull/28

Signed-off-by: Stijn Segers <foss@volatilesystems.org>
This commit is contained in:
Stijn Segers 2020-02-23 15:18:15 +01:00
parent f779ef48cd
commit 839c2e3cae
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/unbound/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=unbound PKG_NAME:=unbound
PKG_VERSION:=1.10.0 PKG_VERSION:=1.10.0
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:=https://nlnetlabs.nl/downloads/unbound PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound
@ -52,7 +52,7 @@ define Package/unbound-daemon-heavy
$(call Package/unbound/Default) $(call Package/unbound/Default)
TITLE+= (daemon, heavy traffic) TITLE+= (daemon, heavy traffic)
URL:=https://nlnetlabs.nl/documentation/unbound/howto-optimise URL:=https://nlnetlabs.nl/documentation/unbound/howto-optimise
DEPENDS+= +libunbound-heavy +libpthread +libevent2 +libevent2-pthreads DEPENDS+= +libunbound-heavy +libpthread +libevent2 +libevent2-pthreads +libmnl
VARIANT:=heavy VARIANT:=heavy
PROVIDES:=unbound-daemon PROVIDES:=unbound-daemon
endef endef
@ -60,6 +60,7 @@ endef
define Package/unbound-daemon-heavy/description define Package/unbound-daemon-heavy/description
This package contains the Unbound daemon including 'libevent' and This package contains the Unbound daemon including 'libevent' and
'libpthread' to better handle large networks with heavy query loads. 'libpthread' to better handle large networks with heavy query loads.
It also offers ipset support.
endef endef
define Package/libunbound-light define Package/libunbound-light
@ -75,7 +76,7 @@ endef
define Package/libunbound-light/description define Package/libunbound-light/description
This package contains the Unbound shared library with basic includes This package contains the Unbound shared library with basic includes
necessary to meet the needs of UCI/LuCI configuration optoins. necessary to meet the needs of UCI/LuCI configuration options.
endef endef
define Package/libunbound-heavy define Package/libunbound-heavy
@ -85,14 +86,15 @@ define Package/libunbound-heavy
SUBMENU:=Networking SUBMENU:=Networking
TITLE+= (library, heavy traffic) TITLE+= (library, heavy traffic)
URL:=https://nlnetlabs.nl/documentation/unbound/howto-optimise URL:=https://nlnetlabs.nl/documentation/unbound/howto-optimise
DEPENDS+= +libpthread +libevent2 +libevent2-pthreads DEPENDS+= +libpthread +libevent2 +libevent2-pthreads +libmnl
VARIANT:=heavy VARIANT:=heavy
PROVIDES:=libunbound PROVIDES:=libunbound
endef endef
define Package/libunbound-heavy/description define Package/libunbound-heavy/description
This package contains the Unbound shared library including 'libevent' and This package contains the Unbound shared library including 'libevent' and
'libpthread' to better handle large networks with heavy query loads. 'libpthread' to better handle large networks with heavy query loads. It
also offers ipset support.
endef endef
define Package/unbound-anchor define Package/unbound-anchor
@ -161,8 +163,10 @@ CONFIGURE_ARGS += \
ifeq ($(BUILD_VARIANT),heavy) ifeq ($(BUILD_VARIANT),heavy)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-ipset \
--with-pthreads \ --with-pthreads \
--with-libevent="$(STAGING_DIR)/usr" \ --with-libevent="$(STAGING_DIR)/usr" \
--with-libmnl="$(STAGING_DIR)/usr" \
--enable-event-api --enable-event-api
else else
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \