diff --git a/net/libcoap/Makefile b/net/libcoap/Makefile index faa994ad49ec..ea7de6e6b69d 100644 --- a/net/libcoap/Makefile +++ b/net/libcoap/Makefile @@ -1,38 +1,39 @@ PORTNAME= libcoap DISTVERSIONPREFIX= v -DISTVERSION= 4.3.0 +DISTVERSION= 4.3.1 CATEGORIES= net MAINTAINER= tcberner@FreeBSD.org COMMENT= C implementation of the Constrained Application Protocol WWW= https://github.com/obgm/libcoap LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= a2x:textproc/asciidoc \ gsed:textproc/gsed LIB_DEPENDS= libgnutls.so:security/gnutls USES= autoreconf gmake libtool pkgconfig USE_GITHUB= yes GH_ACCOUNT= obgm GNU_CONFIGURE= yes INSTALL_TARGET= install-strip BINARY_ALIAS= sed=gsed PORTSCOUT= limit:^4\. PORTDOCS= * OPTIONS_DEFINE= DOCS DOXYGEN OPTIONS_DEFAULT= DOXYGEN DOXYGEN_IMPLIES= DOCS DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ dot:graphics/graphviz DOXYGEN_CONFIGURE_ENABLE= doxygen +CONFIGURE_ENV=ac_cv_path_SED=${LOCALBASE}/bin/gsed .include diff --git a/net/libcoap/distinfo b/net/libcoap/distinfo index 38141afec5f5..7199e3a4803a 100644 --- a/net/libcoap/distinfo +++ b/net/libcoap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624736788 -SHA256 (obgm-libcoap-v4.3.0_GH0.tar.gz) = 1a195adacd6188d3b71c476e7b21706fef7f3663ab1fb138652e8da49a9ec556 -SIZE (obgm-libcoap-v4.3.0_GH0.tar.gz) = 495456 +TIMESTAMP = 1669214147 +SHA256 (obgm-libcoap-v4.3.1_GH0.tar.gz) = 074a71deca01e06d3acb00a1416d0fbeb87d130f40a3c0f6fda3a5c711855dca +SIZE (obgm-libcoap-v4.3.1_GH0.tar.gz) = 521381 diff --git a/net/libcoap/files/patch-configure.ac b/net/libcoap/files/patch-configure.ac index d0e3cbae92c5..031becf7991c 100644 --- a/net/libcoap/files/patch-configure.ac +++ b/net/libcoap/files/patch-configure.ac @@ -1,11 +1,11 @@ ---- configure.ac.orig 2021-06-21 08:39:42 UTC +--- configure.ac.orig 2022-09-02 11:42:24 UTC +++ configure.ac -@@ -826,7 +826,7 @@ case $host in +@@ -918,7 +918,7 @@ case $host in #AC_SUBST(OS_MACOS) ;; - *-freebsd1*) + *freebsd*) AC_MSG_RESULT([FreeBSD-1x]) ADDITIONAL_CFLAGS="-D_GNU_SOURCE" ;; diff --git a/net/libcoap/files/patch-doc_Makefile.am b/net/libcoap/files/patch-doc_Makefile.am deleted file mode 100644 index 88c6d97839da..000000000000 --- a/net/libcoap/files/patch-doc_Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ ---- doc/Makefile.am.orig 2021-06-21 08:39:42 UTC -+++ doc/Makefile.am -@@ -112,8 +112,8 @@ man-page-build: upg-page-build man-page-start - echo ' ' >> $(top_builddir)/doc/insert_file ;\ - ## Create and Update the DoxygenLayout.xml file - $(DOXYGEN) -l ;\ -- $(SED) -i 's/Name^

NAME

^g' $(top_builddir)/doc/man_html/$${BASE}.html ;\ -- $(SED) -i 's^

Synopsis

^

SYNOPSIS

^g' $(top_builddir)/doc/man_html/$${BASE}.html ;\ -+ $(SED) -i '' 's^

Name

^

NAME

^g' $(top_builddir)/doc/man_html/$${BASE}.html ;\ -+ $(SED) -i '' 's^

Synopsis

^

SYNOPSIS

^g' $(top_builddir)/doc/man_html/$${BASE}.html ;\ - else \ - echo "ERROR: $(top_builddir)/man/$${BASE}.html not found!";\ - exit 1 ;\ -@@ -131,7 +131,7 @@ man-page-build: upg-page-build man-page-start - EBASE=`basename $${ENTRY} | cut -d . -f1` ;\ - MANUAL=`egrep -B 1 "^====" $${ENTRY} | head -1` ;\ - SECTION=`echo $${MANUAL} | cut -d\( -f2 | cut -d\) -f1` ;\ -- $(SED) -i "s^$${EBASE}($${SECTION})^$${EBASE}($${SECTION})^g" $(top_builddir)/doc/man_html/$${BASE}.html ;\ -+ $(SED) -i '' "s^$${EBASE}($${SECTION})^$${EBASE}($${SECTION})^g" $(top_builddir)/doc/man_html/$${BASE}.html ;\ - done ;\ - echo "finalized addition $${BASE}.html" ;\ - done diff --git a/net/libcoap/pkg-plist b/net/libcoap/pkg-plist index ce0fcf5a1a8a..01764c2794e4 100644 --- a/net/libcoap/pkg-plist +++ b/net/libcoap/pkg-plist @@ -1,246 +1,261 @@ bin/coap-client bin/coap-client-gnutls bin/coap-rd bin/coap-rd-gnutls bin/coap-server bin/coap-server-gnutls -include/coap3/address.h -include/coap3/async.h include/coap3/block.h include/coap3/coap.h +include/coap3/coap_address.h +include/coap3/coap_async.h include/coap3/coap_cache.h include/coap3/coap_debug.h include/coap3/coap_dtls.h include/coap3/coap_event.h include/coap3/coap_forward_decls.h include/coap3/coap_hashkey.h include/coap3/coap_io.h include/coap3/coap_mutex.h +include/coap3/coap_option.h include/coap3/coap_prng.h include/coap3/coap_session.h +include/coap3/coap_subscribe.h include/coap3/coap_time.h include/coap3/encode.h include/coap3/libcoap.h include/coap3/mem.h include/coap3/net.h -include/coap3/option.h include/coap3/pdu.h include/coap3/resource.h include/coap3/str.h -include/coap3/subscribe.h include/coap3/uri.h lib/libcoap-3-gnutls.a lib/libcoap-3-gnutls.so lib/libcoap-3-gnutls.so.3 lib/libcoap-3-gnutls.so.3.0.0 lib/libcoap-3.a lib/libcoap-3.so libdata/pkgconfig/libcoap-3-gnutls.pc libdata/pkgconfig/libcoap-3.pc man/man3/coap_add_attr.3.gz man/man3/coap_add_data.3.gz man/man3/coap_add_data_blocked_response.3.gz man/man3/coap_add_data_large_request.3.gz man/man3/coap_add_data_large_response.3.gz man/man3/coap_add_option.3.gz man/man3/coap_add_optlist_pdu.3.gz man/man3/coap_add_resource.3.gz man/man3/coap_add_token.3.gz man/man3/coap_async.3.gz man/man3/coap_async_get_app_data.3.gz man/man3/coap_async_is_supported.3.gz man/man3/coap_async_set_app_data.3.gz man/man3/coap_async_set_delay.3.gz +man/man3/coap_async_trigger.3.gz +man/man3/coap_attr_get_value.3.gz man/man3/coap_attribute.3.gz man/man3/coap_binary_equal.3.gz man/man3/coap_block.3.gz man/man3/coap_block_build_body.3.gz man/man3/coap_cache.3.gz -man/man3/coap_cache_delete_key.3.gz man/man3/coap_cache_derive_key.3.gz man/man3/coap_cache_derive_key_w_ignore.3.gz man/man3/coap_cache_get_app_data.3.gz man/man3/coap_cache_get_by_key.3.gz man/man3/coap_cache_get_by_pdu.3.gz man/man3/coap_cache_get_pdu.3.gz man/man3/coap_cache_ignore_options.3.gz man/man3/coap_cache_set_app_data.3.gz man/man3/coap_cancel_observe.3.gz man/man3/coap_check_option.3.gz man/man3/coap_context.3.gz man/man3/coap_context_get_coap_fd.3.gz man/man3/coap_context_get_csm_timeout.3.gz man/man3/coap_context_get_max_handshake_sessions.3.gz man/man3/coap_context_get_max_idle_sessions.3.gz man/man3/coap_context_get_session_timeout.3.gz man/man3/coap_context_set_block_mode.3.gz man/man3/coap_context_set_csm_timeout.3.gz man/man3/coap_context_set_keepalive.3.gz man/man3/coap_context_set_max_handshake_sessions.3.gz man/man3/coap_context_set_max_idle_sessions.3.gz man/man3/coap_context_set_pki.3.gz man/man3/coap_context_set_pki_root_cas.3.gz man/man3/coap_context_set_psk2.3.gz man/man3/coap_context_set_session_timeout.3.gz man/man3/coap_debug_set_packet_loss.3.gz man/man3/coap_decode_var_bytes.3.gz man/man3/coap_decode_var_bytes8.3.gz man/man3/coap_delete_bin_const.3.gz man/man3/coap_delete_binary.3.gz man/man3/coap_delete_cache_entry.3.gz +man/man3/coap_delete_cache_key.3.gz man/man3/coap_delete_optlist.3.gz man/man3/coap_delete_resource.3.gz man/man3/coap_delete_str_const.3.gz man/man3/coap_delete_string.3.gz man/man3/coap_dtls_cpsk_t.3.gz man/man3/coap_dtls_is_supported.3.gz man/man3/coap_dtls_pki_t.3.gz man/man3/coap_dtls_spsk_t.3.gz man/man3/coap_encode_var_safe.3.gz man/man3/coap_encode_var_safe8.3.gz man/man3/coap_encryption.3.gz man/man3/coap_endpoint_client.3.gz man/man3/coap_endpoint_server.3.gz man/man3/coap_endpoint_set_default_mtu.3.gz man/man3/coap_endpoint_str.3.gz man/man3/coap_find_async.3.gz man/man3/coap_find_attr.3.gz man/man3/coap_free_async.3.gz man/man3/coap_free_context.3.gz man/man3/coap_free_endpoint.3.gz man/man3/coap_get_data.3.gz man/man3/coap_get_data_large.3.gz man/man3/coap_get_log_level.3.gz man/man3/coap_get_tls_library_version.3.gz +man/man3/coap_get_uri_path.3.gz man/man3/coap_handler.3.gz man/man3/coap_insert_optlist.3.gz man/man3/coap_io.3.gz +man/man3/coap_io_can_exit.3.gz man/man3/coap_io_do_epoll.3.gz man/man3/coap_io_do_io.3.gz man/man3/coap_io_prepare_epoll.3.gz man/man3/coap_io_prepare_io.3.gz man/man3/coap_io_process.3.gz man/man3/coap_io_process_with_fds.3.gz man/man3/coap_join_mcast_group_intf.3.gz man/man3/coap_keepalive.3.gz man/man3/coap_log.3.gz man/man3/coap_logging.3.gz man/man3/coap_make_str_const.3.gz +man/man3/coap_mcast_per_resource.3.gz man/man3/coap_new_bin_const.3.gz man/man3/coap_new_binary.3.gz man/man3/coap_new_cache_entry.3.gz man/man3/coap_new_client_session.3.gz man/man3/coap_new_client_session_pki.3.gz man/man3/coap_new_client_session_psk2.3.gz man/man3/coap_new_context.3.gz man/man3/coap_new_endpoint.3.gz man/man3/coap_new_optlist.3.gz man/man3/coap_new_pdu.3.gz man/man3/coap_new_str_const.3.gz man/man3/coap_new_string.3.gz man/man3/coap_observe.3.gz man/man3/coap_opt_length.3.gz man/man3/coap_opt_value.3.gz man/man3/coap_option_filter_clear.3.gz man/man3/coap_option_filter_get.3.gz man/man3/coap_option_filter_set.3.gz man/man3/coap_option_filter_unset.3.gz man/man3/coap_option_iterator_init.3.gz man/man3/coap_option_next.3.gz +man/man3/coap_package_build.3.gz man/man3/coap_package_name.3.gz man/man3/coap_package_version.3.gz man/man3/coap_pdu_access.3.gz man/man3/coap_pdu_get_code.3.gz man/man3/coap_pdu_get_mid.3.gz man/man3/coap_pdu_get_token.3.gz man/man3/coap_pdu_get_type.3.gz man/man3/coap_pdu_init.3.gz man/man3/coap_pdu_set_code.3.gz man/man3/coap_pdu_set_mid.3.gz man/man3/coap_pdu_set_type.3.gz man/man3/coap_pdu_setup.3.gz man/man3/coap_recovery.3.gz man/man3/coap_register_async.3.gz man/man3/coap_register_event_handler.3.gz -man/man3/coap_register_handler.3.gz man/man3/coap_register_nack_handler.3.gz man/man3/coap_register_ping_handler.3.gz man/man3/coap_register_pong_handler.3.gz +man/man3/coap_register_request_handler.3.gz man/man3/coap_register_response_handler.3.gz man/man3/coap_resize_binary.3.gz man/man3/coap_resource.3.gz man/man3/coap_resource_get_uri_path.3.gz man/man3/coap_resource_get_userdata.3.gz man/man3/coap_resource_init.3.gz man/man3/coap_resource_notify_observers.3.gz man/man3/coap_resource_proxy_uri_init.3.gz +man/man3/coap_resource_proxy_uri_init2.3.gz man/man3/coap_resource_release_userdata_handler.3.gz man/man3/coap_resource_set_get_observable.3.gz man/man3/coap_resource_set_mode.3.gz man/man3/coap_resource_set_userdata.3.gz man/man3/coap_resource_unknown_init.3.gz +man/man3/coap_resource_unknown_init2.3.gz man/man3/coap_send.3.gz man/man3/coap_session.3.gz man/man3/coap_session_disconnected.3.gz man/man3/coap_session_get_ack_random_factor.3.gz man/man3/coap_session_get_ack_timeout.3.gz man/man3/coap_session_get_addr_local.3.gz man/man3/coap_session_get_addr_remote.3.gz man/man3/coap_session_get_app_data.3.gz man/man3/coap_session_get_context.3.gz +man/man3/coap_session_get_default_leisure.3.gz man/man3/coap_session_get_ifindex.3.gz man/man3/coap_session_get_max_retransmit.3.gz +man/man3/coap_session_get_nstart.3.gz +man/man3/coap_session_get_probing_wait.3.gz man/man3/coap_session_get_proto.3.gz man/man3/coap_session_get_psk_hint.3.gz man/man3/coap_session_get_psk_key.3.gz man/man3/coap_session_get_state.3.gz man/man3/coap_session_get_tls.3.gz man/man3/coap_session_get_type.3.gz man/man3/coap_session_init_token.3.gz man/man3/coap_session_max_pdu_size.3.gz man/man3/coap_session_new_token.3.gz man/man3/coap_session_reference.3.gz man/man3/coap_session_release.3.gz man/man3/coap_session_set_ack_random_factor.3.gz man/man3/coap_session_set_ack_timeout.3.gz man/man3/coap_session_set_app_data.3.gz +man/man3/coap_session_set_default_leisure.3.gz man/man3/coap_session_set_max_retransmit.3.gz man/man3/coap_session_set_mtu.3.gz +man/man3/coap_session_set_no_observe_cancel.3.gz +man/man3/coap_session_set_nstart.3.gz +man/man3/coap_session_set_probing_wait.3.gz man/man3/coap_session_set_type_client.3.gz man/man3/coap_session_str.3.gz man/man3/coap_set_log_handler.3.gz man/man3/coap_set_log_level.3.gz man/man3/coap_set_show_pdu_output.3.gz man/man3/coap_show_pdu.3.gz man/man3/coap_show_tls_version.3.gz man/man3/coap_split_path.3.gz man/man3/coap_split_query.3.gz man/man3/coap_string.3.gz man/man3/coap_string_equal.3.gz man/man3/coap_string_tls_support.3.gz man/man3/coap_string_tls_version.3.gz man/man3/coap_tcp_is_supported.3.gz man/man3/coap_tls_is_supported.3.gz man/man3/coap_tls_library.3.gz man/man5/coap-client-gnutls.5.gz man/man5/coap-client-mbedtls.5.gz man/man5/coap-client-notls.5.gz man/man5/coap-client-openssl.5.gz man/man5/coap-client.5.gz man/man5/coap-rd-gnutls.5.gz man/man5/coap-rd-mbedtls.5.gz man/man5/coap-rd-notls.5.gz man/man5/coap-rd-openssl.5.gz man/man5/coap-rd.5.gz man/man5/coap-server-gnutls.5.gz man/man5/coap-server-mbedtls.5.gz man/man5/coap-server-notls.5.gz man/man5/coap-server-openssl.5.gz man/man5/coap-server.5.gz man/man7/coap.7.gz %%DATADIR%%/examples/COPYING %%DATADIR%%/examples/LICENSE %%DATADIR%%/examples/Makefile %%DATADIR%%/examples/README %%DATADIR%%/examples/coap-client.c %%DATADIR%%/examples/coap-server.c