Mercurial > mxe-octave
changeset 6943:fafb290c1dd7
zeromq: update to v4.3.5
* src/zeromq.mk: update to v4.3.5
* dist-files.mk: remove ref to patch files
* src/mingw-zeromq-1-fixes.patch, src/zeromq-1.patch: removed
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Sat, 28 Oct 2023 13:32:14 -0400 |
| parents | f64f0c7f8649 |
| children | 9414e8cf3e4f |
| files | dist-files.mk src/mingw-zeromq-1-fixes.patch src/zeromq-1.patch src/zeromq.mk |
| diffstat | 4 files changed, 2 insertions(+), 200 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Sat Oct 28 13:32:12 2023 -0400 +++ b/dist-files.mk Sat Oct 28 13:32:14 2023 -0400 @@ -351,7 +351,6 @@ mingw-texinfo-2-makeinfo-non-ASCII-perl.patch \ mingw-utils-1-portability-fix.patch \ mingw-w64.mk \ - mingw-zeromq-1-fixes.patch \ mingwrt.mk \ mman-win32-1-include_name_change.patch \ mman-win32.mk \ @@ -827,7 +826,6 @@ xz.mk \ yasm.mk \ zenity.mk \ - zeromq-1.patch \ zeromq.mk \ zlib-1-win32-static.patch \ zlib.mk \
--- a/src/mingw-zeromq-1-fixes.patch Sat Oct 28 13:32:12 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ ---- a/tests/testutil.cpp -+++ b/tests/testutil.cpp -@@ -382,7 +382,7 @@ fd_t connect_socket (const char *endpoint_, const int af_, const int protocol_) - protocol_ == IPPROTO_UDP - ? IPPROTO_UDP - : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0); -- TEST_ASSERT_NOT_EQUAL (-1, s_pre); -+ TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre); - - if (af_ == AF_INET || af_ == AF_INET6) { - const char *port = strrchr (endpoint_, ':') + 1; -@@ -439,7 +439,7 @@ fd_t bind_socket_resolve_port (const char *address_, - protocol_ == IPPROTO_UDP - ? IPPROTO_UDP - : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0); -- TEST_ASSERT_NOT_EQUAL (-1, s_pre); -+ TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre); - - if (af_ == AF_INET || af_ == AF_INET6) { - #ifdef ZMQ_HAVE_WINDOWS - ---- a/tests/testutil.hpp -+++ b/tests/testutil.hpp -@@ -102,7 +102,6 @@ const uint8_t zmtp_ready_sub[27] = { - #include <winsock2.h> - #include <ws2tcpip.h> - #include <stdexcept> --#define close closesocket - typedef int socket_size_t; - inline const char *as_setsockopt_opt_t (const void *opt) - { - ---- a/tests/testutil.cpp -+++ b/tests/testutil.cpp -@@ -296,7 +296,7 @@ int is_ipv6_available () - ipv6 = 0; - } - #endif -- close (fd); -+ closesocket (fd); - } - - return ipv6; -@@ -484,7 +484,7 @@ fd_t bind_socket_resolve_port (const char *address_, - #else - int fd = mkstemp (buffer); - TEST_ASSERT_TRUE (fd != -1); -- close (fd); -+ closesocket (fd); - #endif - #endif - strcpy ((*(struct sockaddr_un *) &addr).sun_path, buffer); -diff -ur zeromq-4.3.3.orig/Makefile.in zeromq-4.3.3/Makefile.in ---- zeromq-4.3.3.orig/Makefile.in 2021-01-16 16:58:57.118548621 -0500 -+++ zeromq-4.3.3/Makefile.in 2021-01-16 17:07:39.885588121 -0500 -@@ -2881,7 +2881,7 @@ - $(am__append_29) $(am__append_30) $(am__append_31) \ - $(am__append_32) $(am__append_33) $(am__append_36) \ - $(am__append_37) $(am__append_38) $(am__append_39) --UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT -+UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT -D__USE_MINGW_ANSI_STDIO=1 - UNITY_LIBS = $(top_builddir)/external/unity/libunity.a - external_unity_libunity_a_SOURCES = external/unity/unity.c \ - external/unity/unity.h \
--- a/src/zeromq-1.patch Sat Oct 28 13:32:12 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,132 +0,0 @@ -Patch for GCC12 -diff --git a/doc/zmq_socket_monitor_versioned.txt b/doc/zmq_socket_monitor_versioned.txt -index 5339f404a4..e71dd3544d 100644 ---- a/doc/zmq_socket_monitor_versioned.txt -+++ b/doc/zmq_socket_monitor_versioned.txt -@@ -244,7 +244,7 @@ EXAMPLE - // in case of error. - - static uint64_t --get_monitor_event (void *monitor, uint64_t *value, char **local_address, char **remote_address) -+get_monitor_event (void *monitor, uint64_t **value, char **local_address, char **remote_address) - { - // First frame in message contains event number - zmq_msg_t msg; -@@ -267,6 +267,11 @@ get_monitor_event (void *monitor, uint64_t *value, char **local_address, char ** - memcpy (&value_count, zmq_msg_data (&msg), sizeof (value_count)); - zmq_msg_close (&msg); - -+ if (value) { -+ *value = (uint64_t *) malloc (value_count * sizeof (uint64_t)); -+ assert (*value); -+ } -+ - for (uint64_t i = 0; i < value_count; ++i) { - // Subsequent frames in message contain event values - zmq_msg_init (&msg); -@@ -274,8 +279,8 @@ get_monitor_event (void *monitor, uint64_t *value, char **local_address, char ** - return -1; // Interrupted, presumably - assert (zmq_msg_more (&msg)); - -- if (value_ && value_ + i) -- memcpy (value_ + i, zmq_msg_data (&msg), sizeof (*value_)); -+ if (value && *value) -+ memcpy (&(*value)[i], zmq_msg_data (&msg), sizeof (uint64_t)); - zmq_msg_close (&msg); - } - -diff --git a/tests/test_monitor.cpp b/tests/test_monitor.cpp -index b9309e6df3..7398dbd8d0 100644 ---- a/tests/test_monitor.cpp -+++ b/tests/test_monitor.cpp -@@ -396,17 +396,19 @@ void test_monitor_versioned_stats (bind_function_t bind_function_, - for (int i = 0; i < pulls_count; ++i) { - char *push_local_address = NULL; - char *push_remote_address = NULL; -- uint64_t queue_stat[2]; -+ uint64_t *queue_stat = NULL; - int64_t event = get_monitor_event_v2 ( -- push_mon, queue_stat, &push_local_address, &push_remote_address); -+ push_mon, &queue_stat, &push_local_address, &push_remote_address); - TEST_ASSERT_EQUAL_STRING (server_endpoint, push_local_address); - TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, push_remote_address, - strlen (expected_prefix_)); - TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_PIPES_STATS, event); -+ TEST_ASSERT_NOT_NULL (queue_stat); - TEST_ASSERT_EQUAL_INT (i == 0 ? 0 : send_hwm, queue_stat[0]); - TEST_ASSERT_EQUAL_INT (0, queue_stat[1]); - free (push_local_address); - free (push_remote_address); -+ free (queue_stat); - } - - // Close client and server -diff --git a/tests/testutil_monitoring.cpp b/tests/testutil_monitoring.cpp -index 06406270a0..8668caee83 100644 ---- a/tests/testutil_monitoring.cpp -+++ b/tests/testutil_monitoring.cpp -@@ -207,7 +207,7 @@ int expect_monitor_event_multiple (void *server_mon_, - } - - static int64_t get_monitor_event_internal_v2 (void *monitor_, -- uint64_t *value_, -+ uint64_t **value_, - char **local_address_, - char **remote_address_, - int recv_flag_) -@@ -239,6 +239,12 @@ static int64_t get_monitor_event_internal_v2 (void *monitor_, - memcpy (&value_count, zmq_msg_data (&msg), sizeof (value_count)); - zmq_msg_close (&msg); - -+ if (value_) { -+ *value_ = -+ (uint64_t *) malloc ((size_t) value_count * sizeof (uint64_t)); -+ TEST_ASSERT_NOT_NULL (*value_); -+ } -+ - for (uint64_t i = 0; i < value_count; ++i) { - // Subsequent frames in message contain event values - zmq_msg_init (&msg); -@@ -249,8 +255,8 @@ static int64_t get_monitor_event_internal_v2 (void *monitor_, - TEST_ASSERT_TRUE (zmq_msg_more (&msg)); - TEST_ASSERT_EQUAL_UINT (sizeof (uint64_t), zmq_msg_size (&msg)); - -- if (value_ && value_ + i) -- memcpy (value_ + i, zmq_msg_data (&msg), sizeof (*value_)); -+ if (value_ && *value_) -+ memcpy (&(*value_)[i], zmq_msg_data (&msg), sizeof (uint64_t)); - zmq_msg_close (&msg); - } - -@@ -266,7 +272,7 @@ static int64_t get_monitor_event_internal_v2 (void *monitor_, - } - - static int64_t get_monitor_event_with_timeout_v2 (void *monitor_, -- uint64_t *value_, -+ uint64_t **value_, - char **local_address_, - char **remote_address_, - int timeout_) -@@ -299,7 +305,7 @@ static int64_t get_monitor_event_with_timeout_v2 (void *monitor_, - } - - int64_t get_monitor_event_v2 (void *monitor_, -- uint64_t *value_, -+ uint64_t **value_, - char **local_address_, - char **remote_address_) - { -diff --git a/tests/testutil_monitoring.hpp b/tests/testutil_monitoring.hpp -index a69db29015..eb6817d3c1 100644 ---- a/tests/testutil_monitoring.hpp -+++ b/tests/testutil_monitoring.hpp -@@ -67,7 +67,7 @@ int expect_monitor_event_multiple (void *server_mon_, - bool optional_ = false); - - int64_t get_monitor_event_v2 (void *monitor_, -- uint64_t *value_, -+ uint64_t **value_, - char **local_address_, - char **remote_address_); - -
--- a/src/zeromq.mk Sat Oct 28 13:32:12 2023 -0400 +++ b/src/zeromq.mk Sat Oct 28 13:32:14 2023 -0400 @@ -3,8 +3,8 @@ PKG := zeromq $(PKG)_IGNORE := -$(PKG)_VERSION := 4.3.4 -$(PKG)_CHECKSUM := 47277a64749049123d1401600e8cfbab10a3ae28 +$(PKG)_VERSION := 4.3.5 +$(PKG)_CHECKSUM := bdbf686c8a40ba638e21cf74e34dbb425e108500 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://github.com/$(PKG)/libzmq/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)