# HG changeset patch
# User tomas.jedlicka <tomas.jedlicka@oracle.com>
# Date 1345650206 25200
# Node ID 42138962369db5b33b447ff1790073d9135ad650
# Parent  a0fb7976f6c7e1b5114aea36f05402447c355683
7102711 BIND 9 may once more be able to use getifaddrs()
7113306 Provide BIND 9 Administrators Reference Manual in usr/share/doc/bind
7072815 host -wT -t CNAME command fails
7191934 Userland docs transforms select wrong facet for pdf files.

diff -r a0fb7976f6c7 -r 42138962369d components/bind/Makefile
--- a/components/bind/Makefile	Sun Aug 19 23:35:53 2012 -0700
+++ b/components/bind/Makefile	Wed Aug 22 08:43:26 2012 -0700
@@ -59,7 +59,6 @@
 CONFIGURE_OPTIONS +=	--enable-devpoll=yes
 CONFIGURE_OPTIONS +=	--disable-openssl-version-check
 CONFIGURE_OPTIONS +=	--enable-fixed-rrset
-CONFIGURE_OPTIONS +=	--disable-getifaddrs
 CONFIGURE_OPTIONS +=	--with-pkcs11
 
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
diff -r a0fb7976f6c7 -r 42138962369d components/bind/bind.p5m
--- a/components/bind/bind.p5m	Sun Aug 19 23:35:53 2012 -0700
+++ b/components/bind/bind.p5m	Wed Aug 22 08:43:26 2012 -0700
@@ -18,9 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
+<transform file path=usr/share/doc/bind/html/(.+)$ -> \
+	set action.hash doc/arm/%<\1> >
+
 set name=pkg.fmri \
     value=pkg:/service/network/dns/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.human-version value=$(COMPONENT_VERSION)
@@ -47,12 +50,41 @@
 dir path=usr/share
 dir path=usr/share/doc
 dir path=usr/share/doc/bind
+dir path=usr/share/doc/bind/html
 
 # Solaris additions
 file Solaris/server.xml path=lib/svc/manifest/network/dns/server.xml
 file Solaris/dns-server.sh path=lib/svc/method/dns-server mode=0555
 file Solaris/migration.txt path=usr/share/doc/bind/migration.txt
 
+# Documentation
+file doc/arm/Bv9ARM.pdf path=usr/share/doc/bind/Bv9ARM.pdf
+file path=usr/share/doc/bind/html/Bv9ARM.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch01.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch02.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch03.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch04.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch05.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch06.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch07.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch08.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch09.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch10.html
+file path=usr/share/doc/bind/html/man.dig.html
+file path=usr/share/doc/bind/html/man.dnssec-dsfromkey.html
+file path=usr/share/doc/bind/html/man.dnssec-keyfromlabel.html
+file path=usr/share/doc/bind/html/man.dnssec-keygen.html
+file path=usr/share/doc/bind/html/man.dnssec-signzone.html
+file path=usr/share/doc/bind/html/man.host.html
+file path=usr/share/doc/bind/html/man.named-checkconf.html
+file path=usr/share/doc/bind/html/man.named-checkzone.html
+file path=usr/share/doc/bind/html/man.named.html
+file path=usr/share/doc/bind/html/man.nsupdate.html
+file path=usr/share/doc/bind/html/man.rndc-confgen.html
+file path=usr/share/doc/bind/html/man.rndc.conf.html
+file path=usr/share/doc/bind/html/man.rndc.html
+
+# Tools
 file path=usr/sbin/dnssec-dsfromkey
 file path=usr/sbin/dnssec-keyfromlabel
 file path=usr/sbin/dnssec-keygen
diff -r a0fb7976f6c7 -r 42138962369d components/bind/patches/7072815.timers.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bind/patches/7072815.timers.patch	Wed Aug 22 08:43:26 2012 -0700
@@ -0,0 +1,20 @@
+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);
+ 
+ 	/*!
diff -r a0fb7976f6c7 -r 42138962369d transforms/docs
--- a/transforms/docs	Sun Aug 19 23:35:53 2012 -0700
+++ b/transforms/docs	Wed Aug 22 08:43:26 2012 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 # man pages
@@ -42,7 +42,7 @@
 
 # pdf docs
 <transform dir file link hardlink path=usr/.*/doc/.*\.pdf$ -> \
-    default facet.doc.html true>
+    default facet.doc.pdf true>
 
 # general documentation
 <transform dir file link hardlink path=usr/.*/doc(/.+){0,1}$ -> \