summaryrefslogtreecommitdiff
path: root/net/kea
diff options
context:
space:
mode:
Diffstat (limited to 'net/kea')
-rw-r--r--net/kea/Makefile45
-rw-r--r--net/kea/distinfo6
-rw-r--r--net/kea/files/patch-Makefile.am10
-rw-r--r--net/kea/files/patch-meson.build59
-rw-r--r--net/kea/files/patch-src_bin_keactrl_Makefile.am11
-rw-r--r--net/kea/files/patch-src_bin_keactrl_meson.build11
-rw-r--r--net/kea/files/patch-src_lib_asiolink_io__address.cc20
-rw-r--r--net/kea/files/patch-src_lib_asiolink_io__service.cc35
-rw-r--r--net/kea/files/patch-src_lib_asiolink_tcp__endpoint.h11
-rw-r--r--net/kea/files/patch-src_lib_asiolink_udp__endpoint.h11
-rw-r--r--net/kea/files/patch-src_lib_asiolink_unix__domain__socket.cc74
-rw-r--r--net/kea/files/patch-src_lib_dhcp_iface__mgr.cc11
-rw-r--r--net/kea/files/patch-src_lib_dhcpsrv_Makefile.am11
-rw-r--r--net/kea/files/patch-src_lib_dns_name.cc57
-rw-r--r--net/kea/files/patch-src_lib_dns_name.h11
-rw-r--r--net/kea/pkg-message8
-rw-r--r--net/kea/pkg-plist239
17 files changed, 238 insertions, 392 deletions
diff --git a/net/kea/Makefile b/net/kea/Makefile
index 943e9581143f..a937964fc4ab 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -1,5 +1,5 @@
PORTNAME= kea
-DISTVERSION= 2.6.2
+DISTVERSION= 3.0.1
CATEGORIES= net
MASTER_SITES= ISC/kea/${DISTVERSION}
@@ -13,7 +13,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libboost_system.so:devel/boost-libs \
liblog4cplus.so:devel/log4cplus
-USES= autoreconf compiler:c++11-lang cpe iconv libtool pathfix ssl
+USES= compiler:c++11-lang cpe iconv libtool pathfix ssl python tar:xz meson pkgconfig cmake:indirect shebangfix
+MESON_ARGS= --auto-features=disabled \
+ -Dcrypto=openssl \
+ -Dnetconf=disabled
+
+BUILD_DEPENDS= googletest>0:devel/googletest \
+ rst2man:textproc/py-docutils@${PY_FLAVOR}
CPE_VENDOR= isc
CPE_VERSION= ${DISTVERSION:C/-.*//}
@@ -23,37 +29,38 @@ CPE_UPDATE= ${DISTVERSION:C/.*-//:tl}
USE_LDCONFIG= yes
USE_RC_SUBR= ${PORTNAME}
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-boost-include=${LOCALBASE}/include \
- --with-boost-lib-dir=${LOCALBASE}/lib \
- --with-log4cplus=${LOCALBASE} \
- --with-openssl=${OPENSSLBASE} \
- --without-werror
-INSTALL_TARGET= install-strip
-TEST_TARGET= check
PORTDOCS= AUTHORS CONTRIBUTING.md COPYING ChangeLog README SECURITY.md \
code_of_conduct.md examples platforms.rst
-OPTIONS_DEFINE= DOCS MYSQL PGSQL SHELL
-OPTIONS_SUB= yes
+SHEBANG_GLOB= *.py *.in
+python_OLD_CMD+=@PYTHON@
-SHELL_DESC= Install kea-shell(8) (Python)
+OPTIONS_DEFINE= DOCS MYSQL PGSQL
+OPTIONS_SUB= yes
MYSQL_USES= mysql
-MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config
-MYSQL_CONFIGURE_OFF= --without-mysql
+MYSQL_MESON_ENABLED= mysql
MYSQL_SUB_LIST= REQ_MYSQL=mysql
MYSQL_SUB_LIST_OFF= REQ_MYSQL=""
PGSQL_USES= pgsql
-PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE}/bin/pg_config
-PGSQL_CONFIGURE_OFF= --without-pgsql
+PGSQL_MESON_ENABLED= postgresql
PGSQL_SUB_LIST= REQ_PGSQL=postgresql
PGSQL_SUB_LIST_OFF= REQ_PGSQL=""
PGSQL_VARS= WANT_PGSQL=client
-SHELL_USES= python
-SHELL_CONFIGURE_ON= --enable-shell
+post-build:
+ cd ${WRKSRC}/doc/sphinx/man; \
+ for i in *.8.rst; do rst2man $$i > $$(basename $$i .rst); done
+
+post-install:
+ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/kea ${STAGEDIR}/var/db/kea \
+ ${STAGEDIR}/var/run/kea
+ @${RM} -rf ${STAGEDIR}${PREFIX}/var
+ @cd ${WRKSRC}/doc/sphinx/man; \
+ ${CP} *.8 ${STAGEDIR}${PREFIX}/share/man/man8
+ @cd ${WRKSRC}/_build/src/bin/keactrl; \
+ for i in *.conf; do ${CP} $$i ${STAGEDIR}${PREFIX}/etc/kea/$$i.sample; done
.include <bsd.port.mk>
diff --git a/net/kea/distinfo b/net/kea/distinfo
index 809a7ac17730..51c5c2bafda0 100644
--- a/net/kea/distinfo
+++ b/net/kea/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742998274
-SHA256 (kea-2.6.2.tar.gz) = 8a50b63103734b59c3b8619ccd6766d2dfee3f02e3a5f9f3abc1cd55f70fa424
-SIZE (kea-2.6.2.tar.gz) = 10474184
+TIMESTAMP = 1756327795
+SHA256 (kea-3.0.1.tar.xz) = ec84fec4bb7f6b9d15a82e755a571e9348eb4d6fbc62bb3f6f1296cd7a24c566
+SIZE (kea-3.0.1.tar.xz) = 6632284
diff --git a/net/kea/files/patch-Makefile.am b/net/kea/files/patch-Makefile.am
deleted file mode 100644
index 77fc64848c9e..000000000000
--- a/net/kea/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.am.orig 2019-10-25 12:41:08 UTC
-+++ Makefile.am
-@@ -154,7 +154,6 @@ docs:
- # These steps are necessary during installation
- install-exec-hook:
- mkdir -p $(DESTDIR)${localstatedir}/log/
-- mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
- mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
-
- EXTRA_DIST = tools/path_replacer.sh
diff --git a/net/kea/files/patch-meson.build b/net/kea/files/patch-meson.build
new file mode 100644
index 000000000000..f444e3bcdafe
--- /dev/null
+++ b/net/kea/files/patch-meson.build
@@ -0,0 +1,59 @@
+--- meson.build.orig 2025-06-20 16:28:47 UTC
++++ meson.build
+@@ -59,7 +59,7 @@ if PREFIX == '/usr/local'
+ # Meson is annoying with its opinionated alteration of certain paths based on whether prefix is default or not.
+ # So we revert what it does.
+ if PREFIX == '/usr/local'
+- LOCALSTATEDIR = 'var' # Otherwise, it would have been 'var/local'.
++ LOCALSTATEDIR = '/var' # Otherwise, it would have been 'var/local'.
+ endif
+
+ DATABASE_SCRIPTS_DIR = TOP_BUILD_DIR / 'src/share/database/scripts'
+@@ -69,17 +69,17 @@ KEA_LFC_INSTALLED = PREFIX / SBINDIR / 'kea-lfc'
+ KEA_ADMIN_INSTALLED = PREFIX / SBINDIR / 'kea-admin'
+ KEA_LFC_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-lfc'
+ KEA_LFC_INSTALLED = PREFIX / SBINDIR / 'kea-lfc'
+-LOCALSTATEDIR_INSTALLED = PREFIX / LOCALSTATEDIR
++LOCALSTATEDIR_INSTALLED = LOCALSTATEDIR
+ LIBDIR_INSTALLED = PREFIX / LIBDIR
+ LOGDIR = LOCALSTATEDIR / 'log/kea'
+-LOGDIR_INSTALLED = PREFIX / LOGDIR
++LOGDIR_INSTALLED = LOGDIR
+ if RUNSTATEDIR == ''
+ RUNSTATEDIR = LOCALSTATEDIR / 'run/kea'
+ else
+ RUNSTATEDIR = RUNSTATEDIR / 'kea'
+ endif
+-RUNSTATEDIR_INSTALLED = PREFIX / RUNSTATEDIR
+-SHAREDSTATEDIR = LOCALSTATEDIR / 'lib/kea'
++RUNSTATEDIR_INSTALLED = RUNSTATEDIR
++SHAREDSTATEDIR = LOCALSTATEDIR / 'db/kea'
+ SHAREDSTATEDIR_INSTALLED = PREFIX / SHAREDSTATEDIR
+ SYSCONFDIR_INSTALLED = PREFIX / SYSCONFDIR
+ TEST_CA_DIR = TOP_SOURCE_DIR / 'src/lib/asiolink/testutils/ca'
+@@ -88,9 +88,9 @@ if PREFIX == '/usr/local'
+ # So we revert what it does.
+ if PREFIX == '/usr/local'
+ SYSCONFDIR_INSTALLED = '/usr/local/etc'
+- LOGDIR_INSTALLED = '/usr/local/var/log/kea'
+- RUNSTATEDIR_INSTALLED = '/usr/local/var/run/kea'
+- SHAREDSTATEDIR_INSTALLED = '/usr/local/var/lib/kea'
++ LOGDIR_INSTALLED = '/var/log/kea'
++ RUNSTATEDIR_INSTALLED = '/var/run/kea'
++ SHAREDSTATEDIR_INSTALLED = '/var/db/kea'
+ endif
+
+ #### Build Options
+@@ -1108,9 +1108,9 @@ if PREFIX == '/usr/local'
+ # In case prefix is default, install to hardcoded path.
+ if PREFIX == '/usr/local'
+ install_emptydir('/usr/local/lib/kea')
+- install_emptydir('/usr/local/var/lib/kea')
+- install_emptydir('/usr/local/var/log/kea')
+- install_emptydir('/usr/local/var/run/kea')
++ install_emptydir('/var/db/kea')
++ install_emptydir('/var/log/kea')
++ install_emptydir('/var/run/kea')
+ endif
+
+ # Print the setup report.
diff --git a/net/kea/files/patch-src_bin_keactrl_Makefile.am b/net/kea/files/patch-src_bin_keactrl_Makefile.am
deleted file mode 100644
index 385488664470..000000000000
--- a/net/kea/files/patch-src_bin_keactrl_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/keactrl/Makefile.am.orig 2019-10-25 12:41:08 UTC
-+++ src/bin/keactrl/Makefile.am
-@@ -62,7 +62,7 @@ install-data-local:
- $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f.bak; \
- fi; \
- if test ! -f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$$f; then \
-- ${INSTALL_DATA} $$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/; \
-+ ${INSTALL_DATA} $$f $(DESTDIR)$(sysconfdir)/@PACKAGE@/$${f}.sample; \
- fi; \
- done
-
diff --git a/net/kea/files/patch-src_bin_keactrl_meson.build b/net/kea/files/patch-src_bin_keactrl_meson.build
new file mode 100644
index 000000000000..535929a19de4
--- /dev/null
+++ b/net/kea/files/patch-src_bin_keactrl_meson.build
@@ -0,0 +1,11 @@
+--- src/bin/keactrl/meson.build.orig 2025-07-10 15:51:59 UTC
++++ src/bin/keactrl/meson.build
+@@ -14,7 +14,7 @@ keactrl_conf_data.set('PACKAGE_VERSION', PROJECT_VERSI
+ PROJECT_VERSION + f' (@SOURCE_OF_INSTALLATION@)',
+ )
+ keactrl_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
+-keactrl_conf_data.set('runstatedir', '${prefix}/' + LOCALSTATEDIR + '/run')
++keactrl_conf_data.set('runstatedir', '/' + LOCALSTATEDIR + '/run')
+ keactrl_conf_data.set('localstatedir', '${prefix}/' + LOCALSTATEDIR)
+
+ kea_conf_data = configuration_data()
diff --git a/net/kea/files/patch-src_lib_asiolink_io__address.cc b/net/kea/files/patch-src_lib_asiolink_io__address.cc
deleted file mode 100644
index a61e7460eebd..000000000000
--- a/net/kea/files/patch-src_lib_asiolink_io__address.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/lib/asiolink/io_address.cc.orig 2024-07-25 08:50:58 UTC
-+++ src/lib/asiolink/io_address.cc
-@@ -37,7 +37,7 @@ IOAddress::IOAddress(const std::string& address_str) {
- // because we'd like to throw our own exception on failure.
- IOAddress::IOAddress(const std::string& address_str) {
- boost::system::error_code err;
-- asio_address_ = ip::address::from_string(address_str, err);
-+ asio_address_ = ip::make_address(address_str, err);
- if (err) {
- isc_throw(IOError, "Failed to convert string to address '"
- << address_str << "': " << err.message());
-@@ -116,7 +116,7 @@ IOAddress::toUint32() const {
- uint32_t
- IOAddress::toUint32() const {
- if (asio_address_.is_v4()) {
-- return (asio_address_.to_v4().to_ulong());
-+ return (asio_address_.to_v4().to_uint());
- } else {
- isc_throw(BadValue, "Can't convert " << toText()
- << " address to IPv4.");
diff --git a/net/kea/files/patch-src_lib_asiolink_io__service.cc b/net/kea/files/patch-src_lib_asiolink_io__service.cc
deleted file mode 100644
index 21e451eb0648..000000000000
--- a/net/kea/files/patch-src_lib_asiolink_io__service.cc
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/lib/asiolink/io_service.cc.orig 2024-07-25 08:50:58 UTC
-+++ src/lib/asiolink/io_service.cc
-@@ -30,7 +30,7 @@ class IOServiceImpl { (public)
- /// @brief The constructor.
- IOServiceImpl() :
- io_service_(),
-- work_(new boost::asio::io_service::work(io_service_)) {
-+ work_(boost::asio::make_work_guard(io_service_)) {
- };
-
- /// @brief The destructor.
-@@ -92,7 +92,7 @@ class IOServiceImpl { (public)
-
- /// @brief Restarts the IOService in preparation for a subsequent @ref run() invocation.
- void restart() {
-- io_service_.reset();
-+ io_service_.restart();
- }
-
- /// @brief Removes IO service work object to let it finish running
-@@ -115,12 +115,12 @@ class IOServiceImpl { (public)
- ///
- /// @param callback The callback to be run on the IO service.
- void post(const std::function<void ()>& callback) {
-- io_service_.post(callback);
-+ boost::asio::post(io_service_, callback);
- }
-
- private:
- boost::asio::io_service io_service_;
-- boost::shared_ptr<boost::asio::io_service::work> work_;
-+ boost::asio::executor_work_guard<boost::asio::io_service::executor_type> work_;
- };
-
- IOService::IOService() : io_impl_(new IOServiceImpl()) {
diff --git a/net/kea/files/patch-src_lib_asiolink_tcp__endpoint.h b/net/kea/files/patch-src_lib_asiolink_tcp__endpoint.h
deleted file mode 100644
index c2c0d7d80442..000000000000
--- a/net/kea/files/patch-src_lib_asiolink_tcp__endpoint.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/asiolink/tcp_endpoint.h.orig 2024-07-25 08:50:58 UTC
-+++ src/lib/asiolink/tcp_endpoint.h
-@@ -42,7 +42,7 @@ class TCPEndpoint : public IOEndpoint { (public)
- /// \param port The TCP port number of the endpoint.
- TCPEndpoint(const IOAddress& address, const unsigned short port) :
- asio_endpoint_placeholder_(
-- new boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(address.toText()),
-+ new boost::asio::ip::tcp::endpoint(boost::asio::ip::make_address(address.toText()),
- port)),
- asio_endpoint_(*asio_endpoint_placeholder_)
- {}
diff --git a/net/kea/files/patch-src_lib_asiolink_udp__endpoint.h b/net/kea/files/patch-src_lib_asiolink_udp__endpoint.h
deleted file mode 100644
index c528b76f5ce1..000000000000
--- a/net/kea/files/patch-src_lib_asiolink_udp__endpoint.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/asiolink/udp_endpoint.h.orig 2024-07-25 08:50:58 UTC
-+++ src/lib/asiolink/udp_endpoint.h
-@@ -42,7 +42,7 @@ class UDPEndpoint : public IOEndpoint { (public)
- /// \param port The UDP port number of the endpoint.
- UDPEndpoint(const IOAddress& address, const unsigned short port) :
- asio_endpoint_placeholder_(
-- new boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(address.toText()),
-+ new boost::asio::ip::udp::endpoint(boost::asio::ip::make_address(address.toText()),
- port)),
- asio_endpoint_(*asio_endpoint_placeholder_)
- {}
diff --git a/net/kea/files/patch-src_lib_asiolink_unix__domain__socket.cc b/net/kea/files/patch-src_lib_asiolink_unix__domain__socket.cc
deleted file mode 100644
index b540cacb5890..000000000000
--- a/net/kea/files/patch-src_lib_asiolink_unix__domain__socket.cc
+++ /dev/null
@@ -1,74 +0,0 @@
---- src/lib/asiolink/unix_domain_socket.cc.orig 2024-07-25 08:50:58 UTC
-+++ src/lib/asiolink/unix_domain_socket.cc
-@@ -83,7 +83,7 @@ class UnixDomainSocketImpl : public boost::enable_shar
- /// @param buffer Buffers holding the data to be sent.
- /// @param handler User supplied callback to be invoked when data have
- /// been sent or sending error is signalled.
-- void doSend(const boost::asio::const_buffers_1& buffer,
-+ void doSend(const boost::asio::const_buffer& buffer,
- const UnixDomainSocket::Handler& handler);
-
-
-@@ -103,7 +103,7 @@ class UnixDomainSocketImpl : public boost::enable_shar
- /// @param ec Error code returned as a result of sending the data.
- /// @param length Length of the data sent.
- void sendHandler(const UnixDomainSocket::Handler& remote_handler,
-- const boost::asio::const_buffers_1& buffer,
-+ const boost::asio::const_buffer& buffer,
- const boost::system::error_code& ec,
- size_t length);
-
-@@ -127,7 +127,7 @@ class UnixDomainSocketImpl : public boost::enable_shar
- /// @param buffer A buffer into which the data should be received.
- /// @param handler User supplied callback invoked when data have been
- /// received on an error is signalled.
-- void doReceive(const boost::asio::mutable_buffers_1& buffer,
-+ void doReceive(const boost::asio::mutable_buffer& buffer,
- const UnixDomainSocket::Handler& handler);
-
- /// @brief Local handler invoked as a result of asynchronous receive.
-@@ -146,7 +146,7 @@ class UnixDomainSocketImpl : public boost::enable_shar
- /// @param ec Error code returned as a result of asynchronous receive.
- /// @param length Size of the received data.
- void receiveHandler(const UnixDomainSocket::Handler& remote_handler,
-- const boost::asio::mutable_buffers_1& buffer,
-+ const boost::asio::mutable_buffer& buffer,
- const boost::system::error_code& ec,
- size_t length);
-
-@@ -197,7 +197,7 @@ void
- }
-
- void
--UnixDomainSocketImpl::doSend(const boost::asio::const_buffers_1& buffer,
-+UnixDomainSocketImpl::doSend(const boost::asio::const_buffer& buffer,
- const UnixDomainSocket::Handler& handler) {
- auto local_handler = std::bind(&UnixDomainSocketImpl::sendHandler,
- shared_from_this(),
-@@ -207,7 +207,7 @@ UnixDomainSocketImpl::sendHandler(const UnixDomainSock
-
- void
- UnixDomainSocketImpl::sendHandler(const UnixDomainSocket::Handler& remote_handler,
-- const boost::asio::const_buffers_1& buffer,
-+ const boost::asio::const_buffer& buffer,
- const boost::system::error_code& ec,
- size_t length) {
- // The asynchronous send may return EWOULDBLOCK or EAGAIN on some
-@@ -230,7 +230,7 @@ void
- }
-
- void
--UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffers_1& buffer,
-+UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffer& buffer,
- const UnixDomainSocket::Handler& handler) {
- auto local_handler = std::bind(&UnixDomainSocketImpl::receiveHandler,
- shared_from_this(),
-@@ -240,7 +240,7 @@ UnixDomainSocketImpl::receiveHandler(const UnixDomainS
-
- void
- UnixDomainSocketImpl::receiveHandler(const UnixDomainSocket::Handler& remote_handler,
-- const boost::asio::mutable_buffers_1& buffer,
-+ const boost::asio::mutable_buffer& buffer,
- const boost::system::error_code& ec,
- size_t length) {
- // The asynchronous receive may return EWOULDBLOCK or EAGAIN on some
diff --git a/net/kea/files/patch-src_lib_dhcp_iface__mgr.cc b/net/kea/files/patch-src_lib_dhcp_iface__mgr.cc
deleted file mode 100644
index e0347d0cb59e..000000000000
--- a/net/kea/files/patch-src_lib_dhcp_iface__mgr.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/dhcp/iface_mgr.cc.orig 2024-07-25 08:50:58 UTC
-+++ src/lib/dhcp/iface_mgr.cc
-@@ -1034,7 +1034,7 @@ IfaceMgr::getLocalAddress(const IOAddress& remote_addr
- }
-
- // Create socket that will be used to connect to remote endpoint.
-- boost::asio::io_service io_service;
-+ boost::asio::io_context io_service;
- boost::asio::ip::udp::socket sock(io_service);
-
- boost::system::error_code err_code;
diff --git a/net/kea/files/patch-src_lib_dhcpsrv_Makefile.am b/net/kea/files/patch-src_lib_dhcpsrv_Makefile.am
deleted file mode 100644
index fc2cb111e705..000000000000
--- a/net/kea/files/patch-src_lib_dhcpsrv_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/dhcpsrv/Makefile.am.orig 2019-10-25 12:41:08 UTC
-+++ src/lib/dhcpsrv/Makefile.am
-@@ -4,7 +4,7 @@ SUBDIRS = . testutils tests benchmarks
-
- # DATA_DIR is the directory where to put default CSV files and the DHCPv6
- # server ID file (i.e. the file where the server finds its DUID at startup).
--dhcp_data_dir = @localstatedir@/lib/@PACKAGE@
-+dhcp_data_dir = @localstatedir@/db/@PACKAGE@
- kea_lfc_location = @prefix@/sbin/kea-lfc
-
- AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\""
diff --git a/net/kea/files/patch-src_lib_dns_name.cc b/net/kea/files/patch-src_lib_dns_name.cc
deleted file mode 100644
index a22b2eb3998c..000000000000
--- a/net/kea/files/patch-src_lib_dns_name.cc
+++ /dev/null
@@ -1,57 +0,0 @@
---- src/lib/dns/name.cc.orig 2024-07-25 08:50:58 UTC
-+++ src/lib/dns/name.cc
-@@ -303,7 +303,7 @@ Name::Name(const std::string &namestring, bool downcas
- // And get the output
- labelcount_ = offsets.size();
- isc_throw_assert(labelcount_ > 0 && labelcount_ <= Name::MAX_LABELS);
-- ndata_.assign(ndata.data(), ndata.size());
-+ ndata_.assign(ndata.data(), ndata.data() + ndata.size());
- length_ = ndata_.size();
- offsets_.assign(offsets.begin(), offsets.end());
- }
-@@ -336,7 +336,7 @@ Name::Name(const char* namedata, size_t data_len, cons
- // Get the output
- labelcount_ = offsets.size();
- isc_throw_assert(labelcount_ > 0 && labelcount_ <= Name::MAX_LABELS);
-- ndata_.assign(ndata.data(), ndata.size());
-+ ndata_.assign(ndata.data(), ndata.data() + ndata.size());
- length_ = ndata_.size();
- offsets_.assign(offsets.begin(), offsets.end());
-
-@@ -347,7 +347,7 @@ Name::Name(const char* namedata, size_t data_len, cons
- // Drop the last character of the data (the \0) and append a copy of
- // the origin's data
- ndata_.erase(ndata_.end() - 1);
-- ndata_.append(origin->ndata_);
-+ ndata_.insert(ndata_.end(), origin->ndata_.begin(), origin->ndata_.end());
-
- // Do a similar thing with offsets. However, we need to move them
- // so they point after the prefix we parsed before.
-@@ -582,7 +582,7 @@ Name::concatenate(const Name& suffix) const {
-
- Name retname;
- retname.ndata_.reserve(length);
-- retname.ndata_.assign(ndata_, 0, length_ - 1);
-+ retname.ndata_.assign(ndata_.data(), ndata_.data() + length_ - 1);
- retname.ndata_.insert(retname.ndata_.end(),
- suffix.ndata_.begin(), suffix.ndata_.end());
- isc_throw_assert(retname.ndata_.size() == length);
-@@ -622,7 +622,7 @@ Name::reverse() const {
- NameString::const_iterator n0 = ndata_.begin();
- retname.offsets_.push_back(0);
- while (rit1 != offsets_.rend()) {
-- retname.ndata_.append(n0 + *rit1, n0 + *rit0);
-+ retname.ndata_.insert(retname.ndata_.end(), n0 + *rit1, n0 + *rit0);
- retname.offsets_.push_back(retname.ndata_.size());
- ++rit0;
- ++rit1;
-@@ -662,7 +662,8 @@ Name::split(const unsigned int first, const unsigned i
- // original name, and append the trailing dot explicitly.
- //
- retname.ndata_.reserve(retname.offsets_.back() + 1);
-- retname.ndata_.assign(ndata_, offsets_[first], retname.offsets_.back());
-+ auto it = ndata_.data() + offsets_[first];
-+ retname.ndata_.assign(it, it + retname.offsets_.back());
- retname.ndata_.push_back(0);
-
- retname.length_ = retname.ndata_.size();
diff --git a/net/kea/files/patch-src_lib_dns_name.h b/net/kea/files/patch-src_lib_dns_name.h
deleted file mode 100644
index e83fde6a960d..000000000000
--- a/net/kea/files/patch-src_lib_dns_name.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/dns/name.h.orig 2024-07-25 08:50:58 UTC
-+++ src/lib/dns/name.h
-@@ -228,7 +228,7 @@ class Name { (private)
- //@{
- private:
- /// \brief Name data string
-- typedef std::basic_string<uint8_t> NameString;
-+ typedef std::vector<uint8_t> NameString;
- /// \brief Name offsets type
- typedef std::vector<uint8_t> NameOffsets;
-
diff --git a/net/kea/pkg-message b/net/kea/pkg-message
new file mode 100644
index 000000000000..a4477e3ebf89
--- /dev/null
+++ b/net/kea/pkg-message
@@ -0,0 +1,8 @@
+[
+{ type: upgrade
+ maximum_version: "3.0.0"
+ message: <<EOM
+Please visit https://kb.isc.org/docs/things-to-be-aware-of-when-upgrading-to-kea-300 for upgrade instructions.
+EOM
+}
+]
diff --git a/net/kea/pkg-plist b/net/kea/pkg-plist
index 8accfc85cb20..08c26c31820c 100644
--- a/net/kea/pkg-plist
+++ b/net/kea/pkg-plist
@@ -1,17 +1,19 @@
+bin/kea-msg-compiler
@sample %%ETCDIR%%/kea-ctrl-agent.conf.sample
@sample %%ETCDIR%%/kea-dhcp-ddns.conf.sample
@sample %%ETCDIR%%/kea-dhcp4.conf.sample
@sample %%ETCDIR%%/kea-dhcp6.conf.sample
+@sample %%ETCDIR%%/kea-netconf.conf.sample
@sample %%ETCDIR%%/keactrl.conf.sample
+%%ETCDIR%%/radius/dictionary
include/kea/asiodns/asiodns_messages.h
include/kea/asiodns/io_fetch.h
include/kea/asiodns/logger.h
include/kea/asiolink/addr_utilities.h
include/kea/asiolink/asio_wrapper.h
include/kea/asiolink/asiolink.h
-include/kea/asiolink/botan_boost_tls.h
-include/kea/asiolink/botan_boost_wrapper.h
include/kea/asiolink/botan_tls.h
+include/kea/asiolink/botan_wrapper.h
include/kea/asiolink/common_tls.h
include/kea/asiolink/crypto_tls.h
include/kea/asiolink/dummy_io_cb.h
@@ -42,6 +44,7 @@ include/kea/cc/base_stamped_element.h
include/kea/cc/cfg_to_element.h
include/kea/cc/command_interpreter.h
include/kea/cc/data.h
+include/kea/cc/default_credentials.h
include/kea/cc/dhcp_config_error.h
include/kea/cc/element_value.h
include/kea/cc/json_feed.h
@@ -50,7 +53,6 @@ include/kea/cc/simple_parser.h
include/kea/cc/stamped_element.h
include/kea/cc/stamped_value.h
include/kea/cc/user_context.h
-include/kea/cfgrpt/config_report.h
include/kea/config.h
include/kea/config/base_command_mgr.h
include/kea/config/client_connection.h
@@ -62,17 +64,23 @@ include/kea/config/command_mgr.h
include/kea/config/config_log.h
include/kea/config/config_messages.h
include/kea/config/hooked_command_mgr.h
+include/kea/config/http_command_config.h
+include/kea/config/http_command_mgr.h
+include/kea/config/http_command_response_creator.h
+include/kea/config/http_command_response_creator_factory.h
include/kea/config/timeouts.h
+include/kea/config/unix_command_config.h
+include/kea/config/unix_command_mgr.h
include/kea/config_backend/base_config_backend.h
include/kea/config_backend/base_config_backend_mgr.h
include/kea/config_backend/base_config_backend_pool.h
include/kea/config_backend/constants.h
+include/kea/cryptolink/botan_common.h
include/kea/cryptolink/crypto_hash.h
include/kea/cryptolink/crypto_hmac.h
include/kea/cryptolink/crypto_rng.h
include/kea/cryptolink/cryptolink.h
include/kea/cryptolink/openssl_common.h
-include/kea/cryptolink/openssl_compat.h
include/kea/d2srv/d2_cfg_mgr.h
include/kea/d2srv/d2_config.h
include/kea/d2srv/d2_log.h
@@ -144,6 +152,7 @@ include/kea/dhcp/pkt_filter6.h
include/kea/dhcp/pkt_filter_bpf.h
include/kea/dhcp/pkt_filter_inet.h
include/kea/dhcp/pkt_filter_inet6.h
+include/kea/dhcp/pkt_filter_lpf.h
include/kea/dhcp/pkt_template.h
include/kea/dhcp/protocol_util.h
include/kea/dhcp/socket_info.h
@@ -195,12 +204,15 @@ include/kea/dhcpsrv/csv_lease_file6.h
include/kea/dhcpsrv/d2_client_cfg.h
include/kea/dhcpsrv/d2_client_mgr.h
include/kea/dhcpsrv/db_type.h
+include/kea/dhcpsrv/ddns_params.h
include/kea/dhcpsrv/dhcp4o6_ipc.h
include/kea/dhcpsrv/dhcpsrv_exceptions.h
include/kea/dhcpsrv/dhcpsrv_log.h
include/kea/dhcpsrv/dhcpsrv_messages.h
include/kea/dhcpsrv/flq_allocation_state.h
include/kea/dhcpsrv/flq_allocator.h
+include/kea/dhcpsrv/fuzz_log.h
+include/kea/dhcpsrv/fuzz_messages.h
include/kea/dhcpsrv/host.h
include/kea/dhcpsrv/host_container.h
include/kea/dhcpsrv/host_data_source_factory.h
@@ -217,14 +229,16 @@ include/kea/dhcpsrv/lease_file_loader.h
include/kea/dhcpsrv/lease_file_stats.h
include/kea/dhcpsrv/lease_mgr.h
include/kea/dhcpsrv/lease_mgr_factory.h
+include/kea/dhcpsrv/legal_log_db_log.h
+include/kea/dhcpsrv/legal_log_mgr.h
+include/kea/dhcpsrv/legal_log_mgr_factory.h
include/kea/dhcpsrv/memfile_lease_limits.h
include/kea/dhcpsrv/memfile_lease_mgr.h
include/kea/dhcpsrv/memfile_lease_storage.h
-%%MYSQL%%include/kea/dhcpsrv/mysql_host_data_source.h
-%%MYSQL%%include/kea/dhcpsrv/mysql_lease_mgr.h
include/kea/dhcpsrv/ncr_generator.h
include/kea/dhcpsrv/network.h
include/kea/dhcpsrv/network_state.h
+include/kea/dhcpsrv/packet_fuzzer.h
include/kea/dhcpsrv/parsers/base_network_parser.h
include/kea/dhcpsrv/parsers/client_class_def_parser.h
include/kea/dhcpsrv/parsers/dhcp_parsers.h
@@ -241,8 +255,6 @@ include/kea/dhcpsrv/parsers/shared_network_parser.h
include/kea/dhcpsrv/parsers/shared_networks_list_parser.h
include/kea/dhcpsrv/parsers/simple_parser4.h
include/kea/dhcpsrv/parsers/simple_parser6.h
-%%PGSQL%%include/kea/dhcpsrv/pgsql_host_data_source.h
-%%PGSQL%%include/kea/dhcpsrv/pgsql_lease_mgr.h
include/kea/dhcpsrv/pool.h
include/kea/dhcpsrv/random_allocation_state.h
include/kea/dhcpsrv/random_allocator.h
@@ -317,6 +329,7 @@ include/kea/http/auth_log.h
include/kea/http/auth_messages.h
include/kea/http/basic_auth.h
include/kea/http/basic_auth_config.h
+include/kea/http/cfg_http_header.h
include/kea/http/client.h
include/kea/http/connection.h
include/kea/http/connection_pool.h
@@ -375,6 +388,7 @@ include/kea/log/output_option.h
%%PGSQL%%include/kea/pgsql/pgsql_connection.h
%%PGSQL%%include/kea/pgsql/pgsql_exchange.h
include/kea/process/cb_ctl_base.h
+include/kea/process/cfgrpt/config_report.h
include/kea/process/config_base.h
include/kea/process/config_ctl_info.h
include/kea/process/config_ctl_parser.h
@@ -434,132 +448,113 @@ include/kea/util/unlock_guard.h
include/kea/util/versioned_csv_file.h
include/kea/util/watch_socket.h
include/kea/util/watched_thread.h
-lib/kea/hooks/libdhcp_bootp.a
lib/kea/hooks/libdhcp_bootp.so
-lib/kea/hooks/libdhcp_flex_option.a
+lib/kea/hooks/libdhcp_class_cmds.so
+lib/kea/hooks/libdhcp_ddns_tuning.so
+lib/kea/hooks/libdhcp_flex_id.so
lib/kea/hooks/libdhcp_flex_option.so
-lib/kea/hooks/libdhcp_ha.a
lib/kea/hooks/libdhcp_ha.so
-lib/kea/hooks/libdhcp_lease_cmds.a
+lib/kea/hooks/libdhcp_host_cache.so
+lib/kea/hooks/libdhcp_host_cmds.so
lib/kea/hooks/libdhcp_lease_cmds.so
-%%MYSQL%%lib/kea/hooks/libdhcp_mysql_cb.a
-%%MYSQL%%lib/kea/hooks/libdhcp_mysql_cb.so
-lib/kea/hooks/libdhcp_perfmon.a
+lib/kea/hooks/libdhcp_lease_query.so
+lib/kea/hooks/libdhcp_legal_log.so
+lib/kea/hooks/libdhcp_limits.so
+%%MYSQL%%lib/kea/hooks/libdhcp_mysql.so
lib/kea/hooks/libdhcp_perfmon.so
-%%PGSQL%%lib/kea/hooks/libdhcp_pgsql_cb.a
-%%PGSQL%%lib/kea/hooks/libdhcp_pgsql_cb.so
-lib/kea/hooks/libdhcp_run_script.a
+%%PGSQL%%lib/kea/hooks/libdhcp_pgsql.so
+lib/kea/hooks/libdhcp_ping_check.so
+lib/kea/hooks/libdhcp_radius.so
lib/kea/hooks/libdhcp_run_script.so
-lib/kea/hooks/libdhcp_stat_cmds.a
lib/kea/hooks/libdhcp_stat_cmds.so
-lib/libkea-asiodns.a
+lib/kea/hooks/libdhcp_subnet_cmds.so
lib/libkea-asiodns.so
-lib/libkea-asiodns.so.48
-lib/libkea-asiodns.so.48.0.0
-lib/libkea-asiolink.a
+lib/libkea-asiodns.so.62
+lib/libkea-asiodns.so.62.0.0
lib/libkea-asiolink.so
-lib/libkea-asiolink.so.71
-lib/libkea-asiolink.so.71.0.0
-lib/libkea-cc.a
+lib/libkea-asiolink.so.88
+lib/libkea-asiolink.so.88.0.0
lib/libkea-cc.so
-lib/libkea-cc.so.68
-lib/libkea-cc.so.68.0.0
-lib/libkea-cfgclient.a
-lib/libkea-cfgclient.so
-lib/libkea-cfgclient.so.65
-lib/libkea-cfgclient.so.65.0.0
-lib/libkea-cryptolink.a
+lib/libkea-cc.so.82
+lib/libkea-cc.so.82.0.0
+lib/libkea-cfgrpt.so
+lib/libkea-cfgrpt.so.3
+lib/libkea-cfgrpt.so.3.0.0
+lib/libkea-config.so
+lib/libkea-config.so.83
+lib/libkea-config.so.83.0.0
lib/libkea-cryptolink.so
-lib/libkea-cryptolink.so.50
-lib/libkea-cryptolink.so.50.0.0
-lib/libkea-d2srv.a
+lib/libkea-cryptolink.so.64
+lib/libkea-cryptolink.so.64.0.0
lib/libkea-d2srv.so
-lib/libkea-d2srv.so.46
-lib/libkea-d2srv.so.46.0.0
-lib/libkea-database.a
+lib/libkea-d2srv.so.63
+lib/libkea-d2srv.so.63.0.0
lib/libkea-database.so
-lib/libkea-database.so.62
-lib/libkea-database.so.62.0.0
-lib/libkea-dhcp++.a
-lib/libkea-dhcp++.so
-lib/libkea-dhcp++.so.91
-lib/libkea-dhcp++.so.91.0.0
-lib/libkea-dhcp_ddns.a
+lib/libkea-database.so.76
+lib/libkea-database.so.76.0.0
+lib/libkea-dhcp.so
+lib/libkea-dhcp.so.109
+lib/libkea-dhcp.so.109.0.0
lib/libkea-dhcp_ddns.so
-lib/libkea-dhcp_ddns.so.56
-lib/libkea-dhcp_ddns.so.56.0.0
-lib/libkea-dhcpsrv.a
+lib/libkea-dhcp_ddns.so.68
+lib/libkea-dhcp_ddns.so.68.0.0
lib/libkea-dhcpsrv.so
-lib/libkea-dhcpsrv.so.110
-lib/libkea-dhcpsrv.so.110.0.0
-lib/libkea-dns++.a
-lib/libkea-dns++.so
-lib/libkea-dns++.so.56
-lib/libkea-dns++.so.56.0.0
-lib/libkea-eval.a
+lib/libkea-dhcpsrv.so.130
+lib/libkea-dhcpsrv.so.130.0.0
+lib/libkea-dns.so
+lib/libkea-dns.so.71
+lib/libkea-dns.so.71.0.0
lib/libkea-eval.so
-lib/libkea-eval.so.69
-lib/libkea-eval.so.69.0.0
-lib/libkea-exceptions.a
+lib/libkea-eval.so.84
+lib/libkea-eval.so.84.0.0
lib/libkea-exceptions.so
-lib/libkea-exceptions.so.33
-lib/libkea-exceptions.so.33.0.0
-lib/libkea-hooks.a
+lib/libkea-exceptions.so.45
+lib/libkea-exceptions.so.45.0.0
lib/libkea-hooks.so
-lib/libkea-hooks.so.99
-lib/libkea-hooks.so.99.0.0
-lib/libkea-http.a
+lib/libkea-hooks.so.119
+lib/libkea-hooks.so.119.0.0
lib/libkea-http.so
-lib/libkea-http.so.71
-lib/libkea-http.so.71.0.0
-lib/libkea-log.a
+lib/libkea-http.so.87
+lib/libkea-http.so.87.0.0
+lib/libkea-log-interprocess.so
+lib/libkea-log-interprocess.so.3
+lib/libkea-log-interprocess.so.3.0.0
lib/libkea-log.so
-lib/libkea-log.so.61
-lib/libkea-log.so.61.0.0
-%%MYSQL%%lib/libkea-mysql.a
+lib/libkea-log.so.75
+lib/libkea-log.so.75.0.0
%%MYSQL%%lib/libkea-mysql.so
-%%MYSQL%%lib/libkea-mysql.so.71
-%%MYSQL%%lib/libkea-mysql.so.71.0.0
-%%PGSQL%%lib/libkea-pgsql.a
+%%MYSQL%%lib/libkea-mysql.so.88
+%%MYSQL%%lib/libkea-mysql.so.88.0.0
%%PGSQL%%lib/libkea-pgsql.so
-%%PGSQL%%lib/libkea-pgsql.so.71
-%%PGSQL%%lib/libkea-pgsql.so.71.0.0
-lib/libkea-process.a
+%%PGSQL%%lib/libkea-pgsql.so.88
+%%PGSQL%%lib/libkea-pgsql.so.88.0.0
lib/libkea-process.so
-lib/libkea-process.so.73
-lib/libkea-process.so.73.0.0
-lib/libkea-stats.a
+lib/libkea-process.so.90
+lib/libkea-process.so.90.0.0
lib/libkea-stats.so
-lib/libkea-stats.so.41
-lib/libkea-stats.so.41.0.0
-lib/libkea-tcp.a
+lib/libkea-stats.so.53
+lib/libkea-stats.so.53.0.0
lib/libkea-tcp.so
-lib/libkea-tcp.so.18
-lib/libkea-tcp.so.18.0.0
-lib/libkea-util-io.a
+lib/libkea-tcp.so.33
+lib/libkea-tcp.so.33.0.0
lib/libkea-util-io.so
-lib/libkea-util-io.so.0
-lib/libkea-util-io.so.0.0.1
-lib/libkea-util.a
+lib/libkea-util-io.so.12
+lib/libkea-util-io.so.12.0.0
lib/libkea-util.so
-lib/libkea-util.so.85
-lib/libkea-util.so.85.0.0
-%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_conn%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_conn%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
-%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_conn%%PYTHON_EXT_SUFFIX%%.pyc
-%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_connector3%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_connector3%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
-%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_connector3%%PYTHON_EXT_SUFFIX%%.pyc
-%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/kea_conn.py
-%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/kea_connector3.py
+lib/libkea-util.so.101
+lib/libkea-util.so.101.0.0
+%%PYTHON_SITELIBDIR%%/kea/kea_conn.py
+%%PYTHON_SITELIBDIR%%/kea/kea_connector3.py
+libdata/pkgconfig/kea.pc
sbin/kea-admin
sbin/kea-ctrl-agent
sbin/kea-dhcp-ddns
sbin/kea-dhcp4
sbin/kea-dhcp6
sbin/kea-lfc
-%%SHELL%%sbin/kea-shell
+sbin/kea-shell
sbin/keactrl
+sbin/perfdhcp
%%DATADIR%%/api/build-report.json
%%DATADIR%%/api/cache-clear.json
%%DATADIR%%/api/cache-flush.json
@@ -643,6 +638,8 @@ sbin/keactrl
%%DATADIR%%/api/network6-list.json
%%DATADIR%%/api/network6-subnet-add.json
%%DATADIR%%/api/network6-subnet-del.json
+%%DATADIR%%/api/perfmon-control.json
+%%DATADIR%%/api/perfmon-get-all-durations.json
%%DATADIR%%/api/remote-class4-del.json
%%DATADIR%%/api/remote-class4-get-all.json
%%DATADIR%%/api/remote-class4-get.json
@@ -747,15 +744,30 @@ sbin/keactrl
%%DATADIR%%/api/subnet4-delta-del.json
%%DATADIR%%/api/subnet4-get.json
%%DATADIR%%/api/subnet4-list.json
+%%DATADIR%%/api/subnet4-select-test.json
%%DATADIR%%/api/subnet4-update.json
+%%DATADIR%%/api/subnet4o6-select-test.json
%%DATADIR%%/api/subnet6-add.json
%%DATADIR%%/api/subnet6-del.json
%%DATADIR%%/api/subnet6-delta-add.json
%%DATADIR%%/api/subnet6-delta-del.json
%%DATADIR%%/api/subnet6-get.json
%%DATADIR%%/api/subnet6-list.json
+%%DATADIR%%/api/subnet6-select-test.json
%%DATADIR%%/api/subnet6-update.json
%%DATADIR%%/api/version-get.json
+%%DATADIR%%/meson-info/intro-benchmarks.json
+%%DATADIR%%/meson-info/intro-buildoptions.json
+%%DATADIR%%/meson-info/intro-buildsystem_files.json
+%%DATADIR%%/meson-info/intro-compilers.json
+%%DATADIR%%/meson-info/intro-dependencies.json
+%%DATADIR%%/meson-info/intro-install_plan.json
+%%DATADIR%%/meson-info/intro-installed.json
+%%DATADIR%%/meson-info/intro-machines.json
+%%DATADIR%%/meson-info/intro-projectinfo.json
+%%DATADIR%%/meson-info/intro-targets.json
+%%DATADIR%%/meson-info/intro-tests.json
+%%DATADIR%%/meson-info/meson-info.json
%%DATADIR%%/scripts/admin-utils.sh
%%DATADIR%%/scripts/mysql/dhcpdb_create.mysql
%%DATADIR%%/scripts/mysql/dhcpdb_drop.mysql
@@ -791,8 +803,14 @@ sbin/keactrl
%%DATADIR%%/scripts/mysql/upgrade_019_to_020.sh
%%DATADIR%%/scripts/mysql/upgrade_020_to_021.sh
%%DATADIR%%/scripts/mysql/upgrade_021_to_022.sh
-%%DATADIR%%/scripts/mysql/upgrade_022.0_to_022.1.sh
-%%DATADIR%%/scripts/mysql/upgrade_022.1_to_022.2.sh
+%%DATADIR%%/scripts/mysql/upgrade_022_to_023.sh
+%%DATADIR%%/scripts/mysql/upgrade_023_to_024.sh
+%%DATADIR%%/scripts/mysql/upgrade_024_to_025.sh
+%%DATADIR%%/scripts/mysql/upgrade_025_to_026.sh
+%%DATADIR%%/scripts/mysql/upgrade_026_to_027.sh
+%%DATADIR%%/scripts/mysql/upgrade_027_to_028.sh
+%%DATADIR%%/scripts/mysql/upgrade_028_to_029.sh
+%%DATADIR%%/scripts/mysql/upgrade_029_to_030.sh
%%DATADIR%%/scripts/mysql/wipe_data.sh
%%DATADIR%%/scripts/pgsql/dhcpdb_create.pgsql
%%DATADIR%%/scripts/pgsql/dhcpdb_drop.pgsql
@@ -823,8 +841,13 @@ sbin/keactrl
%%DATADIR%%/scripts/pgsql/upgrade_019_to_020.sh
%%DATADIR%%/scripts/pgsql/upgrade_020_to_021.sh
%%DATADIR%%/scripts/pgsql/upgrade_021_to_022.sh
-%%DATADIR%%/scripts/pgsql/upgrade_022.0_to_022.1.sh
-%%DATADIR%%/scripts/pgsql/upgrade_022.1_to_022.2.sh
+%%DATADIR%%/scripts/pgsql/upgrade_022_to_023.sh
+%%DATADIR%%/scripts/pgsql/upgrade_023_to_024.sh
+%%DATADIR%%/scripts/pgsql/upgrade_024_to_025.sh
+%%DATADIR%%/scripts/pgsql/upgrade_025_to_026.sh
+%%DATADIR%%/scripts/pgsql/upgrade_026_to_027.sh
+%%DATADIR%%/scripts/pgsql/upgrade_027_to_028.sh
+%%DATADIR%%/scripts/pgsql/upgrade_028_to_029.sh
%%DATADIR%%/scripts/pgsql/wipe_data.sh
share/man/man8/kea-admin.8.gz
share/man/man8/kea-ctrl-agent.8.gz
@@ -836,7 +859,7 @@ share/man/man8/kea-netconf.8.gz
share/man/man8/kea-shell.8.gz
share/man/man8/keactrl.8.gz
share/man/man8/perfdhcp.8.gz
-%%SHELL%%@dir %%PYTHON_SITELIBDIR%%/kea/__pycache__
-%%SHELL%%@dir %%PYTHON_SITELIBDIR%%/kea
-@dir /var/db/kea
-@dir /var/run/kea
+@dir(,,0750) %%ETCDIR%%
+@dir(,,0750) /var/db/kea
+@dir(,,0750) /var/log/kea
+@dir(,,0750) /var/run/kea