Update zeromq to 4.0.3.

0MQ version 4.0.3 stable, released on 2013/11/24
================================================

Bug Fixes
---------

* Fixed test_many_sockets case, which failed when process socket limit
  was 1024.


0MQ version 4.0.2 stable, released on 2013/11/24
================================================

Bug Fixes
---------

* Fixed LIBZMQ-583 - improved low-res timer for Windows
* Fixed LIBZMQ-578 - z85_decode was extremely slow
* Fixed LIBZMQ-577 - fault in man pages.
* Fixed LIBZMQ-574 - assertion failure when ran out of system file handles
* Fixed LIBZMQ-571 - test_stream failing in some cases
* Fixed LIBZMQ-569 - Socket server crashes with random client data and when
  talking to 2.2 versions
* Fixed LIBZMQ-39 - Bad file descriptor during shutdown
* Pulled expected failing test_linger.cpp from release
* Reduced pause time in tests to allow "make check" to run faster


0MQ version 4.0.1 stable, released on 2013/10/08
================================================

Changes
-------

* Updated CURVE mechanism to track revised RFC 27 (INITIATE vouch).

  The INITIATE command vouch box is Box[C',S](C->S') instead of
  Box[C'](C->S), to reduce the risk of client impersonation, as per
  https://codesinchaos.wordpress.com/2012/09/09/curvecp-1/.

* Fixed LIBZMQ-567, adding abstract namespaces for IPC sockets on Linux.

  Converts an initial strudel or "at sign" (@) in the Unix socket path to
  a NULL character ('\0') indicating that the socket uses the abstract
  namespace instead of the filesystem namespace.  For instance, binding a
  socket to 'ipc://@/tmp/tester' will not create a file associated with
  the socket whereas binding to 'ipc:///tmp/tester' will create the file
  /tmp/tester. See issue 567 for more information.

* Added zmq_z85_encode and zmq_z85_decode to core libzmq API.

* Added zmq_curve_keypair to core libzmq API.

* Bumped library ABI version to 4:0:1.

Bug fixes
---------

* Fixed some build/test errors on OS/X + Clang++.

* Fixed LIBZMQ-565, typo in code.

* Fixed LIBZMQ-566, dealer-to-router connections sometimes failing.

* Fixed builds for AIX, MSVC 2008, OS/X with clang++, Solaris.

* Improved CURVE handshake error handling.


0MQ version 4.0.0 (RC1), released on 2013/09/20
===============================================

Major changes
-------------

* New wire level protocol, ZMTP/3.0, see http://rfc.zeromq.org/spec:23.
  Does not yet implement the SUBSCRIBE, CANCEL, PING, and PONG commands.

* New security framework, from plain user+password to strong encryption,
  see section below. See http://hintjens.com/blog:49 for a tutorial.

* New ZMQ_STREAM socket type for working as a TCP client or server. See:
  tests/test_stream.cpp.

Improvements
------------

* You can now connect to an inproc:// endpoint that does not already
  exist. This means inproc:// no longer needs careful set-up, but it may
  break code that relied on the old behaviour. See:
  tests/test_inproc_connect.cpp.

* Libzmq now checks socket types at connection time, so that trying to
  connect a 'wrong' socket type will fail.

* New zmq_ctx_shutdown API method will shutdown a context and send ETERM
  to blocking calls, without blocking. Use zmq_ctx_term to finalise the
  process.

* The regression test suite has been significantly extended and improved.

* Contexts can now be terminated in forked child processes. See:
  tests/test_fork.cpp.

* zmq_disconnect now respects the linger setting on sockets.

* New zmq_send_const API method to send constant data (without copying).
  See: tests/test_inproc_connect.cpp.

* Added CMake support for static libraries.

* Added test cases for socket semantics as defined in RFCs 28, 29, 30, 31.
  See: tests/test_spec_*.cpp.

* New socket option, ZMQ_PROBE_ROUTER triggers an empty message on connect.
  See: tests/test_probe_router.cpp.

* New socket option, ZMQ_REQ_CORRELATE allows for correlation of replies
  from a REP socket. See: tests/test_req_correlate.cpp.

* New socket option, ZMQ_REQ_RELAXED, lets you disable the state machine
  on a REQ socket, so you can send multiple requests without waiting for
  replies, and without getting an EFSM error. See:
  tests/test_req_relaxed.cpp.

* New socket option, ZMQ_CONFLATE restricts the outgoing and incoming
  socket buffers to a single message. See: tests/test_conflate.cpp.

Deprecated Options
------------------

* ZMQ_IPV4ONLY deprecated and renamed to ZMQ_IPV6 so that options are
  consistently "off" by default.

* ZMQ_DELAY_ATTACH_ON_CONNECT deprecated, and renamed to ZMQ_IMMEDIATE.
  See: tests/test_immediate.cpp.

Security Framework
------------------

Based on new ZMTP wire level protocol that negotiates a security
"mechanism" between client and server before exchanging any other data.

Security mechanisms are extensible. ZMTP defines three by default:

* NULL - classic ZeroMQ, with no authentication. See
  http://rfc.zeromq.org/spec:23.

* PLAIN - plain-text username + password authentication. See
  http://rfc.zeromq.org/spec:24.

* CURVE - secure authentication and encryption based on elliptic curve
  cryptography, using the Curve25519 algorithm from Daniel Bernstein and
  based on CurveCP's security handshake. See http://rfc.zeromq.org/spec:25,
  http://rfc.zeromq.org/spec:26, and http://curvecp.org.

Authentication is done by pluggable "authenticators" that connect to libzmq
over an inproc endpoint, see http://rfc.zeromq.org/spec:27.

Socket options to configure PLAIN security on client or server:

* ZMQ_PLAIN_SERVER, ZMQ_PLAIN_USERNAME, ZMQ_PLAIN_PASSWORD. See
  tests/test_security_plain.

Socket options to configure CURVE security on client or server:

* ZMQ_CURVE_SERVER, ZMQ_CURVE_PUBLICKEY, ZMQ_CURVE_SECRETKEY,
  ZMQ_CURVE_SERVERKEY. See tests/test_security_curve.cpp.

Socket options to configure "domain" for ZAP handler:

* ZMQ_ZAP_DOMAIN, see tests/test_security_null.cpp.

Support for encoding/decoding CURVE binary keys to ASCII:

* zmq_z85_encode, zmq_z85_decode.

Other issues addressed in this release
--------------------------------------

* LIBZMQ-525 Multipart upstreaming from XSUB to XPUB

6 files changed, 26 insertions, 30 deletions

diff --git a/net/zeromq/Makefile b/net/zeromq/Makefile
index c49ba93f4f6..f20a9264ece 100644
--- a/net/zeromq/Makefile
+++ b/net/zeromq/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2013/09/30 12:54:11 obache Exp $
+# $NetBSD: Makefile,v 1.13 2014/03/01 08:38:12 obache Exp $
 
-DISTNAME=	zeromq-3.2.4
+DISTNAME=	zeromq-4.0.3
 CATEGORIES=	net devel
 MASTER_SITES=	http://download.zeromq.org/
 
diff --git a/net/zeromq/PLIST b/net/zeromq/PLIST
index e3701654974..5d03032486c 100644
--- a/net/zeromq/PLIST
+++ b/net/zeromq/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2013/07/19 08:16:36 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/03/01 08:38:12 obache Exp $
+bin/curve_keygen
 include/zmq.h
 include/zmq_utils.h
 lib/libzmq.la
@@ -10,6 +11,8 @@ man/man3/zmq_ctx_destroy.3
 man/man3/zmq_ctx_get.3
 man/man3/zmq_ctx_new.3
 man/man3/zmq_ctx_set.3
+man/man3/zmq_ctx_term.3
+man/man3/zmq_curve_keypair.3
 man/man3/zmq_disconnect.3
 man/man3/zmq_errno.3
 man/man3/zmq_getsockopt.3
@@ -32,6 +35,7 @@ man/man3/zmq_proxy.3
 man/man3/zmq_recv.3
 man/man3/zmq_recvmsg.3
 man/man3/zmq_send.3
+man/man3/zmq_send_const.3
 man/man3/zmq_sendmsg.3
 man/man3/zmq_setsockopt.3
 man/man3/zmq_socket.3
@@ -40,9 +44,14 @@ man/man3/zmq_strerror.3
 man/man3/zmq_term.3
 man/man3/zmq_unbind.3
 man/man3/zmq_version.3
+man/man3/zmq_z85_decode.3
+man/man3/zmq_z85_encode.3
 man/man7/zmq.7
+man/man7/zmq_curve.7
 man/man7/zmq_epgm.7
 man/man7/zmq_inproc.7
 man/man7/zmq_ipc.7
+man/man7/zmq_null.7
 man/man7/zmq_pgm.7
+man/man7/zmq_plain.7
 man/man7/zmq_tcp.7
diff --git a/net/zeromq/distinfo b/net/zeromq/distinfo
index e1b83ac4ef5..ac095a6e907 100644
--- a/net/zeromq/distinfo
+++ b/net/zeromq/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.12 2013/10/04 18:36:54 joerg Exp $
+$NetBSD: distinfo,v 1.13 2014/03/01 08:38:12 obache Exp $
 
-SHA1 (zeromq-3.2.4.tar.gz) = 08303259f08edd1faeac2e256f5be3899377135e
-RMD160 (zeromq-3.2.4.tar.gz) = 9f62881bc5d910cc1d1eb91df6be0ad3ca09d541
-Size (zeromq-3.2.4.tar.gz) = 2083123 bytes
-SHA1 (patch-configure) = 884409304fa361e1590ce673fb92146581ea1663
-SHA1 (patch-src_platform.hpp.in) = d248fabbd2194e27f667d55f676744a2d7076c19
-SHA1 (patch-tests_test__connect__delay.cpp) = 6c3bb997d8f0aaf277f1f81ce96d38c682c7bbf9
+SHA1 (zeromq-4.0.3.tar.gz) = a363ddfff75f73976f656b3ba48f32544b214075
+RMD160 (zeromq-4.0.3.tar.gz) = 183228d912c88618ed8392f0f82bec5ac6af4b1b
+Size (zeromq-4.0.3.tar.gz) = 2169301 bytes
+SHA1 (patch-configure) = 1dc8623eb06a167b3559ae950a9dbf1e19a29b6d
+SHA1 (patch-src_platform.hpp.in) = 767370bd997310cddeb7ee1f759bec1a638974e0
diff --git a/net/zeromq/patches/patch-configure b/net/zeromq/patches/patch-configure
index 75a77d7c904..1288a92b22c 100644
--- a/net/zeromq/patches/patch-configure
+++ b/net/zeromq/patches/patch-configure
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.3 2013/09/30 12:54:11 obache Exp $
+$NetBSD: patch-configure,v 1.4 2014/03/01 08:38:12 obache Exp $
 
 * DragonFly support
 
---- configure.orig	2013-05-02 09:13:30.000000000 +0000
+--- configure.orig	2013-11-24 18:02:49.000000000 +0000
 +++ configure
-@@ -17064,6 +17064,14 @@ $as_echo "#define ZMQ_FORCE_MUTEXES 1" >
- 
-         fi
+@@ -17123,6 +17123,14 @@ $as_echo "#define ZMQ_FORCE_MUTEXES 1" >
+         LDFLAGS="-lssp $LDFLAGS"
+         CPPFLAGS="$CPPFLAGS -Wno-long-long"
          ;;
 +    *dragonfly*)
 +        # Define on DragonFly to enable all library features
diff --git a/net/zeromq/patches/patch-src_platform.hpp.in b/net/zeromq/patches/patch-src_platform.hpp.in
index e30c0e59f8b..c3ed037b8cc 100644
--- a/net/zeromq/patches/patch-src_platform.hpp.in
+++ b/net/zeromq/patches/patch-src_platform.hpp.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_platform.hpp.in,v 1.3 2013/09/30 12:54:11 obache Exp $
+$NetBSD: patch-src_platform.hpp.in,v 1.4 2014/03/01 08:38:12 obache Exp $
 
 * DragonFly support
 
---- src/platform.hpp.in.orig	2013-05-02 09:13:31.000000000 +0000
+--- src/platform.hpp.in.orig	2013-11-24 18:02:50.000000000 +0000
 +++ src/platform.hpp.in
-@@ -178,9 +178,12 @@
+@@ -184,9 +184,12 @@
  /* Have eventfd extension. */
  #undef ZMQ_HAVE_EVENTFD
  
diff --git a/net/zeromq/patches/patch-tests_test__connect__delay.cpp b/net/zeromq/patches/patch-tests_test__connect__delay.cpp
deleted file mode 100644
index ec2ef6a72a7..00000000000
--- a/net/zeromq/patches/patch-tests_test__connect__delay.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-tests_test__connect__delay.cpp,v 1.3 2013/10/04 18:36:54 joerg Exp $
-
---- tests/test_connect_delay.cpp.orig	2013-10-02 11:20:19.000000000 +0000
-+++ tests/test_connect_delay.cpp
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <string>
-+#include <time.h>
- 
- #undef NDEBUG
- #include <assert.h>