CVS commit: pkgsrc/net/kea

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Nov 13 14:37:28 UTC 2024

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

Log Message:
net/kea: update to 2.6.1

A patch to fix build problem on NetBSD is provided from Yoshitaka Tokugawa.

Changes are too many to write here, please refer these relase notes.

2.6.0 (2024-05-29)

https://downloads.isc.org/isc/kea/2.6.0/Kea-2.6.0-ReleaseNotes.txt

2.6.1 (2024-07-31)

https://downloads.isc.org/isc/kea/2.6.1/Kea-2.6.1-ReleaseNotes.txt


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/kea/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/kea/PLIST pkgsrc/net/kea/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/kea/patches/patch-config.h.in \
    pkgsrc/net/kea/patches/patch-configure.ac \
    pkgsrc/net/kea/patches/patch-src_lib_dhcp_pkt__filter__bpf.cc
cvs rdiff -u -r1.1 -r0 pkgsrc/net/kea/patches/patch-configure

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.9 pkgsrc/net/kea/Makefile:1.10
--- pkgsrc/net/kea/Makefile:1.9 Fri Oct  4 03:49:33 2024
+++ pkgsrc/net/kea/Makefile     Wed Nov 13 14:37:28 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2024/10/04 03:49:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2024/11/13 14:37:28 taca Exp $
 
 DISTNAME=      kea-${VERSION}
-PKGREVISION=   4
 COMMENT=       Next-generation ISC Dynamic Host Configuration Protocol (DHCP) Server
 
 .include "options.mk"
@@ -13,7 +12,7 @@ MAINTAINER=           sekiya%NetBSD.org@localhost
 HOMEPAGE=              https://www.isc.org/kea/
 LICENSE=               mpl-2.0
 
-VERSION=               2.4.0
+VERSION=               2.6.1
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -21,12 +20,15 @@ GNU_CONFIGURE=              yes
 USE_LIBTOOL=           yes
 PKG_SYSCONFSUBDIR=     kea
 
-USE_TOOLS+=            gmake
+USE_TOOLS+=            autoconf gmake
 USE_LANGUAGES+=                c++ c
 USE_CC_FEATURES+=      c99
 
 RCD_SCRIPTS=           kea
 
+pre-configure:
+       cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} autoconf -f
+
 post-install:
        cd ${DESTDIR} && \
        mkdir -p ${DESTDIR}${PREFIX}/share/examples/kea && \

Index: pkgsrc/net/kea/PLIST
diff -u pkgsrc/net/kea/PLIST:1.2 pkgsrc/net/kea/PLIST:1.3
--- pkgsrc/net/kea/PLIST:1.2    Sat Oct 28 21:51:37 2023
+++ pkgsrc/net/kea/PLIST        Wed Nov 13 14:37:28 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/10/28 21:51:37 sekiya Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/11/13 14:37:28 taca Exp $
 include/kea/asiodns/asiodns_messages.h
 include/kea/asiodns/io_fetch.h
 include/kea/asiodns/logger.h
@@ -18,6 +18,7 @@ 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_mgr.h
 include/kea/asiolink/io_service_signal.h
 include/kea/asiolink/io_service_thread_pool.h
 include/kea/asiolink/io_socket.h
@@ -49,6 +50,9 @@ include/kea/cfgrpt/config_report.h
 include/kea/config.h
 include/kea/config/base_command_mgr.h
 include/kea/config/client_connection.h
+include/kea/config/cmd_http_listener.h
+include/kea/config/cmd_response_creator.h
+include/kea/config/cmd_response_creator_factory.h
 include/kea/config/cmds_impl.h
 include/kea/config/command_mgr.h
 include/kea/config/config_log.h
@@ -70,6 +74,12 @@ 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/d2srv/d2_stats.h
+include/kea/d2srv/d2_tsig_key.h
+include/kea/d2srv/d2_update_message.h
+include/kea/d2srv/d2_zone.h
+include/kea/d2srv/dns_client.h
+include/kea/d2srv/nc_trans.h
 include/kea/database/audit_entry.h
 include/kea/database/backend_selector.h
 include/kea/database/database_connection.h
@@ -94,14 +104,17 @@ include/kea/dhcp/opaque_data_tuple.h
 include/kea/dhcp/option.h
 include/kea/dhcp/option4_addrlst.h
 include/kea/dhcp/option4_client_fqdn.h
+include/kea/dhcp/option4_dnr.h
 include/kea/dhcp/option6_addrlst.h
 include/kea/dhcp/option6_auth.h
 include/kea/dhcp/option6_client_fqdn.h
+include/kea/dhcp/option6_dnr.h
 include/kea/dhcp/option6_ia.h
 include/kea/dhcp/option6_iaaddr.h
 include/kea/dhcp/option6_iaprefix.h
 include/kea/dhcp/option6_pdexclude.h
 include/kea/dhcp/option6_status_code.h
+include/kea/dhcp/option_classless_static_route.h
 include/kea/dhcp/option_custom.h
 include/kea/dhcp/option_data_types.h
 include/kea/dhcp/option_definition.h
@@ -240,7 +253,7 @@ include/kea/dhcpsrv/timer_mgr.h
 include/kea/dhcpsrv/tracking_lease_mgr.h
 include/kea/dhcpsrv/utils.h
 include/kea/dhcpsrv/writable_host_data_source.h
-include/kea/dns/dns_fwd.h
+include/kea/dns/char_string.h
 include/kea/dns/edns.h
 include/kea/dns/exceptions.h
 include/kea/dns/labelsequence.h
@@ -249,33 +262,26 @@ include/kea/dns/master_lexer_inputsource
 include/kea/dns/master_lexer_state.h
 include/kea/dns/master_loader.h
 include/kea/dns/master_loader_callbacks.h
-include/kea/dns/masterload.h
 include/kea/dns/message.h
 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
-include/kea/dns/rdata_pimpl_holder.h
 include/kea/dns/rdataclass.h
-include/kea/dns/rdatafields.h
 include/kea/dns/rrclass.h
-include/kea/dns/rrcollator.h
 include/kea/dns/rrparamregistry.h
 include/kea/dns/rrset.h
-include/kea/dns/rrset_collection.h
-include/kea/dns/rrset_collection_base.h
 include/kea/dns/rrttl.h
 include/kea/dns/rrtype.h
 include/kea/dns/serial.h
+include/kea/dns/time_utils.h
 include/kea/dns/tsig.h
 include/kea/dns/tsigerror.h
 include/kea/dns/tsigkey.h
 include/kea/dns/tsigrecord.h
-include/kea/dns/zone_checker.h
+include/kea/dns/txt_like.h
 include/kea/eval/dependency.h
 include/kea/eval/eval_context.h
 include/kea/eval/eval_context_decl.h
@@ -391,25 +397,18 @@ include/kea/tcp/tcp_stream_msg.h
 include/kea/util/bigints.h
 include/kea/util/boost_time_utils.h
 include/kea/util/buffer.h
+include/kea/util/chrono_time_utils.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
-include/kea/util/encode/base32hex_from_binary.h
-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/encode.h
 include/kea/util/encode/utf8.h
-include/kea/util/file_utilities.h
-include/kea/util/filename.h
+include/kea/util/filesystem.h
 include/kea/util/hash.h
+include/kea/util/io.h
 include/kea/util/io/fd.h
-include/kea/util/io/fd_share.h
 include/kea/util/io/pktinfo_utilities.h
 include/kea/util/io/sockaddr_util.h
-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
@@ -424,9 +423,8 @@ 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/str.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
@@ -437,6 +435,7 @@ 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
@@ -485,6 +484,7 @@ share/doc/kea/CONTRIBUTING.md
 share/doc/kea/COPYING
 share/doc/kea/ChangeLog
 share/doc/kea/README
+share/doc/kea/SECURITY.md
 share/doc/kea/code_of_conduct.md
 share/doc/kea/examples/agent/comments.json
 share/doc/kea/examples/agent/https.json
@@ -509,7 +509,6 @@ share/doc/kea/examples/kea4/classify2.js
 share/doc/kea/examples/kea4/comments.json
 share/doc/kea/examples/kea4/config-backend.json
 share/doc/kea/examples/kea4/dhcpv4-over-dhcpv6.json
-share/doc/kea/examples/kea4/dnr.json
 share/doc/kea/examples/kea4/global-reservations.json
 share/doc/kea/examples/kea4/ha-load-balancing-server1-mt-with-tls.json
 share/doc/kea/examples/kea4/ha-load-balancing-server2-mt.json
@@ -536,7 +535,6 @@ share/doc/kea/examples/kea6/classify2.js
 share/doc/kea/examples/kea6/comments.json
 share/doc/kea/examples/kea6/config-backend.json
 share/doc/kea/examples/kea6/dhcpv4-over-dhcpv6.json
-share/doc/kea/examples/kea6/dnr.json
 share/doc/kea/examples/kea6/duid.json
 share/doc/kea/examples/kea6/global-reservations.json
 share/doc/kea/examples/kea6/ha-hot-standby-server1-with-tls.json
@@ -606,6 +604,7 @@ share/kea/api/config-write.json
 share/kea/api/dhcp-disable.json
 share/kea/api/dhcp-enable.json
 share/kea/api/extended-info4-upgrade.json
+share/kea/api/extended-info6-upgrade.json
 share/kea/api/gss-tsig-get-all.json
 share/kea/api/gss-tsig-get.json
 share/kea/api/gss-tsig-key-del.json
@@ -650,7 +649,6 @@ share/kea/api/lease6-update.json
 share/kea/api/lease6-wipe.json
 share/kea/api/lease6-write.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
@@ -809,6 +807,10 @@ share/kea/scripts/mysql/upgrade_015_to_0
 share/kea/scripts/mysql/upgrade_016_to_017.sh
 share/kea/scripts/mysql/upgrade_017_to_018.sh
 share/kea/scripts/mysql/upgrade_018_to_019.sh
+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_to_022.1.sh
 share/kea/scripts/mysql/wipe_data.sh
 share/kea/scripts/pgsql/dhcpdb_create.pgsql
 share/kea/scripts/pgsql/dhcpdb_drop.pgsql
@@ -835,4 +837,9 @@ share/kea/scripts/pgsql/upgrade_014_to_0
 share/kea/scripts/pgsql/upgrade_015_to_016.sh
 share/kea/scripts/pgsql/upgrade_016_to_017.sh
 share/kea/scripts/pgsql/upgrade_017_to_018.sh
+share/kea/scripts/pgsql/upgrade_018_to_019.sh
+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_to_022.1.sh
 share/kea/scripts/pgsql/wipe_data.sh
Index: pkgsrc/net/kea/distinfo
diff -u pkgsrc/net/kea/distinfo:1.2 pkgsrc/net/kea/distinfo:1.3
--- pkgsrc/net/kea/distinfo:1.2 Sat Oct 28 21:51:37 2023
+++ pkgsrc/net/kea/distinfo     Wed Nov 13 14:37:28 2024
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2023/10/28 21:51:37 sekiya Exp $
+$NetBSD: distinfo,v 1.3 2024/11/13 14:37:28 taca Exp $
 
-BLAKE2s (kea-2.4.0.tar.gz) = d81cd7232631717f2c982ffa9467f5e24f5628d235342dc1c271d293284e051c
-SHA512 (kea-2.4.0.tar.gz) = b0bdb6b6af88e322145ffeb742a818d6e225846ff981ecc4925d311870db94e0c5a4eb0e1140f146624f64b636c9b24148b5efbc32e62a19b99bba0810b54654
-Size (kea-2.4.0.tar.gz) = 10462721 bytes
-SHA1 (patch-configure) = f90136c624f291e6b4fbe28ebd0f14046479b261
+BLAKE2s (kea-2.6.1.tar.gz) = fbc82aa775b8cb7624d6051ba6276283b387d1e5273e4737e56ad96f380ae890
+SHA512 (kea-2.6.1.tar.gz) = 23a4c431117097538a15afd8a28016b49db5490f866aa03abd2bdfef5eaab5031491320acdf3097899d4b071cccff4b53c032ff076b13cab853e063aaa2810ec
+Size (kea-2.6.1.tar.gz) = 10467190 bytes
+SHA1 (patch-config.h.in) = 854ce1d2685f378ee4dcc06d1901e0c7a371bc32
+SHA1 (patch-configure.ac) = 9d70489a402e91fa9db9d576860bcf152d773249
+SHA1 (patch-src_lib_dhcp_pkt__filter__bpf.cc) = 42f0e2c23a6dc8467dd28669b032f63fa11566d4

Added files:

Index: pkgsrc/net/kea/patches/patch-config.h.in
diff -u /dev/null pkgsrc/net/kea/patches/patch-config.h.in:1.1
--- /dev/null   Wed Nov 13 14:37:28 2024
+++ pkgsrc/net/kea/patches/patch-config.h.in    Wed Nov 13 14:37:28 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-config.h.in,v 1.1 2024/11/13 14:37:28 taca Exp $
+
+* Check if struct bpf_timeval is defined.
+
+--- config.h.in.orig   2024-07-25 08:51:15.000000000 +0000
++++ config.h.in
+@@ -69,6 +69,9 @@
+ /* Define to 1 if you have the <botan/botan.h> header file. */
+ #undef HAVE_BOTAN_BOTAN_H
+ 
++/* Define to 1 if you have struct bpf_timeval is defined. */
++#undef HAVE_BPF_TIMEVAL
++
+ /* Define to 1 if getsockopt(IPV6_USE_MIN_MTU) does not work */
+ #undef HAVE_BROKEN_GET_IPV6_USE_MIN_MTU
+ 
Index: pkgsrc/net/kea/patches/patch-configure.ac
diff -u /dev/null pkgsrc/net/kea/patches/patch-configure.ac:1.1
--- /dev/null   Wed Nov 13 14:37:28 2024
+++ pkgsrc/net/kea/patches/patch-configure.ac   Wed Nov 13 14:37:28 2024
@@ -0,0 +1,38 @@
+$NetBSD: patch-configure.ac,v 1.1 2024/11/13 14:37:28 taca Exp $
+
+* Fix for portability
+* Check if struct bpf_timeval is defined.
+
+--- configure.ac.orig  2024-07-25 08:51:01.000000000 +0000
++++ configure.ac
+@@ -653,6 +653,21 @@ AC_COMPILE_IFELSE(
+   [AC_MSG_RESULT(no)]
+ )
+ 
++AC_MSG_CHECKING(for struct bpf_timeval)
++AC_COMPILE_IFELSE(
++  [AC_LANG_PROGRAM([[
++    #include <sys/types.h>
++    #include <net/bpf.h>
++  ]], [[
++    struct bpf_timeval btv;
++    btv.tv_sec = 0;
++    return (0);
++  ]])],
++  [AC_MSG_RESULT(yes)
++   AC_DEFINE(HAVE_BPF_TIMEVAL, 1, [Define to 1 if struct bpf_timeval is defined])],
++  [AC_MSG_RESULT(no)]
++)
++
+ usable_regex=
+ AC_MSG_CHECKING(for usable C++11 regex)
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+@@ -1374,7 +1389,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)
+ 
Index: pkgsrc/net/kea/patches/patch-src_lib_dhcp_pkt__filter__bpf.cc
diff -u /dev/null pkgsrc/net/kea/patches/patch-src_lib_dhcp_pkt__filter__bpf.cc:1.1
--- /dev/null   Wed Nov 13 14:37:28 2024
+++ pkgsrc/net/kea/patches/patch-src_lib_dhcp_pkt__filter__bpf.cc       Wed Nov 13 14:37:28 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_lib_dhcp_pkt__filter__bpf.cc,v 1.1 2024/11/13 14:37:28 taca Exp $
+
+* Fix build problem on NetBSD; check if struct bpf_timeval is defined.
+
+--- src/lib/dhcp/pkt_filter_bpf.cc.orig        2024-07-25 08:50:58.000000000 +0000
++++ src/lib/dhcp/pkt_filter_bpf.cc
+@@ -547,6 +547,16 @@ PktFilterBPF::receive(Iface& iface, cons
+     time_duration usecs(0, 0, 0, bpfh.bh_tstamp.tv_usec);
+     timestamp += usecs;
+     pkt->addPktEvent(PktEvent::SOCKET_RECEIVED, timestamp);
++#elif HAVE_BPF_TIMEVAL
++    // 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
++    // types. Here, instead of casting, we are assigning the values to
++    // the structure members individually.
++    struct timeval timestamp;
++    timestamp.tv_sec = bpfh.bh_tstamp.tv_sec;
++    timestamp.tv_usec = bpfh.bh_tstamp.tv_usec;
++    pkt->addPktEvent(PktEvent::SOCKET_RECEIVED, timestamp);
+ #else
+     pkt->addPktEvent(PktEvent::SOCKET_RECEIVED, bpfh.bh_tstamp);
+ #endif