diff options
Diffstat (limited to 'net/kea-devel')
-rw-r--r-- | net/kea-devel/Makefile | 19 | ||||
-rw-r--r-- | net/kea-devel/distinfo | 6 | ||||
-rw-r--r-- | net/kea-devel/files/patch-subprojects__postgresql__meson.build | 23 | ||||
-rw-r--r-- | net/kea-devel/pkg-plist | 115 |
4 files changed, 91 insertions, 72 deletions
diff --git a/net/kea-devel/Makefile b/net/kea-devel/Makefile index 11a7e2022050..a3e5f66b8275 100644 --- a/net/kea-devel/Makefile +++ b/net/kea-devel/Makefile @@ -1,8 +1,7 @@ PORTNAME= kea -DISTVERSION= 3.0.0 -PORTREVISION= 2 +DISTVERSION= 3.1.2 CATEGORIES= net -MASTER_SITES= ISC/kea/cur/3.0 +MASTER_SITES= ISC/kea/cur/3.1 PKGNAMESUFFIX= -devel MAINTAINER= cy@FreeBSD.org @@ -12,14 +11,13 @@ WWW= https://kea.isc.org/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= rst2man:textproc/py-docutils \ - python3:lang/python3 +BUILD_DEPENDS= rst2man:textproc/py-docutils LIB_DEPENDS= libboost_system.so:devel/boost-libs \ liblog4cplus.so:devel/log4cplus -USES= compiler:c++11-lang cmake:indirect cpe iconv libtool meson \ - pathfix python tar:xz ssl +USES= compiler:c++11-lang cmake:indirect cpe iconv meson \ + pathfix pkgconfig python tar:xz shebangfix ssl CPE_VENDOR= isc CPE_VERSION= ${DISTVERSION:C/-.*//} @@ -40,6 +38,9 @@ OPTIONS_SUB= yes MESON_ARGS= --auto-features=disabled \ -Dnetconf=disabled \ -Drunstatedir=/var/run + +SHEBANG_GLOB= *.py *.in +python_OLD_CMD+=@PYTHON@ MYSQL_USES= mysql MYSQL_MESON_ENABLED= mysql @@ -47,10 +48,10 @@ MYSQL_SUB_LIST= REQ_MYSQL=mysql MYSQL_SUB_LIST_OFF= REQ_MYSQL="" PGSQL_USES= pgsql -PGSQ_MESON_ENABLED= postgresql +PGSQL_MESON_ENABLED= postgresql PGSQL_SUB_LIST= REQ_PGSQL=postgresql PGSQL_SUB_LIST_OFF= REQ_PGSQL="" -PGSQL_VARS= WANT_PGSQL=client +PGSQL_VARS= WANT_PGSQL=lib post-build: cd ${WRKSRC}/doc/sphinx/man; \ diff --git a/net/kea-devel/distinfo b/net/kea-devel/distinfo index b7316e8a33df..f902a250722b 100644 --- a/net/kea-devel/distinfo +++ b/net/kea-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1750911365 -SHA256 (kea-3.0.0.tar.xz) = bf963d1e10951d8c570c6042afccf27c709d45e03813bd2639d7bb1cfc4fee76 -SIZE (kea-3.0.0.tar.xz) = 6631612 +TIMESTAMP = 1758740144 +SHA256 (kea-3.1.2.tar.xz) = 885d4a3361abdf4c8104e7074a27df7d9827a25a10d12491e3f61cc76c0dff7d +SIZE (kea-3.1.2.tar.xz) = 6666128 diff --git a/net/kea-devel/files/patch-subprojects__postgresql__meson.build b/net/kea-devel/files/patch-subprojects__postgresql__meson.build new file mode 100644 index 000000000000..7d4fd8334553 --- /dev/null +++ b/net/kea-devel/files/patch-subprojects__postgresql__meson.build @@ -0,0 +1,23 @@ +--- subprojects/postgresql/meson.build.orig 2025-07-14 21:38:51.533442000 +0000 ++++ subprojects/postgresql/meson.build 2025-07-14 21:55:25.061747000 +0000 +@@ -10,17 +10,16 @@ + includedir = run_command([pg_config, '--includedir'], check: false) + ldflags = run_command([pg_config, '--ldflags'], check: false) + libdir = run_command([pg_config, '--libdir'], check: false) +- libs = run_command([pg_config, '--libs'], check: false) + version = run_command([pg_config, '--version'], check: false) +- if cppflags.returncode() == 0 and includedir.returncode() == 0 and libdir.returncode() == 0 and ldflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0 ++ ++ if cppflags.returncode() == 0 and includedir.returncode() == 0 and ldflags.returncode() == 0 and libdir.returncode() == 0 and version.returncode() == 0 + pgsql_compile_args = cppflags.stdout().split() + pgsql_includedir_args = includedir.stdout().split() + pgsql_ldflags = ldflags.stdout().split() + pgsql_libdir = libdir.stdout().strip() +- pgsql_link_args = libs.stdout().split() + pgsql_version = version.stdout().strip() + +- link_args = [f'-L@pgsql_libdir@'] + pgsql_ldflags + pgsql_link_args ++ link_args = ['-L' + pgsql_libdir] + pgsql_ldflags + if libpq.found() + link_args += ['-lpq'] + endif diff --git a/net/kea-devel/pkg-plist b/net/kea-devel/pkg-plist index dbe5a05bf069..c1f134b42e71 100644 --- a/net/kea-devel/pkg-plist +++ b/net/kea-devel/pkg-plist @@ -448,12 +448,6 @@ 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/libkea-dhcp.so -lib/libkea-dhcp.so.109 -lib/libkea-dhcp.so.109.0.0 -lib/libkea-dns.so -lib/libkea-dns.so.71 -lib/libkea-dns.so.71.0.0 lib/kea/hooks/libdhcp_bootp.so lib/kea/hooks/libdhcp_class_cmds.so lib/kea/hooks/libdhcp_ddns_tuning.so @@ -475,74 +469,80 @@ 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.62 -lib/libkea-asiodns.so.62.0.0 +lib/libkea-asiodns.so.73 +lib/libkea-asiodns.so.73.0.0 lib/libkea-asiolink.so -lib/libkea-asiolink.so.87 -lib/libkea-asiolink.so.87.0.0 +lib/libkea-asiolink.so.100 +lib/libkea-asiolink.so.100.0.0 lib/libkea-cc.so -lib/libkea-cc.so.82 -lib/libkea-cc.so.82.0.0 +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.83 -lib/libkea-config.so.83.0.0 +lib/libkea-config.so.94 +lib/libkea-config.so.94.0.0 lib/libkea-cryptolink.so -lib/libkea-cryptolink.so.63 -lib/libkea-cryptolink.so.63.0.0 +lib/libkea-cryptolink.so.74 +lib/libkea-cryptolink.so.74.0.0 lib/libkea-d2srv.so -lib/libkea-d2srv.so.63 -lib/libkea-d2srv.so.63.0.0 +lib/libkea-d2srv.so.74 +lib/libkea-d2srv.so.74.0.0 lib/libkea-database.so -lib/libkea-database.so.76 -lib/libkea-database.so.76.0.0 +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.68 -lib/libkea-dhcp_ddns.so.68.0.0 +lib/libkea-dhcp_ddns.so.78 +lib/libkea-dhcp_ddns.so.78.0.0 lib/libkea-dhcpsrv.so -lib/libkea-dhcpsrv.so.129 -lib/libkea-dhcpsrv.so.129.0.0 +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.84 -lib/libkea-eval.so.84.0.0 +lib/libkea-eval.so.96 +lib/libkea-eval.so.96.0.0 lib/libkea-exceptions.so -lib/libkea-exceptions.so.45 -lib/libkea-exceptions.so.45.0.0 +lib/libkea-exceptions.so.55 +lib/libkea-exceptions.so.55.0.0 lib/libkea-hooks.so -lib/libkea-hooks.so.118 -lib/libkea-hooks.so.118.0.0 +lib/libkea-hooks.so.131 +lib/libkea-hooks.so.131.0.0 lib/libkea-http.so -lib/libkea-http.so.87 -lib/libkea-http.so.87.0.0 +lib/libkea-http.so.98 +lib/libkea-http.so.98.0.0 lib/libkea-log-interprocess.so -lib/libkea-log-interprocess.so.3 -lib/libkea-log-interprocess.so.3.0.0 +lib/libkea-log-interprocess.so.4 +lib/libkea-log-interprocess.so.4.0.0 lib/libkea-log.so -lib/libkea-log.so.75 -lib/libkea-log.so.75.0.0 +lib/libkea-log.so.85 +lib/libkea-log.so.85.0.0 %%MYSQL%%lib/libkea-mysql.so -%%MYSQL%%lib/libkea-mysql.so.86 -%%MYSQL%%lib/libkea-mysql.so.86.0.0 +%%MYSQL%%lib/libkea-mysql.so.101 +%%MYSQL%%lib/libkea-mysql.so.101.0.0 %%PGSQL%%lib/libkea-pgsql.so -%%PGSQL%%lib/libkea-pgsql.so.87 -%%PGSQL%%lib/libkea-pgsql.so.87.0.0 +%%PGSQL%%lib/libkea-pgsql.so.101 +%%PGSQL%%lib/libkea-pgsql.so.101.0.0 lib/libkea-process.so -lib/libkea-process.so.90 -lib/libkea-process.so.90.0.0 +lib/libkea-process.so.102 +lib/libkea-process.so.102.0.0 lib/libkea-stats.so -lib/libkea-stats.so.53 -lib/libkea-stats.so.53.0.0 +lib/libkea-stats.so.64 +lib/libkea-stats.so.64.0.0 lib/libkea-tcp.so -lib/libkea-tcp.so.33 -lib/libkea-tcp.so.33.0.0 +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.101 -lib/libkea-util.so.101.0.0 +lib/libkea-util.so.113 +lib/libkea-util.so.113.0.0 %%PYTHON_SITELIBDIR%%/kea/kea_conn.py %%PYTHON_SITELIBDIR%%/kea/kea_connector3.py libdata/pkgconfig/kea.pc @@ -600,6 +600,7 @@ sbin/perfdhcp %%DATADIR%%/api/ha-scopes.json %%DATADIR%%/api/ha-sync-complete-notify.json %%DATADIR%%/api/ha-sync.json +%%DATADIR%%/api/kea-lfc-start.json %%DATADIR%%/api/lease4-add.json %%DATADIR%%/api/lease4-del.json %%DATADIR%%/api/lease4-get-all.json @@ -618,6 +619,7 @@ sbin/perfdhcp %%DATADIR%%/api/lease6-get-all.json %%DATADIR%%/api/lease6-get-by-duid.json %%DATADIR%%/api/lease6-get-by-hostname.json +%%DATADIR%%/api/lease6-get-by-hw-address.json %%DATADIR%%/api/lease6-get-page.json %%DATADIR%%/api/lease6-get.json %%DATADIR%%/api/lease6-resend-ddns.json @@ -729,6 +731,7 @@ sbin/perfdhcp %%DATADIR%%/api/stat-lease6-get.json %%DATADIR%%/api/statistic-get-all.json %%DATADIR%%/api/statistic-get.json +%%DATADIR%%/api/statistic-global-get-all.json %%DATADIR%%/api/statistic-remove-all.json %%DATADIR%%/api/statistic-remove.json %%DATADIR%%/api/statistic-reset-all.json @@ -756,18 +759,6 @@ sbin/perfdhcp %%DATADIR%%/api/subnet6-select-test.json %%DATADIR%%/api/subnet6-update.json %%DATADIR%%/api/version-get.json -%%DATADIR%%/meson-info/intro-benchmarks.json -%%DATADIR%%/meson-info/intro-buildoptions.json -%%DATADIR%%/meson-info/intro-buildsystem_files.json -%%DATADIR%%/meson-info/intro-compilers.json -%%DATADIR%%/meson-info/intro-dependencies.json -%%DATADIR%%/meson-info/intro-install_plan.json -%%DATADIR%%/meson-info/intro-installed.json -%%DATADIR%%/meson-info/intro-machines.json -%%DATADIR%%/meson-info/intro-projectinfo.json -%%DATADIR%%/meson-info/intro-targets.json -%%DATADIR%%/meson-info/intro-tests.json -%%DATADIR%%/meson-info/meson-info.json %%DATADIR%%/scripts/admin-utils.sh %%DATADIR%%/scripts/mysql/dhcpdb_create.mysql %%DATADIR%%/scripts/mysql/dhcpdb_drop.mysql @@ -811,6 +802,8 @@ sbin/perfdhcp %%DATADIR%%/scripts/mysql/upgrade_027_to_028.sh %%DATADIR%%/scripts/mysql/upgrade_028_to_029.sh %%DATADIR%%/scripts/mysql/upgrade_029_to_030.sh +%%DATADIR%%/scripts/mysql/upgrade_030_to_031.sh +%%DATADIR%%/scripts/mysql/upgrade_031_to_032.sh %%DATADIR%%/scripts/mysql/wipe_data.sh %%DATADIR%%/scripts/pgsql/dhcpdb_create.pgsql %%DATADIR%%/scripts/pgsql/dhcpdb_drop.pgsql @@ -848,6 +841,8 @@ sbin/perfdhcp %%DATADIR%%/scripts/pgsql/upgrade_026_to_027.sh %%DATADIR%%/scripts/pgsql/upgrade_027_to_028.sh %%DATADIR%%/scripts/pgsql/upgrade_028_to_029.sh +%%DATADIR%%/scripts/pgsql/upgrade_029_to_030.sh +%%DATADIR%%/scripts/pgsql/upgrade_030_to_031.sh %%DATADIR%%/scripts/pgsql/wipe_data.sh share/man/man8/kea-admin.8.gz share/man/man8/kea-ctrl-agent.8.gz |