Changes 4.1.4:

* Fixed 1315 - socket monitor hangs if bind/setsockopt failed.
* Fixed 1399 - assertion failure in tcp.cpp after network reconnect.
* Fixed 1632 - build failure using latest libsodium.
* Fixed 1644 - assertion failure in msg.cpp:390 on STREAM sockets.
* Fixed 1661 - does not handle IPv6 link local addresses.

4 files changed, 13 insertions, 90 deletions

diff --git a/net/zeromq/Makefile b/net/zeromq/Makefile
index 7ec0e5f11bc..b811f27c5e9 100644
--- a/net/zeromq/Makefile
+++ b/net/zeromq/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2015/08/28 12:52:01 he Exp $
+# $NetBSD: Makefile,v 1.22 2016/02/07 11:05:38 adam Exp $
 
-DISTNAME=	zeromq-4.1.3
+DISTNAME=	zeromq-4.1.4
 CATEGORIES=	net devel
 MASTER_SITES=	http://download.zeromq.org/
 
@@ -9,10 +9,11 @@ HOMEPAGE=	http://www.zeromq.org/
 COMMENT=	The ZeroMQ messaging library
 LICENSE=	gnu-lgpl-v3
 
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
-GNU_CONFIGURE=	yes
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-libsodium=${BUILDLINK_PREFIX.libsodium}
 
 PKGCONFIG_OVERRIDE+=	src/libzmq.pc.in
 
@@ -28,11 +29,9 @@ CXXFLAGS+=	-std=gnu++0x
 CXXFLAGS+=	-std=gnu++11
 .endif
 
-.include "../../security/libsodium/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-libsodium=${BUILDLINK_PREFIX.libsodium}
-
 .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/distinfo b/net/zeromq/distinfo
index 567186ccbc6..28c07c6efde 100644
--- a/net/zeromq/distinfo
+++ b/net/zeromq/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.19 2015/11/24 11:01:34 wiz Exp $
+$NetBSD: distinfo,v 1.20 2016/02/07 11:05:38 adam Exp $
 
-SHA1 (zeromq-4.1.3.tar.gz) = b7185724f2fd56d0face50047757ac2a04d26ca4
-RMD160 (zeromq-4.1.3.tar.gz) = fbfe9c0fe9a141c9b4cf282b89019f9df47079de
-SHA512 (zeromq-4.1.3.tar.gz) = 2c993d18ea44e1cba890e024176af65b85b842ca4f8a22d319be4ace8388ab8828dd706b065f02754025bf271b1d7aa878c3f6655878248f7826452cb2a6134c
-Size (zeromq-4.1.3.tar.gz) = 1372069 bytes
+SHA1 (zeromq-4.1.4.tar.gz) = b632a4b6f8a14390dc17824e37ff7b10831ce2b4
+RMD160 (zeromq-4.1.4.tar.gz) = 6ee27e7b1c3a978cdff670774a8363d8592c3031
+SHA512 (zeromq-4.1.4.tar.gz) = 8a8cf4f52ad78dddfff104bfba0f80bbc12566920906a0fafb9fc340aa92f5577c2923cb2e5346c69835cd2ea1609647a8893c2883cd22c1f0340a720511460c
+Size (zeromq-4.1.4.tar.gz) = 1400012 bytes
 SHA1 (patch-configure) = 1dc8623eb06a167b3559ae950a9dbf1e19a29b6d
-SHA1 (patch-src_curve__client.cpp) = 72503a9649e6e02bd17d78109aa8b396eb7b0049
-SHA1 (patch-src_curve__server.cpp) = 7acd371d1e8ec6064d086c2dc503cdd0ec6c9a58
 SHA1 (patch-src_platform.hpp.in) = 767370bd997310cddeb7ee1f759bec1a638974e0
 SHA1 (patch-src_tcp__address.cpp) = ad1c1ec9b724c3bd7f0fae15c296e0ec33b4267a
diff --git a/net/zeromq/patches/patch-src_curve__client.cpp b/net/zeromq/patches/patch-src_curve__client.cpp
deleted file mode 100644
index 1c3c023216d..00000000000
--- a/net/zeromq/patches/patch-src_curve__client.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-src_curve__client.cpp,v 1.1 2015/11/24 11:01:34 wiz Exp $
-
-Problem: return code of sodium_init() is not checked.
-
-There are two todo comments in curve_client.cpp and curve_server.cpp that suggest
-checking the return code of sodium_init() call. sodium_init() returns -1 on error,
-0 on success and 1 if it has been called before and is already initalized:
-https://github.com/jedisct1/libsodium/blob/master/src/libsodium/sodium/core.c
-
-https://github.com/zeromq/zeromq4-1/commit/89d4e995ef92d5cb3d0f0373ec7d80c2ad7fa0d3
-
---- src/curve_client.cpp.orig	2015-06-15 09:43:08.000000000 +0000
-+++ src/curve_client.cpp
-@@ -48,6 +48,7 @@ zmq::curve_client_t::curve_client_t (con
-     cn_peer_nonce(1),
-     sync()
- {
-+    int rc;
-     memcpy (public_key, options_.curve_public_key, crypto_box_PUBLICKEYBYTES);
-     memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES);
-     memcpy (server_key, options_.curve_server_key, crypto_box_PUBLICKEYBYTES);
-@@ -57,12 +58,12 @@ zmq::curve_client_t::curve_client_t (con
-     unsigned char tmpbytes[4];
-     randombytes(tmpbytes, 4);
- #else
--    // todo check return code
--    sodium_init();
-+    rc = sodium_init ();
-+    zmq_assert (rc != -1);
- #endif
- 
-     //  Generate short-term key pair
--    const int rc = crypto_box_keypair (cn_public, cn_secret);
-+    rc = crypto_box_keypair (cn_public, cn_secret);
-     zmq_assert (rc == 0);
- }
- 
diff --git a/net/zeromq/patches/patch-src_curve__server.cpp b/net/zeromq/patches/patch-src_curve__server.cpp
deleted file mode 100644
index 4180c5bda71..00000000000
--- a/net/zeromq/patches/patch-src_curve__server.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-src_curve__server.cpp,v 1.1 2015/11/24 11:01:34 wiz Exp $
-
-Problem: return code of sodium_init() is not checked.
-
-There are two todo comments in curve_client.cpp and curve_server.cpp that suggest
-checking the return code of sodium_init() call. sodium_init() returns -1 on error,
-0 on success and 1 if it has been called before and is already initalized:
-https://github.com/jedisct1/libsodium/blob/master/src/libsodium/sodium/core.c
-
-https://github.com/zeromq/zeromq4-1/commit/89d4e995ef92d5cb3d0f0373ec7d80c2ad7fa0d3
-
---- src/curve_server.cpp.orig	2015-06-15 09:43:08.000000000 +0000
-+++ src/curve_server.cpp
-@@ -52,6 +52,7 @@ zmq::curve_server_t::curve_server_t (ses
-     cn_peer_nonce(1),
-     sync()
- {
-+    int rc;
-     //  Fetch our secret key from socket options
-     memcpy (secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES);
-     scoped_lock_t lock (sync);
-@@ -60,12 +61,12 @@ zmq::curve_server_t::curve_server_t (ses
-     unsigned char tmpbytes[4];
-     randombytes(tmpbytes, 4);
- #else
--    // todo check return code
--    sodium_init();
-+    rc = sodium_init ();
-+    zmq_assert (rc != -1);
- #endif
- 
-     //  Generate short-term key pair
--    const int rc = crypto_box_keypair (cn_public, cn_secret);
-+    rc = crypto_box_keypair (cn_public, cn_secret);
-     zmq_assert (rc == 0);
- }
-