Date: Thu, 30 May 2024 05:59:05 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d2749ec0735c - main - net/kea: Update to 2.6.0 Message-ID: <202405300559.44U5x5Wp052387@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2749ec0735c69172fa362082cdf06ced5f259fe commit d2749ec0735c69172fa362082cdf06ced5f259fe Author: Andrey Pevnev <apevnev@me.com> AuthorDate: 2024-05-30 05:54:32 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2024-05-30 05:58:38 +0000 net/kea: Update to 2.6.0 - Use DISTVERSION to account for upstream release numbering strategy - Cleanup Makefile, reorder/sort variables - Put WANT_PGSQL inside optional PGSQL_VARS PR: 279376 --- net/kea/Makefile | 64 +++++++++++---------- net/kea/distinfo | 6 +- net/kea/pkg-plist | 163 ++++++++++++++++++++++++++++-------------------------- 3 files changed, 119 insertions(+), 114 deletions(-) diff --git a/net/kea/Makefile b/net/kea/Makefile index 9a24ecf1ea45..d4bb7bf1d2eb 100644 --- a/net/kea/Makefile +++ b/net/kea/Makefile @@ -1,9 +1,7 @@ PORTNAME= kea -PORTVERSION= ${ISCVERSION:S/-P/P/:S/-beta/b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 2 +DISTVERSION= 2.6.0 CATEGORIES= net -MASTER_SITES= ISC/kea/${ISCVERSION} -DISTNAME= ${PORTNAME}-${ISCVERSION} +MASTER_SITES= ISC/kea/${DISTVERSION} MAINTAINER= apevnev@me.com COMMENT= Alternative DHCP implementation by ISC @@ -12,51 +10,51 @@ WWW= https://kea.isc.org/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= liblog4cplus.so:devel/log4cplus \ - libboost_system.so:devel/boost-libs +LIB_DEPENDS= libboost_system.so:devel/boost-libs \ + 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.4.1 +USES= autoreconf compiler:c++11-lang cpe iconv libtool pathfix ssl CPE_VENDOR= isc -CPE_VERSION= ${ISCVERSION:C/-.*//} -.if ${ISCVERSION:M*-*} -CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} +CPE_VERSION= ${DISTVERSION:C/-.*//} +.if ${DISTVERSION:M*-*} +CPE_UPDATE= ${DISTVERSION:C/.*-//:tl} .endif -USE_LDCONFIG= yes -USE_RC_SUBR= ${PORTNAME} -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE} \ - --with-log4cplus=${LOCALBASE} \ - --with-boost-include=${LOCALBASE}/include \ - --with-boost-lib-dir=${LOCALBASE}/lib \ - --without-werror -INSTALL_TARGET= install-strip -TEST_TARGET= check - -PORTDOCS= AUTHORS COPYING ChangeLog README \ - CONTRIBUTING.md examples code_of_conduct.md \ - platforms.rst +USE_LDCONFIG= yes +USE_RC_SUBR= ${PORTNAME} +GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share +CONFIGURE_ARGS= --with-boost-include=${LOCALBASE}/include \ + --with-boost-lib-dir=${LOCALBASE}/lib \ + --with-log4cplus=${LOCALBASE} \ + --with-openssl=${OPENSSLBASE} \ + --without-werror +INSTALL_TARGET= install-strip +TEST_TARGET= check + +PORTDOCS= AUTHORS CONTRIBUTING.md COPYING ChangeLog README SECURITY.md \ + code_of_conduct.md examples platforms.rst OPTIONS_DEFINE= DOCS MYSQL PGSQL SHELL OPTIONS_SUB= yes -MYSQL_USES= mysql + +SHELL_DESC= Install kea-shell(8) (Python) + +MYSQL_USES= mysql MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config MYSQL_CONFIGURE_OFF= --without-mysql MYSQL_SUB_LIST= REQ_MYSQL=mysql MYSQL_SUB_LIST_OFF= REQ_MYSQL="" -PGSQL_USES= pgsql -WANT_PGSQL= client + +PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE}/bin/pg_config PGSQL_CONFIGURE_OFF= --without-pgsql PGSQL_SUB_LIST= REQ_PGSQL=postgresql PGSQL_SUB_LIST_OFF= REQ_PGSQL="" -SHELL_DESC= Install kea-shell(8) (Python) -SHELL_USES= python +PGSQL_VARS= WANT_PGSQL=client + +SHELL_USES= python SHELL_CONFIGURE_ON= --enable-shell .include <bsd.port.mk> diff --git a/net/kea/distinfo b/net/kea/distinfo index 4f0da67862f5..e58639e78ebf 100644 --- a/net/kea/distinfo +++ b/net/kea/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701358723 -SHA256 (kea-2.4.1.tar.gz) = 815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a -SIZE (kea-2.4.1.tar.gz) = 10487415 +TIMESTAMP = 1716958377 +SHA256 (kea-2.6.0.tar.gz) = 207ceae33eb3b81ec4e6ac5605249a85b93779333b62aadf39e489f11dbcdc8d +SIZE (kea-2.6.0.tar.gz) = 10459190 diff --git a/net/kea/pkg-plist b/net/kea/pkg-plist index 0c6b140e0e82..ddc1e7934311 100644 --- a/net/kea/pkg-plist +++ b/net/kea/pkg-plist @@ -22,6 +22,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 @@ -53,6 +54,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 @@ -74,6 +78,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 @@ -98,14 +108,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 @@ -244,7 +257,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 @@ -253,33 +266,26 @@ include/kea/dns/master_lexer_inputsource.h 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 @@ -395,25 +401,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 @@ -428,9 +427,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 @@ -446,6 +444,8 @@ 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 +lib/kea/hooks/libdhcp_perfmon.a +lib/kea/hooks/libdhcp_perfmon.so %%PGSQL%%lib/kea/hooks/libdhcp_pgsql_cb.a %%PGSQL%%lib/kea/hooks/libdhcp_pgsql_cb.so lib/kea/hooks/libdhcp_run_script.a @@ -454,112 +454,102 @@ 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.35 -lib/libkea-asiodns.so.35.0.0 +lib/libkea-asiodns.so.48 +lib/libkea-asiodns.so.48.0.0 lib/libkea-asiolink.a lib/libkea-asiolink.so -lib/libkea-asiolink.so.56 -lib/libkea-asiolink.so.56.0.0 +lib/libkea-asiolink.so.71 +lib/libkea-asiolink.so.71.0.0 lib/libkea-cc.a lib/libkea-cc.so -lib/libkea-cc.so.54 -lib/libkea-cc.so.54.0.0 +lib/libkea-cc.so.68 +lib/libkea-cc.so.68.0.0 lib/libkea-cfgclient.a lib/libkea-cfgclient.so -lib/libkea-cfgclient.so.51 -lib/libkea-cfgclient.so.51.0.0 +lib/libkea-cfgclient.so.65 +lib/libkea-cfgclient.so.65.0.0 lib/libkea-cryptolink.a lib/libkea-cryptolink.so -lib/libkea-cryptolink.so.38 -lib/libkea-cryptolink.so.38.0.0 +lib/libkea-cryptolink.so.50 +lib/libkea-cryptolink.so.50.0.0 lib/libkea-d2srv.a lib/libkea-d2srv.so -lib/libkea-d2srv.so.30 -lib/libkea-d2srv.so.30.0.0 +lib/libkea-d2srv.so.46 +lib/libkea-d2srv.so.46.0.0 lib/libkea-database.a lib/libkea-database.so -lib/libkea-database.so.48 -lib/libkea-database.so.48.0.0 +lib/libkea-database.so.61 +lib/libkea-database.so.61.0.0 lib/libkea-dhcp++.a lib/libkea-dhcp++.so -lib/libkea-dhcp++.so.74 -lib/libkea-dhcp++.so.74.0.0 +lib/libkea-dhcp++.so.89 +lib/libkea-dhcp++.so.89.0.0 lib/libkea-dhcp_ddns.a lib/libkea-dhcp_ddns.so -lib/libkea-dhcp_ddns.so.41 -lib/libkea-dhcp_ddns.so.41.0.0 +lib/libkea-dhcp_ddns.so.56 +lib/libkea-dhcp_ddns.so.56.0.0 lib/libkea-dhcpsrv.a lib/libkea-dhcpsrv.so -lib/libkea-dhcpsrv.so.90 -lib/libkea-dhcpsrv.so.90.0.0 +lib/libkea-dhcpsrv.so.108 +lib/libkea-dhcpsrv.so.108.0.0 lib/libkea-dns++.a lib/libkea-dns++.so -lib/libkea-dns++.so.42 -lib/libkea-dns++.so.42.0.0 +lib/libkea-dns++.so.56 +lib/libkea-dns++.so.56.0.0 lib/libkea-eval.a lib/libkea-eval.so -lib/libkea-eval.so.52 -lib/libkea-eval.so.52.0.0 +lib/libkea-eval.so.69 +lib/libkea-eval.so.69.0.0 lib/libkea-exceptions.a lib/libkea-exceptions.so -lib/libkea-exceptions.so.23 -lib/libkea-exceptions.so.23.0.0 +lib/libkea-exceptions.so.33 +lib/libkea-exceptions.so.33.0.0 lib/libkea-hooks.a lib/libkea-hooks.so -lib/libkea-hooks.so.78 -lib/libkea-hooks.so.78.0.0 +lib/libkea-hooks.so.97 +lib/libkea-hooks.so.97.0.0 lib/libkea-http.a lib/libkea-http.so -lib/libkea-http.so.56 -lib/libkea-http.so.56.0.0 +lib/libkea-http.so.71 +lib/libkea-http.so.71.0.0 lib/libkea-log.a lib/libkea-log.so -lib/libkea-log.so.48 -lib/libkea-log.so.48.0.0 +lib/libkea-log.so.61 +lib/libkea-log.so.61.0.0 %%MYSQL%%lib/libkea-mysql.a %%MYSQL%%lib/libkea-mysql.so -%%MYSQL%%lib/libkea-mysql.so.53 -%%MYSQL%%lib/libkea-mysql.so.53.0.0 +%%MYSQL%%lib/libkea-mysql.so.69 +%%MYSQL%%lib/libkea-mysql.so.69.0.0 %%PGSQL%%lib/libkea-pgsql.a %%PGSQL%%lib/libkea-pgsql.so -%%PGSQL%%lib/libkea-pgsql.so.53 -%%PGSQL%%lib/libkea-pgsql.so.53.0.0 +%%PGSQL%%lib/libkea-pgsql.so.69 +%%PGSQL%%lib/libkea-pgsql.so.69.0.0 lib/libkea-process.a lib/libkea-process.so -lib/libkea-process.so.57 -lib/libkea-process.so.57.0.0 +lib/libkea-process.so.72 +lib/libkea-process.so.72.0.0 lib/libkea-stats.a lib/libkea-stats.so -lib/libkea-stats.so.29 -lib/libkea-stats.so.29.0.0 +lib/libkea-stats.so.41 +lib/libkea-stats.so.41.0.0 lib/libkea-tcp.a lib/libkea-tcp.so -lib/libkea-tcp.so.5 -lib/libkea-tcp.so.5.0.0 +lib/libkea-tcp.so.18 +lib/libkea-tcp.so.18.0.0 lib/libkea-util-io.a lib/libkea-util-io.so 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.68 -lib/libkea-util.so.68.0.0 +lib/libkea-util.so.84 +lib/libkea-util.so.84.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_connector3%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_connector3%%PYTHON_EXT_SUFFIX%%.pyc %%SHELL%%%%PYTHON_SITELIBDIR%%/kea/kea_conn.py %%SHELL%%%%PYTHON_SITELIBDIR%%/kea/kea_connector3.py -share/man/man8/kea-admin.8.gz -share/man/man8/kea-ctrl-agent.8.gz -share/man/man8/kea-dhcp-ddns.8.gz -share/man/man8/kea-dhcp4.8.gz -share/man/man8/kea-dhcp6.8.gz -share/man/man8/kea-lfc.8.gz -share/man/man8/kea-netconf.8.gz -share/man/man8/kea-shell.8.gz -share/man/man8/keactrl.8.gz -share/man/man8/perfdhcp.8.gz sbin/kea-admin sbin/kea-ctrl-agent sbin/kea-dhcp-ddns @@ -593,6 +583,7 @@ sbin/keactrl %%DATADIR%%/api/dhcp-disable.json %%DATADIR%%/api/dhcp-enable.json %%DATADIR%%/api/extended-info4-upgrade.json +%%DATADIR%%/api/extended-info6-upgrade.json %%DATADIR%%/api/gss-tsig-get-all.json %%DATADIR%%/api/gss-tsig-get.json %%DATADIR%%/api/gss-tsig-key-del.json @@ -637,7 +628,6 @@ sbin/keactrl %%DATADIR%%/api/lease6-wipe.json %%DATADIR%%/api/lease6-write.json %%DATADIR%%/api/leases-reclaim.json -%%DATADIR%%/api/libreload.json %%DATADIR%%/api/list-commands.json %%DATADIR%%/api/network4-add.json %%DATADIR%%/api/network4-del.json @@ -796,6 +786,9 @@ sbin/keactrl %%DATADIR%%/scripts/mysql/upgrade_016_to_017.sh %%DATADIR%%/scripts/mysql/upgrade_017_to_018.sh %%DATADIR%%/scripts/mysql/upgrade_018_to_019.sh +%%DATADIR%%/scripts/mysql/upgrade_019_to_020.sh +%%DATADIR%%/scripts/mysql/upgrade_020_to_021.sh +%%DATADIR%%/scripts/mysql/upgrade_021_to_022.sh %%DATADIR%%/scripts/mysql/wipe_data.sh %%DATADIR%%/scripts/pgsql/dhcpdb_create.pgsql %%DATADIR%%/scripts/pgsql/dhcpdb_drop.pgsql @@ -822,7 +815,21 @@ sbin/keactrl %%DATADIR%%/scripts/pgsql/upgrade_015_to_016.sh %%DATADIR%%/scripts/pgsql/upgrade_016_to_017.sh %%DATADIR%%/scripts/pgsql/upgrade_017_to_018.sh +%%DATADIR%%/scripts/pgsql/upgrade_018_to_019.sh +%%DATADIR%%/scripts/pgsql/upgrade_019_to_020.sh +%%DATADIR%%/scripts/pgsql/upgrade_020_to_021.sh +%%DATADIR%%/scripts/pgsql/upgrade_021_to_022.sh %%DATADIR%%/scripts/pgsql/wipe_data.sh +share/man/man8/kea-admin.8.gz +share/man/man8/kea-ctrl-agent.8.gz +share/man/man8/kea-dhcp-ddns.8.gz +share/man/man8/kea-dhcp4.8.gz +share/man/man8/kea-dhcp6.8.gz +share/man/man8/kea-lfc.8.gz +share/man/man8/kea-netconf.8.gz +share/man/man8/kea-shell.8.gz +share/man/man8/keactrl.8.gz +share/man/man8/perfdhcp.8.gz %%SHELL%%@dir %%PYTHON_SITELIBDIR%%/kea/__pycache__ %%SHELL%%@dir %%PYTHON_SITELIBDIR%%/kea @dir /var/db/kea
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405300559.44U5x5Wp052387>