From: Francis Dupont Date: Wed, 16 Sep 2015 13:38:20 +0000 (+0200) Subject: [master] Finished merge of trac3911a (Makefile.am dependency) X-Git-Tag: trac4049_base~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d13f5234da33df03c0989829a0e1c1056e53a4e;p=thirdparty%2Fkea.git [master] Finished merge of trac3911a (Makefile.am dependency) --- 4d13f5234da33df03c0989829a0e1c1056e53a4e diff --cc ChangeLog index ecc9296cb7,0f8366253e..bfd688c164 --- a/ChangeLog +++ b/ChangeLog @@@ -1,61 -1,3 +1,67 @@@ ++1003. [build] fdupont ++ Updated Makefiles to ensure that all required dynamic libraries ++ are included in the link command line as some systems are unable ++ handle implied library dependencies. ++ (Trac #3911, git xxx) ++ +1002. [func] marcin + MySQL lease database backend has been extended with new + functions to obtain expired leases and to delete expired + reclaimed leases. + (Trac #3966, git 419832a6279c70b5db04b1cab10737e31f2c99f9) + +1001. [build] fdupont + Fixed critical C++ issues in the Kea code. This does not cover + auto_ptr warnings (just ignore them) or the gtest 1.7.0 bug with + EXPECT_TRUE() and ASSERT_TRUE() macros (we recommend to download + last subversion souces at http://googletest.googlecode.com/svn/trunk + and use the --with-gtest-source configuration argument when + you'd like to build unit tests). + (Trac #4024, git 55afd98fead0c16bb81107dfc1a5f49a5e295aa6) + +1000. [func] marcin + Implemented Timer Manager which holds the pool of interval + timers used by the DHCP servers. + (Trac #3970, git bc8503055338da36d07a2b67c64087f645c9a9e3) + +999. [func]* tmark + The DHCPv4 server will now honor DHCPRELEASEs for leased addresses + which cannot be matched to subnet. This allows leases to be + released after configuration changes have eliminated their subnet. + Prior to this the server would reject the release and emit a + DHCP4_RELEASE_FAIL_NO_SUBNET log message. + (Trac #2615, git eeebf9f68cf5be6a0f7eefc78832d664361c4990) + +998. [func] tomek + 'decline-probation-period' parameter has been added to DHCPv4 + and DHCPv6 configuration. It can be configured, but is not yet + used, as the DECLINE message support is still pending implementation. + (Trac #3983, git 6b10d119c89685476335f268181c9982f6fa6161) + +997. [build] jreed + Removed obsolete Python coverage build options. + (Trac #3483, git a08cbbecbd3b11d0b73f68a40986a353b22ed3be) + +996. [func] marcin + Memfile lease database backend has been extended with new + functions to obtain expired leases and to delete expired + reclaimed leases. + (Trac #3965, git dd5b95453528416f22e961e6ebb3051bc2ae788c) + +995. [build] fdupont + Removed additional files left over from BIND 10 (headers, + src/lib/{asiodns,testutils,asiolink}). + (Trac #40{28,29,31}, git 78ff0fb0a97731a8b3c055b1cbb4faebcd115f7c) + +994. [func]* marcin + DHCPv6 server fully supports RFC 7550. + (Trac #3947, git c06ab97a4e068c4b4b11f4685c56dd402b2385dc) + +993. [bug] fdupont + The logging spec file was searched in the build tree when it + was in the source tree so distcheck (where they differ) failed. + (Trac #4026, git 5eb213647d7ac0a707530d57af2c6dbd725ac1b3) + 992. [func] fdupont A 'flush' parameter has been added to logging configuration. It is now possible to disable automatic immediate flushing to achieve diff --cc src/bin/d2/tests/Makefile.am index 72373b7cc6,f64fa8a987..aaffb8fa25 --- a/src/bin/d2/tests/Makefile.am +++ b/src/bin/d2/tests/Makefile.am @@@ -20,9 -20,8 +20,7 @@@ check-local AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -I$(top_builddir)/src/bin # for generated spec_config.h header AM_CPPFLAGS += -I$(top_srcdir)/src/bin - AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc - AM_CPPFLAGS += -I$(top_srcdir)/src/lib/asiolink AM_CPPFLAGS += $(BOOST_INCLUDES) -AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_top_srcdir)/src/lib/testutils/testdata\" AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/d2/tests\" AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\" diff --cc src/bin/dhcp4/tests/Makefile.am index 4fe6793bd5,5cfc1abb7c..5648da73fd --- a/src/bin/dhcp4/tests/Makefile.am +++ b/src/bin/dhcp4/tests/Makefile.am @@@ -17,12 -17,10 +17,10 @@@ check-local done AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib +AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src AM_CPPFLAGS += -I$(top_builddir)/src/bin # for generated spec_config.h header AM_CPPFLAGS += -I$(top_srcdir)/src/bin - AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc - AM_CPPFLAGS += -I$(top_srcdir)/src/lib/asiolink AM_CPPFLAGS += $(BOOST_INCLUDES) -AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_top_srcdir)/src/lib/testutils/testdata\" AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/dhcp4/tests\" AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\" diff --cc src/bin/dhcp6/Makefile.am index 7da28a5973,e47c904ef3..04ba47e0b3 --- a/src/bin/dhcp6/Makefile.am +++ b/src/bin/dhcp6/Makefile.am @@@ -2,8 -2,6 +2,7 @@@ SUBDIRS = . test AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin - AM_CPPFLAGS += -I$(top_srcdir)/src/lib/cc -I$(top_builddir)/src/lib/cc +AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src AM_CPPFLAGS += $(BOOST_INCLUDES) if HAVE_MYSQL AM_CPPFLAGS += $(MYSQL_CPPFLAGS) diff --cc src/bin/lfc/tests/Makefile.am index 6aa15585e0,107fbc8c86..d013cbbae7 --- a/src/bin/lfc/tests/Makefile.am +++ b/src/bin/lfc/tests/Makefile.am @@@ -15,9 -15,8 +15,7 @@@ check-local AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += -I$(top_builddir)/src/bin # for generated spec_config.h header AM_CPPFLAGS += -I$(top_srcdir)/src/bin - AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc - AM_CPPFLAGS += -I$(top_srcdir)/src/lib/asiolink AM_CPPFLAGS += $(BOOST_INCLUDES) -AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_top_srcdir)/src/lib/testutils/testdata\" AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/lfc/tests\" AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\" diff --cc src/lib/dhcp_ddns/tests/Makefile.am index d870e38252,53f4c8b9dc..6ebdde978f --- a/src/lib/dhcp_ddns/tests/Makefile.am +++ b/src/lib/dhcp_ddns/tests/Makefile.am @@@ -30,10 -30,11 +30,10 @@@ libdhcp_ddns_unittests_SOURCES = run_u libdhcp_ddns_unittests_SOURCES += ncr_unittests.cc libdhcp_ddns_unittests_SOURCES += ncr_udp_unittests.cc libdhcp_ddns_unittests_SOURCES += test_utils.cc test_utils.h -libdhcp_ddns_unittests_SOURCES += watch_socket_unittests.cc - libdhcp_ddns_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES) + libdhcp_ddns_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) - libdhcp_ddns_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) + libdhcp_ddns_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS) libdhcp_ddns_unittests_CXXFLAGS = $(AM_CXXFLAGS) if USE_CLANGPP diff --cc src/lib/dhcpsrv/tests/Makefile.am index ff5fc36379,adff539399..87989d0b96 --- a/src/lib/dhcpsrv/tests/Makefile.am +++ b/src/lib/dhcpsrv/tests/Makefile.am @@@ -104,9 -107,8 +108,9 @@@ libdhcpsrv_unittests_SOURCES += subnet_ libdhcpsrv_unittests_SOURCES += test_get_callout_handle.cc test_get_callout_handle.h libdhcpsrv_unittests_SOURCES += triplet_unittest.cc libdhcpsrv_unittests_SOURCES += test_utils.cc test_utils.h +libdhcpsrv_unittests_SOURCES += timer_mgr_unittest.cc - libdhcpsrv_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES) + libdhcpsrv_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) if HAVE_MYSQL libdhcpsrv_unittests_CPPFLAGS += $(MYSQL_CPPFLAGS) endif