+++ /dev/null
-diff -urN bind-9.4.1.org/bin/named/main.c bind-9.4.1/bin/named/main.c
---- bind-9.4.1.org/bin/named/main.c 2007-06-01 19:44:51.223203000 +0200
-+++ bind-9.4.1/bin/named/main.c 2007-06-01 20:08:19.703753086 +0200
-@@ -464,9 +464,7 @@
- }
- }
-
--static isc_result_t
--create_managers(void) {
-- isc_result_t result;
-+static void fill_ns_g_cpus() {
- #ifdef ISC_PLATFORM_USETHREADS
- unsigned int cpus_detected;
- #endif
-@@ -475,13 +473,20 @@
- cpus_detected = isc_os_ncpus();
- if (ns_g_cpus == 0)
- ns_g_cpus = cpus_detected;
-- isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER,
-- ISC_LOG_INFO, "found %u CPU%s, using %u worker thread%s",
-- cpus_detected, cpus_detected == 1 ? "" : "s",
-- ns_g_cpus, ns_g_cpus == 1 ? "" : "s");
- #else
- ns_g_cpus = 1;
- #endif
-+}
-+
-+static isc_result_t
-+create_managers(void) {
-+ isc_result_t result;
-+
-+#ifdef ISC_PLATFORM_USETHREADS
-+ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_SERVER,
-+ ISC_LOG_INFO, "using %u worker thread%s",
-+ ns_g_cpus, ns_g_cpus == 1 ? "" : "s");
-+#endif
- result = isc_taskmgr_create(ns_g_mctx, ns_g_cpus, 0, &ns_g_taskmgr);
- if (result != ISC_R_SUCCESS) {
- UNEXPECTED_ERROR(__FILE__, __LINE__,
-@@ -581,6 +586,9 @@
- isc_mem_free(ns_g_mctx, instance);
- #endif /* HAVE_LIBSCF */
-
-+ /* Fill in ns_g_cpus date before chroot happens */
-+ fill_ns_g_cpus();
-+
- #ifdef PATH_RANDOMDEV
- /*
- * Initialize system's random device as fallback entropy source
+++ /dev/null
-diff -urN bind-9.2.1.org/lib/bind9/include/Makefile.in bind-9.2.1/lib/bind9/include/Makefile.in
---- bind-9.2.1.org/lib/bind9/include/Makefile.in Sun Sep 29 00:00:18 2002
-+++ bind-9.2.1/lib/bind9/include/Makefile.in Sun Sep 29 00:01:05 2002
-@@ -31,17 +31,17 @@
- @BIND9_MAKE_RULES@
-
- installdirs:
-- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir} \
-- ${DESTDIR}${includedir}/arpa ${DESTDIR}${includedir}/isc
-+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/bind \
-+ ${DESTDIR}${includedir}/bind/arpa ${DESTDIR}${includedir}/bind/isc
-
- install:: installdirs
- for i in ${HEADERS}; do \
-- ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}; \
-+ ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/bind; \
- done
- for i in ${IHEADERS}; do \
-- ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isc; \
-+ ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/bind/isc; \
- done
- for i in ${AHEADERS}; do \
-- ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/arpa; \
-+ ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/bind/arpa; \
- done
-
-
+++ /dev/null
---- bind-9.3.1/configure.in~ 2005-03-15 08:50:04.942697232 +0100
-+++ bind-9.3.1/configure.in 2005-03-15 08:55:33.325775416 +0100
-@@ -1630,32 +1630,8 @@
-
- case $want_getifaddrs in
- yes|glibc)
--#
--# Do we have getifaddrs() ?
--#
--case $host in
--*-linux*)
-- # Some recent versions of glibc support getifaddrs() which does not
-- # provide AF_INET6 addresses while the function provided by the USAGI
-- # project handles the AF_INET6 case correctly. We need to avoid
-- # using the former but prefer the latter unless overridden by
-- # --enable-getifaddrs=glibc.
-- if test $want_getifaddrs = glibc
-- then
-- AC_CHECK_FUNC(getifaddrs, AC_DEFINE(HAVE_GETIFADDRS))
-- else
-- save_LIBS="$LIBS"
-- LIBS="-L/usr/local/v6/lib $LIBS"
-- AC_CHECK_LIB(inet6, getifaddrs,
-- LIBS="$LIBS -linet6"
-- AC_DEFINE(HAVE_GETIFADDRS),
-- LIBS=${save_LIBS})
-- fi
-- ;;
--*)
-- AC_CHECK_FUNC(getifaddrs, AC_DEFINE(HAVE_GETIFADDRS))
-- ;;
--esac
-+
-+AC_CHECK_FUNC(getifaddrs, AC_DEFINE(HAVE_GETIFADDRS))
- ;;
- no)
- ;;