From: Razvan Becheriu Date: Fri, 11 Dec 2020 18:11:05 +0000 (+0200) Subject: [#1605] bump lib versions for 1.9.3 X-Git-Tag: Kea-1.9.3~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=480831dbcf92e5a128a13d8e699a848e2fef6866;p=thirdparty%2Fkea.git [#1605] bump lib versions for 1.9.3 --- diff --git a/ChangeLog b/ChangeLog index e3525e127f..d3aa76c998 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1846. [build] razvan + Library version numbers bumped for Kea 1.9.3 development + version. + (Gitlab #1605) + 1845. [func] marcin Kea configuration now allows for using database passwords which include whitespace. diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am index 1e14c84c56..bde21081e9 100644 --- a/src/lib/asiolink/Makefile.am +++ b/src/lib/asiolink/Makefile.am @@ -17,7 +17,7 @@ CLEANFILES = *.gcno *.gcda lib_LTLIBRARIES = libkea-asiolink.la -libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 20:0:1 +libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 21:0:0 libkea_asiolink_la_SOURCES = asiolink.h libkea_asiolink_la_SOURCES += asio_wrapper.h diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am index 0522bd6ea6..8fd593e326 100644 --- a/src/lib/config/Makefile.am +++ b/src/lib/config/Makefile.am @@ -26,7 +26,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 10:0:0 +libkea_cfgclient_la_LDFLAGS = -no-undefined -version-info 21:0:0 libkea_cfgclient_la_LDFLAGS += $(CRYPTO_LDFLAGS) # The message file should be in the distribution. diff --git a/src/lib/database/Makefile.am b/src/lib/database/Makefile.am index c809560798..b9c0d19033 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 18:0:0 +libkea_database_la_LDFLAGS = -no-undefined -version-info 19: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/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am index 164a757aa1..b07eafa8da 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 40:0:0 +libkea_dhcpsrv_la_LDFLAGS = -no-undefined -version-info 41: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 fa4403970f..f9d04149ce 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 28:0:0 +libkea_hooks_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 29: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 6f2d0f7a3c..b4b19165d0 100644 --- a/src/lib/hooks/hooks.h +++ b/src/lib/hooks/hooks.h @@ -12,8 +12,8 @@ namespace { -// Version 10902 of the hooks framework, set for Kea 1.9.2 -const int KEA_HOOKS_VERSION = 10902; +// Version 10903 of the hooks framework, set for Kea 1.9.3 +const int KEA_HOOKS_VERSION = 10903; // 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 867913f6ea..e5f03f0962 100644 --- a/src/lib/http/Makefile.am +++ b/src/lib/http/Makefile.am @@ -45,7 +45,7 @@ libkea_http_la_SOURCES += basic_auth_config.cc basic_auth_config.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 21:0:0 +libkea_http_la_LDFLAGS += -no-undefined -version-info 22:0:0 libkea_http_la_LIBADD = 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 3a85db17e9..104a07216e 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 18:0:0 +libkea_mysql_la_LDFLAGS = -no-undefined -version-info 19:0:0 libkea_mysql_la_LDFLAGS += $(MYSQL_LIBS) diff --git a/src/lib/pgsql/Makefile.am b/src/lib/pgsql/Makefile.am index d07df248cc..83b7313ab1 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 16:0:0 +libkea_pgsql_la_LDFLAGS = -no-undefined -version-info 17:0:0 libkea_pgsql_la_LDFLAGS += $(PGSQL_LIBS) diff --git a/src/lib/process/Makefile.am b/src/lib/process/Makefile.am index f481851a49..fa3a5f95c8 100644 --- a/src/lib/process/Makefile.am +++ b/src/lib/process/Makefile.am @@ -33,7 +33,7 @@ libkea_process_la_SOURCES += process_messages.cc process_messages.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 23:0:0 +libkea_process_la_LDFLAGS += -no-undefined -version-info 24:0:0 libkea_process_la_LIBADD = libkea_process_la_LIBADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am index db14cf661a..4a29fc7cab 100644 --- a/src/lib/util/Makefile.am +++ b/src/lib/util/Makefile.am @@ -48,7 +48,7 @@ libkea_util_la_SOURCES += random/random_number_generator.h libkea_util_la_LIBADD = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -libkea_util_la_LDFLAGS = -no-undefined -version-info 29:0:0 +libkea_util_la_LDFLAGS = -no-undefined -version-info 30:0:0 EXTRA_DIST = util.dox diff --git a/tools/bump-lib-versions.sh b/tools/bump-lib-versions.sh index 28abb3048e..10fcfb84d5 100755 --- a/tools/bump-lib-versions.sh +++ b/tools/bump-lib-versions.sh @@ -68,7 +68,7 @@ test -z "${old_release_tag+x}" && error '$old_release_tag is mandatory' test -z "${new_release_tag+x}" && error '$new_release_tag is mandatory' is_stable_release() { - version=$(printf '%s' "${1}" | cut -d . -f2) + local version=$(printf '%s' "${1}" | cut -d . -f2) if test $((version % 2)) -eq 0; then return 0 else @@ -77,7 +77,7 @@ is_stable_release() { } find_latest_stable_release_tag() { - tag_pattern=${1} + local tag_pattern=${1} for version in $(git tag | grep -F "${tag_pattern}" | tac); do if is_stable_release "${version}"; then printf '%s' "${version}"