diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/cc/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/hooks/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/hooks/hooks.h | 4 | ||||
| -rw-r--r-- | src/lib/http/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/mysql/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/pgsql/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/yang/Makefile.am | 2 | ||||
| -rw-r--r-- | src/share/database/scripts/mysql/dhcpdb_create.mysql | 4 |
10 files changed, 18 insertions, 9 deletions
@@ -1,3 +1,8 @@ +2247. [build] razvan + The library version numbers have been bumped up for the Kea 2.6.0 + stable release. + (Gitlab #3430) + 2246. [bug] razvan Permit configuring pool-id in pd-pools. (Gitlab #3424) diff --git a/src/lib/cc/Makefile.am b/src/lib/cc/Makefile.am index 0e6bda7bb1..20e0a6739a 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 67:0:0 +libkea_cc_la_LDFLAGS = -no-undefined -version-info 68:0:0 # Specify the headers for copying into the installation directory tree. libkea_cc_includedir = $(pkgincludedir)/cc diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am index b885f875b7..38668d4e32 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 107:0:0 +libkea_dhcpsrv_la_LDFLAGS = -no-undefined -version-info 108: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 ff142a843f..4bf58ef396 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 96:0:0 +libkea_hooks_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 97: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 b008a99cda..93079611bd 100644 --- a/src/lib/hooks/hooks.h +++ b/src/lib/hooks/hooks.h @@ -12,8 +12,8 @@ namespace { -// Version 20508 of the hooks framework, set for Kea 2.5.8 -const int KEA_HOOKS_VERSION = 20508; +// Version 20600 of the hooks framework, set for Kea 2.6.0 +const int KEA_HOOKS_VERSION = 20600; // 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 b3d40ce6c9..a1fd3afaf6 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 70:0:0 +libkea_http_la_LDFLAGS += -no-undefined -version-info 71:0:0 libkea_http_la_LIBADD = $(top_builddir)/src/lib/hooks/libkea-hooks.la libkea_http_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la diff --git a/src/lib/mysql/Makefile.am b/src/lib/mysql/Makefile.am index a5f4ec99a1..5f9dedea0b 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 68:0:0 +libkea_mysql_la_LDFLAGS = -no-undefined -version-info 69:0:0 libkea_mysql_la_LDFLAGS += $(MYSQL_LIBS) diff --git a/src/lib/pgsql/Makefile.am b/src/lib/pgsql/Makefile.am index 8ab8024329..205ff5f883 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 68:0:0 +libkea_pgsql_la_LDFLAGS = -no-undefined -version-info 69:0:0 libkea_pgsql_la_LDFLAGS += $(PGSQL_LIBS) diff --git a/src/lib/yang/Makefile.am b/src/lib/yang/Makefile.am index 52b98af873..9a219bb7a9 100644 --- a/src/lib/yang/Makefile.am +++ b/src/lib/yang/Makefile.am @@ -50,7 +50,7 @@ libkea_yang_la_LIBADD += $(LIBYANGCPP_LIBS) libkea_yang_la_LIBADD += $(SYSREPO_LIBS) libkea_yang_la_LIBADD += $(SYSREPOCPP_LIBS) -libkea_yang_la_LDFLAGS = -no-undefined -version-info 60:0:0 +libkea_yang_la_LDFLAGS = -no-undefined -version-info 61:0:0 # Specify the headers for copying into the installation directory tree. libkea_yang_includedir = $(pkgincludedir)/yang diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql index 153ba099d3..abcb6ce1ee 100644 --- a/src/share/database/scripts/mysql/dhcpdb_create.mysql +++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql @@ -5857,6 +5857,10 @@ UPDATE schema_version -- Add subnet id and address index for lease6. CREATE INDEX lease6_by_subnet_id_address ON lease6 (subnet_id, address ASC); +-- Update the schema version number. +UPDATE schema_version + SET version = '21', minor = '0'; + -- This line concludes the schema upgrade to version 21.0. -- This line starts the schema upgrade to version 22.0. |