net/kea: Update to 2.2.0

ChangeLog:	https://downloads.isc.org/isc/kea/2.2.0/Kea-2.2.0-ReleaseNotes.txt
PR:		265469

3 files changed, 76 insertions, 62 deletions

diff --git a/net/kea/Makefile b/net/kea/Makefile
index e64aca6fd29e..366a08d7a729 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	kea
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/-beta/b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ISC/kea/${ISCVERSION}
 DISTNAME=	${PORTNAME}-${ISCVERSION}
@@ -17,7 +16,7 @@ LIB_DEPENDS=	liblog4cplus.so:devel/log4cplus \
 USES=		autoreconf compiler:c++11-lang iconv libtool pathfix ssl cpe
 
 # ISC releases things like 1.4.0-P1, which our versioning doesn't like
-ISCVERSION=	2.0.2
+ISCVERSION=	2.2.0
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/net/kea/distinfo b/net/kea/distinfo
index 6f7106a4b630..48626d9777e6 100644
--- a/net/kea/distinfo
+++ b/net/kea/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646337034
-SHA256 (kea-2.0.2.tar.gz) = 8d28213bdc8e2bb870a383b30ac1e53d54e1eba43d2f86e5151b08b66aa6cf32
-SIZE (kea-2.0.2.tar.gz) = 9796557
+TIMESTAMP = 1658951756
+SHA256 (kea-2.2.0.tar.gz) = da7d90ca62a772602dac6e77e507319038422895ad68eeb142f1487d67d531d2
+SIZE (kea-2.2.0.tar.gz) = 9999074
diff --git a/net/kea/pkg-plist b/net/kea/pkg-plist
index 68fb3deff854..237fcc327827 100644
--- a/net/kea/pkg-plist
+++ b/net/kea/pkg-plist
@@ -130,6 +130,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_template.h
 include/kea/dhcp/protocol_util.h
 include/kea/dhcp/socket_info.h
 include/kea/dhcp/std_option_defs.h
@@ -196,6 +197,7 @@ 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
 %%MYSQL%%include/kea/dhcpsrv/mysql_host_data_source.h
@@ -230,7 +232,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
@@ -377,6 +378,7 @@ 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
@@ -386,6 +388,7 @@ 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
@@ -402,6 +405,7 @@ include/kea/util/pid_file.h
 include/kea/util/pointer_util.h
 include/kea/util/range_utilities.h
 include/kea/util/readwrite_mutex.h
+include/kea/util/reconnect_ctl.h
 include/kea/util/staged_value.h
 include/kea/util/state_model.h
 include/kea/util/stopwatch.h
@@ -409,6 +413,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
@@ -423,86 +428,88 @@ lib/kea/hooks/libdhcp_lease_cmds.a
 lib/kea/hooks/libdhcp_lease_cmds.so
 %%MYSQL%%lib/kea/hooks/libdhcp_mysql_cb.a
 %%MYSQL%%lib/kea/hooks/libdhcp_mysql_cb.so
+%%PGSQL%%lib/kea/hooks/libdhcp_pgsql_cb.a
+%%PGSQL%%lib/kea/hooks/libdhcp_pgsql_cb.so
 lib/kea/hooks/libdhcp_run_script.a
 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/libkea-asiodns.so
-lib/libkea-asiodns.so.14
-lib/libkea-asiodns.so.14.0.0
+lib/libkea-asiodns.so.24
+lib/libkea-asiodns.so.24.0.0
 lib/libkea-asiolink.a
 lib/libkea-asiolink.so
-lib/libkea-asiolink.so.27
-lib/libkea-asiolink.so.27.0.0
+lib/libkea-asiolink.so.40
+lib/libkea-asiolink.so.40.0.0
 lib/libkea-cc.a
 lib/libkea-cc.so
-lib/libkea-cc.so.25
-lib/libkea-cc.so.25.0.0
+lib/libkea-cc.so.39
+lib/libkea-cc.so.39.0.0
 lib/libkea-cfgclient.a
 lib/libkea-cfgclient.so
-lib/libkea-cfgclient.so.25
-lib/libkea-cfgclient.so.25.0.0
+lib/libkea-cfgclient.so.36
+lib/libkea-cfgclient.so.36.0.0
 lib/libkea-cryptolink.a
 lib/libkea-cryptolink.so
-lib/libkea-cryptolink.so.16
-lib/libkea-cryptolink.so.16.0.0
+lib/libkea-cryptolink.so.28
+lib/libkea-cryptolink.so.28.0.0
 lib/libkea-d2srv.a
 lib/libkea-d2srv.so
-lib/libkea-d2srv.so.4
-lib/libkea-d2srv.so.4.0.0
+lib/libkea-d2srv.so.16
+lib/libkea-d2srv.so.16.0.0
 lib/libkea-database.a
 lib/libkea-database.so
-lib/libkea-database.so.23
-lib/libkea-database.so.23.0.0
+lib/libkea-database.so.35
+lib/libkea-database.so.35.0.0
 lib/libkea-dhcp++.a
 lib/libkea-dhcp++.so
-lib/libkea-dhcp++.so.36
-lib/libkea-dhcp++.so.36.0.0
+lib/libkea-dhcp++.so.54
+lib/libkea-dhcp++.so.54.0.0
 lib/libkea-dhcp_ddns.a
 lib/libkea-dhcp_ddns.so
-lib/libkea-dhcp_ddns.so.18
-lib/libkea-dhcp_ddns.so.18.0.0
+lib/libkea-dhcp_ddns.so.29
+lib/libkea-dhcp_ddns.so.29.0.0
 lib/libkea-dhcpsrv.a
 lib/libkea-dhcpsrv.so
-lib/libkea-dhcpsrv.so.51
-lib/libkea-dhcpsrv.so.51.0.0
+lib/libkea-dhcpsrv.so.69
+lib/libkea-dhcpsrv.so.69.0.0
 lib/libkea-dns++.a
 lib/libkea-dns++.so
-lib/libkea-dns++.so.19
-lib/libkea-dns++.so.19.0.0
+lib/libkea-dns++.so.30
+lib/libkea-dns++.so.30.0.0
 lib/libkea-eval.a
 lib/libkea-eval.so
-lib/libkea-eval.so.27
-lib/libkea-eval.so.27.0.0
+lib/libkea-eval.so.39
+lib/libkea-eval.so.39.0.0
 lib/libkea-exceptions.a
 lib/libkea-exceptions.so
 lib/libkea-exceptions.so.13
 lib/libkea-exceptions.so.13.0.0
 lib/libkea-hooks.a
 lib/libkea-hooks.so
-lib/libkea-hooks.so.40
-lib/libkea-hooks.so.40.0.0
+lib/libkea-hooks.so.57
+lib/libkea-hooks.so.57.0.0
 lib/libkea-http.a
 lib/libkea-http.so
-lib/libkea-http.so.30
-lib/libkea-http.so.30.0.0
+lib/libkea-http.so.42
+lib/libkea-http.so.42.0.0
 lib/libkea-log.a
 lib/libkea-log.so
-lib/libkea-log.so.22
-lib/libkea-log.so.22.0.0
+lib/libkea-log.so.35
+lib/libkea-log.so.35.0.0
 %%MYSQL%%lib/libkea-mysql.a
 %%MYSQL%%lib/libkea-mysql.so
-%%MYSQL%%lib/libkea-mysql.so.26
-%%MYSQL%%lib/libkea-mysql.so.26.0.0
+%%MYSQL%%lib/libkea-mysql.so.38
+%%MYSQL%%lib/libkea-mysql.so.38.0.0
 %%PGSQL%%lib/libkea-pgsql.a
 %%PGSQL%%lib/libkea-pgsql.so
-%%PGSQL%%lib/libkea-pgsql.so.20
-%%PGSQL%%lib/libkea-pgsql.so.20.0.0
+%%PGSQL%%lib/libkea-pgsql.so.36
+%%PGSQL%%lib/libkea-pgsql.so.36.0.0
 lib/libkea-process.a
 lib/libkea-process.so
-lib/libkea-process.so.29
-lib/libkea-process.so.29.0.0
+lib/libkea-process.so.40
+lib/libkea-process.so.40.0.0
 lib/libkea-stats.a
 lib/libkea-stats.so
 lib/libkea-stats.so.18
@@ -513,8 +520,8 @@ lib/libkea-util-io.so.0
 lib/libkea-util-io.so.0.0.1
 lib/libkea-util.a
 lib/libkea-util.so
-lib/libkea-util.so.36
-lib/libkea-util.so.36.0.0
+lib/libkea-util.so.52
+lib/libkea-util.so.52.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%%.pyc
 %%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_connector2%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -573,6 +580,8 @@ sbin/keactrl
 %%DATADIR%%/api/gss-tsig-list.json
 %%DATADIR%%/api/gss-tsig-purge-all.json
 %%DATADIR%%/api/gss-tsig-purge.json
+%%DATADIR%%/api/gss-tsig-rekey-all.json
+%%DATADIR%%/api/gss-tsig-rekey.json
 %%DATADIR%%/api/ha-continue.json
 %%DATADIR%%/api/ha-heartbeat.json
 %%DATADIR%%/api/ha-maintenance-cancel.json
@@ -717,23 +726,20 @@ sbin/keactrl
 %%DATADIR%%/api/status-get.json
 %%DATADIR%%/api/subnet4-add.json
 %%DATADIR%%/api/subnet4-del.json
+%%DATADIR%%/api/subnet4-delta-add.json
+%%DATADIR%%/api/subnet4-delta-del.json
 %%DATADIR%%/api/subnet4-get.json
 %%DATADIR%%/api/subnet4-list.json
 %%DATADIR%%/api/subnet4-update.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-update.json
 %%DATADIR%%/api/version-get.json
 %%DATADIR%%/scripts/admin-utils.sh
-%%DATADIR%%/scripts/cql/dhcpdb_create.cql
-%%DATADIR%%/scripts/cql/dhcpdb_drop.cql
-%%DATADIR%%/scripts/cql/upgrade_1.0_to_2.0.sh
-%%DATADIR%%/scripts/cql/upgrade_2.0_to_3.0.sh
-%%DATADIR%%/scripts/cql/upgrade_3.0_to_4.0.sh
-%%DATADIR%%/scripts/cql/upgrade_4.0_to_5.0.sh
-%%DATADIR%%/scripts/cql/wipe_data.sh
 %%DATADIR%%/scripts/mysql/dhcpdb_create.mysql
 %%DATADIR%%/scripts/mysql/dhcpdb_drop.mysql
 %%DATADIR%%/scripts/mysql/upgrade_001.0_to_002.0.sh
@@ -758,20 +764,29 @@ sbin/keactrl
 %%DATADIR%%/scripts/mysql/upgrade_009.6_to_010.0.sh
 %%DATADIR%%/scripts/mysql/upgrade_010_to_011.sh
 %%DATADIR%%/scripts/mysql/upgrade_011_to_012.sh
+%%DATADIR%%/scripts/mysql/upgrade_012_to_013.sh
+%%DATADIR%%/scripts/mysql/upgrade_013_to_014.sh
 %%DATADIR%%/scripts/mysql/wipe_data.sh
 %%DATADIR%%/scripts/pgsql/dhcpdb_create.pgsql
 %%DATADIR%%/scripts/pgsql/dhcpdb_drop.pgsql
-%%DATADIR%%/scripts/pgsql/upgrade_1.0_to_2.0.sh
-%%DATADIR%%/scripts/pgsql/upgrade_2.0_to_3.0.sh
-%%DATADIR%%/scripts/pgsql/upgrade_3.0_to_3.1.sh
-%%DATADIR%%/scripts/pgsql/upgrade_3.1_to_3.2.sh
-%%DATADIR%%/scripts/pgsql/upgrade_3.2_to_3.3.sh
-%%DATADIR%%/scripts/pgsql/upgrade_3.3_to_4.0.sh
-%%DATADIR%%/scripts/pgsql/upgrade_4.0_to_5.0.sh
-%%DATADIR%%/scripts/pgsql/upgrade_5.0_to_5.1.sh
-%%DATADIR%%/scripts/pgsql/upgrade_5.1_to_6.0.sh
-%%DATADIR%%/scripts/pgsql/upgrade_6.0_to_6.1.sh
-%%DATADIR%%/scripts/pgsql/upgrade_6.1_to_6.2.sh
+%%DATADIR%%/scripts/pgsql/upgrade_001.0_to_002.0.sh
+%%DATADIR%%/scripts/pgsql/upgrade_002.0_to_003.0.sh
+%%DATADIR%%/scripts/pgsql/upgrade_003.0_to_003.1.sh
+%%DATADIR%%/scripts/pgsql/upgrade_003.1_to_003.2.sh
+%%DATADIR%%/scripts/pgsql/upgrade_003.2_to_003.3.sh
+%%DATADIR%%/scripts/pgsql/upgrade_003.3_to_004.0.sh
+%%DATADIR%%/scripts/pgsql/upgrade_004.0_to_005.0.sh
+%%DATADIR%%/scripts/pgsql/upgrade_005.0_to_005.1.sh
+%%DATADIR%%/scripts/pgsql/upgrade_005.1_to_006.0.sh
+%%DATADIR%%/scripts/pgsql/upgrade_006.0_to_006.1.sh
+%%DATADIR%%/scripts/pgsql/upgrade_006.1_to_006.2.sh
+%%DATADIR%%/scripts/pgsql/upgrade_006.2_to_007.0.sh
+%%DATADIR%%/scripts/pgsql/upgrade_007_to_008.sh
+%%DATADIR%%/scripts/pgsql/upgrade_008_to_009.sh
+%%DATADIR%%/scripts/pgsql/upgrade_009_to_010.sh
+%%DATADIR%%/scripts/pgsql/upgrade_010_to_011.sh
+%%DATADIR%%/scripts/pgsql/upgrade_011_to_012.sh
+%%DATADIR%%/scripts/pgsql/upgrade_012_to_013.sh
 %%DATADIR%%/scripts/pgsql/wipe_data.sh
 %%SHELL%%@dir %%PYTHON_SITELIBDIR%%/kea/__pycache__
 %%SHELL%%@dir %%PYTHON_SITELIBDIR%%/kea