zeromq: updated to 4.2.3

version 4.2.3 stable:

* API change: previously ZMQ_POLLOUT on a ZMQ_ROUTER socket returned always
  true due to how the type works. When ZMQ_ROUTER_MANDATORY is set, sending
  fails when the peer is not available, but ZMQ_POLLOUT always returns true
  anyway, which does not make sense. Now when ZMQ_ROUTER_MANDATORY is set,
  ZMQ_POLLOUT on a ZMQ_ROUTER will return true only if at least one peer is
  available.
  Given ZMQ_POLLOUT with ZMQ_ROUTER was not usable at all previously, we do
  not consider this a breakage warranting a major or minor version increase.

* ZMQ_IDENTITY has been renamed to ZMQ_ROUTING_ID and ZMQ_CONNECT_RID has been
  renamed to ZMQ_CONNTECT_ROUTING_ID to disambiguate. ZMQ_IDENTITY and
  ZMQ_CONNECT_RID are still available to keep backward compatibility, and will
  be removed in a future release after further advance notice.

* DRAFT API change: zmq_poller_wait, zmq_poller_wait_all and zmq_poller_poll
  have been changed to be inline with other existing APIs that have a timeout
  to return EAGAIN instead of ETIMEDOUT as the errno value.

* Existing non-DRAFT socket types ZMQ_REP/REQ, ZMQ_ROUTER/DEALER and
  ZMQPUB/SUB, that were previously declared deprecated, have been reinstated
  as stable and supported.

* Tweetnacl: add support for, and use preferably if available, getrandom() as
  a simpler and less error-prone alternative to /dev/urandom on OSes where it
  is available (eg: Linux 3.18 with glibc 2.25).

* Curve: all remaining traces of debug output to console are now removed, and
  new DRAFT events are available to properly debug CURVE, PLAIN, GSSAPI and
  ZAP events and failures. See below for details on the new events.

* New DRAFT (see NEWS for 4.2.0) socket options:
  - ZMQ_GSSAPI_PRINCIPAL_NAMETYPE and ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE, for
    the corresponding GSSAPI features. Additional definitions for principal
    name types:
    - ZMQ_GSSAPI_NT_HOSTBASED
    - ZMQ_GSSAPI_NT_USER_NAME
    - ZMQ_GSSAPI_NT_KRB5_PRINCIPAL
    See doc/zmq_gssapi.txt for details.
  - ZMQ_BINDTODEVICE (Linux only), which will bind the socket(s) to the
    specified interface. Allows to use Linux VRF, see:
    https://www.kernel.org/doc/Documentation/networking/vrf.txt
    NOTE: requires the program to be ran as root OR with CAP_NET_RAW
  - ZMQ_ZAP_ENFORCE_DOMAIN, enables strict RFC 27 compatibility mode and makes
    the ZAP Domain mandatory when using security. See:
    https://rfc.zeromq.org/spec:27/ZAP
  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.

* New DRAFT (see NEWS for 4.2.0) context options:
  - ZMQ_THREAD_AFFINITY_CPU_ADD and ZMQ_THREAD_AFFINITY_CPU_REMOVE (Posix only),
    to add and remove CPUs to the affinity set of the I/O threads. Useful to pin
    the background threads to specific CPUs.
  - ZMQ_THREAD_NAME_PREFIX (Posix only), to add a specific integer prefix to the
    background threads names, to easily identify them for debugging purposes.
  See doc/zmq_ctx_set.txt and doc/zmq_ctx_get.txt for details.

* New DRAFT (see NEWS for 4.2.0) message property name definitions to facilitate
  the use of zmq_msg_gets:
  - ZMQ_MSG_PROPERTY_ROUTING_ID
  - ZMQ_MSG_PROPERTY_SOCKET_TYPE
  - ZMQ_MSG_PROPERTY_USER_ID
  - ZMQ_MSG_PROPERTY_PEER_ADDRESS
  See doc/zmq_msg_gets.txt for details.

* New DRAFT (see NEWS for 4.2.0) API zmq_socket_get_peer_state, to be used to
  query the state of a specific peer (via routing-id) of a ZMQ_ROUTER socket.

* New DRAFT (see NEWS for 4.2.0) Socket Monitor events:
  - ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL, unknown system error and returns errno
  - ZMQ_EVENT_HANDSHAKE_SUCCEEDED, handshake was successful
  - ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL, protocol errors between peers or server
    and ZAP handler. Returns one of ZMQ_PROTOCOL_ERROR_* - see manpage for list
  - ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, failed authentication, returns ZAP status
  These events trigger when the ZMTP security mechanism handshake is
  completed or failed. See doc/zmq_socket_monitor.txt for more information.

* New DRAFT (see NEWS for 4.2.0) zmq_proxy_steerable command 'STATISTICS' to
  retrieve stats about the amount of messages and bytes sent and received by
  the proxy. See doc/zmq_proxy_steerable.txt for more information.

* Add new autoconf --disable-libunwind option to stop building with libunwind
  even if it is available.

* Add new autoconf --disable-Werror option to avoid building with the Werror
  flag.

* Use pkg-config as the first method for finding and building with external
  optional dependencies such as libnorm, libpgm and gssapi.

* On Posix platform where the feature is available, name the ZMQ background
  threads to simplify debugging: "ZMQbg/<num_thread>"

* Improve performance of zmq_poller_* (and zmq_poll and zmq_proxy when building
  with DRAFT APIs enabled).

* The TCP unit tests have been refactored to bind and connect to random ports
  rather than hard-coded ones, to allow running tests in parallel.
  There are 6 exceptions where it is necessary to use an hard-coded port to
  test specific code paths that would not be exercised when binding to a
  wildcard port. These are listed in tests/testutil.hpp so that distributions
  can easily patch them if they wish to and so that they can be unique across
  all the tests, allowing parallel runs.
  The IPC unit tests have been changed as well to use unique socket file names
  per test, where before there were some clashes.

* Fixed 2349 - fix building with libsodium when using CMake

* Fixed 2334 - do not assert when tuning socket options fails due to network
  errors, but simply retry again when connecting or send a socket monitor
  ZMQ_EVENT_ACCEPT_FAILED event when binding

* Fixed 2341 - fix source files path in VS2015 solution

* Fixed 2344 - Note that on Windows with VS2012 it is mandatory to increase
  the default stack size to at least 2MB

* Fixed 2348 - ZMQ_ROUTER send with ZMQ_ROUTER_MANDATORY can be stuck in case of
  network problem

* Fixed 2358 - occasional abort on zmq_connect on Windows

* Fixed 2370 - zmq_curve_keypair should return an error on failure rather
  than ignoring them and always returning 0

* Fixed 2452 - __STDC_LIMIT_MACROS before precompiled headers causes VC++
  warning

* Fixed 2457 - fix building with libsodium in Visual Studio solutions

* Fixed 2466 - add const qualifier to internal and public API that does not
  modify parameters

* Fixed 2471 - do more checks for OOM conditions when dynamic allocations is
  used

* Fixed 2476 - assertion causes abort after ZAP stop at shutdown

* Fixed 2479 - improve zmq_poller performance on Windows

* Fixed 2481 - potential memory leaks due to ZMTP handshake failures

* Fixed 2531 - ZMQ_GSSAPI_PRINCIPAL sockopt has no effect on client side

* Fixed 2535 - add BUILD_SHARED and BUILD_STATIC options to CMake, both on by
  default, to toggle shared and static library builds

* Fixed 2537 - use SYSTEM_CLOCK on OSX and CLOCK_MONOTONIC elsewhere for
  internal timers to avoid races

* Fixed 2540 - new zmq_poller used by zmq_poll without DRAFTs

* Fixed 2552 - Fix WITH_DOC CMake build to avoid checking for asciidoc if the
  option is disabled

* Fixed 2567 - Memory leak in REP socket handling

* Fixed 2579 - Compilation issue on Windows with CMake + ninja

* Fixed 2588 - SIGBUS under 64-bit SunOS Sparc

* Fixed 2590 - crash when using ZMQ_IMMEDIATE and ZMQ_LINGER to non-zero

* Fixed 2601 - XPUB_MANUAL subscriptions not removed on peer term

* Fixed 2602 - intermittent memory leak for ZMQ_REQ/REP send/recv

* Fixed 2608 - CURVE server (connect) fails when client rebinds

* Fixed 2610 - print backtraces in mutual exclusion to avoid mixing
  different traces

* Fixed 2621 - add missing CMake files to distributable tarball

* Fixed 2630 - improve compatibility with OpenBSD w.r.t. IPV6_V6ONLY

* Fixed 2638 - note in INSTALL that when using Windows builds on Linux with
  Wine it is necessary to increase the minimum TCP buffers

* Fixed 2632 - Fix file descriptor leak when using Tweetnacl (internal NACL
  implementation) instead of Libsodium, and fix race condition when using
  multiple ZMQ contexts with Tweetnacl

* Fixed 2681 - Possible buffer overflow in CURVE mechanism handshake.
  NOTE: this was protected by an assert previously, so there is no security
  risk.

* Fixed 2704 - test_sockopt_hwm fails occasionally on Windows

* Fixed 2701 - pgm build via cmake doesn't link libzmq with libpgm

* Fixed 2711 - ZAP handler communication errors should be handled consistently

* Fixed 2723 - assertion in src\select.cpp:111 or hang on zmq_ctx_destroy on
  Windows

* Fixed 2728 - fix support O_CLOEXEC when building with CMake

* Fixed 2761 - improve compatibility with TrueOS (FreeBSD 12)

* Fixed 2764 - do not unlink IPC socket files when closing a socket to avoid
  race conditions

* Fixed 2770 - support lcov 1.13 and newer

* Fixed 2787 - add libiphlpapi to PKGCFG_LIBS_PRIVATE for static mingw builds

* Fixed 2788 - document that adding -DZMQ_STATIC is required for Windows
  static builds with Mingw

* Fixed 2789 - description of zmq_atomic_counter_value return value is cloned
  from zmq_atomic_counter_new

* Fixed 2791 - fix building with DRAFT APIs on CentOS 6

* Fixed 2794 - router_t methods should not allocate memory for lookup in
  outpipes

* Fixed 2809 - optimize select() usage on Windows

* Fixed 2816 - add CMake and autoconf check for accept4, as it is not
  available on old Linux releases, and fallback to accept + FD_CLOEXEC

* Fixed 2824 - ZMQ_REQ socket does not report ZMQ_POLLOUT when ZMQ_REQ_RELAXED
  is set

* Fixed 2827 - add support for Haiku

* Fixed 2840 - fix building with VS2008

* Fixed 2845 - correct the ZMQ_LINGER documentation to accurately reflect that
  the default value is -1 (infinite). It never was 30 second in any released
  version, it was only changed briefly and then changed back, but the manpage
  was not reverted.

* Fixed 2861 - CMake/MSVC: export ZMQ_STATIC when needed.

6 files changed, 33 insertions, 24 deletions

diff --git a/net/zeromq/Makefile b/net/zeromq/Makefile
index 0da3668f2bb..12dffa7e7b8 100644
--- a/net/zeromq/Makefile
+++ b/net/zeromq/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2017/08/13 17:10:45 adam Exp $
+# $NetBSD: Makefile,v 1.27 2018/01/13 18:22:42 adam Exp $
 
-DISTNAME=	zeromq-4.2.2
+DISTNAME=	zeromq-4.2.3
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=zeromq/}
 
@@ -27,6 +27,5 @@ TEST_TARGET=	check
 .if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 .include "../../devel/libuuid/buildlink3.mk"
 .endif
-
 .include "../../security/libsodium/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/zeromq/PLIST b/net/zeromq/PLIST
index 3e73d2ae38a..bdace1ffe3b 100644
--- a/net/zeromq/PLIST
+++ b/net/zeromq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2017/02/02 10:09:53 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/01/13 18:22:42 adam Exp $
 bin/curve_keygen
 include/zmq.h
 include/zmq_utils.h
@@ -58,6 +58,7 @@ man/man3/zmq_z85_decode.3
 man/man3/zmq_z85_encode.3
 man/man7/zmq.7
 man/man7/zmq_curve.7
+man/man7/zmq_gssapi.7
 man/man7/zmq_inproc.7
 man/man7/zmq_ipc.7
 man/man7/zmq_null.7
diff --git a/net/zeromq/distinfo b/net/zeromq/distinfo
index d01f85aa284..9604feb77c2 100644
--- a/net/zeromq/distinfo
+++ b/net/zeromq/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2017/08/13 17:10:45 adam Exp $
+$NetBSD: distinfo,v 1.26 2018/01/13 18:22:42 adam Exp $
 
-SHA1 (zeromq-4.2.2.tar.gz) = 5ef9b1c385f4b897e6a9e4847e5355758c20de76
-RMD160 (zeromq-4.2.2.tar.gz) = 22394c5a83727abcb10bbc56f228cb8180879741
-SHA512 (zeromq-4.2.2.tar.gz) = d78813a61ce3311a1f8c230f7da0f5aedc97ef4b792afb6d398c5710da239348c0c7a67bdfeb38a7ab0282af498f1ed173649aff4add1bc35f0ef1b66f965443
-Size (zeromq-4.2.2.tar.gz) = 1236437 bytes
-SHA1 (patch-configure) = 5501450e277660d649d53f8a9d753037b4a22f15
-SHA1 (patch-src_ipc__listener.cpp) = 8e7cbd5554e9f16f251445ed56419cce4f255b35
-SHA1 (patch-src_tcp__listener.cpp) = 1a13889c499b71a22665c31ec374e7e284fe503c
+SHA1 (zeromq-4.2.3.tar.gz) = a4d00313d11f0fe38fd7a24a65c2363c80675494
+RMD160 (zeromq-4.2.3.tar.gz) = cb1fd3fa0193760872dcbd3dc7bd212826299f7e
+SHA512 (zeromq-4.2.3.tar.gz) = 8ac588a7a4db9d65586dd7b501999edac151e1d03056c1014d7ded6cd4bcf5bb4f81252b47d89d60c3ad7d527685218992bf5853b4656c0702e0f64c2d77712b
+Size (zeromq-4.2.3.tar.gz) = 1326780 bytes
+SHA1 (patch-configure) = c6b5ab95dc022525b8af92756c5c1ee9dc3656e0
+SHA1 (patch-src_ipc__listener.cpp) = fdaa86b9c13b5c3f7e9dff3934085a4138fac279
+SHA1 (patch-src_tcp__listener.cpp) = d91f06b69a650f74084bb4a0106d7fc0a8387107
diff --git a/net/zeromq/patches/patch-configure b/net/zeromq/patches/patch-configure
index 3e4357f3a62..bbc11f5fb91 100644
--- a/net/zeromq/patches/patch-configure
+++ b/net/zeromq/patches/patch-configure
@@ -1,10 +1,19 @@
-$NetBSD: patch-configure,v 1.5 2017/02/02 10:09:53 fhajny Exp $
+$NetBSD: patch-configure,v 1.6 2018/01/13 18:22:42 adam Exp $
 
-Portability.
+Portability fixes.
 
---- configure.orig	2016-11-04 10:30:55.000000000 +0000
+--- configure.orig	2017-12-13 13:37:25.000000000 +0000
 +++ configure
-@@ -20286,12 +20286,12 @@ if test "${with_poller+set}" = set; then
+@@ -19007,7 +19007,7 @@ if test "${enable_address_sanitizer+set}
+ fi
+ 
+ 
+-if test "x${ZMQ_ASAN}" == "xyes"; then
++if test "x${ZMQ_ASAN}" = "xyes"; then
+     CFLAGS="${CFLAGS} -fsanitize=address"
+     CXXFLAGS="${CXXFLAGS} -fsanitize=address"
+ 
+@@ -20448,12 +20448,12 @@ if test "${with_poller+set}" = set; then
  fi
  
  
diff --git a/net/zeromq/patches/patch-src_ipc__listener.cpp b/net/zeromq/patches/patch-src_ipc__listener.cpp
index 68f9c3c6eae..9eadf27e754 100644
--- a/net/zeromq/patches/patch-src_ipc__listener.cpp
+++ b/net/zeromq/patches/patch-src_ipc__listener.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_ipc__listener.cpp,v 1.2 2017/02/08 18:15:44 maya Exp $
+$NetBSD: patch-src_ipc__listener.cpp,v 1.3 2018/01/13 18:22:42 adam Exp $
 
 NetBSD<8 has SOCK_CLOEXEC -- but uses it with paccept, not accept4
 
---- src/ipc_listener.cpp.orig	2016-12-31 15:25:47.000000000 +0000
+--- src/ipc_listener.cpp.orig	2017-12-13 13:37:08.000000000 +0000
 +++ src/ipc_listener.cpp
-@@ -391,7 +391,11 @@ zmq::fd_t zmq::ipc_listener_t::accept ()
+@@ -383,7 +383,11 @@ zmq::fd_t zmq::ipc_listener_t::accept ()
      //  resources is considered valid and treated by ignoring the connection.
      zmq_assert (s != retired_fd);
- #if defined ZMQ_HAVE_SOCK_CLOEXEC
+ #if defined ZMQ_HAVE_SOCK_CLOEXEC && defined HAVE_ACCEPT4
 +#if defined(__NetBSD__)
 +    fd_t sock = ::paccept (s, NULL, NULL, NULL, SOCK_CLOEXEC);
 +#else
diff --git a/net/zeromq/patches/patch-src_tcp__listener.cpp b/net/zeromq/patches/patch-src_tcp__listener.cpp
index 9546ab8e10c..a95276349cd 100644
--- a/net/zeromq/patches/patch-src_tcp__listener.cpp
+++ b/net/zeromq/patches/patch-src_tcp__listener.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_tcp__listener.cpp,v 1.2 2017/02/08 18:15:44 maya Exp $
+$NetBSD: patch-src_tcp__listener.cpp,v 1.3 2018/01/13 18:22:42 adam Exp $
 
 NetBSD<8 has SOCK_CLOEXEC, but uses it with paccept, not accept4
 
---- src/tcp_listener.cpp.orig	2016-12-31 15:25:47.000000000 +0000
+--- src/tcp_listener.cpp.orig	2017-12-13 13:37:08.000000000 +0000
 +++ src/tcp_listener.cpp
-@@ -274,7 +274,11 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
+@@ -282,7 +282,11 @@ zmq::fd_t zmq::tcp_listener_t::accept ()
      socklen_t ss_len = sizeof (ss);
  #endif
- #if defined ZMQ_HAVE_SOCK_CLOEXEC
+ #if defined ZMQ_HAVE_SOCK_CLOEXEC && defined HAVE_ACCEPT4
 +#if defined(__NetBSD__)
 +    fd_t sock = ::paccept (s, (struct sockaddr *) &ss, &ss_len, NULL, SOCK_CLOEXEC);
 +#else