24336470 Upgrade Solaris to BIND 9.10.4-P2
authorBen Chang <Benjamin.Chang@Oracle.COM>
Thu, 28 Jul 2016 16:15:45 -0700
changeset 6511 d283aa33e131
parent 6510 d00d3d1fc778
child 6512 92717ce71105
24336470 Upgrade Solaris to BIND 9.10.4-P2 24299918 problem in SERVICE/DNS-SERVER
components/bind/Makefile
components/bind/bind.license
components/bind/bind.p5m
components/bind/bindc.p5m
components/bind/patches/001-manpage.patch
components/bind/patches/002-configure.patch
components/bind/patches/002-gssapi-link_libs.patch
components/bind/test/results-i386.master
--- a/components/bind/Makefile	Thu Jul 28 14:41:31 2016 -0700
+++ b/components/bind/Makefile	Thu Jul 28 16:15:45 2016 -0700
@@ -26,19 +26,19 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		bind
-COMPONENT_VERSION=	9.10.3-P4
+COMPONENT_VERSION=	9.10.4-P2
 HUMAN_VERSION=		$(COMPONENT_VERSION)
-IPS_COMPONENT_VERSION=	9.10.3.0.4
+IPS_COMPONENT_VERSION=	9.10.4.0.2
 COMPONENT_PROJECT_URL=	http://www.isc.org/software/bind/
 
 # hash from: sha256sum $(COMPONENT_ARCHIVE) | sed 's/\(.[^ ]*\).*/sha256:\1/'
 COMPONENT_ARCHIVE_HASH=	 \
-	sha256:2ac044b5fbdf45fb45107af0df961b3b7cb5262a3bf1948ed3fe7a170dd13e3e
+	sha256:b35b8af8fe030196d03b3e487f5ecd0c0836b5e124abc7a3ecd184740b444423
 COMPONENT_ARCHIVE_URL=	\
 	http://ftp.isc.org/isc/bind9/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_SIG_URL=	$(COMPONENT_ARCHIVE_URL).sha512.asc
 COMPONENT_BUGDB=	service/dns-server
-TPNO=			26279
+TPNO=			30276
 
 include $(WS_MAKE_RULES)/common.mk
 
@@ -46,6 +46,9 @@
 PYTHON_VERSION =	3.4
 PKG_MACROS +=		PYVER=$(PYTHON_VERSION)
 
+# Some patches need configure script re-creation.
+COMPONENT_PREP_ACTION +=(cd $(@D); autoreconf -vfi);
+
 # Specify "configure" options and features.
 # FYI, The configure options are displayed by 'named -V'.
 CONFIGURE_OPTIONS +=	--enable-full-report
--- a/components/bind/bind.license	Thu Jul 28 14:41:31 2016 -0700
+++ b/components/bind/bind.license	Thu Jul 28 16:15:45 2016 -0700
@@ -1,3 +1,5 @@
+"This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (Link2 /)"
+
 Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
 
--- a/components/bind/bind.p5m	Thu Jul 28 14:41:31 2016 -0700
+++ b/components/bind/bind.p5m	Thu Jul 28 16:15:45 2016 -0700
@@ -116,6 +116,7 @@
 file path=usr/share/doc/bind/html/man.named-checkzone.html
 file path=usr/share/doc/bind/html/man.named-journalprint.html
 file path=usr/share/doc/bind/html/man.named-rrchecker.html
+file path=usr/share/doc/bind/html/man.named.conf.html
 file path=usr/share/doc/bind/html/man.named.html
 file path=usr/share/doc/bind/html/man.nsec3hash.html
 file path=usr/share/doc/bind/html/man.nsupdate.html
@@ -123,6 +124,7 @@
 file path=usr/share/doc/bind/html/man.rndc.conf.html
 file path=usr/share/doc/bind/html/man.rndc.html
 file path=usr/share/doc/bind/html/notes.html
+file doc/arm/notes.pdf path=usr/share/doc/bind/notes.pdf
 file path=usr/share/man/man1/named-rrchecker.1
 file path=usr/share/man/man5/named.conf.5
 file path=usr/share/man/man8/ddns-confgen.8
--- a/components/bind/bindc.p5m	Thu Jul 28 14:41:31 2016 -0700
+++ b/components/bind/bindc.p5m	Thu Jul 28 16:15:45 2016 -0700
@@ -43,24 +43,24 @@
 file path=usr/bin/host
 file path=usr/bin/nslookup
 file path=usr/bin/nsupdate
-link path=usr/lib/dns/$(MACH64)/libbind9.so target=libbind9.so.140.0.10
-link path=usr/lib/dns/$(MACH64)/libbind9.so.140 target=libbind9.so.140.0.10
-file path=usr/lib/dns/$(MACH64)/libbind9.so.140.0.10
-link path=usr/lib/dns/$(MACH64)/libdns.so target=libdns.so.162.1.3
-link path=usr/lib/dns/$(MACH64)/libdns.so.162 target=libdns.so.162.1.3
-file path=usr/lib/dns/$(MACH64)/libdns.so.162.1.3
+link path=usr/lib/dns/$(MACH64)/libbind9.so target=libbind9.so.140.0.11
+link path=usr/lib/dns/$(MACH64)/libbind9.so.140 target=libbind9.so.140.0.11
+file path=usr/lib/dns/$(MACH64)/libbind9.so.140.0.11
+link path=usr/lib/dns/$(MACH64)/libdns.so target=libdns.so.165.0.1
+link path=usr/lib/dns/$(MACH64)/libdns.so.165 target=libdns.so.165.0.1
+file path=usr/lib/dns/$(MACH64)/libdns.so.165.0.1
 link path=usr/lib/dns/$(MACH64)/libirs.so target=libirs.so.141.0.4
 link path=usr/lib/dns/$(MACH64)/libirs.so.141 target=libirs.so.141.0.4
 file path=usr/lib/dns/$(MACH64)/libirs.so.141.0.4
-link path=usr/lib/dns/$(MACH64)/libisc.so target=libisc.so.160.0.0
-link path=usr/lib/dns/$(MACH64)/libisc.so.160 target=libisc.so.160.0.0
-file path=usr/lib/dns/$(MACH64)/libisc.so.160.0.0
+link path=usr/lib/dns/$(MACH64)/libisc.so target=libisc.so.160.1.1
+link path=usr/lib/dns/$(MACH64)/libisc.so.160 target=libisc.so.160.1.1
+file path=usr/lib/dns/$(MACH64)/libisc.so.160.1.1
 link path=usr/lib/dns/$(MACH64)/libisccc.so target=libisccc.so.140.0.4
 link path=usr/lib/dns/$(MACH64)/libisccc.so.140 target=libisccc.so.140.0.4
 file path=usr/lib/dns/$(MACH64)/libisccc.so.140.0.4
-link path=usr/lib/dns/$(MACH64)/libisccfg.so target=libisccfg.so.140.3.0
-link path=usr/lib/dns/$(MACH64)/libisccfg.so.140 target=libisccfg.so.140.3.0
-file path=usr/lib/dns/$(MACH64)/libisccfg.so.140.3.0
+link path=usr/lib/dns/$(MACH64)/libisccfg.so target=libisccfg.so.140.3.1
+link path=usr/lib/dns/$(MACH64)/libisccfg.so.140 target=libisccfg.so.140.3.1
+file path=usr/lib/dns/$(MACH64)/libisccfg.so.140.3.1
 link path=usr/lib/dns/$(MACH64)/liblwres.so target=liblwres.so.141.0.3
 link path=usr/lib/dns/$(MACH64)/liblwres.so.141 target=liblwres.so.141.0.3
 file path=usr/lib/dns/$(MACH64)/liblwres.so.141.0.3
--- a/components/bind/patches/001-manpage.patch	Thu Jul 28 14:41:31 2016 -0700
+++ b/components/bind/patches/001-manpage.patch	Thu Jul 28 16:15:45 2016 -0700
@@ -8,19 +8,19 @@
 diff -r 752254461f9c bin/named/named.8
 --- a/bin/named/named.8 Mon Apr 18 11:28:30 2016 +0100
 +++ b/bin/named/named.8 Thu Apr 21 10:15:34 2016 +0100
-@@ -288,7 +288,7 @@
- \fBnamed\-checkconf\fR(8),
- \fBnamed\-checkzone\fR(8),
+@@ -358,7 +358,7 @@
+ \fBnamed-checkconf\fR(8),
+ \fBnamed-checkzone\fR(8),
  \fBrndc\fR(8),
 -\fBlwresd\fR(8),
 +\fBdns-server\fR(8s),
  \fBnamed.conf\fR(5),
- BIND 9 Administrator Reference Manual.
+ BIND 9 Administrator Reference Manual\&.
  .SH "AUTHOR"
 diff -r 752254461f9c doc/arm/man.named.html
 --- a/doc/arm/man.named.html    Mon Apr 18 11:28:30 2016 +0100
 +++ b/doc/arm/man.named.html    Thu Apr 21 10:59:57 2016 +0100
-@@ -342,7 +342,7 @@
+@@ -344,7 +344,7 @@
        <span class="citerefentry"><span class="refentrytitle">named-checkconf</span>(8)</span>,
        <span class="citerefentry"><span class="refentrytitle">named-checkzone</span>(8)</span>,
        <span class="citerefentry"><span class="refentrytitle">rndc</span>(8)</span>,
--- a/components/bind/patches/002-configure.patch	Thu Jul 28 14:41:31 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-Patch file created at Oracle to use krb5-config to discover libraries
-and include paths for linking with gssapi.
-
-Intention is to share patch with ISC for their inclusion in future
-releases of BIND.
-
---- a/configure.in	Thu Jun  2 11:28:43 2016
-+++ b/configure.in	Thu Jun  2 11:43:34 2016
-@@ -799,6 +799,49 @@
- [  --with-gssapi=PATH      Specify path for system-supplied GSSAPI [[default=yes]]],
-     use_gssapi="$withval", use_gssapi="yes")
- 
-+# first try using krb5-config, if that does not work then fall back to "yes" method.
-+if test "$use_gssapi" = "krb5-config"
-+then
-+    AC_MSG_RESULT(trying krb5_config)
-+    AC_PATH_PROG(KRB5_CONFIG, krb5-config)
-+    gssapi_cflags=`$KRB5_CONFIG --cflags gssapi`
-+    gssapi_libs=`$KRB5_CONFIG --libs gssapi`
-+    saved_cppflags="$CPPFLAGS"
-+    CPPFLAGS="$gssapi_cflags $CPPFLAGS"
-+    AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h,
-+	[ISC_PLATFORM_GSSAPIHEADER="#define ISC_PLATFORM_GSSAPIHEADER <$ac_header>"])
-+    if test "$ISC_PLATFORM_GSSAPIHEADER" = ""; then
-+	AC_MSG_RESULT([krb5-config: gssapi.h not found])
-+	CPPFLAGS="$saved_cppflags"
-+	use_gssapi="yes"
-+    else
-+	AC_CHECK_HEADERS(krb5/krb5.h krb5.h,
-+	    [ISC_PLATFORM_KRB5HEADER="#define ISC_PLATFORM_KRB5HEADER <$ac_header>"])
-+	if test "$ISC_PLATFORM_KRB5HEADER" = ""; then
-+	    AC_MSG_RESULT([krb5-config: krb5.h not found])
-+	    CPPFLAGS="$saved_cppflags"
-+	    use_gssapi="yes"
-+	else
-+	    CPPFLAGS="$saved_cppflags"
-+	    saved_libs="$LIBS"
-+	    LIBS=$gssapi_libs
-+	    AC_MSG_CHECKING([krb5-config linking as $LIBS])
-+	    AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context()],
-+		gssapi_linked=yes, gssapi_linked=no)
-+	    case $gssapi_linked in
-+		yes) AC_MSG_RESULT([krb5-config: linked]);;
-+		no)  AC_MSG_RESULT([krb5-config: could not determine proper GSSAPI linkage])
-+		    use_gssapi="yes"
-+		    ;;
-+	    esac
-+	    LIBS=$saved_libs
-+	fi
-+    fi
-+    if test "$use_gssapi" = "yes"; then
-+	AC_MSG_CHECKING([for GSSAPI library, non krb5-config method])
-+    fi
-+fi
-+
- # gssapi is just the framework, we really require kerberos v5, so
- # look for those headers (the gssapi headers must be there, too)
- # The problem with this implementation is that it doesn't allow
-@@ -842,6 +885,11 @@
- 	yes)
- 		AC_MSG_ERROR([--with-gssapi must specify a path])
- 		;;
-+	krb5-config)
-+		USE_GSSAPI='-DGSSAPI'
-+		DST_GSSAPI_INC="$gssapi_cflags"
-+		DNS_GSSAPI_LIBS="$gssapi_libs"
-+		;;
- 	*)
- 		AC_MSG_RESULT(looking in $use_gssapi/lib)
- 		USE_GSSAPI='-DGSSAPI'
---- a/configure	Sun Feb 28 16:29:06 2016
-+++ b/configure	Thu Jun  2 03:56:59 2016
-@@ -1,5 +1,5 @@
- #! /bin/sh
--# Copyright (C) 2004-2015  Internet Systems Consortium, Inc. ("ISC")
-+# Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
- # Copyright (C) 1996-2003  Internet Software Consortium.
- #
- # Permission to use, copy, modify, and/or distribute this software for any
-@@ -851,6 +851,7 @@
- ISC_PLATFORM_GSSAPI_KRB5_HEADER
- ISC_PLATFORM_GSSAPIHEADER
- ISC_PLATFORM_HAVEGSSAPI
-+KRB5_CONFIG
- GEOIPLINKOBJS
- GEOIPLINKSRCS
- LWRES_PLATFORM_NEEDSYSSELECTH
-@@ -13975,6 +13976,133 @@
- fi
- 
- 
-+# first try using krb5-config, if that does not work then fall back to "yes" method.
-+if test "$use_gssapi" = "krb5-config"
-+then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: trying krb5_config" >&5
-+$as_echo "trying krb5_config" >&6; }
-+    # Extract the first word of "krb5-config", so it can be a program name with args.
-+set dummy krb5-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_KRB5_CONFIG+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $KRB5_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  ;;
-+esac
-+fi
-+KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG
-+if test -n "$KRB5_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KRB5_CONFIG" >&5
-+$as_echo "$KRB5_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+    gssapi_cflags=`$KRB5_CONFIG --cflags gssapi`
-+    gssapi_libs=`$KRB5_CONFIG --libs gssapi`
-+    saved_cppflags="$CPPFLAGS"
-+    CPPFLAGS="$gssapi_cflags $CPPFLAGS"
-+    for ac_header in gssapi.h gssapi/gssapi.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ ISC_PLATFORM_GSSAPIHEADER="#define ISC_PLATFORM_GSSAPIHEADER <$ac_header>"
-+fi
-+
-+done
-+
-+    if test "$ISC_PLATFORM_GSSAPIHEADER" = ""; then
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: krb5-config: gssapi.h not found" >&5
-+$as_echo "krb5-config: gssapi.h not found" >&6; }
-+	CPPFLAGS="$saved_cppflags"
-+	use_gssapi="yes"
-+    else
-+	for ac_header in krb5/krb5.h krb5.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ ISC_PLATFORM_KRB5HEADER="#define ISC_PLATFORM_KRB5HEADER <$ac_header>"
-+fi
-+
-+done
-+
-+	if test "$ISC_PLATFORM_KRB5HEADER" = ""; then
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: krb5-config: krb5.h not found" >&5
-+$as_echo "krb5-config: krb5.h not found" >&6; }
-+	    CPPFLAGS="$saved_cppflags"
-+	    use_gssapi="yes"
-+	else
-+	    CPPFLAGS="$saved_cppflags"
-+	    saved_libs="$LIBS"
-+	    LIBS=$gssapi_libs
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking krb5-config linking as $LIBS" >&5
-+$as_echo_n "checking krb5-config linking as $LIBS... " >&6; }
-+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+gss_acquire_cred();krb5_init_context()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  gssapi_linked=yes
-+else
-+  gssapi_linked=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+	    case $gssapi_linked in
-+		yes) { $as_echo "$as_me:${as_lineno-$LINENO}: result: krb5-config: linked" >&5
-+$as_echo "krb5-config: linked" >&6; };;
-+		no)  { $as_echo "$as_me:${as_lineno-$LINENO}: result: krb5-config: could not determine proper GSSAPI linkage" >&5
-+$as_echo "krb5-config: could not determine proper GSSAPI linkage" >&6; }
-+		    use_gssapi="yes"
-+		    ;;
-+	    esac
-+	    LIBS=$saved_libs
-+	fi
-+    fi
-+    if test "$use_gssapi" = "yes"; then
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSSAPI library, non krb5-config method" >&5
-+$as_echo_n "checking for GSSAPI library, non krb5-config method... " >&6; }
-+    fi
-+fi
-+
- # gssapi is just the framework, we really require kerberos v5, so
- # look for those headers (the gssapi headers must be there, too)
- # The problem with this implementation is that it doesn't allow
-@@ -14019,6 +14147,11 @@
- 	yes)
- 		as_fn_error $? "--with-gssapi must specify a path" "$LINENO" 5
- 		;;
-+	krb5-config)
-+		USE_GSSAPI='-DGSSAPI'
-+		DST_GSSAPI_INC="$gssapi_cflags"
-+		DNS_GSSAPI_LIBS="$gssapi_libs"
-+		;;
- 	*)
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: looking in $use_gssapi/lib" >&5
- $as_echo "looking in $use_gssapi/lib" >&6; }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bind/patches/002-gssapi-link_libs.patch	Thu Jul 28 16:15:45 2016 -0700
@@ -0,0 +1,70 @@
+Patch file created at Oracle to use krb5-config to discover libraries
+and include paths for linking with gssapi.
+
+Intention is to share patch with ISC for their inclusion in future
+releases of BIND.
+
+--- a/configure.in	2016-07-20 13:39:39.458348472 -0700
++++ b/configure.in	2016-07-20 13:39:39.275061884 -0700
+@@ -818,6 +818,49 @@
+ [  --with-gssapi=PATH      Specify path for system-supplied GSSAPI [[default=yes]]],
+     use_gssapi="$withval", use_gssapi="yes")
+ 
++# first try using krb5-config, if that does not work then fall back to "yes" method.
++if test "$use_gssapi" = "krb5-config"
++then
++    AC_MSG_RESULT(trying krb5_config)
++    AC_PATH_PROG(KRB5_CONFIG, krb5-config)
++    gssapi_cflags=`$KRB5_CONFIG --cflags gssapi`
++    gssapi_libs=`$KRB5_CONFIG --libs gssapi`
++    saved_cppflags="$CPPFLAGS"
++    CPPFLAGS="$gssapi_cflags $CPPFLAGS"
++    AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h,
++	[ISC_PLATFORM_GSSAPIHEADER="#define ISC_PLATFORM_GSSAPIHEADER <$ac_header>"])
++    if test "$ISC_PLATFORM_GSSAPIHEADER" = ""; then
++	AC_MSG_RESULT([krb5-config: gssapi.h not found])
++	CPPFLAGS="$saved_cppflags"
++	use_gssapi="yes"
++    else
++	AC_CHECK_HEADERS(krb5/krb5.h krb5.h,
++	    [ISC_PLATFORM_KRB5HEADER="#define ISC_PLATFORM_KRB5HEADER <$ac_header>"])
++	if test "$ISC_PLATFORM_KRB5HEADER" = ""; then
++	    AC_MSG_RESULT([krb5-config: krb5.h not found])
++	    CPPFLAGS="$saved_cppflags"
++	    use_gssapi="yes"
++	else
++	    CPPFLAGS="$saved_cppflags"
++	    saved_libs="$LIBS"
++	    LIBS=$gssapi_libs
++	    AC_MSG_CHECKING([krb5-config linking as $LIBS])
++	    AC_TRY_LINK( , [gss_acquire_cred();krb5_init_context()],
++		gssapi_linked=yes, gssapi_linked=no)
++	    case $gssapi_linked in
++		yes) AC_MSG_RESULT([krb5-config: linked]);;
++		no)  AC_MSG_RESULT([krb5-config: could not determine proper GSSAPI linkage])
++		    use_gssapi="yes"
++		    ;;
++	    esac
++	    LIBS=$saved_libs
++	fi
++    fi
++    if test "$use_gssapi" = "yes"; then
++	AC_MSG_CHECKING([for GSSAPI library, non krb5-config method])
++    fi
++fi
++
+ # gssapi is just the framework, we really require kerberos v5, so
+ # look for those headers (the gssapi headers must be there, too)
+ # The problem with this implementation is that it doesn't allow
+@@ -861,6 +904,11 @@
+ 	yes)
+ 		AC_MSG_ERROR([--with-gssapi must specify a path])
+ 		;;
++	krb5-config)
++		USE_GSSAPI='-DGSSAPI'
++		DST_GSSAPI_INC="$gssapi_cflags"
++		DNS_GSSAPI_LIBS="$gssapi_libs"
++		;;
+ 	*)
+ 		AC_MSG_RESULT(looking in $use_gssapi/lib)
+ 		USE_GSSAPI='-DGSSAPI'
--- a/components/bind/test/results-i386.master	Thu Jul 28 14:41:31 2016 -0700
+++ b/components/bind/test/results-i386.master	Thu Jul 28 16:15:45 2016 -0700
@@ -12,6 +12,12 @@
 T:test_atomic_xaddq:1:A
 A:ensure that isc_atomic_xaddq() works.
 R:PASS
+T:test_atomic_store:1:A
+A:ensure that isc_atomic_store() works.
+R:PASS
+T:test_atomic_storeq:1:A
+A:ensure that isc_atomic_storeq() works.
+R:PASS
 E:$(@D)/bin/tests/atomic/.libs/t_atomic:
 make[3]: Leaving directory '$(@D)/bin/tests/atomic'
 make[3]: Entering directory '$(@D)/bin/tests/db'