diff --git a/ChangeLog b/ChangeLog index 35ffd3ea31..e4d370d6b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2293. [build] razvan + The library version numbers have been bumped up for the Kea 2.7.4 + development release. + (Gitlab #3639) + 2292. [doc] tmark Updated the ARM to include and explanation for why the default values for 'calculate-tee-times' are diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am index 21fbee30b3..3e59243a86 100644 --- a/src/lib/asiolink/Makefile.am +++ b/src/lib/asiolink/Makefile.am @@ -11,7 +11,7 @@ CLEANFILES = *.gcno *.gcda lib_LTLIBRARIES = libkea-asiolink.la -libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 81:0:0 +libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 82:0:0 libkea_asiolink_la_LDFLAGS += $(CRYPTO_LDFLAGS) libkea_asiolink_la_SOURCES = asiolink.h diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am index f6f898acf1..b74b2eaba3 100644 --- a/src/lib/config/Makefile.am +++ b/src/lib/config/Makefile.am @@ -36,7 +36,7 @@ libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_cfgclient_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) -libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 77:0:0 +libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 78:0:0 libkea_cfgclient_la_LDFLAGS += $(CRYPTO_LDFLAGS) # The message file should be in the distribution. diff --git a/src/lib/cryptolink/Makefile.am b/src/lib/cryptolink/Makefile.am index 59bd8e0e40..c25bd54bfb 100644 --- a/src/lib/cryptolink/Makefile.am +++ b/src/lib/cryptolink/Makefile.am @@ -27,7 +27,7 @@ libkea_cryptolink_la_SOURCES += openssl_hmac.cc endif libkea_cryptolink_la_LDFLAGS = $(CRYPTO_LDFLAGS) -libkea_cryptolink_la_LDFLAGS += -no-undefined -version-info 60:0:0 +libkea_cryptolink_la_LDFLAGS += -no-undefined -version-info 61:0:0 libkea_cryptolink_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_cryptolink_la_LIBADD += $(CRYPTO_LIBS) diff --git a/src/lib/database/Makefile.am b/src/lib/database/Makefile.am index c520d9337c..21d1eb423d 100644 --- a/src/lib/database/Makefile.am +++ b/src/lib/database/Makefile.am @@ -29,7 +29,7 @@ libkea_database_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_database_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_database_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) -libkea_database_la_LDFLAGS = -no-undefined -version-info 72:0:0 +libkea_database_la_LDFLAGS = -no-undefined -version-info 73:0:0 # If we want to get rid of all generated messages files, we need to use # make maintainer-clean. The proper way to introduce custom commands for diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am index fb1442ca6f..6f6531fa93 100644 --- a/src/lib/dhcp/Makefile.am +++ b/src/lib/dhcp/Makefile.am @@ -87,7 +87,7 @@ libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_dhcp___la_LIBADD += $(BOOST_LIBS) libkea_dhcp___la_LIBADD += $(CRYPTO_LIBS) -libkea_dhcp___la_LDFLAGS = -no-undefined -version-info 103:0:0 +libkea_dhcp___la_LDFLAGS = -no-undefined -version-info 104:0:0 libkea_dhcp___la_LDFLAGS += $(CRYPTO_LDFLAGS) EXTRA_DIST = README libdhcp++.dox diff --git a/src/lib/dhcp/classify.cc b/src/lib/dhcp/classify.cc index 86f6b5367f..828b137604 100644 --- a/src/lib/dhcp/classify.cc +++ b/src/lib/dhcp/classify.cc @@ -92,7 +92,7 @@ ClientClasses::fromElement(isc::data::ConstElementPtr cc_list) { for (auto i = 0; i < cc_list->size(); ++i) { auto cclass = cc_list->get(i); if (cclass->getType() != Element::string) { - isc_throw(BadValue, "elements of list must be valid strings"); + isc_throw(BadValue, "elements of list must be valid strings"); } static_cast(insert(cclass->stringValue())); diff --git a/src/lib/dhcp/tests/classify_unittest.cc b/src/lib/dhcp/tests/classify_unittest.cc index 4c3be5ec9c..075af19547 100644 --- a/src/lib/dhcp/tests/classify_unittest.cc +++ b/src/lib/dhcp/tests/classify_unittest.cc @@ -243,7 +243,7 @@ TEST(ClassifyTest, ClientClassesFromElement) { EXPECT_FALSE(classes.contains("two")); EXPECT_TRUE(classes.contains("three")); - // Verify another invocation with an empty pointer is harmless. + // Verify another invocation with an empty pointer is harmless. cclasses_element.reset(); ASSERT_NO_THROW(classes.fromElement(cclasses_element)); EXPECT_TRUE(classes.contains("three")); diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am index cf960993d3..e7057a0f9e 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@ -198,7 +198,7 @@ libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_dhcpsrv_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) -libkea_dhcpsrv_la_LDFLAGS = -no-undefined -version-info 122:0:0 +libkea_dhcpsrv_la_LDFLAGS = -no-undefined -version-info 123:0:0 libkea_dhcpsrv_la_LDFLAGS += $(CRYPTO_LDFLAGS) # The message file should be in the distribution diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am index abc46355dc..9014c7007e 100644 --- a/src/lib/hooks/Makefile.am +++ b/src/lib/hooks/Makefile.am @@ -38,7 +38,7 @@ libkea_hooks_la_SOURCES += hooks_messages.cc hooks_messages.h libkea_hooks_la_CXXFLAGS = $(AM_CXXFLAGS) libkea_hooks_la_CPPFLAGS = $(AM_CPPFLAGS) -libkea_hooks_la_LDFLAGS = -no-undefined -version-info 111:0:0 +libkea_hooks_la_LDFLAGS = -no-undefined -version-info 112:0:0 libkea_hooks_la_LDFLAGS += $(AM_LDFLAGS) libkea_hooks_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la diff --git a/src/lib/hooks/hooks.h b/src/lib/hooks/hooks.h index ce3a6ed0d2..e7dd61e010 100644 --- a/src/lib/hooks/hooks.h +++ b/src/lib/hooks/hooks.h @@ -12,8 +12,8 @@ namespace { -// Version 20703 of the hooks framework, set for Kea 2.7.3 -const int KEA_HOOKS_VERSION = 20703; +// Version 20704 of the hooks framework, set for Kea 2.7.4 +const int KEA_HOOKS_VERSION = 20704; // Names of the framework functions. const char* const LOAD_FUNCTION_NAME = "load"; diff --git a/src/lib/http/Makefile.am b/src/lib/http/Makefile.am index a8bb0c2c6d..5935b9e8db 100644 --- a/src/lib/http/Makefile.am +++ b/src/lib/http/Makefile.am @@ -47,7 +47,7 @@ libkea_http_la_SOURCES += basic_auth.cc basic_auth.h libkea_http_la_CXXFLAGS = $(AM_CXXFLAGS) libkea_http_la_CPPFLAGS = $(AM_CPPFLAGS) libkea_http_la_LDFLAGS = $(AM_LDFLAGS) -libkea_http_la_LDFLAGS += -no-undefined -version-info 82:0:0 +libkea_http_la_LDFLAGS += -no-undefined -version-info 83:0:0 libkea_http_la_LIBADD = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la libkea_http_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la diff --git a/src/lib/mysql/Makefile.am b/src/lib/mysql/Makefile.am index 89553ed22d..71ee016d02 100644 --- a/src/lib/mysql/Makefile.am +++ b/src/lib/mysql/Makefile.am @@ -22,7 +22,7 @@ libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_mysql_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(CRYPTO_LIBS) -libkea_mysql_la_LDFLAGS = -no-undefined -version-info 82:0:0 +libkea_mysql_la_LDFLAGS = -no-undefined -version-info 83:0:0 libkea_mysql_la_LDFLAGS += $(MYSQL_LIBS) diff --git a/src/lib/pgsql/Makefile.am b/src/lib/pgsql/Makefile.am index 4c99306a7d..caf35fc3ed 100644 --- a/src/lib/pgsql/Makefile.am +++ b/src/lib/pgsql/Makefile.am @@ -22,7 +22,7 @@ libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_pgsql_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(CRYPTO_LIBS) -libkea_pgsql_la_LDFLAGS = -no-undefined -version-info 82:0:0 +libkea_pgsql_la_LDFLAGS = -no-undefined -version-info 83:0:0 libkea_pgsql_la_LDFLAGS += $(PGSQL_LIBS) diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am index f7db06a209..9f95fa0c77 100644 --- a/src/lib/process/Makefile.am +++ b/src/lib/process/Makefile.am @@ -30,7 +30,7 @@ libkea_process_la_SOURCES += redact_config.cc redact_config.h libkea_process_la_CXXFLAGS = $(AM_CXXFLAGS) libkea_process_la_CPPFLAGS = $(AM_CPPFLAGS) libkea_process_la_LDFLAGS = $(AM_LDFLAGS) -libkea_process_la_LDFLAGS += -no-undefined -version-info 84:0:0 +libkea_process_la_LDFLAGS += -no-undefined -version-info 85:0:0 libkea_process_la_LIBADD = $(top_builddir)/src/lib/process/cfgrpt/libcfgrpt.la libkea_process_la_LIBADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am index f630f90f90..9ffd0e2da3 100644 --- a/src/lib/util/Makefile.am +++ b/src/lib/util/Makefile.am @@ -44,7 +44,7 @@ libkea_util_la_SOURCES += encode/utf8.cc encode/utf8.h libkea_util_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -libkea_util_la_LDFLAGS = -no-undefined -version-info 96:0:0 +libkea_util_la_LDFLAGS = -no-undefined -version-info 97:0:0 EXTRA_DIST = util.dox