pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/net/kea



Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct 27 15:46:56 UTC 2025

Modified Files:
        pkgsrc/net/kea: Makefile PLIST distinfo options.mk
        pkgsrc/net/kea/patches: patch-src_lib_dhcp_pkt__filter__bpf.cc
Added Files:
        pkgsrc/net/kea/patches: patch-src_bin_keactrl_meson.build
Removed Files:
        pkgsrc/net/kea/patches: patch-config.h.in patch-configure.ac

Log Message:
kea: updated to 3.1.2

3.1.2

The following bug fixes and features have been implemented since the
previous release:

1. **Statistics**: New global address counters, packet statistics, and
statistic commands (`statistics-global-get-all`) were introduced. A fix
for the address miscount was introduced.
The new statistics are:
    - `pkt4-service-disabled` and `pkt6-service-disabled`
    - `assigned-addresses`, `assigned-nas` and `assigned-pds`

2. **Security**: Kea High Availability (HA) now allows specifying HTTP
authentication details in the password file using the
`basic-auth-user-file` parameter. Kea no longer logs the
database password as clear text when `kea-dhcp4` or `kea-dhcp6`
initializes the schema.

3. **Flex-id hook**: The flex-id hook library parameter
`identifier-expression` is now optional; previously, it was mandatory.

4. **RADIUS**: The RADIUS dictionary has been extended to support
includes, vendor attributes, and integer translations to the RADIUS hook
library.

5. **API**: We expanded the `config-get` command to include the location
of the lease file in the "csv-lease-file" entry.

6. **Logging**: Debug-level logging has been expanded with additional
packet details.

7. **Bug fixes**: Kea now rejects the `config-set` and `config-reload`
commands while the lease file cleanup process is running, to avoid file
corruption. We fixed a race condition where starting two Kea
servers could result in deletion of one of the PID files.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/kea/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/kea/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/kea/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/kea/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/net/kea/patches/patch-config.h.in \
    pkgsrc/net/kea/patches/patch-configure.ac
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/kea/patches/patch-src_bin_keactrl_meson.build
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/kea/patches/patch-src_lib_dhcp_pkt__filter__bpf.cc

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

Modified files:

Index: pkgsrc/net/kea/Makefile
diff -u pkgsrc/net/kea/Makefile:1.18 pkgsrc/net/kea/Makefile:1.19
--- pkgsrc/net/kea/Makefile:1.18        Thu Oct 23 20:38:48 2025
+++ pkgsrc/net/kea/Makefile     Mon Oct 27 15:46:56 2025
@@ -1,46 +1,29 @@
-# $NetBSD: Makefile,v 1.18 2025/10/23 20:38:48 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2025/10/27 15:46:56 adam Exp $
 
-DISTNAME=      kea-${VERSION}
+DISTNAME=      kea-3.1.2
 COMMENT=       Next-generation ISC Dynamic Host Configuration Protocol (DHCP) Server
-PKGREVISION=   2
 
 .include "options.mk"
 
-CATEGORIES=            net
-MASTER_SITES=          https://ftp.isc.org/isc/kea/${VERSION}/
+CATEGORIES=    net
+MASTER_SITES=  https://ftp.isc.org/isc/kea/${PKGVERSION_NOREV}/
+EXTRACT_SUFX=  .tar.xz
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://www.isc.org/kea/
+LICENSE=       mpl-2.0
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              https://www.isc.org/kea/
-LICENSE=               mpl-2.0
-
-VERSION=               2.6.3
-
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE=         yes
+USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
-PKG_SYSCONFSUBDIR=     kea
-
-USE_TOOLS+=            autoconf gmake
-USE_LANGUAGES+=                c++ c
-
-RCD_SCRIPTS=           kea
-
-pre-configure:
-       cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
-
-post-install:
-       cd ${DESTDIR} && \
-       mkdir -p ${DESTDIR}${PREFIX}/share/examples/kea && \
-       mv ${DESTDIR}${PKG_SYSCONFDIR}/*.conf \
-               ${DESTDIR}${PREFIX}/share/examples/kea/
 
-BUILD_DEFS+=           VARBASE
-
-CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
+.include "../../mk/bsd.prefs.mk"
 
-MAKE_DIRS+=            ${VARBASE}/lib/kea
-MAKE_DIRS+=            ${VARBASE}/run/kea
+BUILD_DEFS+=   VARBASE
+MAKE_DIRS+=    ${VARBASE}/lib/kea
+MAKE_DIRS+=    ${VARBASE}/run/kea
+MESON_ARGS+=   -Drunstatedir=${VARBASE}
+PY_PATCHPLIST= yes
+RCD_SCRIPTS=   kea
 
 .if ${USE_CROSS_COMPILE:tl} == "yes"
 # This appears to store an absolute path to the bison(1) executable
@@ -48,10 +31,19 @@ MAKE_DIRS+=         ${VARBASE}/run/kea
 CHECK_WRKREF_SKIP+=    lib/libkea-process*
 .endif
 
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+INSTALLATION_DIRS+=    share/examples/kea
+
+post-install:
+       ${RM} -fr ${DESTDIR}${PREFIX}/share/examples/kea && \
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/kea \
+                ${DESTDIR}${PREFIX}/share/examples/kea
+
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/log4cplus/buildlink3.mk"
-
+.include "../../devel/meson/build.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/extension.mk"
+.include "../../lang/python/tool.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/kea/PLIST
diff -u pkgsrc/net/kea/PLIST:1.4 pkgsrc/net/kea/PLIST:1.5
--- pkgsrc/net/kea/PLIST:1.4    Thu Jun  5 15:00:44 2025
+++ pkgsrc/net/kea/PLIST        Mon Oct 27 15:46:56 2025
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2025/06/05 15:00:44 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/10/27 15:46:56 adam Exp $
+bin/kea-msg-compiler
 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
@@ -38,6 +38,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
@@ -46,7 +47,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
@@ -58,18 +58,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
@@ -141,6 +146,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
@@ -192,12 +198,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
@@ -214,6 +223,9 @@ 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
@@ -222,6 +234,7 @@ ${PLIST.mysql}include/kea/dhcpsrv/mysql_
 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
@@ -238,8 +251,6 @@ include/kea/dhcpsrv/parsers/shared_netwo
 include/kea/dhcpsrv/parsers/shared_networks_list_parser.h
 include/kea/dhcpsrv/parsers/simple_parser4.h
 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/random_allocation_state.h
 include/kea/dhcpsrv/random_allocator.h
@@ -314,6 +325,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
@@ -372,6 +384,7 @@ ${PLIST.mysql}include/kea/mysql/mysql_co
 ${PLIST.pgsql}include/kea/pgsql/pgsql_connection.h
 ${PLIST.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
@@ -431,55 +444,114 @@ 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.la
-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
-lib/kea/hooks/libdhcp_perfmon.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
-lib/libkea-dhcpsrv.la
-lib/libkea-dns++.la
-lib/libkea-eval.la
-lib/libkea-exceptions.la
-lib/libkea-hooks.la
-lib/libkea-http.la
-lib/libkea-log.la
-${PLIST.mysql}lib/libkea-mysql.la
-${PLIST.pgsql}lib/libkea-pgsql.la
-lib/libkea-process.la
-lib/libkea-stats.la
-lib/libkea-tcp.la
-lib/libkea-util-io.la
-lib/libkea-util.la
-man/man8/kea-admin.8
-man/man8/kea-ctrl-agent.8
-man/man8/kea-dhcp-ddns.8
-man/man8/kea-dhcp4.8
-man/man8/kea-dhcp6.8
-man/man8/kea-lfc.8
-man/man8/kea-netconf.8
-man/man8/kea-shell.8
-man/man8/keactrl.8
-man/man8/perfdhcp.8
+lib/kea/hooks/libddns_gss_tsig.so
+lib/kea/hooks/libdhcp_bootp.so
+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.so
+lib/kea/hooks/libdhcp_host_cache.so
+lib/kea/hooks/libdhcp_host_cmds.so
+lib/kea/hooks/libdhcp_lease_cmds.so
+lib/kea/hooks/libdhcp_lease_query.so
+lib/kea/hooks/libdhcp_legal_log.so
+lib/kea/hooks/libdhcp_limits.so
+${PLIST.mysql}lib/kea/hooks/libdhcp_mysql_cb.so
+lib/kea/hooks/libdhcp_perfmon.so
+${PLIST.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.so
+lib/kea/hooks/libdhcp_subnet_cmds.so
+lib/libkea-asiodns.so
+lib/libkea-asiodns.so.73
+lib/libkea-asiodns.so.73.0.0
+lib/libkea-asiolink.so
+lib/libkea-asiolink.so.100
+lib/libkea-asiolink.so.100.0.0
+lib/libkea-cc.so
+lib/libkea-cc.so.93
+lib/libkea-cc.so.93.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.94
+lib/libkea-config.so.94.0.0
+lib/libkea-cryptolink.so
+lib/libkea-cryptolink.so.74
+lib/libkea-cryptolink.so.74.0.0
+lib/libkea-d2srv.so
+lib/libkea-d2srv.so.74
+lib/libkea-d2srv.so.74.0.0
+lib/libkea-database.so
+lib/libkea-database.so.87
+lib/libkea-database.so.87.0.0
+lib/libkea-dhcp.so
+lib/libkea-dhcp.so.121
+lib/libkea-dhcp.so.121.0.0
+lib/libkea-dhcp_ddns.so
+lib/libkea-dhcp_ddns.so.78
+lib/libkea-dhcp_ddns.so.78.0.0
+lib/libkea-dhcpsrv.so
+lib/libkea-dhcpsrv.so.142
+lib/libkea-dhcpsrv.so.142.0.0
+lib/libkea-dns.so
+lib/libkea-dns.so.81
+lib/libkea-dns.so.81.0.0
+lib/libkea-eval.so
+lib/libkea-eval.so.96
+lib/libkea-eval.so.96.0.0
+lib/libkea-exceptions.so
+lib/libkea-exceptions.so.55
+lib/libkea-exceptions.so.55.0.0
+lib/libkea-hooks.so
+lib/libkea-hooks.so.131
+lib/libkea-hooks.so.131.0.0
+lib/libkea-http.so
+lib/libkea-http.so.98
+lib/libkea-http.so.98.0.0
+lib/libkea-log-interprocess.so
+lib/libkea-log-interprocess.so.4
+lib/libkea-log-interprocess.so.4.0.0
+lib/libkea-log.so
+lib/libkea-log.so.85
+lib/libkea-log.so.85.0.0
+${PLIST.mysql}lib/libkea-mysql.so
+${PLIST.pgsql}lib/libkea-pgsql.so
+${PLIST.pgsql}lib/libkea-pgsql.so.101
+${PLIST.pgsql}lib/libkea-pgsql.so.101.0.0
+lib/libkea-process.so
+lib/libkea-process.so.102
+lib/libkea-process.so.102.0.0
+lib/libkea-stats.so
+lib/libkea-stats.so.64
+lib/libkea-stats.so.64.0.0
+lib/libkea-tcp.so
+lib/libkea-tcp.so.43
+lib/libkea-tcp.so.43.0.0
+lib/libkea-util-io.so
+lib/libkea-util-io.so.12
+lib/libkea-util-io.so.12.0.0
+lib/libkea-util.so
+lib/libkea-util.so.113
+lib/libkea-util.so.113.0.0
+lib/pkgconfig/kea.pc
+${PYSITELIB}/kea/kea_conn.py
+${PYSITELIB}/kea/kea_conn.pyc
+${PYSITELIB}/kea/kea_connector3.py
+${PYSITELIB}/kea/kea_connector3.pyc
 sbin/kea-admin
 sbin/kea-ctrl-agent
 sbin/kea-dhcp-ddns
 sbin/kea-dhcp4
 sbin/kea-dhcp6
 sbin/kea-lfc
+sbin/kea-shell
 sbin/keactrl
+sbin/perfdhcp
 share/doc/kea/AUTHORS
 share/doc/kea/CONTRIBUTING.md
 share/doc/kea/COPYING
@@ -579,6 +651,7 @@ 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/kea/radius/dictionary
 share/examples/rc.d/kea
 share/kea/api/build-report.json
 share/kea/api/cache-clear.json
@@ -625,6 +698,7 @@ 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/kea-lfc-start.json
 share/kea/api/lease4-add.json
 share/kea/api/lease4-del.json
 share/kea/api/lease4-get-all.json
@@ -643,6 +717,7 @@ 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-by-hw-address.json
 share/kea/api/lease6-get-page.json
 share/kea/api/lease6-get.json
 share/kea/api/lease6-resend-ddns.json
@@ -663,6 +738,8 @@ 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/perfmon-control.json
+share/kea/api/perfmon-get-all-durations.json
 share/kea/api/remote-class4-del.json
 share/kea/api/remote-class4-get-all.json
 share/kea/api/remote-class4-get.json
@@ -752,6 +829,7 @@ 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-global-get-all.json
 share/kea/api/statistic-remove-all.json
 share/kea/api/statistic-remove.json
 share/kea/api/statistic-reset-all.json
@@ -767,13 +845,16 @@ 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-select-test.json
 share/kea/api/subnet4-update.json
+share/kea/api/subnet4o6-select-test.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-select-test.json
 share/kea/api/subnet6-update.json
 share/kea/api/version-get.json
 share/kea/scripts/admin-utils.sh
@@ -811,8 +892,16 @@ share/kea/scripts/mysql/upgrade_018_to_0
 share/kea/scripts/mysql/upgrade_019_to_020.sh
 share/kea/scripts/mysql/upgrade_020_to_021.sh
 share/kea/scripts/mysql/upgrade_021_to_022.sh
-share/kea/scripts/mysql/upgrade_022.0_to_022.1.sh
-share/kea/scripts/mysql/upgrade_022.1_to_022.2.sh
+share/kea/scripts/mysql/upgrade_022_to_023.sh
+share/kea/scripts/mysql/upgrade_023_to_024.sh
+share/kea/scripts/mysql/upgrade_024_to_025.sh
+share/kea/scripts/mysql/upgrade_025_to_026.sh
+share/kea/scripts/mysql/upgrade_026_to_027.sh
+share/kea/scripts/mysql/upgrade_027_to_028.sh
+share/kea/scripts/mysql/upgrade_028_to_029.sh
+share/kea/scripts/mysql/upgrade_029_to_030.sh
+share/kea/scripts/mysql/upgrade_030_to_031.sh
+share/kea/scripts/mysql/upgrade_031_to_032.sh
 share/kea/scripts/mysql/wipe_data.sh
 share/kea/scripts/pgsql/dhcpdb_create.pgsql
 share/kea/scripts/pgsql/dhcpdb_drop.pgsql
@@ -843,6 +932,13 @@ share/kea/scripts/pgsql/upgrade_018_to_0
 share/kea/scripts/pgsql/upgrade_019_to_020.sh
 share/kea/scripts/pgsql/upgrade_020_to_021.sh
 share/kea/scripts/pgsql/upgrade_021_to_022.sh
-share/kea/scripts/pgsql/upgrade_022.0_to_022.1.sh
-share/kea/scripts/pgsql/upgrade_022.1_to_022.2.sh
+share/kea/scripts/pgsql/upgrade_022_to_023.sh
+share/kea/scripts/pgsql/upgrade_023_to_024.sh
+share/kea/scripts/pgsql/upgrade_024_to_025.sh
+share/kea/scripts/pgsql/upgrade_025_to_026.sh
+share/kea/scripts/pgsql/upgrade_026_to_027.sh
+share/kea/scripts/pgsql/upgrade_027_to_028.sh
+share/kea/scripts/pgsql/upgrade_028_to_029.sh
+share/kea/scripts/pgsql/upgrade_029_to_030.sh
+share/kea/scripts/pgsql/upgrade_030_to_031.sh
 share/kea/scripts/pgsql/wipe_data.sh

Index: pkgsrc/net/kea/distinfo
diff -u pkgsrc/net/kea/distinfo:1.5 pkgsrc/net/kea/distinfo:1.6
--- pkgsrc/net/kea/distinfo:1.5 Thu Jun  5 15:00:44 2025
+++ pkgsrc/net/kea/distinfo     Mon Oct 27 15:46:56 2025
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.5 2025/06/05 15:00:44 taca Exp $
+$NetBSD: distinfo,v 1.6 2025/10/27 15:46:56 adam Exp $
 
-BLAKE2s (kea-2.6.3.tar.gz) = cc62f7905be8fb087286f3b6b20dbb309eef82bf64c1d5582f787fdd34a050e0
-SHA512 (kea-2.6.3.tar.gz) = d7781c0b95529bfe89c19615c1dd5952fd4c4b60274e187a641992dad81ef5af921dfb15050ec43169a0c2ad267639642b2e294c5d43405f85a5fb11bb1a939a
-Size (kea-2.6.3.tar.gz) = 10498882 bytes
-SHA1 (patch-config.h.in) = 854ce1d2685f378ee4dcc06d1901e0c7a371bc32
-SHA1 (patch-configure.ac) = 9d70489a402e91fa9db9d576860bcf152d773249
-SHA1 (patch-src_lib_dhcp_pkt__filter__bpf.cc) = 42f0e2c23a6dc8467dd28669b032f63fa11566d4
+BLAKE2s (kea-3.1.2.tar.xz) = d15ca844c284426a966edfd49b3a89df9585aff699769663cde24257158a3f65
+SHA512 (kea-3.1.2.tar.xz) = ffeb849d5310ff27f483e37ad3c34c756d580a84cfb6b4e52096d5d6ae9b599cf45c61fa8540ed4593d5ea2deef820c1fface9077d2cd3e648d5f50038b3ee5e
+Size (kea-3.1.2.tar.xz) = 6666128 bytes
+SHA1 (patch-src_bin_keactrl_meson.build) = 587941248217d989d04c5926feab1b601dce867b
+SHA1 (patch-src_lib_dhcp_pkt__filter__bpf.cc) = 6fbc86f9fcf9889027e3cbfce28b01f7acfe2de4

Index: pkgsrc/net/kea/options.mk
diff -u pkgsrc/net/kea/options.mk:1.1 pkgsrc/net/kea/options.mk:1.2
--- pkgsrc/net/kea/options.mk:1.1       Mon Dec 19 07:44:50 2022
+++ pkgsrc/net/kea/options.mk   Mon Oct 27 15:46:56 2025
@@ -1,15 +1,18 @@
-# $NetBSD: options.mk,v 1.1 2022/12/19 07:44:50 sekiya Exp $
+# $NetBSD: options.mk,v 1.2 2025/10/27 15:46:56 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kea
 PKG_SUPPORTED_OPTIONS+=        botan libyang pgsql mysql
-PKG_SUGGESTED_OPTIONS=
 
 PLIST_VARS+=   pgsql mysql
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mbotan)
-.  include "../../security/botan2/buildlink3.mk"
+MESON_ARGS+=   -Dcrypto=botan
+.  include "../../security/botan3/buildlink3.mk"
+.else
+MESON_ARGS+=   -Dcrypto=openssl
+.  include "../../security/openssl/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibyang)
@@ -18,12 +21,16 @@ PLIST_VARS+=        pgsql mysql
 
 .if !empty(PKG_OPTIONS:Mpgsql)
 .  include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+=       --with-pgsql
+MESON_ARGS+=   -Dpostgresql=enabled
 PLIST.pgsql=   yes
+.else
+MESON_ARGS+=   -Dpostgresql=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
+MESON_ARGS+=   -Dmysql=enabled
 .  include "../../mk/mysql.buildlink3.mk"
-CONFIGURE_ARGS+=       --with-mysql
+MESON_ARGS+=   -Dmysql=disabled
 PLIST.mysql=   yes
+.else
 .endif

Index: pkgsrc/net/kea/patches/patch-src_lib_dhcp_pkt__filter__bpf.cc
diff -u pkgsrc/net/kea/patches/patch-src_lib_dhcp_pkt__filter__bpf.cc:1.1 pkgsrc/net/kea/patches/patch-src_lib_dhcp_pkt__filter__bpf.cc:1.2
--- pkgsrc/net/kea/patches/patch-src_lib_dhcp_pkt__filter__bpf.cc:1.1   Wed Nov 13 14:37:28 2024
+++ pkgsrc/net/kea/patches/patch-src_lib_dhcp_pkt__filter__bpf.cc       Mon Oct 27 15:46:56 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_lib_dhcp_pkt__filter__bpf.cc,v 1.1 2024/11/13 14:37:28 taca Exp $
+$NetBSD: patch-src_lib_dhcp_pkt__filter__bpf.cc,v 1.2 2025/10/27 15:46:56 adam Exp $
 
 * Fix build problem on NetBSD; check if struct bpf_timeval is defined.
 
@@ -8,7 +8,7 @@ $NetBSD: patch-src_lib_dhcp_pkt__filter_
      time_duration usecs(0, 0, 0, bpfh.bh_tstamp.tv_usec);
      timestamp += usecs;
      pkt->addPktEvent(PktEvent::SOCKET_RECEIVED, timestamp);
-+#elif HAVE_BPF_TIMEVAL
++#elif __NetBSD__
 +    // It is dangerous to cast and assign structures or structure pointers
 +    // unless there is a guarantee that the members of struct timeval and
 +    // struct bpf_timeval are defined in the same order and with the same

Added files:

Index: pkgsrc/net/kea/patches/patch-src_bin_keactrl_meson.build
diff -u /dev/null pkgsrc/net/kea/patches/patch-src_bin_keactrl_meson.build:1.1
--- /dev/null   Mon Oct 27 15:46:56 2025
+++ pkgsrc/net/kea/patches/patch-src_bin_keactrl_meson.build    Mon Oct 27 15:46:56 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_bin_keactrl_meson.build,v 1.1 2025/10/27 15:46:56 adam Exp $
+
+Fix sysconfdir.
+
+--- src/bin/keactrl/meson.build.orig   2025-10-27 15:37:31.338812153 +0000
++++ src/bin/keactrl/meson.build
+@@ -3,7 +3,7 @@ keactrl_conf_data.set('PACKAGE', 'kea')
+ keactrl_conf_data.set('exec_prefix', '${prefix}')
+ keactrl_conf_data.set('prefix', PREFIX)
+ keactrl_conf_data.set('sbindir', '${prefix}/' + SBINDIR)
+-keactrl_conf_data.set('sysconfdir', '${prefix}/' + SYSCONFDIR)
++keactrl_conf_data.set('sysconfdir', SYSCONFDIR)
+ if NETCONF_DEP.found()
+     keactrl_conf_data.set('HAVE_NETCONF', 'yes')
+ else



Home | Main Index | Thread Index | Old Index