summaryrefslogtreecommitdiff
path: root/package/bind
diff options
context:
space:
mode:
Diffstat (limited to 'package/bind')
-rw-r--r--package/bind/Config.in97
-rw-r--r--package/bind/Makefile35
-rw-r--r--package/bind/files/named.init2
-rw-r--r--package/bind/patches/patch-lib_isc_unix_ifiter_ioctl_c14
4 files changed, 19 insertions, 129 deletions
diff --git a/package/bind/Config.in b/package/bind/Config.in
deleted file mode 100644
index b561312fc..000000000
--- a/package/bind/Config.in
+++ /dev/null
@@ -1,97 +0,0 @@
-config ADK_COMPILE_BIND
- tristate
- default n
- select ADK_PACKAGE_LIBOPENSSL
-
-config ADK_DUMMY_BIND
- prompt "bind.............................. A DNS server implementation"
- tristate
- default n
-
-config ADK_PACKAGE_BIND_RNDC
- prompt "bind-rndc......................... Bind administration tools (rndc & rndc-confgen only)"
- tristate
- default n
- depends on ADK_DUMMY_BIND
- select ADK_COMPILE_BIND
- select ADK_PACKAGE_LIBBIND
- help
- rndc, rndc-confgen
- http://www.isc.org/sw/bind/
-
-config ADK_PACKAGE_BIND_CHECK
- prompt "bind-check........................ Bind administration tools (named-checkconf & named-checkzone only)"
- tristate
- default n
- depends on ADK_DUMMY_BIND
- select ADK_COMPILE_BIND
- select ADK_PACKAGE_LIBBIND
- help
- named-checkconf, named-checkzone
- http://www.isc.org/sw/bind/
-
-config ADK_PACKAGE_BIND_DNSSEC
- prompt "bind-dnssec....................... Bind administration tools (dnssec-keygen & dnssec-signzone only)"
- tristate
- default n
- depends on ADK_DUMMY_BIND
- select ADK_COMPILE_BIND
- select ADK_PACKAGE_LIBBIND
- help
- dnssec-keygen, dnssec-signzone
- http://www.isc.org/sw/bind/
-
-config ADK_PACKAGE_BIND_HOST
- prompt "bind-host......................... A simple DNS client"
- tristate
- default n
- depends on ADK_DUMMY_BIND
- select ADK_COMPILE_BIND
- select ADK_PACKAGE_LIBBIND
- help
- host utility.
- http://www.isc.org/sw/bind/
-
-
-config ADK_PACKAGE_BIND_DIG
- prompt "bind-dig.......................... A DNS client"
- tristate
- default n
- depends on ADK_DUMMY_BIND
- select ADK_COMPILE_BIND
- select ADK_PACKAGE_LIBBIND
- help
- dig utility.
- http://www.isc.org/sw/bind/
-
-
-config ADK_PACKAGE_BIND_CLIENT
- prompt "bind-client....................... A dynamic DNS client"
- tristate
- default n
- depends on ADK_DUMMY_BIND
- select ADK_COMPILE_BIND
- select ADK_PACKAGE_LIBBIND
- help
- A DNS dynamic client (nsupdate)
- http://www.isc.org/sw/bind/
-
-config ADK_PACKAGE_BIND_SERVER
- prompt "bind-server....................... A DNS server"
- tristate
- default n
- depends on ADK_DUMMY_BIND
- select ADK_COMPILE_BIND
- select ADK_PACKAGE_LIBBIND
- help
- A DNS server (named)
- http://www.isc.org/sw/bind/
-
-config ADK_PACKAGE_LIBBIND
- prompt "libbind........................... Support library for the bind tools and dns server/client."
- tristate
- default n
- depends on ADK_DUMMY_BIND
- select ADK_COMPILE_BIND
- help
- http://www.isc.org/sw/bind/
diff --git a/package/bind/Makefile b/package/bind/Makefile
index a4e783e03..eb6eb46da 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -4,12 +4,13 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= bind
-PKG_VERSION:= 9.4.1
-PKG_RELEASE:= 4
-PKG_MD5SUM:= 09b54d35036cb0423b2e618f21766285
+PKG_VERSION:= 9.7.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= c245b5d1aa0a4f53d9538faa1efe2c3f
PKG_DESCR:= popular DNS server
PKG_SECTION:= net
-PKG_DEPENDS:= libopenssl libbind
+PKG_DEPENDS:= libopenssl libbind libxml2
+PKG_BUILDDEP+= openssl libxml2
PKG_URL:= https://www.isc.org/software/bind
PKG_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
@@ -21,28 +22,23 @@ PKG_DESCR_5:= dnssec-keygen & dnssec-signzone utilities
PKG_DESCR_6:= host utility
PKG_DESCR_7:= dig utility
-PKG_SECTION_2:= libs
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},libs))
$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION}))
$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION}))
$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION}))
$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION}))
$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_7},${PKG_SECTION}))
-CONFIGURE_STYLE= gnu
-CONFIGURE_ENV+= BUILD_CC="${TARGET_CC}" \
- ac_cv_lib_nsl_inet_ntoa=no
CONFIGURE_ARGS+= --with-randomdev=/dev/urandom \
--disable-threads \
--with-openssl=${STAGING_DIR}/usr/ \
+ --with-libxml2=${STAGING_DIR}/usr/ \
+ --enable-epoll \
--with-libtool
-BUILD_STYLE= auto
-INSTALL_STYLE= auto
pre-build:
${MAKE} -C ${WRKBUILD}/lib/dns \
@@ -62,15 +58,20 @@ post-install:
# rndc
${INSTALL_DIR} ${IDIR_BIND_RNDC}/usr/sbin
${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_RNDC}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen ${IDIR_BIND_RNDC}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen \
+ ${IDIR_BIND_RNDC}/usr/sbin/
# bind check
${INSTALL_DIR} ${IDIR_BIND_CHECK}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf ${IDIR_BIND_CHECK}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone ${IDIR_BIND_CHECK}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf \
+ ${IDIR_BIND_CHECK}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone \
+ ${IDIR_BIND_CHECK}/usr/sbin/
# dnsec tools
${INSTALL_DIR} ${IDIR_BIND_DNSSEC}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen ${IDIR_BIND_DNSSEC}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone ${IDIR_BIND_DNSSEC}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen \
+ ${IDIR_BIND_DNSSEC}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone \
+ ${IDIR_BIND_DNSSEC}/usr/sbin/
# host
${INSTALL_DIR} ${IDIR_BIND_HOST}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/host ${IDIR_BIND_HOST}/usr/bin/
diff --git a/package/bind/files/named.init b/package/bind/files/named.init
index ce0c0abfa..b2052c1d3 100644
--- a/package/bind/files/named.init
+++ b/package/bind/files/named.init
@@ -15,7 +15,7 @@ autostop) ;;
fi
;;
stop)
- killall named
+ pkill named
;;
restart)
sh $0 stop
diff --git a/package/bind/patches/patch-lib_isc_unix_ifiter_ioctl_c b/package/bind/patches/patch-lib_isc_unix_ifiter_ioctl_c
deleted file mode 100644
index adb2aa906..000000000
--- a/package/bind/patches/patch-lib_isc_unix_ifiter_ioctl_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- bind-9.4.1.orig/lib/isc/unix/ifiter_ioctl.c 2006-02-04 00:51:38.000000000 +0100
-+++ bind-9.4.1/lib/isc/unix/ifiter_ioctl.c 2008-10-08 14:56:12.000000000 +0200
-@@ -479,8 +479,8 @@ linux_if_inet6_current(isc_interfaceiter
- for (i = 0; i < 16; i++) {
- unsigned char byte;
- static const char hex[] = "0123456789abcdef";
-- byte = ((index(hex, address[i * 2]) - hex) << 4) |
-- (index(hex, address[i * 2 + 1]) - hex);
-+ byte = ((strchr(hex, address[i * 2]) - hex) << 4) |
-+ (strchr(hex, address[i * 2 + 1]) - hex);
- addr6.s6_addr[i] = byte;
- }
- iter->current.af = AF_INET6;