pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

kea: Update to kea-2.2.0

Module Name:	pkgsrc-wip
Committed By:	snow flurry <snow%datagirl.xyz@localhost>
Pushed By:	flurry
Date:		Sat Oct 1 13:01:18 2022 -0700
Changeset:	3aa5c0fe0d2d677a4398b4bb7da6253d42fbbaf9

Modified Files:
	kea/Makefile
	kea/PLIST
	kea/distinfo
	kea/patches/patch-configure.ac
	kea/patches/patch-src_bin_agent_agent__lexer.ll
	kea/patches/patch-src_bin_d2_d2__lexer.ll
	kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll
	kea/patches/patch-src_bin_dhcp4_tests_parser__unittest.cc
	kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll
	kea/patches/patch-src_bin_dhcp6_tests_parser__unittest.cc
	kea/patches/patch-src_bin_netconf_netconf__lexer.ll
	kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc
	kea/patches/patch-src_lib_dhcp_tests_iface__mgr__unittest.cc
	kea/patches/patch-src_lib_dhcpsrv_host__data__source__factory.cc
Removed Files:
	kea/patches/patch-m4macros_ax__gtest.m4
	kea/patches/patch-src_lib_dhcpsrv_timer__mgr.cc
	kea/patches/patch-src_lib_util_signal__set.cc

Log Message:
kea: Update to kea-2.2.0

Successful build on NetBSD-9.3, haven't yet tested on illumos or Linux.

* Modified indexes on the hosts table in the postgresql
  schema to improve performance on host reservation searches.
  Thanks to Paul Kutzer for suggesting these changes.  (Gitlab #2452)

* The status-get command now shows the status of the sockets being
  opened to receive DHCP requests, and a list of errors for the
  sockets that were not successfully created.  (Gitlab #2434)

* Added missing parameters to YANG modules, including TLS
  parameters for database connections.  (Gitlab #2224)

* HA now applies load balancing and scoping only to inbound
  client packet types that apply to client lease fulfillment,
  e.g. DHCPDISCOVER, DHCPREQUEST, DHCPV6_SOLICIT, DHCPV6_REQUEST,
  etc. Previously, HA indiscriminately balanced and
  scoped all inbound packets, including those related to lease
  query.  (Gitlab #1781)

* Added support for Alpine 3.16 in hammer.py.  (Gitlab #2491)

* Updated the limits hook library ARM documentation to reflect
  support for lease limits.  (Gitlab #2481)

* Added a new statistic to kea-dhcp4 that counts host
  reservation conflicts. They are now tracked at both
  the global and subnet levels, as v4-reservation-conflicts
  and subnet[id].v4-reservation-conflicts, respectively.
  (Gitlab #2419)

* Fixed a crash in the HA+MT scenario caused by a race condition
  which occurred between resetting the CalloutHandle state and
  accessing the hook point parameters, from different threads,
  when unparking packets.  (Gitlab #2473)

* Added a tool that checks whether there are any missing REST
  commands from the API Reference section of the ARM.
  See tools/check-for-missing-api-commands.sh.
  It has been integrated into the Gitlab CI and runs on every
  push.  (Gitlab #2379)

* The Developer's Guide now correctly uses the Lease4CollectionPtr
  and Lease6CollectionPtr types. Thanks to Daniel Bjors for
  reporting this typo.  (Gitlab #2447)

* The PostgreSQL schema has been changed to provide initial support
  for the lease-limiting feature, part of the limits hook library.
  (Gitlab #2445)

* Functionality needed to support the lease-limiting feature of
  of the limits hook library has been added to Memfile_LeaseMgr.
  (Gitlab #2436)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3aa5c0fe0d2d677a4398b4bb7da6253d42fbbaf9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 kea/Makefile                                       |   3 +-
 kea/PLIST                                          | 327 ++++++++++++++++++---
 kea/distinfo                                       |  31 +-
 kea/patches/patch-configure.ac                     |  22 +-
 kea/patches/patch-m4macros_ax__gtest.m4            |  15 -
 kea/patches/patch-src_bin_agent_agent__lexer.ll    |   7 +-
 kea/patches/patch-src_bin_d2_d2__lexer.ll          |   8 +-
 kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll    |   8 +-
 .../patch-src_bin_dhcp4_tests_parser__unittest.cc  |  17 +-
 kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll    |   8 +-
 .../patch-src_bin_dhcp6_tests_parser__unittest.cc  |  17 +-
 .../patch-src_bin_netconf_netconf__lexer.ll        |   7 +-
 kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc  |  24 +-
 ...atch-src_lib_dhcp_tests_iface__mgr__unittest.cc |   8 +-
 ...-src_lib_dhcpsrv_host__data__source__factory.cc |   4 +-
 kea/patches/patch-src_lib_dhcpsrv_timer__mgr.cc    |  14 -
 kea/patches/patch-src_lib_util_signal__set.cc      |  32 --
 17 files changed, 356 insertions(+), 196 deletions(-)

diffs:
diff --git a/kea/Makefile b/kea/Makefile
index 2fcb63fb9d..a1210b0204 100644
--- a/kea/Makefile
+++ b/kea/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	kea-1.8.0
+DISTNAME=	kea-2.2.0
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.isc.org/isc/kea/${PKGVERSION_NOREV}/
 MASTER_SITES+=	ftp://ftp.isc.org/isc/kea/${PKGVERSION_NOREV}/
@@ -12,6 +12,7 @@ HOMEPAGE=	https://www.isc.org/kea/
 COMMENT=	DHCP servers from ISC
 LICENSE=	mpl-2.0
 
+BUILD_DEFS+=	VARBASE
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
diff --git a/kea/PLIST b/kea/PLIST
index 1d0f0621bb..45c4e9ca5e 100644
--- a/kea/PLIST
+++ b/kea/PLIST
@@ -5,6 +5,11 @@ 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/common_tls.h
+include/kea/asiolink/crypto_tls.h
 include/kea/asiolink/dummy_io_cb.h
 include/kea/asiolink/interval_timer.h
 include/kea/asiolink/io_acceptor.h
@@ -13,10 +18,15 @@ include/kea/asiolink/io_asio_socket.h
 include/kea/asiolink/io_endpoint.h
 include/kea/asiolink/io_error.h
 include/kea/asiolink/io_service.h
+include/kea/asiolink/io_service_signal.h
 include/kea/asiolink/io_socket.h
+include/kea/asiolink/openssl_tls.h
+include/kea/asiolink/process_spawn.h
 include/kea/asiolink/tcp_acceptor.h
 include/kea/asiolink/tcp_endpoint.h
 include/kea/asiolink/tcp_socket.h
+include/kea/asiolink/tls_acceptor.h
+include/kea/asiolink/tls_socket.h
 include/kea/asiolink/udp_endpoint.h
 include/kea/asiolink/udp_socket.h
 include/kea/asiolink/unix_domain_socket.h
@@ -54,6 +64,11 @@ 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
+include/kea/d2srv/d2_messages.h
+include/kea/d2srv/d2_simple_parser.h
 include/kea/database/audit_entry.h
 include/kea/database/backend_selector.h
 include/kea/database/database_connection.h
@@ -111,6 +126,7 @@ include/kea/dhcp/pkt_filter6.h
 ${PLIST.bpf}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_template.h
 include/kea/dhcp/protocol_util.h
 include/kea/dhcp/socket_info.h
 include/kea/dhcp/std_option_defs.h
@@ -162,18 +178,22 @@ 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/free_lease_queue.h
 include/kea/dhcpsrv/host.h
 include/kea/dhcpsrv/host_container.h
 include/kea/dhcpsrv/host_data_source_factory.h
 include/kea/dhcpsrv/host_mgr.h
 include/kea/dhcpsrv/hosts_log.h
 include/kea/dhcpsrv/hosts_messages.h
+include/kea/dhcpsrv/ip_range.h
+include/kea/dhcpsrv/ip_range_permutation.h
 include/kea/dhcpsrv/key_from_key.h
 include/kea/dhcpsrv/lease.h
 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/memfile_lease_limits.h
 include/kea/dhcpsrv/memfile_lease_mgr.h
 include/kea/dhcpsrv/memfile_lease_storage.h
 ${PLIST.mysql}include/kea/dhcpsrv/mysql_host_data_source.h
@@ -208,7 +228,6 @@ include/kea/dhcpsrv/subnet.h
 include/kea/dhcpsrv/subnet_id.h
 include/kea/dhcpsrv/subnet_selector.h
 include/kea/dhcpsrv/timer_mgr.h
-include/kea/dhcpsrv/triplet.h
 include/kea/dhcpsrv/utils.h
 include/kea/dhcpsrv/writable_host_data_source.h
 include/kea/dns/dns_fwd.h
@@ -226,6 +245,7 @@ include/kea/dns/messagerenderer.h
 include/kea/dns/name.h
 include/kea/dns/nsec3hash.h
 include/kea/dns/opcode.h
+include/kea/dns/qid_gen.h
 include/kea/dns/question.h
 include/kea/dns/rcode.h
 include/kea/dns/rdata.h
@@ -272,6 +292,11 @@ include/kea/hooks/library_manager_collection.h
 include/kea/hooks/parking_lots.h
 include/kea/hooks/pointer_converter.h
 include/kea/hooks/server_hooks.h
+include/kea/http/auth_config.h
+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/client.h
 include/kea/http/connection.h
 include/kea/http/connection_pool.h
@@ -283,6 +308,7 @@ include/kea/http/http_log.h
 include/kea/http/http_message.h
 include/kea/http/http_message_parser_base.h
 include/kea/http/http_messages.h
+include/kea/http/http_thread_pool.h
 include/kea/http/http_types.h
 include/kea/http/listener.h
 include/kea/http/listener_impl.h
@@ -327,8 +353,8 @@ include/kea/log/output_option.h
 ${PLIST.mysql}include/kea/mysql/mysql_binding.h
 ${PLIST.mysql}include/kea/mysql/mysql_connection.h
 ${PLIST.mysql}include/kea/mysql/mysql_constants.h
-${PLIST.pgsql}include/kea/pgsql/pgsql_connection.h
-${PLIST.pgsql}include/kea/pgsql/pgsql_exchange.h
+${PLIST.mysql}include/kea/pgsql/pgsql_connection.h
+${PLIST.mysql}include/kea/pgsql/pgsql_exchange.h
 include/kea/process/cb_ctl_base.h
 include/kea/process/config_base.h
 include/kea/process/config_ctl_info.h
@@ -338,16 +364,17 @@ include/kea/process/d_controller.h
 include/kea/process/d_log.h
 include/kea/process/d_process.h
 include/kea/process/daemon.h
-include/kea/process/io_service_signal.h
 include/kea/process/log_parser.h
 include/kea/process/logging_info.h
 include/kea/process/process_messages.h
+include/kea/process/redact_config.h
 include/kea/stats/context.h
 include/kea/stats/observation.h
 include/kea/stats/stats_mgr.h
 include/kea/util/boost_time_utils.h
 include/kea/util/buffer.h
 include/kea/util/csv_file.h
+include/kea/util/dhcp_space.h
 include/kea/util/doubles.h
 include/kea/util/encode/base16_from_binary.h
 include/kea/util/encode/base32hex.h
@@ -356,6 +383,8 @@ include/kea/util/encode/base64.h
 include/kea/util/encode/binary_from_base16.h
 include/kea/util/encode/binary_from_base32hex.h
 include/kea/util/encode/hex.h
+include/kea/util/encode/utf8.h
+include/kea/util/file_utilities.h
 include/kea/util/filename.h
 include/kea/util/hash.h
 include/kea/util/io/fd.h
@@ -370,12 +399,9 @@ include/kea/util/multi_threading_mgr.h
 include/kea/util/optional.h
 include/kea/util/pid_file.h
 include/kea/util/pointer_util.h
-include/kea/util/process_spawn.h
-include/kea/util/random/qid_gen.h
-include/kea/util/random/random_number_generator.h
 include/kea/util/range_utilities.h
 include/kea/util/readwrite_mutex.h
-include/kea/util/signal_set.h
+include/kea/util/reconnect_ctl.h
 include/kea/util/staged_value.h
 include/kea/util/state_model.h
 include/kea/util/stopwatch.h
@@ -383,6 +409,7 @@ include/kea/util/stopwatch_impl.h
 include/kea/util/strutil.h
 include/kea/util/thread_pool.h
 include/kea/util/time_utilities.h
+include/kea/util/triplet.h
 include/kea/util/unlock_guard.h
 include/kea/util/versioned_csv_file.h
 include/kea/util/watch_socket.h
@@ -392,12 +419,15 @@ lib/kea/hooks/libdhcp_flex_option.la
 lib/kea/hooks/libdhcp_ha.la
 lib/kea/hooks/libdhcp_lease_cmds.la
 ${PLIST.mysql}lib/kea/hooks/libdhcp_mysql_cb.la
+${PLIST.pgsql}lib/kea/hooks/libdhcp_pgsql_cb.la
+lib/kea/hooks/libdhcp_run_script.la
 lib/kea/hooks/libdhcp_stat_cmds.la
 lib/libkea-asiodns.la
 lib/libkea-asiolink.la
 lib/libkea-cc.la
 lib/libkea-cfgclient.la
 lib/libkea-cryptolink.la
+lib/libkea-d2srv.la
 lib/libkea-database.la
 lib/libkea-dhcp++.la
 lib/libkea-dhcp_ddns.la
@@ -448,8 +478,13 @@ share/doc/kea/ChangeLog
 share/doc/kea/README
 share/doc/kea/code_of_conduct.md
 share/doc/kea/examples/agent/comments.json
+share/doc/kea/examples/agent/https.json
+share/doc/kea/examples/agent/rbac.json
 share/doc/kea/examples/agent/simple.json
+share/doc/kea/examples/ddns/all-keys-netconf.json
+share/doc/kea/examples/ddns/all-keys.json
 share/doc/kea/examples/ddns/comments.json
+share/doc/kea/examples/ddns/gss-tsig.json
 share/doc/kea/examples/ddns/sample1.json
 share/doc/kea/examples/ddns/template.json
 share/doc/kea/examples/https/httpd2/kea-httpd2.conf
@@ -458,8 +493,8 @@ share/doc/kea/examples/https/shell/kea-stunnel.conf
 share/doc/kea/examples/kea4/advanced.json
 share/doc/kea/examples/kea4/all-keys-netconf.json
 share/doc/kea/examples/kea4/all-keys.json
+share/doc/kea/examples/kea4/all-options.json
 share/doc/kea/examples/kea4/backends.json
-share/doc/kea/examples/kea4/cassandra.json
 share/doc/kea/examples/kea4/classify.json
 share/doc/kea/examples/kea4/classify2.json
 share/doc/kea/examples/kea4/comments.json
@@ -477,12 +512,14 @@ share/doc/kea/examples/kea4/reservations.json
 share/doc/kea/examples/kea4/several-subnets.json
 share/doc/kea/examples/kea4/shared-network.json
 share/doc/kea/examples/kea4/single-subnet.json
+share/doc/kea/examples/kea4/vendor-specific.json
+share/doc/kea/examples/kea4/vivso.json
 share/doc/kea/examples/kea4/with-ddns.json
 share/doc/kea/examples/kea6/advanced.json
 share/doc/kea/examples/kea6/all-keys-netconf.json
 share/doc/kea/examples/kea6/all-keys.json
+share/doc/kea/examples/kea6/all-options.json
 share/doc/kea/examples/kea6/backends.json
-share/doc/kea/examples/kea6/cassandra.json
 share/doc/kea/examples/kea6/classify.json
 share/doc/kea/examples/kea6/classify2.json
 share/doc/kea/examples/kea6/comments.json
@@ -514,49 +551,253 @@ share/doc/kea/examples/netconf/kea-dhcp6-operations/twopools.xml
 share/doc/kea/examples/netconf/kea-dhcp6-operations/twosubnets.xml
 share/doc/kea/examples/netconf/simple-dhcp4.json
 share/doc/kea/examples/netconf/simple-dhcp6.json
+share/doc/kea/examples/template-power-user-home/info.md
+share/doc/kea/examples/template-power-user-home/kea-ca-1.conf
+share/doc/kea/examples/template-power-user-home/kea-ca-2.conf
+share/doc/kea/examples/template-power-user-home/kea-dhcp4-1.conf
+share/doc/kea/examples/template-power-user-home/kea-dhcp4-2.conf
 share/doc/kea/platforms.rst
 share/examples/kea/kea-ctrl-agent.conf
 share/examples/kea/kea-dhcp-ddns.conf
 share/examples/kea/kea-dhcp4.conf
 share/examples/kea/kea-dhcp6.conf
 share/examples/kea/keactrl.conf
+share/kea/api/build-report.json
+share/kea/api/cache-clear.json
+share/kea/api/cache-flush.json
+share/kea/api/cache-get-by-id.json
+share/kea/api/cache-get.json
+share/kea/api/cache-insert.json
+share/kea/api/cache-load.json
+share/kea/api/cache-remove.json
+share/kea/api/cache-size.json
+share/kea/api/cache-write.json
+share/kea/api/class-add.json
+share/kea/api/class-del.json
+share/kea/api/class-get.json
+share/kea/api/class-list.json
+share/kea/api/class-update.json
+share/kea/api/config-backend-pull.json
+share/kea/api/config-get.json
+share/kea/api/config-reload.json
+share/kea/api/config-set.json
+share/kea/api/config-test.json
+share/kea/api/config-write.json
+share/kea/api/dhcp-disable.json
+share/kea/api/dhcp-enable.json
+share/kea/api/gss-tsig-get-all.json
+share/kea/api/gss-tsig-get.json
+share/kea/api/gss-tsig-key-del.json
+share/kea/api/gss-tsig-key-expire.json
+share/kea/api/gss-tsig-key-get.json
+share/kea/api/gss-tsig-list.json
+share/kea/api/gss-tsig-purge-all.json
+share/kea/api/gss-tsig-purge.json
+share/kea/api/gss-tsig-rekey-all.json
+share/kea/api/gss-tsig-rekey.json
+share/kea/api/ha-continue.json
+share/kea/api/ha-heartbeat.json
+share/kea/api/ha-maintenance-cancel.json
+share/kea/api/ha-maintenance-notify.json
+share/kea/api/ha-maintenance-start.json
+share/kea/api/ha-reset.json
+share/kea/api/ha-scopes.json
+share/kea/api/ha-sync-complete-notify.json
+share/kea/api/ha-sync.json
+share/kea/api/lease4-add.json
+share/kea/api/lease4-del.json
+share/kea/api/lease4-get-all.json
+share/kea/api/lease4-get-by-client-id.json
+share/kea/api/lease4-get-by-hostname.json
+share/kea/api/lease4-get-by-hw-address.json
+share/kea/api/lease4-get-page.json
+share/kea/api/lease4-get.json
+share/kea/api/lease4-resend-ddns.json
+share/kea/api/lease4-update.json
+share/kea/api/lease4-wipe.json
+share/kea/api/lease6-add.json
+share/kea/api/lease6-bulk-apply.json
+share/kea/api/lease6-del.json
+share/kea/api/lease6-get-all.json
+share/kea/api/lease6-get-by-duid.json
+share/kea/api/lease6-get-by-hostname.json
+share/kea/api/lease6-get-page.json
+share/kea/api/lease6-get.json
+share/kea/api/lease6-resend-ddns.json
+share/kea/api/lease6-update.json
+share/kea/api/lease6-wipe.json
+share/kea/api/leases-reclaim.json
+share/kea/api/libreload.json
+share/kea/api/list-commands.json
+share/kea/api/network4-add.json
+share/kea/api/network4-del.json
+share/kea/api/network4-get.json
+share/kea/api/network4-list.json
+share/kea/api/network4-subnet-add.json
+share/kea/api/network4-subnet-del.json
+share/kea/api/network6-add.json
+share/kea/api/network6-del.json
+share/kea/api/network6-get.json
+share/kea/api/network6-list.json
+share/kea/api/network6-subnet-add.json
+share/kea/api/network6-subnet-del.json
+share/kea/api/remote-class4-del.json
+share/kea/api/remote-class4-get-all.json
+share/kea/api/remote-class4-get.json
+share/kea/api/remote-class4-set.json
+share/kea/api/remote-class6-del.json
+share/kea/api/remote-class6-get-all.json
+share/kea/api/remote-class6-get.json
+share/kea/api/remote-class6-set.json
+share/kea/api/remote-global-parameter4-del.json
+share/kea/api/remote-global-parameter4-get-all.json
+share/kea/api/remote-global-parameter4-get.json
+share/kea/api/remote-global-parameter4-set.json
+share/kea/api/remote-global-parameter6-del.json
+share/kea/api/remote-global-parameter6-get-all.json
+share/kea/api/remote-global-parameter6-get.json
+share/kea/api/remote-global-parameter6-set.json
+share/kea/api/remote-network4-del.json
+share/kea/api/remote-network4-get.json
+share/kea/api/remote-network4-list.json
+share/kea/api/remote-network4-set.json
+share/kea/api/remote-network6-del.json
+share/kea/api/remote-network6-get.json
+share/kea/api/remote-network6-list.json
+share/kea/api/remote-network6-set.json
+share/kea/api/remote-option-def4-del.json
+share/kea/api/remote-option-def4-get-all.json
+share/kea/api/remote-option-def4-get.json
+share/kea/api/remote-option-def4-set.json
+share/kea/api/remote-option-def6-del.json
+share/kea/api/remote-option-def6-get-all.json
+share/kea/api/remote-option-def6-get.json
+share/kea/api/remote-option-def6-set.json
+share/kea/api/remote-option4-global-del.json
+share/kea/api/remote-option4-global-get-all.json
+share/kea/api/remote-option4-global-get.json
+share/kea/api/remote-option4-global-set.json
+share/kea/api/remote-option4-network-del.json
+share/kea/api/remote-option4-network-set.json
+share/kea/api/remote-option4-pool-del.json
+share/kea/api/remote-option4-pool-set.json
+share/kea/api/remote-option4-subnet-del.json
+share/kea/api/remote-option4-subnet-set.json
+share/kea/api/remote-option6-global-del.json
+share/kea/api/remote-option6-global-get-all.json
+share/kea/api/remote-option6-global-get.json
+share/kea/api/remote-option6-global-set.json
+share/kea/api/remote-option6-network-del.json
+share/kea/api/remote-option6-network-set.json
+share/kea/api/remote-option6-pd-pool-del.json
+share/kea/api/remote-option6-pd-pool-set.json
+share/kea/api/remote-option6-pool-del.json
+share/kea/api/remote-option6-pool-set.json
+share/kea/api/remote-option6-subnet-del.json
+share/kea/api/remote-option6-subnet-set.json
+share/kea/api/remote-server4-del.json
+share/kea/api/remote-server4-get-all.json
+share/kea/api/remote-server4-get.json
+share/kea/api/remote-server4-set.json
+share/kea/api/remote-server6-del.json
+share/kea/api/remote-server6-get-all.json
+share/kea/api/remote-server6-get.json
+share/kea/api/remote-server6-set.json
+share/kea/api/remote-subnet4-del-by-id.json
+share/kea/api/remote-subnet4-del-by-prefix.json
+share/kea/api/remote-subnet4-get-by-id.json
+share/kea/api/remote-subnet4-get-by-prefix.json
+share/kea/api/remote-subnet4-list.json
+share/kea/api/remote-subnet4-set.json
+share/kea/api/remote-subnet6-del-by-id.json
+share/kea/api/remote-subnet6-del-by-prefix.json
+share/kea/api/remote-subnet6-get-by-id.json
+share/kea/api/remote-subnet6-get-by-prefix.json
+share/kea/api/remote-subnet6-list.json
+share/kea/api/remote-subnet6-set.json
+share/kea/api/reservation-add.json
+share/kea/api/reservation-del.json
+share/kea/api/reservation-get-all.json
+share/kea/api/reservation-get-by-hostname.json
+share/kea/api/reservation-get-by-id.json
+share/kea/api/reservation-get-page.json
+share/kea/api/reservation-get.json
+share/kea/api/server-tag-get.json
+share/kea/api/shutdown.json
+share/kea/api/stat-lease4-get.json
+share/kea/api/stat-lease6-get.json
+share/kea/api/statistic-get-all.json
+share/kea/api/statistic-get.json
+share/kea/api/statistic-remove-all.json
+share/kea/api/statistic-remove.json
+share/kea/api/statistic-reset-all.json
+share/kea/api/statistic-reset.json
+share/kea/api/statistic-sample-age-set-all.json
+share/kea/api/statistic-sample-age-set.json
+share/kea/api/statistic-sample-count-set-all.json
+share/kea/api/statistic-sample-count-set.json
+share/kea/api/status-get.json
+share/kea/api/subnet4-add.json
+share/kea/api/subnet4-del.json
+share/kea/api/subnet4-delta-add.json
+share/kea/api/subnet4-delta-del.json
+share/kea/api/subnet4-get.json
+share/kea/api/subnet4-list.json
+share/kea/api/subnet4-update.json
+share/kea/api/subnet6-add.json
+share/kea/api/subnet6-del.json
+share/kea/api/subnet6-delta-add.json
+share/kea/api/subnet6-delta-del.json
+share/kea/api/subnet6-get.json
+share/kea/api/subnet6-list.json
+share/kea/api/subnet6-update.json
+share/kea/api/version-get.json
 share/kea/scripts/admin-utils.sh
-share/kea/scripts/cql/dhcpdb_create.cql
-share/kea/scripts/cql/dhcpdb_drop.cql
-share/kea/scripts/cql/upgrade_1.0_to_2.0.sh
-share/kea/scripts/cql/upgrade_2.0_to_3.0.sh
-share/kea/scripts/cql/upgrade_3.0_to_4.0.sh
-share/kea/scripts/cql/upgrade_4.0_to_5.0.sh
-share/kea/scripts/cql/wipe_data.sh
 share/kea/scripts/mysql/dhcpdb_create.mysql
 share/kea/scripts/mysql/dhcpdb_drop.mysql
-share/kea/scripts/mysql/upgrade_1.0_to_2.0.sh
-share/kea/scripts/mysql/upgrade_2.0_to_3.0.sh
-share/kea/scripts/mysql/upgrade_3.0_to_4.0.sh
-share/kea/scripts/mysql/upgrade_4.0_to_4.1.sh
-share/kea/scripts/mysql/upgrade_4.1_to_5.0.sh
-share/kea/scripts/mysql/upgrade_5.0_to_5.1.sh
-share/kea/scripts/mysql/upgrade_5.1_to_5.2.sh
-share/kea/scripts/mysql/upgrade_5.2_to_6.0.sh
-share/kea/scripts/mysql/upgrade_6.0_to_7.0.sh
-share/kea/scripts/mysql/upgrade_7.0_to_8.0.sh
-share/kea/scripts/mysql/upgrade_8.0_to_8.1.sh
-share/kea/scripts/mysql/upgrade_8.1_to_8.2.sh
-share/kea/scripts/mysql/upgrade_8.2_to_9.0.sh
-share/kea/scripts/mysql/upgrade_9.0_to_9.1.sh
-share/kea/scripts/mysql/upgrade_9.1_to_9.2.sh
-share/kea/scripts/mysql/upgrade_9.2_to_9.3.sh
+share/kea/scripts/mysql/upgrade_001.0_to_002.0.sh
+share/kea/scripts/mysql/upgrade_002.0_to_003.0.sh
+share/kea/scripts/mysql/upgrade_003.0_to_004.0.sh
+share/kea/scripts/mysql/upgrade_004.0_to_004.1.sh
+share/kea/scripts/mysql/upgrade_004.1_to_005.0.sh
+share/kea/scripts/mysql/upgrade_005.0_to_005.1.sh
+share/kea/scripts/mysql/upgrade_005.1_to_005.2.sh
+share/kea/scripts/mysql/upgrade_005.2_to_006.0.sh
+share/kea/scripts/mysql/upgrade_006.0_to_007.0.sh
+share/kea/scripts/mysql/upgrade_007.0_to_008.0.sh
+share/kea/scripts/mysql/upgrade_008.0_to_008.1.sh
+share/kea/scripts/mysql/upgrade_008.1_to_008.2.sh
+share/kea/scripts/mysql/upgrade_008.2_to_009.0.sh
+share/kea/scripts/mysql/upgrade_009.0_to_009.1.sh
+share/kea/scripts/mysql/upgrade_009.1_to_009.2.sh
+share/kea/scripts/mysql/upgrade_009.2_to_009.3.sh
+share/kea/scripts/mysql/upgrade_009.3_to_009.4.sh
+share/kea/scripts/mysql/upgrade_009.4_to_009.5.sh
+share/kea/scripts/mysql/upgrade_009.5_to_009.6.sh
+share/kea/scripts/mysql/upgrade_009.6_to_010.0.sh
+share/kea/scripts/mysql/upgrade_010_to_011.sh
+share/kea/scripts/mysql/upgrade_011_to_012.sh
+share/kea/scripts/mysql/upgrade_012_to_013.sh
+share/kea/scripts/mysql/upgrade_013_to_014.sh
 share/kea/scripts/mysql/wipe_data.sh
 share/kea/scripts/pgsql/dhcpdb_create.pgsql
 share/kea/scripts/pgsql/dhcpdb_drop.pgsql
-share/kea/scripts/pgsql/upgrade_1.0_to_2.0.sh
-share/kea/scripts/pgsql/upgrade_2.0_to_3.0.sh
-share/kea/scripts/pgsql/upgrade_3.0_to_3.1.sh
-share/kea/scripts/pgsql/upgrade_3.1_to_3.2.sh
-share/kea/scripts/pgsql/upgrade_3.2_to_3.3.sh
-share/kea/scripts/pgsql/upgrade_3.3_to_4.0.sh
-share/kea/scripts/pgsql/upgrade_4.0_to_5.0.sh
-share/kea/scripts/pgsql/upgrade_5.0_to_5.1.sh
-share/kea/scripts/pgsql/upgrade_5.1_to_6.0.sh
-share/kea/scripts/pgsql/upgrade_6.0_to_6.1.sh
+share/kea/scripts/pgsql/upgrade_001.0_to_002.0.sh
+share/kea/scripts/pgsql/upgrade_002.0_to_003.0.sh
+share/kea/scripts/pgsql/upgrade_003.0_to_003.1.sh
+share/kea/scripts/pgsql/upgrade_003.1_to_003.2.sh
+share/kea/scripts/pgsql/upgrade_003.2_to_003.3.sh
+share/kea/scripts/pgsql/upgrade_003.3_to_004.0.sh
+share/kea/scripts/pgsql/upgrade_004.0_to_005.0.sh
+share/kea/scripts/pgsql/upgrade_005.0_to_005.1.sh
+share/kea/scripts/pgsql/upgrade_005.1_to_006.0.sh
+share/kea/scripts/pgsql/upgrade_006.0_to_006.1.sh
+share/kea/scripts/pgsql/upgrade_006.1_to_006.2.sh
+share/kea/scripts/pgsql/upgrade_006.2_to_007.0.sh
+share/kea/scripts/pgsql/upgrade_007_to_008.sh
+share/kea/scripts/pgsql/upgrade_008_to_009.sh
+share/kea/scripts/pgsql/upgrade_009_to_010.sh
+share/kea/scripts/pgsql/upgrade_010_to_011.sh
+share/kea/scripts/pgsql/upgrade_011_to_012.sh
+share/kea/scripts/pgsql/upgrade_012_to_013.sh
 share/kea/scripts/pgsql/wipe_data.sh
diff --git a/kea/distinfo b/kea/distinfo
index 14ee4aa09d..3604fb90e8 100644
--- a/kea/distinfo
+++ b/kea/distinfo
@@ -1,26 +1,23 @@
 $NetBSD$
 
-RMD160 (kea-1.8.0.tar.gz) = daff3aac1f3459a1d86007f3563e5aa39f896d61
-SHA512 (kea-1.8.0.tar.gz) = a8896ebdb6948851cddca015d696db4ec205af1472ccc25e7fd6d2f9070599cb7f80998f1dc94e763723723e8e0edd8a53274b96630d27db8c40995489d3a883
-Size (kea-1.8.0.tar.gz) = 8997516 bytes
+BLAKE2s (kea-2.2.0.tar.gz) = 3792891ce82628c82cd7102d137c7f61d1658c5b2435ab5aed452fe62213f0b1
+SHA512 (kea-2.2.0.tar.gz) = 82cd44efea8c968ef097de242e1ca59e0183c80df25050017fd45538d35da64a9a0d2f4a5249ad3bd3d30b1f8895c360d301518bc22e60dfddd966fe020dc773
+Size (kea-2.2.0.tar.gz) = 9999074 bytes
 SHA1 (patch-Makefile.am) = 4e4896be44290114160be878666878bb44d71a8e
-SHA1 (patch-configure.ac) = 5922054574a91b9164062a5cdd68b704e0f2d84c
-SHA1 (patch-m4macros_ax__gtest.m4) = 66d5c4c4a05e4691881b4938bcf67b99f7cf441b
-SHA1 (patch-src_bin_agent_agent__lexer.ll) = d5bc016c0939f5f4bbb391b2f588c9840f60cb96
-SHA1 (patch-src_bin_d2_d2__lexer.ll) = 400b9f54b5bb9c9eb9c52c1ef23c9a377f29960e
-SHA1 (patch-src_bin_dhcp4_dhcp4__lexer.ll) = dfcca8319ca3b6b8902676bb1662ceb9abca74bc
-SHA1 (patch-src_bin_dhcp4_tests_parser__unittest.cc) = bcc737988cd306f3acbd232e40874d7daa1a4c7b
-SHA1 (patch-src_bin_dhcp6_dhcp6__lexer.ll) = 6ebeb6b18dc8d86d0890ce3cfcaeea4c2658e958
-SHA1 (patch-src_bin_dhcp6_tests_parser__unittest.cc) = f671c6b5c26a6b6179971f2f10af8e2b1b8b7e6a
+SHA1 (patch-configure.ac) = e21effcad5d78f56425c18d73198ba510d2da47d
+SHA1 (patch-src_bin_agent_agent__lexer.ll) = ad1c16b40a946e1c6128c96d7e3214346497e4fe
+SHA1 (patch-src_bin_d2_d2__lexer.ll) = e5e6e995f18baec7d7e3eaa59d2ef8eab5fd21fb
+SHA1 (patch-src_bin_dhcp4_dhcp4__lexer.ll) = ba61167af842a47b25dcd27db81a90cd535c1410
+SHA1 (patch-src_bin_dhcp4_tests_parser__unittest.cc) = 85c3150d75fc749a1c0085883bdeb7ce8e82419b
+SHA1 (patch-src_bin_dhcp6_dhcp6__lexer.ll) = 24591b557d72dc070090e180627cf28141b625e8
+SHA1 (patch-src_bin_dhcp6_tests_parser__unittest.cc) = e9a21a45aecaed25bea26b0545d94869a3a46791
 SHA1 (patch-src_bin_keactrl_Makefile.am) = 5b6fd816da6011858d1167d297c83eda7947efd7
-SHA1 (patch-src_bin_netconf_netconf__lexer.ll) = ec316d436f791470df9dd5c106c76f3026a19b0e
+SHA1 (patch-src_bin_netconf_netconf__lexer.ll) = db9d08205bfb4f369c40dbb8464006f39792de1e
 SHA1 (patch-src_lib_dhcp_Makefile.am) = 452036d0100a85f41c52562292931bea2501e396
-SHA1 (patch-src_lib_dhcp_iface__mgr__sun.cc) = ca4330b27adfa12b1ff6c6cc54c8c30f89f9851f
+SHA1 (patch-src_lib_dhcp_iface__mgr__sun.cc) = f16f5b109c1a471a14905dabd19853e78be25bb6
 SHA1 (patch-src_lib_dhcp_pkt__filter__inet.cc) = 32f70306483a719a8b400eff613cdbb935fe9cd0
 SHA1 (patch-src_lib_dhcp_tests_Makefile.am) = 9ee63ba82b05d02ea88e3a74183a7aa6da7b36c9
-SHA1 (patch-src_lib_dhcp_tests_iface__mgr__unittest.cc) = 833ce8dd4d06253a53a1ab9868fe92a5412b99ee
+SHA1 (patch-src_lib_dhcp_tests_iface__mgr__unittest.cc) = 71db19d1507fdaf2535545e68f1716b02b819750
 SHA1 (patch-src_lib_dhcpsrv_Makefile.am) = bdd2be227d8c7f34b4329092e6de3bcaa7117284
-SHA1 (patch-src_lib_dhcpsrv_host__data__source__factory.cc) = a1bc71ec40b9eb5a6c9247360a84ce480521cad2
-SHA1 (patch-src_lib_dhcpsrv_timer__mgr.cc) = ccdde3264c6e80b3d971d3af96c48cffbcaee141
-SHA1 (patch-src_lib_util_signal__set.cc) = f060fcedecb8ccdda997fbef2040dab82c620cb0
+SHA1 (patch-src_lib_dhcpsrv_host__data__source__factory.cc) = d6056b9b7a2e21450231f56d829b77c73d3523c4
 SHA1 (patch-src_lib_util_watch__socket.cc) = ab55b5e613bc431dcd92ef68bf3501a7e4aca7de
diff --git a/kea/patches/patch-configure.ac b/kea/patches/patch-configure.ac
index 3b86b2c639..9e60b22157 100644
--- a/kea/patches/patch-configure.ac
+++ b/kea/patches/patch-configure.ac
@@ -2,27 +2,9 @@ $NetBSD$
 
 * fix compatability errors
 
---- configure.ac.orig	2020-08-24 16:36:40.000000000 +0000
+--- configure.ac.orig	2022-09-30 18:53:59.273008159 +0000
 +++ configure.ac
-@@ -1298,7 +1298,7 @@ if test "x$enable_generate_parser" != "x
-        AC_MSG_ERROR([Flex is required for enable-generate-parser, but was not found])
-     fi
- 
--    if test "x$YACC" == "x"; then
-+    if test "x$YACC" = "x"; then
-        AC_MSG_ERROR([Bison is required for enable-generate-parser, but was not found])
-     fi
- 
-@@ -1422,7 +1422,7 @@ if test "x$enable_generate_docs" != xno 
- 
-   if test -z "$PDFLATEX"; then
-     PDFLATEX=no
--  elif test "x$PDFLATEX" == "xno"; then
-+  elif test "x$PDFLATEX" = "xno"; then
-     AC_MSG_CHECKING([for pdflatex])
-     AC_MSG_RESULT([no (disabled)])
-   else
-@@ -1472,7 +1472,7 @@ else
+@@ -1271,7 +1271,7 @@ else
    fi
    generate_docs_report="no"
  fi
diff --git a/kea/patches/patch-m4macros_ax__gtest.m4 b/kea/patches/patch-m4macros_ax__gtest.m4
deleted file mode 100644
index 142f04a36a..0000000000
--- a/kea/patches/patch-m4macros_ax__gtest.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-* fix compatability errors
-
---- m4macros/ax_gtest.m4.orig	2020-08-24 16:36:38.000000000 +0000
-+++ m4macros/ax_gtest.m4
-@@ -100,7 +100,7 @@ if test "x$enable_gtest" = "xyes" ; then
- 
- # Versions starting from 1.8.0 are put in the googletest directory. If the basename
- # returns googletest string, we need to cut it off and try baseline again.
--        if test "$GTEST_VERSION" == "googletest"; then
-+        if test "$GTEST_VERSION" = "googletest"; then
-             GTEST_VERSION=${GTEST_SOURCE%"/googletest"}
-             GTEST_VERSION=`basename $GTEST_VERSION`
-         fi
diff --git a/kea/patches/patch-src_bin_agent_agent__lexer.ll b/kea/patches/patch-src_bin_agent_agent__lexer.ll
index e98a3a031c..d0877184a0 100644
--- a/kea/patches/patch-src_bin_agent_agent__lexer.ll
+++ b/kea/patches/patch-src_bin_agent_agent__lexer.ll
@@ -3,13 +3,14 @@ $NetBSD$
 * put io_adress.h first so that map from net/if.h on solaris won't confict
   with std::map on illumos
 
---- src/bin/agent/agent_lexer.ll.orig	2019-11-19 14:50:43.000000000 +0000
+--- src/bin/agent/agent_lexer.ll.orig   2022-09-30 18:57:27.637505322 +0000
 +++ src/bin/agent/agent_lexer.ll
-@@ -9,12 +9,12 @@
+@@ -9,13 +9,13 @@
  /* Generated files do not make clang static analyser so happy */
  #ifndef __clang_analyzer__
- 
+
 +#include <asiolink/io_address.h>
+ #include <cctype>
  #include <cerrno>
  #include <climits>
  #include <cstdlib>
diff --git a/kea/patches/patch-src_bin_d2_d2__lexer.ll b/kea/patches/patch-src_bin_d2_d2__lexer.ll
index 0a3a3dbe82..705b80c09a 100644
--- a/kea/patches/patch-src_bin_d2_d2__lexer.ll
+++ b/kea/patches/patch-src_bin_d2_d2__lexer.ll
@@ -3,13 +3,14 @@ $NetBSD$
 * put io_adress.h first so that map from net/if.h on solaris won't confict
   with std::map
 
---- src/bin/d2/d2_lexer.ll.orig	2019-11-19 14:50:43.000000000 +0000
+--- src/bin/d2/d2_lexer.ll.orig 2022-07-26 06:08:02.000000000 +0000
 +++ src/bin/d2/d2_lexer.ll
-@@ -9,12 +9,12 @@
+@@ -9,13 +9,13 @@
  /* Generated files do not make clang static analyser so happy */
  #ifndef __clang_analyzer__
- 
+
 +#include <asiolink/io_address.h>
+ #include <cctype>
  #include <cerrno>
  #include <climits>
  #include <cstdlib>
@@ -18,4 +19,3 @@ $NetBSD$
 -#include <asiolink/io_address.h>
  #include <boost/lexical_cast.hpp>
  #include <exceptions/exceptions.h>
- 
diff --git a/kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll b/kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll
index fd874e3203..379a8912d5 100644
--- a/kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll
+++ b/kea/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll
@@ -3,13 +3,14 @@ $NetBSD$
 * put io_adress.h first so that map from net/if.h on solaris won't confict
   with std::map
 
---- src/bin/dhcp4/dhcp4_lexer.ll.orig	2019-11-19 14:50:43.000000000 +0000
+--- src/bin/dhcp4/dhcp4_lexer.ll.orig   2022-07-26 06:08:02.000000000 +0000
 +++ src/bin/dhcp4/dhcp4_lexer.ll
-@@ -9,12 +9,12 @@
+@@ -9,13 +9,13 @@
  /* Generated files do not make clang static analyser so happy */
  #ifndef __clang_analyzer__
- 
+
 +#include <asiolink/io_address.h>
+ #include <cctype>
  #include <cerrno>
  #include <climits>
  #include <cstdlib>
@@ -18,4 +19,3 @@ $NetBSD$
 -#include <asiolink/io_address.h>
  #include <boost/lexical_cast.hpp>
  #include <exceptions/exceptions.h>
- 
diff --git a/kea/patches/patch-src_bin_dhcp4_tests_parser__unittest.cc b/kea/patches/patch-src_bin_dhcp4_tests_parser__unittest.cc
index cfdd44eb59..99bb885d37 100644
--- a/kea/patches/patch-src_bin_dhcp4_tests_parser__unittest.cc
+++ b/kea/patches/patch-src_bin_dhcp4_tests_parser__unittest.cc
@@ -3,16 +3,15 @@ $NetBSD$
 * put inclusion of asiolink on top so that std::map dos not conflict with 
   map in net/if.h on illumos
 
---- src/bin/dhcp4/tests/parser_unittest.cc.orig	2020-08-24 16:36:38.000000000 +0000
+--- src/bin/dhcp4/tests/parser_unittest.cc.orig 2022-07-26 06:08:02.000000000 +0000
 +++ src/bin/dhcp4/tests/parser_unittest.cc
-@@ -6,9 +6,9 @@
- 
+@@ -6,8 +6,8 @@
+
  #include <config.h>
- 
-+#include <dhcpsrv/parsers/simple_parser4.h>
- #include <gtest/gtest.h>
- #include <dhcp4/parser_context.h>
--#include <dhcpsrv/parsers/simple_parser4.h>
+
+-#include <dhcp4/parser_context.h>
+ #include <dhcpsrv/parsers/simple_parser4.h>
++#include <dhcp4/parser_context.h>
  #include <testutils/gtest_utils.h>
  #include <testutils/io_utils.h>
- #include <testutils/user_context_utils.h>
+ #include <testutils/log_utils.h>
diff --git a/kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll b/kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll
index c5186b5cc8..6220eb9cf1 100644
--- a/kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll
+++ b/kea/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll
@@ -3,13 +3,14 @@ $NetBSD$
 * put io_adress.h first so that map from net/if.h on solaris won't confict
   with std::map
 
---- src/bin/dhcp6/dhcp6_lexer.ll.orig	2019-11-19 14:50:43.000000000 +0000
+--- src/bin/dhcp6/dhcp6_lexer.ll.orig   2022-07-26 06:08:02.000000000 +0000
 +++ src/bin/dhcp6/dhcp6_lexer.ll
-@@ -9,12 +9,12 @@
+@@ -9,13 +9,13 @@
  /* Generated files do not make clang static analyser so happy */
  #ifndef __clang_analyzer__
- 
+
 +#include <asiolink/io_address.h>
+ #include <cctype>
  #include <cerrno>
  #include <climits>
  #include <cstdlib>
@@ -18,4 +19,3 @@ $NetBSD$
 -#include <asiolink/io_address.h>
  #include <boost/lexical_cast.hpp>
  #include <exceptions/exceptions.h>
- 
diff --git a/kea/patches/patch-src_bin_dhcp6_tests_parser__unittest.cc b/kea/patches/patch-src_bin_dhcp6_tests_parser__unittest.cc
index d31b671012..593d823bf6 100644
--- a/kea/patches/patch-src_bin_dhcp6_tests_parser__unittest.cc
+++ b/kea/patches/patch-src_bin_dhcp6_tests_parser__unittest.cc
@@ -3,16 +3,15 @@ $NetBSD$
 * put inclusion of asiolonk first so that map from net/if.h on illumos 
   won't confict with std::map
 
---- src/bin/dhcp6/tests/parser_unittest.cc.orig	2020-01-02 23:01:48.000000000 +0000
+--- src/bin/dhcp6/tests/parser_unittest.cc.orig 2022-07-26 06:08:02.000000000 +0000
 +++ src/bin/dhcp6/tests/parser_unittest.cc
-@@ -6,9 +6,9 @@
- 
+@@ -6,8 +6,8 @@
+
  #include <config.h>
- 
-+#include <dhcpsrv/parsers/simple_parser6.h>
- #include <gtest/gtest.h>
- #include <dhcp6/parser_context.h>
--#include <dhcpsrv/parsers/simple_parser6.h>
+
+-#include <dhcp6/parser_context.h>
+ #include <dhcpsrv/parsers/simple_parser6.h>
++#include <dhcp6/parser_context.h>
  #include <testutils/io_utils.h>
+ #include <testutils/log_utils.h>
  #include <testutils/user_context_utils.h>
- 
diff --git a/kea/patches/patch-src_bin_netconf_netconf__lexer.ll b/kea/patches/patch-src_bin_netconf_netconf__lexer.ll
index 9aead52ed8..631cb768ab 100644
--- a/kea/patches/patch-src_bin_netconf_netconf__lexer.ll
+++ b/kea/patches/patch-src_bin_netconf_netconf__lexer.ll
@@ -3,13 +3,14 @@ $NetBSD$
 * put io_adress.h first so that map from net/if.h on solaris won't confict
   with std::map
 
---- src/bin/netconf/netconf_lexer.ll.orig	2019-11-19 14:50:43.000000000 +0000
+--- src/bin/netconf/netconf_lexer.ll.orig       2022-07-26 06:08:02.000000000 +0000
 +++ src/bin/netconf/netconf_lexer.ll
-@@ -9,12 +9,12 @@
+@@ -9,13 +9,13 @@
  /* Generated files do not make clang static analyser so happy */
  #ifndef __clang_analyzer__
- 
+
 +#include <asiolink/io_address.h>
+ #include <cctype>
  #include <cerrno>
  #include <climits>
  #include <cstdlib>
diff --git a/kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc b/kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc
index d31b5babb9..9751a3cbee 100644
--- a/kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc
+++ b/kea/patches/patch-src_lib_dhcp_iface__mgr__sun.cc
@@ -8,7 +8,7 @@ $NetBSD$
   copyright ISC licensed under mpl-2.0
   https://www.mozilla.org/en-US/MPL/2.0/
 
---- src/lib/dhcp/iface_mgr_sun.cc.orig	2020-01-02 23:01:48.000000000 +0000
+--- src/lib/dhcp/iface_mgr_sun.cc.orig	2022-07-26 06:08:02.000000000 +0000
 +++ src/lib/dhcp/iface_mgr_sun.cc
 @@ -10,6 +10,7 @@
  
@@ -18,7 +18,7 @@ $NetBSD$
  #include <dhcp/pkt_filter_inet.h>
  #include <exceptions/exceptions.h>
  
-@@ -39,7 +40,12 @@ IfaceMgr::detectIfaces() {
+@@ -43,7 +44,12 @@ IfaceMgr::detectIfaces(bool update_only)
          isc_throw(Unexpected, "Network interfaces detection failed.");
      }
  
@@ -32,7 +32,7 @@ $NetBSD$
      IfaceLst::iterator iface_iter;
      IfaceLst ifaces;
  
-@@ -51,6 +57,7 @@ IfaceMgr::detectIfaces() {
+@@ -55,6 +61,7 @@ IfaceMgr::detectIfaces(bool update_only)
          if (!(ifindex = if_nametoindex(ifname))) {
              // Interface name does not have corresponding index ...
              freeifaddrs(iflist);
@@ -40,8 +40,8 @@ $NetBSD$
              isc_throw(Unexpected, "Interface " << ifname << " has no index");
          }
  
-@@ -62,9 +69,26 @@ IfaceMgr::detectIfaces() {
-         IfacePtr iface(new Iface(ifname, ifindex));
+@@ -72,9 +79,26 @@ IfaceMgr::detectIfaces(bool update_only)
+         }
          iface->setFlags(ifptr->ifa_flags);
          ifaces.insert(pair<string, IfacePtr>(ifname, iface));
 +
@@ -68,11 +68,11 @@ $NetBSD$
      for (ifptr = iflist; ifptr != 0; ifptr = ifptr->ifa_next) {
          iface_iter = ifaces.find(ifptr->ifa_name);
          if (iface_iter == ifaces.end()) {
-@@ -72,15 +96,7 @@ IfaceMgr::detectIfaces() {
+@@ -82,15 +106,7 @@ IfaceMgr::detectIfaces(bool update_only)
          }
          // Common byte pointer for following data
          const uint8_t * ptr = 0;
--        if(ifptr->ifa_addr->sa_family == AF_LINK) {
+-        if (ifptr->ifa_addr->sa_family == AF_LINK) {
 -            // HWAddr
 -            struct sockaddr_dl * ldata =
 -                reinterpret_cast<struct sockaddr_dl *>(ifptr->ifa_addr);
@@ -80,20 +80,20 @@ $NetBSD$
 -
 -            iface_iter->second->setHWType(ldata->sdl_type);
 -            iface_iter->second->setMac(ptr, ldata->sdl_alen);
--        } else if(ifptr->ifa_addr->sa_family == AF_INET6) {
-+        if(ifptr->ifa_addr->sa_family == AF_INET6) {
+-        } else if (ifptr->ifa_addr->sa_family == AF_INET6) {
++        if (ifptr->ifa_addr->sa_family == AF_INET6) {
              // IPv6 Addr
              struct sockaddr_in6 * adata =
                  reinterpret_cast<struct sockaddr_in6 *>(ifptr->ifa_addr);
-@@ -100,6 +116,7 @@ IfaceMgr::detectIfaces() {
+@@ -110,6 +126,7 @@ IfaceMgr::detectIfaces(bool update_only)
      }
  
      freeifaddrs(iflist);
 +    close(sock);
  
      // Interfaces registering
-     for(IfaceLst::const_iterator iface_iter = ifaces.begin();
-@@ -124,10 +141,17 @@ void Iface::setFlags(uint64_t flags) {
+     for (IfaceLst::const_iterator iface_iter = ifaces.begin();
+@@ -140,10 +157,17 @@ void Iface::setFlags(uint64_t flags) {
  }
  
  void
diff --git a/kea/patches/patch-src_lib_dhcp_tests_iface__mgr__unittest.cc b/kea/patches/patch-src_lib_dhcp_tests_iface__mgr__unittest.cc
index 747f538094..2074a0c347 100644
--- a/kea/patches/patch-src_lib_dhcp_tests_iface__mgr__unittest.cc
+++ b/kea/patches/patch-src_lib_dhcp_tests_iface__mgr__unittest.cc
@@ -3,9 +3,9 @@ $NetBSD$
 * enable test on illumos
 * use ifru_Addr_sa that is available on illumos and linux
 
---- src/lib/dhcp/tests/iface_mgr_unittest.cc.orig	2020-08-24 16:36:38.000000000 +0000
+--- src/lib/dhcp/tests/iface_mgr_unittest.cc.orig	2022-07-26 06:08:02.000000000 +0000
 +++ src/lib/dhcp/tests/iface_mgr_unittest.cc
-@@ -1636,7 +1636,7 @@ TEST_F(IfaceMgrTest, setPacketFilter6) {
+@@ -1649,7 +1649,7 @@ TEST_F(IfaceMgrTest, setPacketFilter6) {
      EXPECT_NO_THROW(iface_mgr->setPacketFilter(custom_packet_filter));
  }
  
@@ -14,7 +14,7 @@ $NetBSD$
  
  // This test is only supported on Linux and BSD systems. It checks
  // if it is possible to use the IfaceMgr to select the packet filter
-@@ -2716,7 +2716,7 @@ checkIfFlags(const Iface & iface,
+@@ -2782,7 +2782,7 @@ checkIfFlags(const Iface & iface,
  bool
  checkIfAddrs(const Iface & iface, struct ifaddrs *& ifptr) {
      const unsigned char * p = 0;
@@ -23,7 +23,7 @@ $NetBSD$
      // Workaround for Linux ...
      if(ifptr->ifa_data != 0) {
          // We avoid localhost as it has no MAC Address
-@@ -2740,7 +2740,7 @@ checkIfAddrs(const Iface & iface, struct
+@@ -2806,7 +2806,7 @@ checkIfAddrs(const Iface & iface, struct
          }
  
          const uint8_t * p =
diff --git a/kea/patches/patch-src_lib_dhcpsrv_host__data__source__factory.cc b/kea/patches/patch-src_lib_dhcpsrv_host__data__source__factory.cc
index ddccd3d41c..666da259a6 100644
--- a/kea/patches/patch-src_lib_dhcpsrv_host__data__source__factory.cc
+++ b/kea/patches/patch-src_lib_dhcpsrv_host__data__source__factory.cc
@@ -2,9 +2,9 @@ $NetBSD$
 
 * map conflicts with map from net/if.h, use std::map explicitly
 
---- src/lib/dhcpsrv/host_data_source_factory.cc.orig	2019-11-19 14:50:43.000000000 +0000
+--- src/lib/dhcpsrv/host_data_source_factory.cc.orig	2022-07-26 06:08:02.000000000 +0000
 +++ src/lib/dhcpsrv/host_data_source_factory.cc
-@@ -40,7 +40,7 @@ using namespace std;
+@@ -36,7 +36,7 @@ using namespace std;
  namespace isc {
  namespace dhcp {
  
diff --git a/kea/patches/patch-src_lib_dhcpsrv_timer__mgr.cc b/kea/patches/patch-src_lib_dhcpsrv_timer__mgr.cc
deleted file mode 100644
index ab9ebe71d1..0000000000
--- a/kea/patches/patch-src_lib_dhcpsrv_timer__mgr.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-* include map to not break build since std::map is used
-
---- src/lib/dhcpsrv/timer_mgr.cc.orig	2020-10-22 14:29:38.523508022 +0000
-+++ src/lib/dhcpsrv/timer_mgr.cc
-@@ -12,6 +12,7 @@
- #include <exceptions/exceptions.h>
- 
- #include <functional>
-+#include <map>
- #include <utility>
- 
- using namespace isc;
diff --git a/kea/patches/patch-src_lib_util_signal__set.cc b/kea/patches/patch-src_lib_util_signal__set.cc
deleted file mode 100644
index 7bc6966c22..0000000000
--- a/kea/patches/patch-src_lib_util_signal__set.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-* setting SIG_IGN on SIGCHLD removes the result from the child that triggered
-  the signal on solaris/illumos
-
---- src/lib/util/signal_set.cc.orig	2020-01-10 08:19:15.723309083 +0000
-+++ src/lib/util/signal_set.cc
-@@ -118,11 +118,22 @@ SignalSet::invokeOnReceiptHandler(int si
-     struct sigaction sa;
-     struct sigaction prev_sa;
-     memset(&sa, 0, sizeof(sa));
--    sa.sa_handler = SIG_IGN;
-+    
-+    if (sig == SIGCHLD) {
-+        sa.sa_handler = SIG_DFL;
-+    } else {
-+        sa.sa_handler = SIG_IGN;
-+    }
-     if (sigaction(sig, &sa, &prev_sa) < 0) {
-         // Highly unlikely we can get here.
-+        std::string sig_type;
-+        if (sa.sa_handler == SIG_DFL) {
-+            sig_type = "SIG_DFL";
-+        } else {
-+            sig_type = "SIG_IGN";
-+        }
-         const char* errmsg = strerror(errno);
--        isc_throw(SignalSetError, "failed to set SIG_IGN for signal "
-+        isc_throw(SignalSetError, "failed to set " << sig_type << " for signal "
-                   << sig << ": " << errmsg);
-     }
-
Home | Main Index | Thread Index | Old Index