git: af77fe610bc0 - main - net/libcoap: update to 4.3.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Tobias C. Berner <tcberner_at_FreeBSD.org>
Date: Wed, 23 Nov 2022 15:29:02 UTC
The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=af77fe610bc0e6e5bbc286f4042fbac17aa334bc

commit af77fe610bc0e6e5bbc286f4042fbac17aa334bc
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2022-11-23 15:04:36 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2022-11-23 15:28:49 +0000

    net/libcoap: update to 4.3.1
    
    - completely rely on gsed instead of patching the makefile to work with
      sed
---
 net/libcoap/Makefile                    |  3 ++-
 net/libcoap/distinfo                    |  6 +++---
 net/libcoap/files/patch-configure.ac    |  4 ++--
 net/libcoap/files/patch-doc_Makefile.am | 33 ---------------------------------
 net/libcoap/pkg-plist                   | 27 +++++++++++++++++++++------
 5 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/net/libcoap/Makefile b/net/libcoap/Makefile
index faa994ad49ec..ea7de6e6b69d 100644
--- a/net/libcoap/Makefile
+++ b/net/libcoap/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libcoap
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.3.0
+DISTVERSION=	4.3.1
 CATEGORIES=	net
 
 MAINTAINER=	tcberner@FreeBSD.org
@@ -35,4 +35,5 @@ DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			dot:graphics/graphviz
 DOXYGEN_CONFIGURE_ENABLE=	doxygen
 
+CONFIGURE_ENV=ac_cv_path_SED=${LOCALBASE}/bin/gsed
 .include <bsd.port.mk>
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,6 +1,6 @@
---- 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)
      ;;
  
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 '    </tab>' >> $(top_builddir)/doc/insert_file ;\
- 	## Create and Update the DoxygenLayout.xml file
- 	$(DOXYGEN) -l ;\
--	$(SED) -i 's/<tab type="pages" visible="yes" /<tab type="pages" visible="no" /g' $(top_builddir)/doc/DoxygenLayout.xml ;\
--	$(SED) -i '/<tab type="examples" visible=.*/r insert_file' $(top_builddir)/doc/DoxygenLayout.xml ;\
-+	$(SED) -i '' 's/<tab type="pages" visible="yes" /<tab type="pages" visible="no" /g' $(top_builddir)/doc/DoxygenLayout.xml ;\
-+	$(SED) -i '' '/<tab type="examples" visible=.*/r insert_file' $(top_builddir)/doc/DoxygenLayout.xml ;\
- 	$(RM) $(top_builddir)/doc/insert_file ;\
- 	## Fix up man html files, fixing links, UC Name and Synopsis
- 	for FILE in $${MAN_FILES} ; do \
-@@ -121,8 +121,8 @@ man-page-build: upg-page-build man-page-start
- 		if [ -f $(top_builddir)/man/$${BASE}.html ]; then \
- 			cp -f $(top_builddir)/man/$${BASE}.html $(top_builddir)/doc/man_html/$${BASE}.html ;\
- 			## Correct case sensitive Name and Synopsis
--			$(SED) -i 's^<h2>Name</h2>^<h2>NAME</h2>^g' $(top_builddir)/doc/man_html/$${BASE}.html ;\
--			$(SED) -i 's^<h2>Synopsis</h2>^<h2>SYNOPSIS</h2>^g' $(top_builddir)/doc/man_html/$${BASE}.html ;\
-+			$(SED) -i '' 's^<h2>Name</h2>^<h2>NAME</h2>^g' $(top_builddir)/doc/man_html/$${BASE}.html ;\
-+			$(SED) -i '' 's^<h2>Synopsis</h2>^<h2>SYNOPSIS</h2>^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^<span class=\"strong\"><strong>$${EBASE}</strong></span>($${SECTION})^<a href=\"man_$${EBASE}.html\" target=\"_self\"><span class=\"strong\"><strong>$${EBASE}</strong></span>($${SECTION})</a>^g" $(top_builddir)/doc/man_html/$${BASE}.html ;\
-+			$(SED) -i '' "s^<span class=\"strong\"><strong>$${EBASE}</strong></span>($${SECTION})^<a href=\"man_$${EBASE}.html\" target=\"_self\"><span class=\"strong\"><strong>$${EBASE}</strong></span>($${SECTION})</a>^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
@@ -4,10 +4,10 @@ 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
@@ -16,18 +16,18 @@ 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
@@ -51,12 +51,13 @@ 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
@@ -88,6 +89,7 @@ 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
@@ -112,9 +114,11 @@ 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
@@ -126,6 +130,7 @@ 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
@@ -147,6 +152,7 @@ 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
@@ -162,10 +168,10 @@ 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
@@ -174,11 +180,13 @@ 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
@@ -188,8 +196,11 @@ 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
@@ -204,8 +215,12 @@ 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