From 2145b92de3dcf1f1a8cd8004d7b2da999a5bec9b Mon Sep 17 00:00:00 2001 From: Marcin Godzina Date: Mon, 17 Mar 2025 11:27:29 +0000 Subject: [PATCH] [#3804] bump versions for 2.6.2 --- ChangeLog | 5 +++++ SECURITY.md | 8 +++++--- src/lib/database/Makefile.am | 2 +- src/lib/dhcp/Makefile.am | 2 +- src/lib/dhcpsrv/Makefile.am | 2 +- src/lib/hooks/Makefile.am | 2 +- src/lib/hooks/hooks.h | 4 ++-- src/lib/mysql/Makefile.am | 2 +- src/lib/pgsql/Makefile.am | 2 +- src/lib/process/Makefile.am | 2 +- src/lib/util/Makefile.am | 2 +- 11 files changed, 20 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27d38147ca..e43a5a90ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2261. [build] mgodzina + The library version numbers have been bumped up for the Kea 2.6.2 + stable release. + (Gitlab #3804) + 2260. [bug] razvan Fixed a bug which was causing the allocation engine to reject the lease if a data race caused by a different server updating the diff --git a/SECURITY.md b/SECURITY.md index 0d688ac4b7..6db573d16b 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,10 +6,12 @@ The following versions are supported: | Version | Supported | End-Of-Life | | ------- | ------------------ | -------------------------------- | -| 2.5.x | :white_check_mark: | summer 2024, on release of 2.6.0 | -| 2.4.x | :white_check_mark: | summer 2025, on release of 2.8.0 | +| 2.7.x | :white_check_mark: | summer 2025, on release of 3.0.0 | +| 2.6.x | :white_check_mark: | summer 2026, on release of 3.2.0 | +| 2.5.x | :x: | August 2024, on release of 2.6.0 | +| 2.4.x | :white_check_mark: | summer 2025, on release of 3.0.0 | | 2.3.x | :x: | July 2023, on release of 2.4.0 | -| 2.2.x | :white_check_mark: | August 2024, on release of 2.6.0 | +| 2.2.x | :x: | August 2024, on release of 2.6.0 | | 2.1.x | :x: | July 2022, on release of 2.2.0 | | 2.0.x | :x: | August 2023, on release of 2.4.0 | | 1.9.0 | :x: | September 2021 | diff --git a/src/lib/database/Makefile.am b/src/lib/database/Makefile.am index 6d37265d05..c3e572c584 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 61:0:0 +libkea_database_la_LDFLAGS = -no-undefined -version-info 62: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 7947ce357a..b4bce99b37 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 90:0:0 +libkea_dhcp___la_LDFLAGS = -no-undefined -version-info 91:0:0 libkea_dhcp___la_LDFLAGS += $(CRYPTO_LDFLAGS) EXTRA_DIST = README libdhcp++.dox diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am index 20b2f05e33..1267293ea6 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@ -224,7 +224,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 109:0:0 +libkea_dhcpsrv_la_LDFLAGS = -no-undefined -version-info 110:0:0 libkea_dhcpsrv_la_LDFLAGS += $(CRYPTO_LDFLAGS) if HAVE_MYSQL libkea_dhcpsrv_la_LDFLAGS += $(MYSQL_LIBS) diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am index 1ef6966fbf..5782e5fe70 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 98:0:0 +libkea_hooks_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 99:0:0 libkea_hooks_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la diff --git a/src/lib/hooks/hooks.h b/src/lib/hooks/hooks.h index 006c676a4c..f46b54ddff 100644 --- a/src/lib/hooks/hooks.h +++ b/src/lib/hooks/hooks.h @@ -12,8 +12,8 @@ namespace { -// Version 20601 of the hooks framework, set for Kea 2.6.1 -const int KEA_HOOKS_VERSION = 20601; +// Version 20602 of the hooks framework, set for Kea 2.6.2 +const int KEA_HOOKS_VERSION = 20602; // Names of the framework functions. const char* const LOAD_FUNCTION_NAME = "load"; diff --git a/src/lib/mysql/Makefile.am b/src/lib/mysql/Makefile.am index 1216e8008c..ca495d5908 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) -libkea_mysql_la_LDFLAGS = -no-undefined -version-info 70:0:0 +libkea_mysql_la_LDFLAGS = -no-undefined -version-info 71:0:0 libkea_mysql_la_LDFLAGS += $(MYSQL_LIBS) diff --git a/src/lib/pgsql/Makefile.am b/src/lib/pgsql/Makefile.am index 79e29a834c..fc4a351dc4 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) -libkea_pgsql_la_LDFLAGS = -no-undefined -version-info 70:0:0 +libkea_pgsql_la_LDFLAGS = -no-undefined -version-info 71:0:0 libkea_pgsql_la_LDFLAGS += $(PGSQL_LIBS) diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am index 16e90b971d..fc7e36270d 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 72:0:0 +libkea_process_la_LDFLAGS += -no-undefined -version-info 73: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 4a9192272c..ab30f5e5b9 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 84:0:0 +libkea_util_la_LDFLAGS = -no-undefined -version-info 85:0:0 EXTRA_DIST = util.dox -- 2.47.2