summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-05-03 15:33:42 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2011-05-03 21:15:17 +0200
commit6780d0ba04ecf4cf4bf2ec1dc9f13c78868cf95c (patch)
tree22799ee2caf92ff0f755bcfbe126eb556ba6f011
parentdd0dfd0ec136c6c7300407d7e8a9713967be0efb (diff)
bind: security bump to version 9.6-ESV-R4
Bump bind to version 9.6-ESV-R4 since the 9.5 series is no longer supported. While at it switch to the ESV (Extended Support Version) branch instead of going for the latest. Also adjust the package to build against OpenSSL when available for proper DNSSEC support and libxml2 too. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/bind/bind.mk32
1 files changed, 19 insertions, 13 deletions
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index ff0ec04d2..e3341bdb6 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -4,26 +4,32 @@
#
#############################################################
-BIND_VERSION = 9.5.2-P4
+BIND_VERSION = 9.6-ESV-R4
BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone
-BIND_TARGET_SBINS += named-compilezone rndc rndc-confgen
-BIND_TARGET_SBINS += dnssec-keygen dnssec-signzone
+BIND_TARGET_SBINS += named-compilezone rndc rndc-confgen dnssec-dsfromkey
+BIND_TARGET_SBINS += dnssec-keyfromlabel dnssec-keygen dnssec-signzone
BIND_TARGET_BINS = dig host nslookup nsupdate
-BIND_TARGET_LIBS = libbind9.* libdns.* libisccc.* libisccfg.* libisc.* liblwres.*
-BIND_MAKE = $(MAKE1)
+BIND_TARGET_LIBS = libbind9.* libdns.* libisc.* libisccc.* libisccfg.* liblwres.*
BIND_CONF_ENV = BUILD_CC="$(TARGET_CC)" \
BUILD_CFLAGS="$(TARGET_CFLAGS)"
-BIND_CONF_OPT = \
- --sysconfdir=/etc \
+BIND_CONF_OPT = --sysconfdir=/etc \
--localstatedir=/var \
--with-randomdev=/dev/urandom \
- --with-openssl=no \
- --with-libxml2=no \
- --with-pic \
- --with-libtool \
- --disable-epoll \
- --disable-threads
+ --enable-epoll --with-libtool
+
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+ BIND_CONF_OPT += --with-libxml2=$(STAGING_DIR)/usr
+ BIND_DEPENDENCIES += libxml2
+else
+ BIND_CONF_OPT += --with-libxml2=no
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ BIND_DEPENDENCIES += openssl
+else
+ BIND_CONF_OPT += --with-openssl=no
+endif
define BIND_TARGET_INSTALL_FIXES
rm -f $(TARGET_DIR)/usr/bin/isc-config.sh