diff --git a/net/radcli/Makefile b/net/radcli/Makefile index b2eb41cedf01..35f405ff9abb 100644 --- a/net/radcli/Makefile +++ b/net/radcli/Makefile @@ -1,35 +1,34 @@ PORTNAME= radcli -PORTVERSION= 1.5.3 +PORTVERSION= 2.0.0 MASTER_SITES= https://github.com/radcli/radcli/releases/download/${PORTVERSION}/ CATEGORIES= net MAINTAINER= sunpoet@FreeBSD.org COMMENT= Simple RADIUS client library WWW= https://radcli.github.io/radcli/ \ https://github.com/radcli/radcli LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libgnutls.so:security/gnutls \ libnettle.so:security/nettle TEST_DEPENDS= bash:shells/bash USES= meson pkgconfig python:test shebangfix tar:xz MESON_DISABLED= docs -MESON_ENABLED= nettle \ - tls +MESON_ENABLED= tls MESON_FALSE= legacy-compat MESON_TRUE= static USE_LDCONFIG= yes SHEBANG_FILES= tests/radius-server.py \ tests/*.sh post-install: .for file in radiusclient.conf radiusclient-tls.conf servers servers-tls ${MV} ${STAGEDIR}${PREFIX}/etc/radcli/${file} ${STAGEDIR}${PREFIX}/etc/radcli/${file}.sample .endfor .include diff --git a/net/radcli/distinfo b/net/radcli/distinfo index f58930d3c0df..09746476558d 100644 --- a/net/radcli/distinfo +++ b/net/radcli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1787587696 -SHA256 (radcli-1.5.3.tar.xz) = df2cd13318c392844d9cb89b7df81fdc21eb7925c27784cbf5189c69618e2d0a -SIZE (radcli-1.5.3.tar.xz) = 302424 +TIMESTAMP = 1789389292 +SHA256 (radcli-2.0.0.tar.xz) = bc41cc2b16879cfbfa53fae741be593de6f3384ee777010611fccac0812e6de1 +SIZE (radcli-2.0.0.tar.xz) = 579184 diff --git a/net/radcli/files/patch-include-radcli-radcli2.h b/net/radcli/files/patch-include-radcli-radcli2.h new file mode 100644 index 000000000000..1247820a2506 --- /dev/null +++ b/net/radcli/files/patch-include-radcli-radcli2.h @@ -0,0 +1,10 @@ +--- include/radcli/radcli2.h.orig 2026-09-13 10:03:44 UTC ++++ include/radcli/radcli2.h +@@ -53,6 +53,7 @@ + #include + #include + #include ++#include + #include /* struct pollfd, radcli_ctx_get_poll() */ + #include + diff --git a/net/radcli/files/patch-rc_strlcpy b/net/radcli/files/patch-rc_strlcpy new file mode 100644 index 000000000000..c5ed9b72a499 --- /dev/null +++ b/net/radcli/files/patch-rc_strlcpy @@ -0,0 +1,25 @@ +--- lib/meson.build.orig 2026-09-13 10:03:44 UTC ++++ lib/meson.build +@@ -27,6 +27,11 @@ map2_conf.set('LIBMAJOR2', lib2_soversion) + + map2_conf = configuration_data() + map2_conf.set('LIBMAJOR2', lib2_soversion) ++if not cc.has_function('strlcpy') ++ map2_conf.set('STRLCPY_SYMBOL', 'rc_strlcpy;') ++else ++ map2_conf.set('STRLCPY_SYMBOL', '') ++endif + radcli2_map = configure_file( + input: 'radcli2.map.in', output: 'radcli2.map', configuration: map2_conf, + ) +--- lib/radcli2.map.in.orig 2026-09-13 10:03:44 UTC ++++ lib/radcli2.map.in +@@ -144,7 +144,7 @@ RADCLI2_PRIVATE + rc_getmtime; + rc_conf_int_id; + rc_str2tm; +- rc_strlcpy; ++ @STRLCPY_SYMBOL@ + rc_md5_calc; + rc_getaddrinfo; + rc_own_bind_addr; diff --git a/net/radcli/pkg-plist b/net/radcli/pkg-plist index 823b5be4ec34..ef5efa80f1a5 100644 --- a/net/radcli/pkg-plist +++ b/net/radcli/pkg-plist @@ -1,77 +1,169 @@ @sample etc/radcli/radiusclient-tls.conf.sample @sample etc/radcli/radiusclient.conf.sample @sample etc/radcli/servers-tls.sample @sample etc/radcli/servers.sample +include/radcli/radcli-defs.h include/radcli/radcli.h +include/radcli/radcli2.h include/radcli/version.h lib/libradcli.a lib/libradcli.so lib/libradcli.so.10 lib/libradcli.so.10.2.0 +lib/libradcli2.so +lib/libradcli2.so.1 +lib/libradcli2.so.1.0.0 libdata/pkgconfig/radcli.pc +libdata/pkgconfig/radcli2.pc share/man/man3/radcli.h.3.gz +share/man/man3/radcli2.h.3.gz +share/man/man3/radcli_aaa.3.gz +share/man/man3/radcli_attr_def_name.3.gz +share/man/man3/radcli_attr_def_oid.3.gz +share/man/man3/radcli_attr_def_type.3.gz +share/man/man3/radcli_avp_add_bytes.3.gz +share/man/man3/radcli_avp_add_bytes_by_num.3.gz +share/man/man3/radcli_avp_add_gigawords64.3.gz +share/man/man3/radcli_avp_add_gigawords64_by_num.3.gz +share/man/man3/radcli_avp_add_ip4.3.gz +share/man/man3/radcli_avp_add_ip4_by_num.3.gz +share/man/man3/radcli_avp_add_ip4prefix.3.gz +share/man/man3/radcli_avp_add_ip4prefix_by_num.3.gz +share/man/man3/radcli_avp_add_ip6.3.gz +share/man/man3/radcli_avp_add_ip6_by_num.3.gz +share/man/man3/radcli_avp_add_str.3.gz +share/man/man3/radcli_avp_add_str_by_num.3.gz +share/man/man3/radcli_avp_add_uint32.3.gz +share/man/man3/radcli_avp_add_uint32_by_num.3.gz +share/man/man3/radcli_avp_add_uint64.3.gz +share/man/man3/radcli_avp_add_uint64_by_num.3.gz +share/man/man3/radcli_avp_add_username.3.gz +share/man/man3/radcli_avp_concat_str.3.gz +share/man/man3/radcli_avp_concat_str_by_num.3.gz +share/man/man3/radcli_avp_def.3.gz +share/man/man3/radcli_avp_get.3.gz +share/man/man3/radcli_avp_get_by_num.3.gz +share/man/man3/radcli_avp_get_bytes.3.gz +share/man/man3/radcli_avp_get_bytes_by_num.3.gz +share/man/man3/radcli_avp_get_cstr.3.gz +share/man/man3/radcli_avp_get_cstr_by_num.3.gz +share/man/man3/radcli_avp_get_gigawords64.3.gz +share/man/man3/radcli_avp_get_gigawords64_by_num.3.gz +share/man/man3/radcli_avp_get_ip4prefix.3.gz +share/man/man3/radcli_avp_get_ip4prefix_by_num.3.gz +share/man/man3/radcli_avp_get_ip6.3.gz +share/man/man3/radcli_avp_get_ip6_by_num.3.gz +share/man/man3/radcli_avp_get_uint32.3.gz +share/man/man3/radcli_avp_get_uint32_by_num.3.gz +share/man/man3/radcli_avp_get_uint64.3.gz +share/man/man3/radcli_avp_get_uint64_by_num.3.gz +share/man/man3/radcli_avp_iter_next.3.gz +share/man/man3/radcli_avp_list_error.3.gz +share/man/man3/radcli_avp_list_free.3.gz +share/man/man3/radcli_avp_list_iter.3.gz +share/man/man3/radcli_avp_list_new.3.gz +share/man/man3/radcli_ctx_apply.3.gz +share/man/man3/radcli_ctx_dispatch.3.gz +share/man/man3/radcli_ctx_free.3.gz +share/man/man3/radcli_ctx_get_opt_int.3.gz +share/man/man3/radcli_ctx_get_opt_str.3.gz +share/man/man3/radcli_ctx_get_poll.3.gz +share/man/man3/radcli_ctx_new.3.gz +share/man/man3/radcli_ctx_read_config.3.gz +share/man/man3/radcli_ctx_read_dictionary.3.gz +share/man/man3/radcli_ctx_read_dictionary_from_buffer.3.gz +share/man/man3/radcli_ctx_set_opt_int.3.gz +share/man/man3/radcli_ctx_set_opt_str.3.gz +share/man/man3/radcli_ctx_set_secret.3.gz +share/man/man3/radcli_ctx_set_tls_psk.3.gz +share/man/man3/radcli_dae_free.3.gz +share/man/man3/radcli_dae_new.3.gz +share/man/man3/radcli_dae_process.3.gz +share/man/man3/radcli_dae_reply.3.gz +share/man/man3/radcli_dae_reply_error.3.gz +share/man/man3/radcli_dae_reply_to_buffer.3.gz +share/man/man3/radcli_dae_req_attrs.3.gz +share/man/man3/radcli_dae_req_code.3.gz +share/man/man3/radcli_dae_req_framed_ip.3.gz +share/man/man3/radcli_dae_req_nas_port.3.gz +share/man/man3/radcli_dae_req_session_id.3.gz +share/man/man3/radcli_dae_req_user_name.3.gz +share/man/man3/radcli_dae_request_free.3.gz +share/man/man3/radcli_dae_set_handler.3.gz +share/man/man3/radcli_dae_start.3.gz +share/man/man3/radcli_dict_lookup.3.gz +share/man/man3/radcli_dict_lookup_num.3.gz +share/man/man3/radcli_dict_lookup_oid.3.gz +share/man/man3/radcli_dict_lookup_value.3.gz +share/man/man3/radcli_request_attrs.3.gz +share/man/man3/radcli_request_code.3.gz +share/man/man3/radcli_request_done.3.gz +share/man/man3/radcli_request_free.3.gz +share/man/man3/radcli_request_new.3.gz +share/man/man3/radcli_request_perform.3.gz +share/man/man3/radcli_request_server.3.gz share/man/man3/rc_aaa.3.gz share/man/man3/rc_aaa_ctx.3.gz share/man/man3/rc_aaa_ctx_free.3.gz share/man/man3/rc_aaa_ctx_get_secret.3.gz share/man/man3/rc_aaa_ctx_get_vector.3.gz share/man/man3/rc_aaa_ctx_server.3.gz share/man/man3/rc_acct.3.gz share/man/man3/rc_acct_async.3.gz share/man/man3/rc_acct_proxy.3.gz share/man/man3/rc_add_config.3.gz share/man/man3/rc_apply_config.3.gz share/man/man3/rc_auth.3.gz share/man/man3/rc_auth_proxy.3.gz share/man/man3/rc_avpair_add.3.gz share/man/man3/rc_avpair_assign.3.gz share/man/man3/rc_avpair_copy.3.gz share/man/man3/rc_avpair_free.3.gz share/man/man3/rc_avpair_gen.3.gz share/man/man3/rc_avpair_get.3.gz share/man/man3/rc_avpair_get_attr.3.gz share/man/man3/rc_avpair_get_in6.3.gz share/man/man3/rc_avpair_get_raw.3.gz share/man/man3/rc_avpair_get_uint32.3.gz share/man/man3/rc_avpair_insert.3.gz share/man/man3/rc_avpair_log.3.gz share/man/man3/rc_avpair_new.3.gz share/man/man3/rc_avpair_next.3.gz share/man/man3/rc_avpair_parse.3.gz share/man/man3/rc_avpair_remove.3.gz share/man/man3/rc_avpair_tostr.3.gz share/man/man3/rc_buildreq.3.gz share/man/man3/rc_check.3.gz share/man/man3/rc_check_tls.3.gz share/man/man3/rc_conf_int.3.gz share/man/man3/rc_conf_srv.3.gz share/man/man3/rc_conf_str.3.gz share/man/man3/rc_config_free.3.gz share/man/man3/rc_config_init.3.gz share/man/man3/rc_destroy.3.gz share/man/man3/rc_dict_addattr.3.gz share/man/man3/rc_dict_addval.3.gz share/man/man3/rc_dict_addvend.3.gz share/man/man3/rc_dict_findattr.3.gz share/man/man3/rc_dict_findval.3.gz share/man/man3/rc_dict_findvend.3.gz share/man/man3/rc_dict_free.3.gz share/man/man3/rc_dict_getattr.3.gz share/man/man3/rc_dict_getval.3.gz share/man/man3/rc_dict_getvend.3.gz share/man/man3/rc_find_server_addr.3.gz share/man/man3/rc_get_socket_type.3.gz share/man/man3/rc_get_srcaddr.3.gz share/man/man3/rc_getport.3.gz share/man/man3/rc_mksid.3.gz share/man/man3/rc_new.3.gz share/man/man3/rc_openlog.3.gz share/man/man3/rc_own_hostname.3.gz share/man/man3/rc_read_config.3.gz share/man/man3/rc_read_dictionary.3.gz share/man/man3/rc_read_dictionary_from_buffer.3.gz share/man/man3/rc_send_server.3.gz share/man/man3/rc_setdebug.3.gz share/man/man3/rc_test_config.3.gz share/man/man3/rc_tls_fd.3.gz %%DATADIR%%/dictionary