update to latest upstream

package/bind/Makefile

@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bind
-PKG_VERSION:=		9.4.1
-PKG_RELEASE:=		4
-PKG_BUILDDEP+=		openssl
-PKG_MD5SUM:=		09b54d35036cb0423b2e618f21766285
+PKG_VERSION:=		9.6.1-P3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a0952d589b3051538033387be4c983f9
 PKG_DESCR:=		popular DNS server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl libbind
+PKG_BUILDDEP+=		openssl
 PKG_URL:=		https://www.isc.org/software/bind
 PKG_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
 
@@ -22,13 +22,11 @@ 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}))
@@ -41,6 +39,7 @@ CONFIGURE_ENV+=         BUILD_CC="${TARGET_CC}" \
 CONFIGURE_ARGS+=	--with-randomdev=/dev/urandom \
 			--disable-threads \
 			--with-openssl=${STAGING_DIR}/usr/ \
+			--enable-epoll \
 			--with-libtool
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
@@ -63,15 +62,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/

package/bind/patches/patch-lib_isc_unix_ifiter_ioctl_c

@@ -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;