--- a/components/bind/Makefile Tue Oct 09 11:17:24 2012 -0700
+++ b/components/bind/Makefile Wed Oct 10 09:33:36 2012 -0700
@@ -23,15 +23,15 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= bind
-COMPONENT_VERSION= 9.6-ESV-R7-P3
-IPS_COMPONENT_VERSION= 9.6.3.7.3
+COMPONENT_VERSION= 9.6-ESV-R8
+IPS_COMPONENT_VERSION= 9.6.3.8.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_PROJECT_URL= http://www.isc.org/software/bind/
# hash from: sha256sum $(COMPONENT_ARCHIVE) | sed 's/\(.[^ ]*\).*/sha256:\1/'
COMPONENT_ARCHIVE_HASH= \
- sha256:c3ca6ab6c162689ec9662d822b255c3a99c076d968bc059b4ae11f1d4c35edae
+ sha256:a4fb8baa5c5018ef0ca7c1a035326efab32e84074daab82599fe5e63a562fa45
COMPONENT_ARCHIVE_URL= \
http://ftp.isc.org/isc/bind9/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
--- a/components/bind/bind.license Tue Oct 09 11:17:24 2012 -0700
+++ b/components/bind/bind.license Wed Oct 10 09:33:36 2012 -0700
@@ -2,11 +2,11 @@
This package may include technology which may be subject to one or more of
the following additional notices:
-----------------------
-- BIND 9.6-ESV-R7-P3 -
-----------------------
+-------------------
+- BIND 9.6-ESV-R8 -
+-------------------
-Oracle Internal Tracking Number: 10379
+Oracle Internal Tracking Number: 10598
Copyright (C) 2004-2012 Internet Systems Consortium, Inc. ("ISC")
Copyright (C) 1996-2003 Internet Software Consortium.
--- a/components/bind/bindc.p5m Tue Oct 09 11:17:24 2012 -0700
+++ b/components/bind/bindc.p5m Wed Oct 10 09:33:36 2012 -0700
@@ -41,12 +41,12 @@
dir path=usr/lib/dns
dir path=usr/sbin
-file path=usr/lib/dns/libbind9.so.50.0.7
-file path=usr/lib/dns/libdns.so.110.0.2
-file path=usr/lib/dns/libisc.so.57.0.2
-file path=usr/lib/dns/libisccc.so.50.0.2
+file path=usr/lib/dns/libbind9.so.50.0.9
+file path=usr/lib/dns/libdns.so.110.1.2
+file path=usr/lib/dns/libisc.so.57.1.0
+file path=usr/lib/dns/libisccc.so.50.0.3
file path=usr/lib/dns/libisccfg.so.50.0.6
-file path=usr/lib/dns/liblwres.so.50.0.5
+file path=usr/lib/dns/liblwres.so.50.0.6
file path=usr/sbin/dig
file path=usr/sbin/host
file path=usr/sbin/nslookup
@@ -54,15 +54,15 @@
file path=usr/sbin/rndc
file path=usr/sbin/rndc-confgen
-link path=usr/lib/dns/libbind9.so target=libbind9.so.50.0.7
-link path=usr/lib/dns/libbind9.so.50 target=libbind9.so.50.0.7
-link path=usr/lib/dns/libdns.so target=libdns.so.110.0.2
-link path=usr/lib/dns/libdns.so.110 target=libdns.so.110.0.2
-link path=usr/lib/dns/libisc.so target=libisc.so.57.0.2
-link path=usr/lib/dns/libisc.so.57 target=libisc.so.57.0.2
-link path=usr/lib/dns/libisccc.so target=libisccc.so.50.0.2
-link path=usr/lib/dns/libisccc.so.50 target=libisccc.so.50.0.2
+link path=usr/lib/dns/libbind9.so target=libbind9.so.50.0.9
+link path=usr/lib/dns/libbind9.so.50 target=libbind9.so.50.0.9
+link path=usr/lib/dns/libdns.so target=libdns.so.110.1.2
+link path=usr/lib/dns/libdns.so.110 target=libdns.so.110.1.2
+link path=usr/lib/dns/libisc.so target=libisc.so.57.1.0
+link path=usr/lib/dns/libisc.so.57 target=libisc.so.57.1.0
+link path=usr/lib/dns/libisccc.so target=libisccc.so.50.0.3
+link path=usr/lib/dns/libisccc.so.50 target=libisccc.so.50.0.3
link path=usr/lib/dns/libisccfg.so target=libisccfg.so.50.0.6
link path=usr/lib/dns/libisccfg.so.50 target=libisccfg.so.50.0.6
-link path=usr/lib/dns/liblwres.so target=liblwres.so.50.0.5
-link path=usr/lib/dns/liblwres.so.50 target=liblwres.so.50.0.5
+link path=usr/lib/dns/liblwres.so target=liblwres.so.50.0.6
+link path=usr/lib/dns/liblwres.so.50 target=liblwres.so.50.0.6
--- a/components/bind/patches/7072815.timers.patch Tue Oct 09 11:17:24 2012 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-diff --git a/lib/isc/pthreads/condition.c b/lib/isc/pthreads/condition.c
-index 50281a2..ca33e66 100644
---- a/lib/isc/pthreads/condition.c
-+++ b/lib/isc/pthreads/condition.c
-@@ -43,7 +43,14 @@ isc_condition_waituntil(isc_condition_t *c, isc_mutex_t *m, isc_time_t *t) {
- * POSIX defines a timespec's tv_sec as time_t.
- */
- result = isc_time_secondsastimet(t, &ts.tv_sec);
-- if (result != ISC_R_SUCCESS)
-+
-+ /*
-+ * If we have a range error ts.tv_sec is most probably a signed
-+ * 32 bit value. Set ts.tv_sec to INT_MAX. This is a kludge.
-+ */
-+ if (result == ISC_R_RANGE)
-+ ts.tv_sec = INT_MAX;
-+ else if (result != ISC_R_SUCCESS)
- return (result);
-
- /*!
--- a/components/bind/patches/rndc-keys.patch Tue Oct 09 11:17:24 2012 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
---- a/bin/named/controlconf.c Fri Jun 1 10:05:49 2012
-+++ b/bin/named/controlconf.c Tue Jun 5 17:27:55 2012
-@@ -371,12 +371,14 @@
- secret.rend = secret.rstart + key->secret.length;
- result = isccc_cc_fromwire(&ccregion, &request, &secret);
- if (result == ISC_R_SUCCESS)
- break;
- isc_mem_put(listener->mctx, secret.rstart, REGION_SIZE(secret));
-- log_invalid(&conn->ccmsg, result);
-- goto cleanup;
-+ if (result != ISCCC_R_BADAUTH) {
-+ log_invalid(&conn->ccmsg, result);
-+ goto cleanup;
-+ }
- }
-
- if (key == NULL) {
- log_invalid(&conn->ccmsg, ISCCC_R_BADAUTH);
- goto cleanup;
---- a/lib/isccc/cc.c Wed Jun 6 01:41:54 2012
-+++ b/lib/isccc/cc.c Wed Jun 6 01:43:22 2012
-@@ -397,12 +397,10 @@
- if (first_tag && secret != NULL && strcmp(key, "_auth") == 0)
- checksum_rstart = source->rstart;
- first_tag = ISC_FALSE;
- }
-
-- *alistp = alist;
--
- if (secret != NULL) {
- if (checksum_rstart != NULL)
- result = verify(alist, checksum_rstart,
- (source->rend - checksum_rstart),
- secret);
---- a/lib/isccc/cc.c Wed Jun 6 01:45:26 2012
-+++ b/lib/isccc/cc.c Wed Jun 6 01:43:22 2012
-@@ -408,11 +408,13 @@
- result = ISCCC_R_BADAUTH;
- } else
- result = ISC_R_SUCCESS;
-
- bad:
-- if (result != ISC_R_SUCCESS)
-+ if (result == ISC_R_SUCCESS)
-+ *alistp = alist;
-+ else
- isccc_sexpr_free(&alist);
-
- return (result);
- }
-