sync kea-git patches and other files

sync patches and other files with kea git as of 20201213

kea-git/Makefile

@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKGNAME=	kea-git-1.7
+PKGNAME=	kea-git-1.9
 CATEGORIES=	net
 GIT_REPO=	https://gitlab.isc.org/isc-projects/kea.git
 GIT_ENV=	GIT_SSL_NO_VERIFY=true

kea-git/PLIST

@@ -138,6 +138,7 @@ include/kea/dhcpsrv/cfg_hosts.h
 include/kea/dhcpsrv/cfg_hosts_util.h
 include/kea/dhcpsrv/cfg_iface.h
 include/kea/dhcpsrv/cfg_mac_source.h
+include/kea/dhcpsrv/cfg_multi_threading.h
 include/kea/dhcpsrv/cfg_option.h
 include/kea/dhcpsrv/cfg_option_def.h
 include/kea/dhcpsrv/cfg_rsoo.h
@@ -161,12 +162,15 @@ 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
@@ -189,6 +193,7 @@ include/kea/dhcpsrv/parsers/expiration_config_parser.h
 include/kea/dhcpsrv/parsers/host_reservation_parser.h
 include/kea/dhcpsrv/parsers/host_reservations_list_parser.h
 include/kea/dhcpsrv/parsers/ifaces_config_parser.h
+include/kea/dhcpsrv/parsers/multi_threading_config_parser.h
 include/kea/dhcpsrv/parsers/option_data_parser.h
 include/kea/dhcpsrv/parsers/sanity_checks_parser.h
 include/kea/dhcpsrv/parsers/shared_network_parser.h
@@ -198,6 +203,7 @@ include/kea/dhcpsrv/parsers/simple_parser6.h
 ${PLIST.pgsql}include/kea/dhcpsrv/pgsql_host_data_source.h
 ${PLIST.pgsql}include/kea/dhcpsrv/pgsql_lease_mgr.h
 include/kea/dhcpsrv/pool.h
+include/kea/dhcpsrv/resource_handler.h
 include/kea/dhcpsrv/sanity_checker.h
 include/kea/dhcpsrv/shared_network.h
 include/kea/dhcpsrv/srv_config.h
@@ -269,6 +275,9 @@ 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/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
@@ -353,6 +362,7 @@ 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/filename.h
 include/kea/util/hash.h
 include/kea/util/io/fd.h
@@ -363,6 +373,7 @@ include/kea/util/io_utilities.h
 include/kea/util/labeled_value.h
 include/kea/util/memory_segment.h
 include/kea/util/memory_segment_local.h
+include/kea/util/multi_threading_mgr.h
 include/kea/util/optional.h
 include/kea/util/pid_file.h
 include/kea/util/pointer_util.h
@@ -370,13 +381,16 @@ 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/staged_value.h
 include/kea/util/state_model.h
 include/kea/util/stopwatch.h
 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/unlock_guard.h
 include/kea/util/versioned_csv_file.h
 include/kea/util/watch_socket.h
 include/kea/util/watched_thread.h
@@ -407,15 +421,15 @@ lib/libkea-process.la
 lib/libkea-stats.la
 lib/libkea-util-io.la
 lib/libkea-util.la
-${PYSITELIB}/kea/kea_conn.pyo
-${PYSITELIB}/kea/kea_conn.pyc
-${PYSITELIB}/kea/kea_connector2.pyo
-${PYSITELIB}/kea/kea_connector2.pyc
-${PYSITELIB}/kea/kea_connector3.pyo
-${PYSITELIB}/kea/kea_connector3.pyc
 ${PYSITELIB}/kea/kea_conn.py
+${PYSITELIB}/kea/kea_conn.pyc
+${PYSITELIB}/kea/kea_conn.pyo
 ${PYSITELIB}/kea/kea_connector2.py
+${PYSITELIB}/kea/kea_connector2.pyc
+${PYSITELIB}/kea/kea_connector2.pyo
 ${PYSITELIB}/kea/kea_connector3.py
+${PYSITELIB}/kea/kea_connector3.pyc
+${PYSITELIB}/kea/kea_connector3.pyo
 sbin/kea-admin
 sbin/kea-ctrl-agent
 sbin/kea-dhcp-ddns
@@ -429,6 +443,7 @@ share/doc/kea/CONTRIBUTING.md
 share/doc/kea/COPYING
 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/simple.json
 share/doc/kea/examples/ddns/comments.json
@@ -440,6 +455,7 @@ 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
@@ -463,6 +479,7 @@ 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
@@ -496,12 +513,179 @@ 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/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/examples/rc.d/kea
+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/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-scopes.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-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-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-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
@@ -525,6 +709,11 @@ 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_9.3_to_9.4.sh
+share/kea/scripts/mysql/upgrade_9.4_to_9.5.sh
 share/kea/scripts/mysql/wipe_data.sh
 share/kea/scripts/pgsql/dhcpdb_create.pgsql
 share/kea/scripts/pgsql/dhcpdb_drop.pgsql
@@ -537,4 +726,6 @@ 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_6.1_to_6.2.sh
 share/kea/scripts/pgsql/wipe_data.sh

kea-git/distinfo

@@ -5,21 +5,16 @@ RMD160 (kea-1.6.1.tar.gz) = 261b0ea1bca0a70034532112011c64ad809c37ec
 SHA512 (kea-1.6.1.tar.gz) = 4220f46fc185f4434ad01886d2d43ba1f9dcca57f5afa33235c8593269220a79e2dcb4ad71298dec868444c29e7cb6febe66a1456fdc116a2d9fd3f019f740d8
 Size (kea-1.6.1.tar.gz) = 7155604 bytes
 SHA1 (patch-Makefile.am) = 4e4896be44290114160be878666878bb44d71a8e
-SHA1 (patch-configure.ac) = 70d7a8235ed6459a23f5404303d5babfdfec14db
-SHA1 (patch-src_bin_agent_agent__lexer.ll) = de64c9ad03b1c6812f95f52c8fcd5f6c1aa1ef27
-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) = 6f213d5abd286b57c41b6fad27ada49c9301857a
-SHA1 (patch-src_bin_dhcp6_dhcp6__lexer.ll) = 6ebeb6b18dc8d86d0890ce3cfcaeea4c2658e958
-SHA1 (patch-src_bin_dhcp6_tests_parser__unittest.cc) = f671c6b5c26a6b6179971f2f10af8e2b1b8b7e6a
+SHA1 (patch-configure.ac) = fe7317af048408a86d76cbfe2b7567569160d92e
+SHA1 (patch-m4macros_ax__gtest.m4) = 100a19c1f81f8b502ae06e0c1549ed5acf2a4a1a
 SHA1 (patch-src_bin_keactrl_Makefile.am) = 5b6fd816da6011858d1167d297c83eda7947efd7
-SHA1 (patch-src_bin_netconf_netconf__lexer.ll) = ec316d436f791470df9dd5c106c76f3026a19b0e
 SHA1 (patch-src_lib_dhcp_Makefile.am) = 452036d0100a85f41c52562292931bea2501e396
 SHA1 (patch-src_lib_dhcp_iface__mgr__sun.cc) = ca4330b27adfa12b1ff6c6cc54c8c30f89f9851f
 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) = 8e274dbb5d9897ccd1708e4007cbe69ab2db0ef5
+SHA1 (patch-src_lib_dhcp_tests_iface__mgr__unittest.cc) = 080d9d1af4c6dc65604ddffe8f05b31a3151049f
 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) = 70e22c5cd161d50cb84585baa88f3fd31238546f
 SHA1 (patch-src_lib_util_signal__set.cc) = f060fcedecb8ccdda997fbef2040dab82c620cb0
 SHA1 (patch-src_lib_util_watch__socket.cc) = ab55b5e613bc431dcd92ef68bf3501a7e4aca7de

kea-git/options.mk

@@ -29,6 +29,11 @@ REPLACE_BASH+= src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
 REPLACE_BASH+= src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh.in
 REPLACE_BASH+= src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh.in
 REPLACE_BASH+= src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh.in
+REPLACE_BASH+= src/share/database/scripts/mysql/upgrade_9.0_to_9.1.sh.in
+REPLACE_BASH+= src/share/database/scripts/mysql/upgrade_9.1_to_9.2.sh.in
+REPLACE_BASH+= src/share/database/scripts/mysql/upgrade_9.2_to_9.3.sh.in
+REPLACE_BASH+= src/share/database/scripts/mysql/upgrade_9.3_to_9.4.sh.in
+REPLACE_BASH+= src/share/database/scripts/mysql/upgrade_9.4_to_9.5.sh.in
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
@@ -45,6 +50,8 @@ REPLACE_BASH+= src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh.in
 REPLACE_BASH+= src/share/database/scripts/pgsql/upgrade_5.1_to_6.0.sh.in
 REPLACE_BASH+= src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh.in
 REPLACE_BASH+= src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh.in
+REPLACE_BASH+= src/share/database/scripts/pgsql/upgrade_6.0_to_6.1.sh.in
+REPLACE_BASH+= src/share/database/scripts/pgsql/upgrade_6.1_to_6.2.sh.in
 .endif
 
 .if !empty(PKG_OPTIONS:Mtests)

kea-git/patches/patch-configure.ac

@@ -2,9 +2,9 @@ $NetBSD$
 
 * fix compatability errors
 
---- configure.ac.orig	2019-12-30 16:00:16.704565254 +0000
+--- configure.ac.orig	2020-12-12 08:24:07.206582654 +0000
 +++ configure.ac
-@@ -1391,7 +1391,7 @@ if test "x$enable_generate_parser" != "x
+@@ -1299,7 +1299,7 @@ if test "x$enable_generate_parser" != "x
         AC_MSG_ERROR([Flex is required for enable-generate-parser, but was not found])
      fi
  
@@ -13,7 +13,7 @@ $NetBSD$
         AC_MSG_ERROR([Bison is required for enable-generate-parser, but was not found])
      fi
  
-@@ -1515,7 +1515,7 @@ if test "x$enable_generate_docs" != xno
+@@ -1423,7 +1423,7 @@ if test "x$enable_generate_docs" != xno 
  
    if test -z "$PDFLATEX"; then
      PDFLATEX=no
@@ -22,3 +22,12 @@ $NetBSD$
      AC_MSG_CHECKING([for pdflatex])
      AC_MSG_RESULT([no (disabled)])
    else
+@@ -1473,7 +1473,7 @@ else
+   fi
+   generate_docs_report="no"
+ fi
+-AM_CONDITIONAL(INSTALL_MANS, test "x$install_mans" == "xyes")
++AM_CONDITIONAL(INSTALL_MANS, test "x$install_mans" = "xyes")
+ AM_CONDITIONAL(HAVE_PDFLATEX, test "x$PDFLATEX" != "xno")
+ AM_CONDITIONAL(GENERATE_DOCS, test x$enable_generate_docs != xno)
+ 

kea-git/patches/patch-m4macros_ax__gtest.m4

@@ -0,0 +1,15 @@
+$NetBSD$
+
+* fix compatability errors
+
+--- m4macros/ax_gtest.m4.orig	2020-11-03 13:32:31.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

kea-git/patches/patch-src_bin_agent_agent__lexer.ll

@@ -1,21 +0,0 @@
-$NetBSD$
-
-* put io_adress.h first so that map from net/if.h on solaris won't confict
-  with std::map
-
---- src/bin/agent/agent_lexer.ll.orig	2019-11-19 14:50:43.000000000 +0000
-+++ src/bin/agent/agent_lexer.ll
-@@ -9,12 +9,12 @@
- /* Generated files do not make clang static analyser so happy */
- #ifndef __clang_analyzer__
- 
-+#include <asiolink/io_address.h>
- #include <cerrno>
- #include <climits>
- #include <cstdlib>
- #include <string>
- #include <agent/parser_context.h>
--#include <asiolink/io_address.h>
- #include <boost/lexical_cast.hpp>
- #include <exceptions/exceptions.h>
- #include <cc/dhcp_config_error.h>

kea-git/patches/patch-src_bin_d2_d2__lexer.ll

@@ -1,21 +0,0 @@
-$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
-@@ -9,12 +9,12 @@
- /* Generated files do not make clang static analyser so happy */
- #ifndef __clang_analyzer__
- 
-+#include <asiolink/io_address.h>
- #include <cerrno>
- #include <climits>
- #include <cstdlib>
- #include <string>
- #include <d2/parser_context.h>
--#include <asiolink/io_address.h>
- #include <boost/lexical_cast.hpp>
- #include <exceptions/exceptions.h>
- 

kea-git/patches/patch-src_bin_dhcp4_dhcp4__lexer.ll

@@ -1,21 +0,0 @@
-$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
-@@ -9,12 +9,12 @@
- /* Generated files do not make clang static analyser so happy */
- #ifndef __clang_analyzer__
- 
-+#include <asiolink/io_address.h>
- #include <cerrno>
- #include <climits>
- #include <cstdlib>
- #include <string>
- #include <dhcp4/parser_context.h>
--#include <asiolink/io_address.h>
- #include <boost/lexical_cast.hpp>
- #include <exceptions/exceptions.h>
- 

kea-git/patches/patch-src_bin_dhcp4_tests_parser__unittest.cc

@@ -1,18 +0,0 @@
-$NetBSD$
-
-* put inclusion of asiolink on top so that std::map does not conlict with
-  map in net/if.h on illumos
-
---- src/bin/dhcp4/tests/parser_unittest.cc.orig	2020-01-02 23:01:48.000000000 +0000
-+++ src/bin/dhcp4/tests/parser_unittest.cc
-@@ -6,9 +6,9 @@
- 
- #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 <testutils/io_utils.h>
- #include <testutils/user_context_utils.h>
- 

kea-git/patches/patch-src_bin_dhcp6_dhcp6__lexer.ll

@@ -1,21 +0,0 @@
-$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
-@@ -9,12 +9,12 @@
- /* Generated files do not make clang static analyser so happy */
- #ifndef __clang_analyzer__
- 
-+#include <asiolink/io_address.h>
- #include <cerrno>
- #include <climits>
- #include <cstdlib>
- #include <string>
- #include <dhcp6/parser_context.h>
--#include <asiolink/io_address.h>
- #include <boost/lexical_cast.hpp>
- #include <exceptions/exceptions.h>
- 

kea-git/patches/patch-src_bin_dhcp6_tests_parser__unittest.cc

@@ -1,18 +0,0 @@
-$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
-@@ -6,9 +6,9 @@
- 
- #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 <testutils/io_utils.h>
- #include <testutils/user_context_utils.h>
- 

kea-git/patches/patch-src_bin_netconf_netconf__lexer.ll

@@ -1,21 +0,0 @@
-$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
-@@ -9,12 +9,12 @@
- /* Generated files do not make clang static analyser so happy */
- #ifndef __clang_analyzer__
- 
-+#include <asiolink/io_address.h>
- #include <cerrno>
- #include <climits>
- #include <cstdlib>
- #include <string>
- #include <netconf/parser_context.h>
--#include <asiolink/io_address.h>
- #include <boost/lexical_cast.hpp>
- #include <exceptions/exceptions.h>
- #include <cc/dhcp_config_error.h>

kea-git/patches/patch-src_lib_dhcp_tests_iface__mgr__unittest.cc

@@ -3,18 +3,18 @@ $NetBSD$
 * enable test on illumos
 * use ifru_addr_sa that is available both on illumos and linux
 
---- src/lib/dhcp/tests/iface_mgr_unittest.cc.orig	2020-01-02 23:01:48.000000000 +0000
+--- src/lib/dhcp/tests/iface_mgr_unittest.cc.orig	2020-12-12 08:24:07.381603286 +0000
 +++ src/lib/dhcp/tests/iface_mgr_unittest.cc
-@@ -1569,7 +1569,7 @@ TEST_F(IfaceMgrTest, setPacketFilter6) {
+@@ -1636,7 +1636,7 @@ TEST_F(IfaceMgrTest, setPacketFilter6) {
+     EXPECT_NO_THROW(iface_mgr->setPacketFilter(custom_packet_filter));
  }
  
- 
 -#if defined OS_LINUX || OS_BSD
 +#if defined OS_LINUX || OS_BSD || OS_SOLARIS
  
  // 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
-@@ -2600,7 +2600,7 @@ checkIfFlags(const Iface & iface,
+@@ -2716,7 +2716,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
-@@ -2624,7 +2624,7 @@ checkIfAddrs(const Iface & iface, struct
+@@ -2740,7 +2740,7 @@ checkIfAddrs(const Iface & iface, struct
          }
  
          const uint8_t * p =

kea-git/patches/patch-src_lib_dhcpsrv_timer__mgr.cc

@@ -0,0 +1,14 @@
+$NetBSD$
+
+* include map to fix build breaks since std::map is used
+
+--- src/lib/dhcpsrv/timer_mgr.cc.orig	2020-12-12 08:24:07.447946607 +0000
++++ src/lib/dhcpsrv/timer_mgr.cc
+@@ -15,6 +15,7 @@
+ #include <boost/scoped_ptr.hpp>
+ 
+ #include <functional>
++#include <map>
+ #include <utility>
+ 
+ using namespace isc;