BIND 10 master, updated. d581f79243723a01240da4b7b5adb8028d016e76 Changelogs

[BIND 10 source code commits]

The branch, master has been updated
       via  d581f79243723a01240da4b7b5adb8028d016e76 (commit)
       via  f5f07c976d2d42bdf80fea4433202ecf1f260648 (commit)
       via  511912d01bb7b2019f0a36100c524859a6de23b6 (commit)
       via  69024d03d0cebda395388fdcec2ad559c093f8aa (commit)
       via  544668f9aac4823519cee2b10b52315c0df4c259 (commit)
       via  d07c725e9a441e363a18e66965ff7e76f4de526e (commit)
       via  0eefdc946964638e619c686604c7a275919e2b80 (commit)
      from  598e458c7af7d5bb81131112396e4c5845060ecd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d581f79243723a01240da4b7b5adb8028d016e76
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Aug 13 15:55:19 2013 +0200

    Changelogs

commit f5f07c976d2d42bdf80fea4433202ecf1f260648
Merge: 598e458 511912d
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Aug 13 15:50:59 2013 +0200

    Merge #3064
    
    Disable building resolver by default
    
    Conflicts:
    	configure.ac

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                    |   13 +++++++++++++
 configure.ac                 |    7 +++++++
 src/bin/Makefile.am          |    9 +++++++--
 src/bin/resolver/Makefile.am |    1 -
 src/lib/Makefile.am          |    9 +++++++--
 src/lib/resolve/Makefile.am  |    1 -
 6 files changed, 34 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 53e650c..d371062 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+658.	[func]*		vorner
+	The resolver, being experimental, is no longer installed by default.
+	If you really want to use it, even when it is known to be buggy, use
+	--enable-experimental-resolver.
+	(Trac #3064, git f5f07c976d2d42bdf80fea4433202ecf1f260648)
+
+657.	[bug]		vorner
+	Due to various problems with older versions of boost and shared memory,
+	the server rejects to compile with combination of boost < 1.48 and shared
+	memory enabled. Most users don't need shared memory, admins of large
+	servers are asked to upgrade boost.
+	(Trac #3025, git 598e458c7af7d5bb81131112396e4c5845060ecd)
+
 656.	[func]		tomek
 	Additional hooks (buffer6_receive, lease6_renew,
 	lease6_release, buffer6_send) added to the DHCPv6 server.
diff --git a/configure.ac b/configure.ac
index 41b0900..e153d93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -898,6 +898,13 @@ if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$werror_ok" = X1 -a $CLANGP
     AC_MSG_ERROR([Failed to compile a required header file.  If you are using FreeBSD and Boost installed via ports, retry with specifying --without-werror.  See the ChangeLog entry for Trac no. 1991 for more details.])
 fi
 
+build_experimental_resolver=no
+AC_ARG_ENABLE(experimental_resolver,
+  [AC_HELP_STRING([--enable-experimental-resolver],
+  [enable building of the experimental resolver [default=no]])],
+  build_experimental_resolver=$enableval, build_experimental_resolver=no)
+AM_CONDITIONAL([BUILD_EXPERIMENTAL_RESOLVER], [test "$build_experimental_resolver" = "yes"])
+
 use_shared_memory=yes
 AC_ARG_WITH(shared-memory,
     AC_HELP_STRING([--with-shared-memory],
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index bf61827..621558e 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,5 +1,10 @@
+if BUILD_EXPERIMENTAL_RESOLVER
+# Build resolver only with --enable-experimental-resolver
+experimental_resolver = resolver
+endif
+
 SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq cmdctl auth xfrin \
-	xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 d2\
-	dbutil sysinfo memmgr
+	xfrout usermgr zonemgr stats tests $(experimental_resolver) \
+	sockcreator dhcp4 dhcp6 d2 dbutil sysinfo memmgr
 
 check-recursive: all-recursive
diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index a549e6a..38f9bf6 100644
--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -83,4 +83,3 @@ b10_resolver_LDFLAGS = -pthread
 # and can't use @datadir@ because doesn't expand default ${prefix}
 b10_resolverdir = $(pkgdatadir)
 b10_resolver_DATA = resolver.spec
-
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index ddf369d..59cb8e1 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,3 +1,8 @@
+if BUILD_EXPERIMENTAL_RESOLVER
+# Build resolver only with --enable-experimental-resolver
+experimental_resolver = resolve
+endif
+
 SUBDIRS = exceptions util log hooks cryptolink dns cc config acl xfr bench \
-          asiolink asiodns nsas cache resolve testutils datasrc \
-          server_common python dhcp dhcp_ddns dhcpsrv statistics
+          asiolink asiodns nsas cache $(experimental_resolver) testutils \
+          datasrc server_common python dhcp dhcp_ddns dhcpsrv statistics
diff --git a/src/lib/resolve/Makefile.am b/src/lib/resolve/Makefile.am
index 096a14d..0016684 100644
--- a/src/lib/resolve/Makefile.am
+++ b/src/lib/resolve/Makefile.am
@@ -47,4 +47,3 @@ if USE_CLANGPP
 libb10_resolve_la_CXXFLAGS += -Wno-error
 endif
 libb10_resolve_la_CPPFLAGS = $(AM_CPPFLAGS)
-