Changes 3.2.3:

* LIBZMQ-526 Assertion failure "Invalid argument (tcp_connecter.cpp:285)"
* LIBZMQ-446 Setting the DSCP bits by default causes CAP_NET_ADMIN error
* LIBZMQ-496 Crash on heavy socket opening/closing: Device or resource busy (mutex.hpp:90)
* LIBZMQ-462 test_connect_delay fails at test_connect_delay.cpp:80
* LIBZMQ-497 Messages getting dropped
* LIBZMQ-488 signaler.cpp leaks the win32 Event Handle
* LIBZMQ-476 zmq_disconnect has no effect for inproc sockets
* LIBZMQ-475 zmq_disconnect does not sent unsubscribe messages

6 files changed, 33 insertions, 37 deletions

diff --git a/net/zeromq/Makefile b/net/zeromq/Makefile
index 5e09a49aed1..75ee4195950 100644
--- a/net/zeromq/Makefile
+++ b/net/zeromq/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2013/01/24 11:28:03 obache Exp $
-#
+# $NetBSD: Makefile,v 1.10 2013/07/19 08:16:36 adam Exp $
 
-DISTNAME=	zeromq-2.2.0
+DISTNAME=	zeromq-3.2.3
 CATEGORIES=	net devel
 MASTER_SITES=	http://download.zeromq.org/
 
@@ -10,10 +9,10 @@ HOMEPAGE=	http://www.zeromq.org/
 COMMENT=	The ZeroMQ messaging library
 LICENSE=	gnu-lgpl-v3
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+GNU_CONFIGURE=	yes
 
 PKGCONFIG_OVERRIDE+=	src/libzmq.pc.in
 
diff --git a/net/zeromq/PLIST b/net/zeromq/PLIST
index 3cd41cf64b2..e3701654974 100644
--- a/net/zeromq/PLIST
+++ b/net/zeromq/PLIST
@@ -1,34 +1,46 @@
-@comment $NetBSD: PLIST,v 1.2 2011/05/06 05:30:34 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/07/19 08:16:36 adam Exp $
 include/zmq.h
-include/zmq.hpp
 include/zmq_utils.h
 lib/libzmq.la
 lib/pkgconfig/libzmq.pc
 man/man3/zmq_bind.3
 man/man3/zmq_close.3
 man/man3/zmq_connect.3
-man/man3/zmq_device.3
+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_disconnect.3
 man/man3/zmq_errno.3
 man/man3/zmq_getsockopt.3
 man/man3/zmq_init.3
 man/man3/zmq_msg_close.3
 man/man3/zmq_msg_copy.3
 man/man3/zmq_msg_data.3
+man/man3/zmq_msg_get.3
 man/man3/zmq_msg_init.3
 man/man3/zmq_msg_init_data.3
 man/man3/zmq_msg_init_size.3
+man/man3/zmq_msg_more.3
 man/man3/zmq_msg_move.3
+man/man3/zmq_msg_recv.3
+man/man3/zmq_msg_send.3
+man/man3/zmq_msg_set.3
 man/man3/zmq_msg_size.3
 man/man3/zmq_poll.3
+man/man3/zmq_proxy.3
 man/man3/zmq_recv.3
+man/man3/zmq_recvmsg.3
 man/man3/zmq_send.3
+man/man3/zmq_sendmsg.3
 man/man3/zmq_setsockopt.3
 man/man3/zmq_socket.3
+man/man3/zmq_socket_monitor.3
 man/man3/zmq_strerror.3
 man/man3/zmq_term.3
+man/man3/zmq_unbind.3
 man/man3/zmq_version.3
 man/man7/zmq.7
-man/man7/zmq_cpp.7
 man/man7/zmq_epgm.7
 man/man7/zmq_inproc.7
 man/man7/zmq_ipc.7
diff --git a/net/zeromq/distinfo b/net/zeromq/distinfo
index f03ef304f69..bdc71c36b60 100644
--- a/net/zeromq/distinfo
+++ b/net/zeromq/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.7 2013/01/24 11:28:03 obache Exp $
+$NetBSD: distinfo,v 1.8 2013/07/19 08:16:36 adam Exp $
 
-SHA1 (zeromq-2.2.0.tar.gz) = e4bc024c33d3e62f658640625e061ce4e8bd1ff1
-RMD160 (zeromq-2.2.0.tar.gz) = 63c6ca84c292a72ffb0e18f1a97a6fa744a6be7c
-Size (zeromq-2.2.0.tar.gz) = 1900378 bytes
-SHA1 (patch-configure) = 8e184b534e8fbb97e4007af08f6d305d00899081
-SHA1 (patch-src_platform.hpp.in) = d1063de1699f2cda9f1421417062083b8fc4a0a2
-SHA1 (patch-src_tcp_socket.cpp) = ecc7c0b8b70dfc436a6422d230faa7bb4fef70ee
+SHA1 (zeromq-3.2.3.tar.gz) = 6857a3a0e908eca58f7c0f90e2ba4695f6700957
+RMD160 (zeromq-3.2.3.tar.gz) = b31bccf91f639b67dad56ef1265db73467780515
+Size (zeromq-3.2.3.tar.gz) = 2072758 bytes
+SHA1 (patch-configure) = b04b304545c098af4b17d164b4bbbfc20a3de230
+SHA1 (patch-src_platform.hpp.in) = 6467b1bdbbd163a3132e81d516f8c5b0c660792e
diff --git a/net/zeromq/patches/patch-configure b/net/zeromq/patches/patch-configure
index 010150ff98f..9eb0d7560bf 100644
--- a/net/zeromq/patches/patch-configure
+++ b/net/zeromq/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2012/05/20 21:07:25 marino Exp $
+$NetBSD: patch-configure,v 1.2 2013/07/19 08:16:36 adam Exp $
 
---- configure.orig	2011-12-18 23:22:41.000000000 +0000
+--- configure.orig	2013-05-02 09:13:30.000000000 +0000
 +++ configure
-@@ -17110,6 +17110,14 @@ $as_echo "#define ZMQ_FORCE_MUTEXES 1" >
+@@ -17064,6 +17064,14 @@ $as_echo "#define ZMQ_FORCE_MUTEXES 1" >
  
          fi
          ;;
diff --git a/net/zeromq/patches/patch-src_platform.hpp.in b/net/zeromq/patches/patch-src_platform.hpp.in
index 1d02200e480..a56de4a9d33 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.1 2012/05/20 21:07:25 marino Exp $
+$NetBSD: patch-src_platform.hpp.in,v 1.2 2013/07/19 08:16:36 adam Exp $
 
---- src/platform.hpp.in.orig	2012-05-20 20:57:44.478200000 +0000
+--- src/platform.hpp.in.orig	2013-05-02 09:13:31.000000000 +0000
 +++ src/platform.hpp.in
 @@ -178,9 +178,12 @@
- /* Have Cygwin */
- #undef ZMQ_HAVE_CYGWIN
+ /* Have eventfd extension. */
+ #undef ZMQ_HAVE_EVENTFD
  
 -/* Have FreeBSD OS */
 +/* Have FreeBSD OS -or- DragonFly OS */
diff --git a/net/zeromq/patches/patch-src_tcp_socket.cpp b/net/zeromq/patches/patch-src_tcp_socket.cpp
deleted file mode 100644
index 0ff21444034..00000000000
--- a/net/zeromq/patches/patch-src_tcp_socket.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_tcp_socket.cpp,v 1.1 2012/05/20 21:07:25 marino Exp $
-
---- src/tcp_socket.cpp.orig	2011-11-30 20:00:24.000000000 +0000
-+++ src/tcp_socket.cpp
-@@ -162,7 +162,8 @@ int zmq::tcp_socket_t::open (fd_t fd_, u
-         errno_assert (rc == 0);
-     }
- 
--#if defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_FREEBSD
-+#if defined(ZMQ_HAVE_OSX) || \
-+   (defined(ZMQ_HAVE_FREEBSD) && !defined(ZMQ_DRAGONFLY))
-     int set = 1;
-     int rc = setsockopt (s, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof (int));
-     errno_assert (rc == 0);