From: Razvan Becheriu Date: Fri, 26 Aug 2022 16:40:56 +0000 (+0300) Subject: [#2546] bump lib versions for 2.3.0 X-Git-Tag: Kea-2.3.0~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5acb6ea3f705c3cf10b62d80355dd823361efcf7;p=thirdparty%2Fkea.git [#2546] bump lib versions for 2.3.0 --- diff --git a/ChangeLog b/ChangeLog index c76e11d702..8637e7459d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2054. [build] razvan + The library version numbers have been bumped for the Kea 2.3.0 + development release. + (Gitlab #2546) + +2053. [doc] razvan + A new appendix for configuration templates added to Kea ARM. + which include High Availability with multi-threading and secure + connections using TLS. + (Gitlab #2441) + 2052. [func] andrei Omitted logger configuration entries are now properly inherited from the root logger as the ARM suggests. diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am index 9d9aa00c4a..68c8b31b1b 100644 --- a/src/lib/asiodns/Makefile.am +++ b/src/lib/asiodns/Makefile.am @@ -9,7 +9,7 @@ CLEANFILES = *.gcno *.gcda lib_LTLIBRARIES = libkea-asiodns.la -libkea_asiodns_la_LDFLAGS = -no-undefined -version-info 24:0:0 +libkea_asiodns_la_LDFLAGS = -no-undefined -version-info 34:0:0 libkea_asiodns_la_SOURCES = io_fetch.cc io_fetch.h libkea_asiodns_la_SOURCES += logger.h logger.cc diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am index acff3d07c9..744c830998 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 40:0:0 +libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 50:0:0 libkea_asiolink_la_LDFLAGS += $(CRYPTO_LDFLAGS) libkea_asiolink_la_SOURCES = asiolink.h diff --git a/src/lib/cc/Makefile.am b/src/lib/cc/Makefile.am index 2497524fc6..cef8e311a1 100644 --- a/src/lib/cc/Makefile.am +++ b/src/lib/cc/Makefile.am @@ -22,7 +22,7 @@ libkea_cc_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_cc_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_cc_la_LIBADD += $(BOOST_LIBS) -libkea_cc_la_LDFLAGS = -no-undefined -version-info 39:0:0 +libkea_cc_la_LDFLAGS = -no-undefined -version-info 49:0:0 # Specify the headers for copying into the installation directory tree. libkea_cc_includedir = $(pkgincludedir)/cc diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am index c95bf57486..34c8d75f1f 100644 --- a/src/lib/config/Makefile.am +++ b/src/lib/config/Makefile.am @@ -30,7 +30,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 36:0:0 +libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 46: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 ab5859979b..8a7e72ec98 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 28:0:0 +libkea_cryptolink_la_LDFLAGS += -no-undefined -version-info 38: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/d2srv/Makefile.am b/src/lib/d2srv/Makefile.am index a1e8333955..2104eb1d8b 100644 --- a/src/lib/d2srv/Makefile.am +++ b/src/lib/d2srv/Makefile.am @@ -47,7 +47,7 @@ libkea_d2srv_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_d2srv_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_d2srv_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) -libkea_d2srv_la_LDFLAGS = -no-undefined -version-info 16:0:0 +libkea_d2srv_la_LDFLAGS = -no-undefined -version-info 26:0:0 libkea_d2srv_la_LDFLAGS += $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) # If we want to get rid of all generated messages files, we need to use diff --git a/src/lib/database/Makefile.am b/src/lib/database/Makefile.am index 70b2cba8ac..5bf8633094 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 35:0:0 +libkea_database_la_LDFLAGS = -no-undefined -version-info 45: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 13e3eb60f9..d9e6f3b97c 100644 --- a/src/lib/dhcp/Makefile.am +++ b/src/lib/dhcp/Makefile.am @@ -84,7 +84,7 @@ libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.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 54:0:0 +libkea_dhcp___la_LDFLAGS = -no-undefined -version-info 65:0:0 libkea_dhcp___la_LDFLAGS += $(CRYPTO_LDFLAGS) EXTRA_DIST = README libdhcp++.dox diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am index 7a56064cb6..96b6e9d3c9 100644 --- a/src/lib/dhcp_ddns/Makefile.am +++ b/src/lib/dhcp_ddns/Makefile.am @@ -21,7 +21,7 @@ libkea_dhcp_ddns_la_CXXFLAGS = $(AM_CXXFLAGS) libkea_dhcp_ddns_la_CPPFLAGS = $(AM_CPPFLAGS) libkea_dhcp_ddns_la_LDFLAGS = $(AM_LDFLAGS) libkea_dhcp_ddns_la_LDFLAGS += $(CRYPTO_LDFLAGS) -libkea_dhcp_ddns_la_LDFLAGS += -no-undefined -version-info 29:0:0 +libkea_dhcp_ddns_la_LDFLAGS += -no-undefined -version-info 39:0:0 libkea_dhcp_ddns_la_LIBADD = libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am index c6e8f57208..bb2f86eede 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@ -216,7 +216,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 69:0:0 +libkea_dhcpsrv_la_LDFLAGS = -no-undefined -version-info 80:0:0 libkea_dhcpsrv_la_LDFLAGS += $(CRYPTO_LDFLAGS) if HAVE_MYSQL libkea_dhcpsrv_la_LDFLAGS += $(MYSQL_LIBS) diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am index 4485dcb9f5..719d7f43f4 100644 --- a/src/lib/dns/Makefile.am +++ b/src/lib/dns/Makefile.am @@ -105,7 +105,7 @@ BUILT_SOURCES += rdataclass.h rdataclass.cc lib_LTLIBRARIES = libkea-dns++.la -libkea_dns___la_LDFLAGS = -no-undefined -version-info 30:0:0 +libkea_dns___la_LDFLAGS = -no-undefined -version-info 40:0:0 libkea_dns___la_LDFLAGS += $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) libkea_dns___la_SOURCES = diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am index 3629ad1d59..56c0ffa6d9 100644 --- a/src/lib/eval/Makefile.am +++ b/src/lib/eval/Makefile.am @@ -36,7 +36,7 @@ libkea_eval_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_eval_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_eval_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) -libkea_eval_la_LDFLAGS = -no-undefined -version-info 39:0:0 +libkea_eval_la_LDFLAGS = -no-undefined -version-info 49:0:0 libkea_eval_la_LDFLAGS += $(CRYPTO_LDFLAGS) EXTRA_DIST = eval.dox diff --git a/src/lib/exceptions/Makefile.am b/src/lib/exceptions/Makefile.am index 71785b879c..a6e7b90b8a 100644 --- a/src/lib/exceptions/Makefile.am +++ b/src/lib/exceptions/Makefile.am @@ -7,7 +7,7 @@ lib_LTLIBRARIES = libkea-exceptions.la libkea_exceptions_la_SOURCES = exceptions.h exceptions.cc libkea_exceptions_la_SOURCES += isc_assert.h -libkea_exceptions_la_LDFLAGS = -no-undefined -version-info 13:0:0 +libkea_exceptions_la_LDFLAGS = -no-undefined -version-info 23:0:0 CLEANFILES = *.gcno *.gcda diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am index da8c7a771c..88c34fbbb6 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 = $(AM_LDFLAGS) -no-undefined -version-info 57:0:0 +libkea_hooks_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 68:0:0 libkea_hooks_la_LIBADD = 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 e2d4f5e6e6..300056a82d 100644 --- a/src/lib/hooks/hooks.h +++ b/src/lib/hooks/hooks.h @@ -12,8 +12,8 @@ namespace { -// Version 20200 of the hooks framework, set for Kea 2.2.0 -const int KEA_HOOKS_VERSION = 20200; +// Version 20300 of the hooks framework, set for Kea 2.3.0 +const int KEA_HOOKS_VERSION = 20300; // 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 8ccaedf0a8..c1dade85f6 100644 --- a/src/lib/http/Makefile.am +++ b/src/lib/http/Makefile.am @@ -48,7 +48,7 @@ libkea_http_la_SOURCES += http_thread_pool.cc http_thread_pool.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 42:0:0 +libkea_http_la_LDFLAGS += -no-undefined -version-info 52:0:0 libkea_http_la_LIBADD = libkea_http_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am index 6c80031bbb..1337ebdaf3 100644 --- a/src/lib/log/Makefile.am +++ b/src/lib/log/Makefile.am @@ -48,7 +48,7 @@ libkea_log_la_LIBADD = $(top_builddir)/src/lib/log/interprocess/libkea-log_int libkea_log_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_log_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_log_la_LIBADD += $(LOG4CPLUS_LIBS) -libkea_log_la_LDFLAGS = -no-undefined -version-info 35:0:0 +libkea_log_la_LDFLAGS = -no-undefined -version-info 46:0:0 # Specify the headers for copying into the installation directory tree. libkea_log_includedir = $(pkgincludedir)/log diff --git a/src/lib/mysql/Makefile.am b/src/lib/mysql/Makefile.am index 5ea978291a..0a5f963cc5 100644 --- a/src/lib/mysql/Makefile.am +++ b/src/lib/mysql/Makefile.am @@ -20,7 +20,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) -libkea_mysql_la_LDFLAGS = -no-undefined -version-info 38:0:0 +libkea_mysql_la_LDFLAGS = -no-undefined -version-info 48:0:0 libkea_mysql_la_LDFLAGS += $(MYSQL_LIBS) diff --git a/src/lib/pgsql/Makefile.am b/src/lib/pgsql/Makefile.am index 47b892f34a..050b4dbcc2 100644 --- a/src/lib/pgsql/Makefile.am +++ b/src/lib/pgsql/Makefile.am @@ -20,7 +20,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) -libkea_pgsql_la_LDFLAGS = -no-undefined -version-info 36:0:0 +libkea_pgsql_la_LDFLAGS = -no-undefined -version-info 46:0:0 libkea_pgsql_la_LDFLAGS += $(PGSQL_LIBS) diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am index a35f0b40b6..94deca53bc 100644 --- a/src/lib/process/Makefile.am +++ b/src/lib/process/Makefile.am @@ -33,7 +33,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 40:0:0 +libkea_process_la_LDFLAGS += -no-undefined -version-info 51:0:0 libkea_process_la_LIBADD = libkea_process_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la diff --git a/src/lib/stats/Makefile.am b/src/lib/stats/Makefile.am index 37f3e41f15..e0878f821f 100644 --- a/src/lib/stats/Makefile.am +++ b/src/lib/stats/Makefile.am @@ -10,7 +10,7 @@ libkea_stats_la_SOURCES += context.h context.cc libkea_stats_la_SOURCES += stats_mgr.h stats_mgr.cc libkea_stats_la_CPPFLAGS = $(AM_CPPFLAGS) -libkea_stats_la_LDFLAGS = -no-undefined -version-info 18:0:0 +libkea_stats_la_LDFLAGS = -no-undefined -version-info 28:0:0 libkea_stats_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la libkea_stats_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la diff --git a/src/lib/stats/tests/Makefile.am b/src/lib/stats/tests/Makefile.am index c8f53aa179..138a657989 100644 --- a/src/lib/stats/tests/Makefile.am +++ b/src/lib/stats/tests/Makefile.am @@ -9,6 +9,8 @@ if USE_STATIC_LINK AM_LDFLAGS = -static endif +TESTS_ENVIRONMENT = $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND) + if HAVE_GTEST TESTS = libstats_unittests diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am index a81750a93f..afb5b7566a 100644 --- a/src/lib/util/Makefile.am +++ b/src/lib/util/Makefile.am @@ -48,7 +48,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 52:0:0 +libkea_util_la_LDFLAGS = -no-undefined -version-info 62:0:0 EXTRA_DIST = util.dox diff --git a/src/lib/yang/Makefile.am b/src/lib/yang/Makefile.am index 78b6678c92..f7c82f87c5 100644 --- a/src/lib/yang/Makefile.am +++ b/src/lib/yang/Makefile.am @@ -40,7 +40,7 @@ libkea_yang_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_yang_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_yang_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(SYSREPO_LIBS) -libkea_yang_la_LDFLAGS = -no-undefined -version-info 29:0:0 +libkea_yang_la_LDFLAGS = -no-undefined -version-info 39:0:0 # Specify the headers for copying into the installation directory tree. libkea_yang_includedir = $(pkgincludedir)/yang